[SCM] linbox: library for exact linear algebra branch, master, updated. upstream/1.2.0-27-g5703172
Lifeng Sun
lifongsun at gmail.com
Mon Jun 11 15:27:19 UTC 2012
The following commit has been merged in the master branch:
commit 5b841e896c9b72758263b013a108b8cc34442924
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Fri Jun 8 21:24:48 2012 +0800
Imported Upstream version 1.3.1
diff --git a/AUTHORS b/AUTHORS
index 37611be..b2cbf48 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,13 +2,13 @@ The Linbox team:
Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
Mark Giesbrecht <mwg at csd.uwo.ca>
-Pascal Giorgi <Pascal.Giorgi at ens-lyon.fr>
+Pascal Giorgi <Pascal.Giorgi at lirmm.fr>
Bradford Hovinen <hovinen at cis.udel.edu>
Erich Kaltofen <kaltofen at math.ncsu.edu>
Clement Pernet <Clement.Pernet at imag.fr>
Daniel Roche <roche at cis.udel.edu>
B. David Saunders <saunders at cis.udel.edu>
Arne Storjohann <storjoha at inf.ethz.ch>
-William J. Turner <turnerw at wabash.edu>
+William Turner <turnerw at wabash.edu>
Gilles Villard <Gilles.Villard at ens-lyon.fr>
Zhendong Wan <wan at cis.udel.edu>
diff --git a/COPYING b/COPYING
index bf50f20..d159169 100644
--- a/COPYING
+++ b/COPYING
@@ -1,25 +1,22 @@
- GNU LIBRARY GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
-[This is the first released version of the library GPL. It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it. You can use it for
-your libraries, too.
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
@@ -30,347 +27,195 @@ in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
- Also, for each distributor's protection, we want to make certain
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
-library. If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software. To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
- Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs. This
-license, the GNU Library General Public License, applies to certain
-designated libraries. This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
- The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it. Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program. However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
- Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries. We
-concluded that weaker conditions might promote sharing better.
-
- However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves. This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them. (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.) The hope is that this
-will lead to faster development of free libraries.
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, while the latter only
-works together with the library.
-
- Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
- GNU LIBRARY GENERAL PUBLIC LICENSE
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License"). Each licensee is
-addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
+ a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
+identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
+on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
+entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
-collective works based on the Library.
+collective works based on the Program.
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- c) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- d) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
+distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
+the Program or works based on it.
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
+
+ 7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
+refrain entirely from distribution of the Program.
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
+integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
@@ -381,102 +226,114 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
- 12. If the distribution and/or use of the Library is restricted in
+ 8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307 USA.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
+school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
- <signature of Ty Coon>, 1 April 1990
+ <signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
-That's all there is to it!
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/COPYING.LESSER b/COPYING.LESSER
new file mode 100644
index 0000000..4362b49
--- /dev/null
+++ b/COPYING.LESSER
@@ -0,0 +1,502 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/ChangeLog b/ChangeLog
index 4da39ee..fb15abe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2011-03-10 bboyer
+ * Implement DublinBox Mother model for dense matrices (BlasM* own, BlasS* share)
+ * Change BlasSubmatrix private members (and add one to make Iterators faster)
+ * Change <> includes to "" so I have no surprise when the compiler looks them in a non expected place
+ * add a const in Field Categories for a weird bug...
+ * RawIterators are renamed to Iterators (impossible to pronounce, easy to misspell)
+ * add functions to blas-domain and blas-matrix
+
+2011-24-09 bboyer
+ * replace DenseMatrix(Base) by Blas(Matrix/Blackbox)
+ * put these classes (and DenseSubmatrix) in a Protected namespace (users will be warned...)
+ * update Blas(Mat/Bb) interface
+ * clean DenseMatrix(Base) from LinBox
+ * Delete BlasTag (use LinBoxTag class instead, avoids branching)
+ * Update to Givaro gcd new clean intefarce
+ * Update to one/zero in (some) Fflas-Ffpack fields
+ * Rename Flaflas to more serious FFLAS-FFPACK
+ * Minor updates in some classes.
+ * martin albretch patch to update linbox-sage.h
+ * M4RI checks
+ * Ekopath (pathscale) checks
+
2011-05-11 bboyer
linbox-1.2.0 released:
* Many many bug fixes, many memleaks, much code beautify.
@@ -24,6 +46,7 @@
* Some new field functions like characteristic()
* Work on synchronising field member functions signatures for
better compatibility between all fields (in progress)
+
2010-11-03 cpernet
linbox-1.1.7 released:
* bug fixes and minor enhancements
@@ -32,9 +55,11 @@
* new rebind interface
* incorporate the code for computations over the rationals (by A
Ubranska), still waiting to be cleaned-up (it is not used yet by default)
+
2008-09-22 cpernet
linbox-1.1.6 released:
* compilation pb, and bug fixes, for cygwin support and debianization
+
2008-06-10 cpernet
* Upgrade fflas-ffpack to v1.3.3 (safer and tighter bounds, bug
fixes,...)
@@ -43,6 +68,7 @@
* Add new interface to Sage
* bugs and documentation fixes
* remove gmp++ from LinBox, and thus make Givaro a necessary package
+
2008_03-02 cpernet
linbox-1.1.5 released:
* drivers are back to the source code,
@@ -51,6 +77,7 @@
* new double-determinant algorithm
* changed the rawIndexedIterator interface, fixing the broken previous one.
* many minor fixes, mostly memleaks.
+
2007-10-27 cpernet
linbox-1.1.4 has been released including the following most important
changes:
@@ -59,27 +86,34 @@
* increased system solver functionalities (rectangular, rank deficient
matrices)
* support for g++/gcc v4.2
+
2007-09-28 cpernet
* Add support for more general dense system solving:
The system can be rectangular (over/underdetermined), singular.
+
2007-09-07 bds
* This changelog is being widely ignored. Today buildbot test is on.
+
2007-01-31 bds
* This entry is just to record that version 1.1.0 has been released by
Jean-Guillaume Dumas and the current svn version is just a couple of
steps from the release version.
+
2006-08-08 bds
* examples/det.C, solutions/det.h, methods.h modified in preparation for
* mpi based paralle cra loop in algorithms/cra-domain.h (by Bryan Youse).
* also a stub of util/mpicpp.h added (will become the mpi interface).
+
2006-07-27 Hui Wang and bds
* Add blackbox/quad-matrix.h which defines the ZOQuad matrix,
* which is a cache efficient {0,1}-matrix rep.
* Add it's tests, modify also blackbox/zo.h,
* and accumulate-special in field/modular.h to better support sums of field elements efficiently.
+
2006-06-01 bds
* rank.h adjusted to work around faulty PIVOT_LINEAR code in sparse elim.
* test-rank.C now tests blackbox, elimination, hybrid methods as well as...
+
2006-04-18 bds and Hui Wang
* examples/smith.C minor changes
* linbox/blackbox/apply.h - don't recall what we did to wreck this.
@@ -106,6 +140,7 @@
2005-12-8 bds
* minor cleanups
+
2005-11-17 Pascal Giorgi:
* macros/blas-check.m4: adding new support for blas libraries
* macros/linbox-opt.m4: adding new support for blas libraries
diff --git a/INSTALL b/INSTALL
index 7d1c323..a1e89e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+ HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved. Use GNU `make'
+instead.
+
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
diff --git a/Makefile.am b/Makefile.am
index 82f0639..4d46843 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,29 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+#
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
+
+
ACLOCAL_AMFLAGS = -I macros
-SUBDIRS=linbox macros tests interfaces doc examples
+SUBDIRS=linbox macros tests interfaces doc examples benchmarks
# I intend to pare down the target "check" so as to be a smaller check used
# at installation time with a focus on confirming that dependencies on
@@ -14,30 +33,58 @@ SUBDIRS=linbox macros tests interfaces doc examples
# Fullcheck provides a full check for regression testing purposes.
fullcheck:
- (make ; cd tests; make fullcheck)
+ (${MAKE} ; cd tests; ${MAKE} fullcheck)
docs:doc/linbox-html/index.html
doc/linbox-html/index.html:
- (cd doc; make docs)
+ (cd doc; ${MAKE} docs)
-docs_dev:doc/linbox-dev-html/index.html
+docs_dev:doc/linbox-dev-html/pages.html
-doc/linbox-dev-html/index.html:
- (cd doc; make docs_dev)
+doc/linbox-dev-html/pages.html:
+ (cd doc; ${MAKE} docs_dev)
examples:
- (cd examples; make examples)
+ ( ${MAKE} ; cd examples; ${MAKE} examples)
+benchmarks:
+ (cd benchmarks; ${MAKE} benchmarks)
-.PHONY:examples
+.PHONY:examples benchmarks
bin_SCRIPTS=linbox-config
bundled:
sh auto-install.sh
-VERSION=1.2.0
+uninstall-hook:
+ (test -d "$(includedir)/linbox" && rmdir "$(bindir)" \
+ "$(libdir)" \
+ "$(mandir)/man1" \
+ "$(mandir)" \
+ "$(includedir)/linbox/algorithms/gauss" \
+ "$(includedir)/linbox/algorithms" \
+ "$(includedir)/linbox/blackbox" \
+ "$(includedir)/linbox/element" \
+ "$(includedir)/linbox/field/Givaro" \
+ "$(includedir)/linbox/field/Modular" \
+ "$(includedir)/linbox/field/NTL" \
+ "$(includedir)/linbox/field/" \
+ "$(includedir)/linbox/kaapi" \
+ "$(includedir)/linbox/matrix" \
+ "$(includedir)/linbox/randiter" \
+ "$(includedir)/linbox/ring" \
+ "$(includedir)/linbox/solutions" \
+ "$(includedir)/linbox/switch" \
+ "$(includedir)/linbox/util/formats" \
+ "$(includedir)/linbox/util" \
+ "$(includedir)/linbox/vector" \
+ "$(includedir)/linbox" \
+ "$(datarootdir)/" \
+ "$(includedir)" ) || true
+
+VERSION=1.3.1
EXTRA_DIST=auto-install.sh
#incremente-versions
diff --git a/Makefile.in b/Makefile.in
index d665426..32e758c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,13 +16,48 @@
@SET_MAKE@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+#
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -41,20 +76,23 @@ subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/linbox-config.in $(top_srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL NEWS TODO build-aux/config.guess \
- build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \
- build-aux/missing
+ COPYING COPYING.LESSER ChangeLog INSTALL NEWS TODO \
+ build-aux/config.guess build-aux/config.sub \
+ build-aux/install-sh build-aux/ltmain.sh build-aux/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -62,7 +100,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -73,8 +114,35 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = linbox-config
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(bindir)"
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
depcomp =
am__depfiles_maybe =
@@ -87,8 +155,16 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -96,12 +172,41 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -110,6 +215,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -133,10 +239,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -157,10 +265,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -169,6 +282,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -185,6 +300,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -194,7 +310,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TESTS_CFLAGS = @TESTS_CFLAGS@
-VERSION = 1.2.0
+VERSION = 1.3.1
WARN = @WARN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -248,28 +364,28 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I macros
-SUBDIRS = linbox macros tests interfaces doc examples
+SUBDIRS = linbox macros tests interfaces doc examples benchmarks
bin_SCRIPTS = linbox-config
EXTRA_DIST = auto-install.sh
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-am--refresh:
+am--refresh: Makefile
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu --ignore-deps'; \
- cd $(srcdir) && $(AUTOMAKE) --gnu --ignore-deps \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu --ignore-deps'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu --ignore-deps \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -285,21 +401,20 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
+ $(am__cd) $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
@@ -309,23 +424,39 @@ linbox-config: $(top_builddir)/config.status $(srcdir)/linbox-config.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p; then \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
- else :; fi; \
- done
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n' \
+ -e 'h;s|.*|.|' \
+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+ if (++n[d] == $(am__install_max)) { \
+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+ else { print "f", d "/" $$4, $$1 } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
uninstall-binSCRIPTS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_SCRIPTS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
mostlyclean-libtool:
-rm -f *.lo
@@ -360,7 +491,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -394,16 +525,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -418,7 +549,7 @@ tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -430,7 +561,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -439,36 +570,41 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
$(am__remove_distdir)
- test -d $(distdir) || mkdir $(distdir)
+ test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -484,51 +620,72 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
done
- -find "$(distdir)" -type d ! -perm -755 \
+ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -755 \
-exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
+ || chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__remove_distdir)
dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
+dist-xz: distdir
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -552,15 +709,19 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -568,10 +729,13 @@ distcheck: dist
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
+ test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -592,14 +756,24 @@ distcheck: dist
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+ && cd "$$am__cwd" \
+ || exit 1
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ @test -n '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: trying to run $@ with an empty' \
+ '$$(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ $(am__cd) '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
@@ -633,16 +807,22 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -716,26 +896,28 @@ ps: ps-recursive
ps-am:
uninstall-am: uninstall-binSCRIPTS
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+ ctags-recursive install-am install-strip tags-recursive \
+ uninstall-am
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-binSCRIPTS install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-binSCRIPTS
+ dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-binSCRIPTS install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-binSCRIPTS uninstall-hook
# I intend to pare down the target "check" so as to be a smaller check used
@@ -746,26 +928,56 @@ uninstall-am: uninstall-binSCRIPTS
# Fullcheck provides a full check for regression testing purposes.
fullcheck:
- (make ; cd tests; make fullcheck)
+ (${MAKE} ; cd tests; ${MAKE} fullcheck)
docs:doc/linbox-html/index.html
doc/linbox-html/index.html:
- (cd doc; make docs)
+ (cd doc; ${MAKE} docs)
-docs_dev:doc/linbox-dev-html/index.html
+docs_dev:doc/linbox-dev-html/pages.html
-doc/linbox-dev-html/index.html:
- (cd doc; make docs_dev)
+doc/linbox-dev-html/pages.html:
+ (cd doc; ${MAKE} docs_dev)
examples:
- (cd examples; make examples)
+ ( ${MAKE} ; cd examples; ${MAKE} examples)
+
+benchmarks:
+ (cd benchmarks; ${MAKE} benchmarks)
-.PHONY:examples
+.PHONY:examples benchmarks
bundled:
sh auto-install.sh
+
+uninstall-hook:
+ (test -d "$(includedir)/linbox" && rmdir "$(bindir)" \
+ "$(libdir)" \
+ "$(mandir)/man1" \
+ "$(mandir)" \
+ "$(includedir)/linbox/algorithms/gauss" \
+ "$(includedir)/linbox/algorithms" \
+ "$(includedir)/linbox/blackbox" \
+ "$(includedir)/linbox/element" \
+ "$(includedir)/linbox/field/Givaro" \
+ "$(includedir)/linbox/field/Modular" \
+ "$(includedir)/linbox/field/NTL" \
+ "$(includedir)/linbox/field/" \
+ "$(includedir)/linbox/kaapi" \
+ "$(includedir)/linbox/matrix" \
+ "$(includedir)/linbox/randiter" \
+ "$(includedir)/linbox/ring" \
+ "$(includedir)/linbox/solutions" \
+ "$(includedir)/linbox/switch" \
+ "$(includedir)/linbox/util/formats" \
+ "$(includedir)/linbox/util" \
+ "$(includedir)/linbox/vector" \
+ "$(includedir)/linbox" \
+ "$(datarootdir)/" \
+ "$(includedir)" ) || true
#incremente-versions
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/README b/README
index f45d39b..ec17613 100644
--- a/README
+++ b/README
@@ -17,7 +17,7 @@ AVAILABILITY: from linalg.org
REQUIREMENTS: GMP, ATLAS (or other cblas, lapack), NTL, Givaro
See doc/install*html for details.
-This library requires the GNU C++ compiler (gcc-2.95.1 or newer) or any
+This library requires the GNU C++ compiler (gcc-4.3 or newer) or any
compiler supporting advanced template features.
diff --git a/aclocal.m4 b/aclocal.m4
index b9ee875..77af140 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.10.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,28 +14,31 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
+[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.3], [],
+m4_if([$1], [1.11.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,19 +54,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.3])dnl
+[AM_AUTOMAKE_VERSION([1.11.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -110,14 +116,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
+# serial 9
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -130,6 +136,7 @@ AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -143,14 +150,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 10
+# serial 12
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -190,6 +197,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -254,7 +262,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -319,10 +327,13 @@ AC_DEFUN([AM_DEP_TRACK],
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -426,7 +437,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 13
+# serial 16
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -443,7 +454,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
+[AC_PREREQ([2.62])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -503,24 +514,37 @@ AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
@@ -543,18 +567,28 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -581,27 +615,38 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well. Anyway, the user
+# can override the default with the --enable/--disable switch.
AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
- dnl maintainer-mode is disabled by default
- AC_ARG_ENABLE(maintainer-mode,
-[ --enable-maintainer-mode enable make rules and dependencies not useful
+[m4_case(m4_default([$1], [disable]),
+ [enable], [m4_define([am_maintainer_other], [disable])],
+ [disable], [m4_define([am_maintainer_other], [enable])],
+ [m4_define([am_maintainer_other], [enable])
+ m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+ AC_ARG_ENABLE([maintainer-mode],
+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
(and sometimes confusing) to the casual installer],
- USE_MAINTAINER_MODE=$enableval,
- USE_MAINTAINER_MODE=no)
+ [USE_MAINTAINER_MODE=$enableval],
+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
MAINT=$MAINTAINER_MODE_TRUE
- AC_SUBST(MAINT)dnl
+ AC_SUBST([MAINT])dnl
]
)
@@ -609,14 +654,14 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
+# serial 6
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -633,7 +678,14 @@ AC_SUBST($1)])
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
@@ -643,12 +695,15 @@ else
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_MKDIR_P
# ---------------
# Check for `mkdir -p'.
@@ -671,13 +726,14 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -685,13 +741,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -704,14 +760,14 @@ AC_DEFUN([_AM_IF_OPTION],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# AM_SANITY_CHECK
# ---------------
@@ -720,16 +776,29 @@ AC_DEFUN([AM_SANITY_CHECK],
# Just in case
sleep 1
echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
if test "$[*]" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
+ set X `ls -t "$srcdir/configure" conftest.file`
fi
rm -f conftest.file
if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -754,12 +823,14 @@ Check your system clock])
fi
AC_MSG_RESULT(yes)])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
@@ -782,21 +853,28 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 3
+
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -818,10 +896,11 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
@@ -894,12 +973,15 @@ m4_include([macros/aclocal-include.m4])
m4_include([macros/config-header.m4])
m4_include([macros/debug.m4])
m4_include([macros/expat-check.m4])
-m4_include([macros/fflaflas-check.m4])
+m4_include([macros/fflas-ffpack-check.m4])
+m4_include([macros/fplll-check.m4])
m4_include([macros/givaro-check.m4])
m4_include([macros/gmp-check.m4])
m4_include([macros/iml-check.m4])
+m4_include([macros/lapack-check.m4])
m4_include([macros/libtool.m4])
m4_include([macros/lidia-check.m4])
+m4_include([macros/linbox-benchmark.m4])
m4_include([macros/linbox-doc.m4])
m4_include([macros/linbox-misc.m4])
m4_include([macros/linbox-opt.m4])
@@ -907,7 +989,10 @@ m4_include([macros/ltoptions.m4])
m4_include([macros/ltsugar.m4])
m4_include([macros/ltversion.m4])
m4_include([macros/lt~obsolete.m4])
+m4_include([macros/m4ri-check.m4])
+m4_include([macros/m4rie-check.m4])
m4_include([macros/maple-check.m4])
+m4_include([macros/mpfr-check.m4])
m4_include([macros/ntl-check.m4])
m4_include([macros/saclib-check.m4])
m4_include([macros/sage-check.m4])
diff --git a/auto-install.sh b/auto-install.sh
index 4f2233f..032a7d6 100755
--- a/auto-install.sh
+++ b/auto-install.sh
@@ -10,25 +10,41 @@
# TODO : manage icc/gcc
# TODO : add gmp in givaro and use auto-install in givaro
# TODO : use an optionnal message in die function.
-# TODO : add options to make like '-j'
+# TODO : rpath instead of LD_LIBRARY_PATH ?
-STABLE_FFLAS=1.4.0
-STABLE_GIVARO=3.4.1
-GIV_TAR=123
-GIV_MD5=124
+STABLE_FFLAS=1.6.0
+STABLE_GIVARO=3.7.0
+GIV_TAR=207
+GIV_MD5=208
#switches
-STABLE=true
+STABLE_VAR="true"
DEBUG=""
+DEBUG_VAR=""
WARNINGS=""
+WARNINGS_VAR=""
OPTIM="--enable-optimization"
-CHECK=false
+OPTIM_VAR=""
+CHECK_VAR=""
#options
PREFIX_LOC="/tmp"
+PREFIX_VAR=""
PREFIX="--prefix=$PREFIX_LOC"
BLAS=""
-NTL=""
+BLAS_VAR=""
+NTL="--with-ntl"
+NTL_VAR=""
EXTRA=""
+EXTRA_VAR=""
+IML="--with-iml"
+IML_VAR=""
+SAGE=""
+SAGE_VAR="false"
+DRIV=""
+DRIV_VAR="false"
+
+MAKEOPT=
+MAKE_VAR=""
DONE="\033[0;36m done !\033[0m"
BEG="\033[1;32m * \033[0m"
@@ -38,7 +54,12 @@ BEG="\033[1;32m * \033[0m"
#########
die() {
- echo -e "\n\033[1;31m * \033[0mfailed" ;
+ echo -ne "\n\033[1;31m * \033[0mfailed" ;
+ if [[ -n $1 ]] ; then
+ echo " ($1)"
+ else
+ echo "."
+ fi
exit -1 ;
}
@@ -56,24 +77,44 @@ help() {
echo
echo " * usage :"
echo
- echo " --stable : install latest stable versions or latest svn versions."
- echo " Default : yes."
+ echo " --stable=[yes,no] : install latest stable versions or latest svn versions."
+ echo " Default : yes, even if switch ommitted. No argument means yes"
+
echo " --prefix=MY/PATH : install all libraries under MY/PATH."
echo " Default : /tmp/"
+ echo
+ echo " >> Libraries to search for <<"
+ echo
+ echo " If some library cannot be linked, don't forget to export LD_LIBRARY_PATH ! "
+ echo
echo " --with-gmp=GMP/PATH : tell where gmp is."
- echo " Default : /usr, /usr/local"
- echo " --with-blas=BLAS/PATH : same for Blas installation."
- echo " --with-ntl=NTL/PATH : same for NTL."
+ echo " Default : /usr, /usr/local. No argument is Default"
+ echo " --with-blas=BLAS/PATH : same as GMP for BLAS. (will check anyway)"
+ echo " --with-ntl=NTL/PATH : same as GMP for NTL. (default)"
+ echo " --with-iml=IML/PATH : same as GMP for IML. (default)"
echo " --extra-flags=\"\" : give extra compiler flags."
echo " Default : empty"
+ echo " --make-flags=\"\" : give extra makefile flags."
+ echo " Default : empty"
+ echo
+ echo " >> for the next switches, nothing, Y, y, yes or 1 after \"=\" <<"
+ echo " >> means enabled. Anything else or omission means disabled <<"
+ echo
echo " --enable-debug : build in debugging mode."
- echo " Default : no."
+ echo " Default : disabled."
echo " --enable-check : run make check."
- echo " Default : no."
+ echo " Default : disabled."
echo " --enable-warnings : build with extra compile warnings."
- echo " Default : no."
+ echo " Default : disabled. May be \'full\' "
echo " --enable-optimization : build with compile-time optimization."
- echo " Default : yes."
+ echo " Default : enabled."
+ echo " --enable-sage : build with sage support."
+ echo " Default : disabled."
+ echo " --enable-drivers : build with drivers support."
+ echo " Default : disabled."
+ echo
+ echo " >> calling helllp <<"
+ echo
echo " --help, -h, -? : print help and exit."
}
@@ -81,46 +122,88 @@ help() {
# parser #
############
-for i in $* ; do
+for i in "$@" ; do
case "$i" in
# switches
- "--help"|"-h"|"-?")
+ "--help"|"-h"|"-?")
help
exit 0
;;
- "--no-stable")
- STABLE=false;
- ;;
"--stable")
- #default
+ if [ "x$STABLE_VAR" = "xfalse" ] ; then echo "stable or not ?"; help ; exit -1 ; fi
+ STABLE_VAR=true;
;;
"--enable-debug")
- DEBUG=$i;
- ;;
- "--no-enable-debug")
- DEBUG="";
+ if [ "x$DEBUG_VAR" = "xfalse" ] ; then echo "enable-debug or not ?" ; help ; exit -1 ; fi
+ DEBUG="$i";
+ DEBUG_VAR="true";
;;
"--enable-check")
- CHECK=true;
- ;;
- "--no-enable-check")
- CHECK=false;
+ if [ "x$CHECK_VAR" = "xfalse" ] ; then echo "enable-check or not ?"; help ; exit -1; fi
+ CHECK_VAR="true";
;;
"--enable-warnings")
- WARNINGS=$i;
- ;;
- "--no-enable-warnings")
- WARNINGS="";
+ if [ "x$WARNINGS_VAR" = "xfalse" ] ; then echo "enable-warnings or not ?"; help ; exit -1; fi
+ WARNINGS="$i";
+ WARNINGS_VAR="true";
;;
"--enable-optimization")
- OPTIM=$i;
+ if [ "x$OPTIM_VAR" = "xfalse" ] ; then echo "enable-optimization or not ?"; help ; exit -1; fi
+ OPTIM="$i";
+ OPTIM_VAR="true";
+ ;;
+ "--disable-debug")
+ if [ "x$DEBUG_VAR" = "xtrue" ] ; then echo "enable-debug or not ?" ; help ; exit -1 ; fi
+ DEBUG_VAR="false";
+ ;;
+ "--disable-check")
+ if [ "x$CHECK_VAR" = "xtrue" ] ; then echo "enable-check or not ?"; help ; exit -1; fi
+ CHECK_VAR="false";
;;
- "--no-enable-optimization")
- OPTIM="";
+ "--disable-warnings")
+ if [ "x$WARNINGS_VAR" = "xtrue" ] ; then echo "enable-warnings or not ?"; help ; exit -1; fi
+ WARNINGS_VAR="false";
+ ;;
+ "--disable-optimization")
+ if [ "x$OPTIM_VAR" = "xtrue" ] ; then echo "enable-optimization or not ?"; help ; exit -1; fi
+ OPTIM_VAR="false";
;;
"--with-ntl")
- NTL=$i
+ if [ "x$NTL_VAR" = "xfalse" ] ; then echo "with-ntl or not ?"; help ; exit -1; fi
+ NTL="$i";
+ NTL_VAR="true";
+ ;;
+ "--with-gmp")
+ if [ "x$GMP_VAR" = "xfalse" ] ; then echo "with-gmp or not ?"; help ; exit -1; fi
+ GMP="$i"
+ GMP_VAR="true"
+ ;;
+ "--with-iml")
+ if [ "x$IML_VAR" = "xfalse" ] ; then echo "with-iml or not ?"; help ; exit -1; fi
+ IML="$i "
+ IML_VAR="true"
+ ;;
+ "--enable-sage")
+ if [ "x$SAGE_VAR" = "xfalse" ] ; then echo "enable-sage or not ?"; help ; exit -1; fi
+ SAGE="$i"
+ SAGE_VAR="true"
;;
+ "--enable-drivers")
+ if [ "x$DRIV_VAR" = "xfalse" ] ; then echo "enable-drivers or not ?" ; help ; exit -1; fi
+ DRIV="$i"
+ DRIV_VAR="true"
+ ;;
+ "--disable-sage")
+ if [ "x$SAGE_VAR" = "xtrue" ] ; then echo "enable-sage or not ?"; help ; exit -1; fi
+ SAGE=""
+ SAGE_VAR="false"
+ ;;
+ "--disable-drivers")
+ if [ "x$DRIV_VAR" = "xtrue" ] ; then echo "enable-drivers or not ?" ; help ; exit -1; fi
+ DRIV=""
+ DRIV_VAR="false"
+ ;;
+
*)
if [[ ! "$i" =~ --.*=.+ ]] ; then
echo "bad switch : $i"
@@ -132,35 +215,113 @@ for i in $* ; do
QUOI="`echo $i | cut -d'=' -f2`"
# echo "$QUI = $QUOI"
case "$QUI" in
+ "--stable")
+ OK=2
+ [[ "$QUOI" = "yes" ]] && OK=1
+ [[ "$QUOI" = "no" ]] && OK=0
+ if [[ "$OK" = "2" ]] ; then
+ echo "stable=[yes/no] !" ; help ; exit -1 ;
+ fi
+ [[ "OK" = "1" ]] && STABLE_VAR="true" || STABLE_VAR="false"
+
+ ;;
"--prefix")
+ if [ "x$PREFIX_VAR" = "xtrue" ] ; then echo "prefix already set ?" ; help ; exit -1; fi
PREFIX=$i
PREFIX_LOC=$QUOI
+ PREFIX_VAR="true"
;;
"--extra-flags")
- EXTRA=$QUOI
+ if [ "x$EXTRA_VAR" = "xtrue" ] ; then echo "extra-flags already set ?" ; help ; exit -1; fi
+ EXTRA="$QUOI"
+ EXTRA_VAR="true"
+ ;;
+ "--make-flags")
+ if [ "x$MAKE_VAR" = "xtrue" ] ; then echo "make-flags already set ?" ; help ; exit -1; fi
+ MAKEOPT="$QUOI"
+ MAKE_VAR="true"
;;
"--with-gmp")
- GMP=$i
+ if [ "x$GMP_VAR" = "xtrue" ] ; then echo "GMP path already set ?" ; help ; exit -1; fi
+ GMP="$i"
+ GMP_VAR="true"
;;
"--with-blas")
- BLAS=$i
+ if [ "x$BLAS_VAR" = "xtrue" ] ; then echo "GMP path already set ?" ; help ; exit -1; fi
+ BLAS=$QUI=\"$QUOI\"
+ BLAS_VAR="true"
;;
"--with-ntl")
- NTL=$i
+ if [ "x$NTL_VAR" = "xtrue" ] ; then echo "NTL path already set ?" ; help ; exit -1; fi
+ NTL="$i"
+ NTL_VAR="true"
+ ;;
+ "--with-iml")
+ if [ "x$IML_VAR" = "xtrue" ] ; then echo "IML path already set ?" ; help ; exit -1; fi
+ IML="$i"
+ IML_VAR="true"
;;
"--enable-optimization")
- [[ "$QUOI" =~ y|yes|Y|1 ]] && OPTIM="--enable-optimization" || OPTIM=""
+ [[ "$QUOI" =~ y|yes|Y|1 ]] && OK=1 || OK=0
+ if [ "x$OPTIM_VAR" = "xtrue" -a "OK" = "0" ] ; then echo "optim or not optim ?" ; help ; exit -1; fi
+ if [ "x$OPTIM_VAR" = "xfalse" -a "OK" = "1" ] ; then echo "optim or not optim ?" ; help ; exit -1; fi
+ if [[ "x$OK" = "x1" ]] ; then
+ OPTIM=$QUI ; OPTIM_VAR="true" ;
+ else
+ OPTIM_VAR="false" ;
+ fi
;;
"--enable-warnings")
- [[ "$QUOI" =~ y|yes|Y|1 ]] && WARNINGS="--enable-warnings" || WARNINGS=""
+ [[ "$QUOI" =~ y|yes|Y|1|full ]] && OK=1 || OK=0
+ if [ "x$WARNING_VAR" = "xtrue" -a "OK" = "0" ] ; then echo "warning or not warning ?" ; help ; exit -1; fi
+ if [ "x$WARNING_VAR" = "xfalse" -a "OK" = "1" ] ; then echo "warning or not warning ?" ; help ; exit -1; fi
+ if [[ "x$OK" = "x1" ]] ; then
+ WARNINGS=$QUI ; WARNING_VAR="true"
+ else
+ WARNING_VAR="false"
+ fi
+ [[ "x$QUOI" = "xfull" ]] && WARNINGS=$i
;;
"--enable-debug")
- [[ "$QUOI" =~ y|yes|Y|1 ]] && DEBUG="--enable-debug" || DEBUG=""
+ [[ "$QUOI" =~ y|yes|Y|1 ]] && OK=1 || OK=0
+ if [ "x$DEBUG_VAR" = "xtrue" -a "OK" = "0" ] ; then echo "debug or not debug ?" ; help ; exit -1; fi
+ if [ "x$DEBUG_VAR" = "xfalse" -a "OK" = "1" ] ; then echo "debug or not debug ?" ; help ; exit -1; fi
+ if [[ "x$OK" = "x1" ]] ; then
+ DEBUG=$QUI ; DEBUG_VAR="true"
+ else
+ DEBUG_VAR="false"
+ fi
;;
- "--enable-check")
- [[ "$QUOI" =~ y|yes|Y|1 ]] && CHECK="true" || CHECK="false"
+ "--enable-check")
+ [[ "$QUOI" =~ y|yes|Y|1 ]] && OK=1 || OK=0
+ if [ "x$CHECK_VAR" = "xtrue" -a "OK" = "0" ] ; then echo "check or not check ?" ; help ; exit -1; fi
+ if [ "x$CHECK_VAR" = "xfalse" -a "OK" = "1" ] ; then echo "check or not check ?" ; help ; exit -1; fi
+ if [[ "x$OK" = "x1" ]] ; then
+ CHECK=$QUI ; CHECK_VAR="true"
+ else
+ CHECK_VAR="false"
+ fi
+ ;;
+ "--enable-sage")
+ [[ "$QUOI" =~ y|yes|Y|1 ]] && OK=1 || OK=0
+ if [ "x$OPTIM_VAR" = "xtrue" -a "OK" = "0" ] ; then echo "sage or not sage ?" ; help ; exit -1; fi
+ if [ "x$OPTIM_VAR" = "xfalse" -a "OK" = "1" ] ; then echo "sage or not sage ?" ; help ; exit -1; fi
+ if [[ "x$OK" = "x1" ]] ; then
+ OPTIM=$QUI ; OPTIM_VAR="true"
+ else
+ OPTIM_VAR="false"
+ fi
+ ;;
+ "--enable-drivers")
+ [[ "$QUOI" =~ y|yes|Y|1 ]] && OK=1 || OK=0
+ if [ "x$OPTIM_VAR" = "xtrue" -a "OK" = "0" ] ; then echo "drivers or not drivers ?" ; help ; exit -1; fi
+ if [ "x$OPTIM_VAR" = "xfalse" -a "OK" = "1" ] ; then echo "drivers or not drivers ?" ; help ; exit -1; fi
+ if [[ "x$OK" = "x1" ]] ; then
+ DRIV=$QUI ; DRIV_VAR="true"
+ else
+ DRIV_VAR="false"
+ fi
;;
-
*)
echo "unkown swith option $i" ;
help ;
@@ -171,11 +332,14 @@ for i in $* ; do
esac
done
+MAKEPROG="make ${MAKEOPT}"
+
######################
# create build dir #
######################
-echo -en "${BEG}Preparing build directory..."
+#first tee creates a new log.
+echo -en "${BEG}Preparing build directory..."| tee auto-install.log
if [ -e build ] ; then
if [ ! -d build ] ; then
rm -rf build ;
@@ -196,41 +360,13 @@ cool
cd build ;
-### Fflas-ffpack ###
-
-echo -en "${BEG}fecthing Fflas-Ffpack..."
-if [ "$STABLE" = "true" ]; then
- if [ -f fflas-ffpack-$STABLE_FFLAS.tar.gz ] ; then
- echo "already there"
- echo -ne "${BEG}fetching md5sum" ;
- [ -f fflas-ffpack-$STABLE_FFLAS.tar.gz.md5sum ] && rm fflas-ffpack-${STABLE_FFLAS}.tar.gz.md5sum ;
- wget http://linalg.org/fflas-ffpack-$STABLE_FFLAS.tar.gz.md5sum >/dev/null 2>&1 || die
- [ -f fflas-ffpack-$STABLE_FFLAS.tar.gz.md5sum ] || die
- cool
- echo -ne "${BEG}"
- md5sum -c fflas-ffpack-$STABLE_FFLAS.tar.gz.md5sum || die
- else
- wget http://linalg.org/fflas-ffpack-$STABLE_FFLAS.tar.gz >/dev/null 2>&1 || die
- [ -f fflas-ffpack-$STABLE_FFLAS.tar.gz ] || die
- echo -ne "${BEG}fetching md5sum" ;
- wget http://linalg.org/fflas-ffpack-$STABLE_FFLAS.tar.gz.md5sum >/dev/null 2>&1 || die
- cool
- echo -ne "${BEG}"
- md5sum -c fflas-ffpack-$STABLE_FFLAS.tar.gz.md5sum || die
- fi
-else
- OK=0 ;
- svn co svn://linalg.org/fflas-ffpack 2>&1 >/dev/null && OK=1
- [ "$OK" = "1" ] && cool || die
-fi
-
### Givaro ###
-echo -en "${BEG}fecthing Givaro..."
-if [ "$STABLE" = "true" ]; then
+echo -en "${BEG}fetching Givaro..."| tee -a ../auto-install.log
+if [ "$STABLE_VAR" = "true" ]; then
if [ -f givaro-$STABLE_GIVARO.tar.gz ] ; then
- echo "already there"
- echo -ne "${BEG}fetching md5sum" ;
+ echo -ne " already there!\n"
+ echo -ne "${BEG}fetching md5sum" ;
[ -f givaro-$STABLE_GIVARO.tar.gz.md5sum ] && rm givaro-${STABLE_GIVARO}.tar.gz.md5sum ;
wget --no-check-certificate https://forge.imag.fr/frs/download.php/$GIV_MD5/givaro-$STABLE_GIVARO.tar.gz.md5sum >/dev/null 2>&1 || die
[ -f givaro-$STABLE_GIVARO.tar.gz.md5sum ] || die
@@ -240,7 +376,7 @@ if [ "$STABLE" = "true" ]; then
else
wget --no-check-certificate https://forge.imag.fr/frs/download.php/$GIV_TAR/givaro-$STABLE_GIVARO.tar.gz >/dev/null 2>&1 || die
[ -f givaro-$STABLE_GIVARO.tar.gz ] || die
- echo -ne "${BEG}fetching md5sum" ;
+ echo -ne "${BEG}fetching md5sum" ;
wget --no-check-certificate https://forge.imag.fr/frs/download.php/$GIV_MD5/givaro-$STABLE_GIVARO.tar.gz.md5sum >/dev/null 2>&1 || die
cool
echo -ne "${BEG}"
@@ -252,129 +388,178 @@ else
[ "$OK" = "1" ] && cool || die
fi
+### Fflas-ffpack ###
+
+echo -en "${BEG}fetching Fflas-Ffpack..."| tee -a ../auto-install.log
+if [ "$STABLE_VAR" = "true" ]; then
+ if [ -f fflas-ffpack-$STABLE_FFLAS.tar.gz ] ; then
+ echo -ne " already there!\n"
+ echo -ne "${BEG}fetching md5sum" ;
+ [ -f fflas-ffpack-$STABLE_FFLAS.tar.gz.md5sum ] && rm fflas-ffpack-${STABLE_FFLAS}.tar.gz.md5sum ;
+ wget http://linalg.org/fflas-ffpack-$STABLE_FFLAS.tar.gz.md5sum >/dev/null 2>&1 || die
+ [ -f fflas-ffpack-$STABLE_FFLAS.tar.gz.md5sum ] || die
+ cool
+ echo -ne "${BEG}"
+ md5sum -c fflas-ffpack-$STABLE_FFLAS.tar.gz.md5sum || die
+ else
+ wget http://linalg.org/fflas-ffpack-$STABLE_FFLAS.tar.gz >/dev/null 2>&1 || die
+ [ -f fflas-ffpack-$STABLE_FFLAS.tar.gz ] || die
+ echo -ne "${BEG}fetching md5sum" ;
+ wget http://linalg.org/fflas-ffpack-$STABLE_FFLAS.tar.gz.md5sum >/dev/null 2>&1 || die
+ cool
+ echo -ne "${BEG}"
+ md5sum -c fflas-ffpack-$STABLE_FFLAS.tar.gz.md5sum || die
+ fi
+else
+ OK=0 ;
+ svn co svn://linalg.org/fflas-ffpack 2>&1 >/dev/null && OK=1
+ [ "$OK" = "1" ] && cool || die
+fi
+
#####################
# extract sources #
#####################
+### Givaro ###
+
+OK=0
+if [ "$STABLE_VAR" = "true" ]; then
+ echo -en "${BEG}extracting Givaro..."| tee -a ../auto-install.log
+ tar xzf givaro-$STABLE_GIVARO.tar.gz && OK=1
+ [ "$OK" = "1" ] && cool || die
+fi
+
### Fflas-ffpack ###
OK=0
-if [ "$STABLE" = "true" ]; then
- echo -en "${BEG}extracting Fflas-Ffpack..."
+if [ "$STABLE_VAR" = "true" ]; then
+ echo -en "${BEG}extracting Fflas-Ffpack..."| tee -a ../auto-install.log
tar xzf fflas-ffpack-$STABLE_FFLAS.tar.gz && OK=1
[ "$OK" = "1" ] && cool || die
fi
-### Givaro ###
-OK=0
-if [ "$STABLE" = "true" ]; then
- echo -en "${BEG}extracting Givaro..."
- tar xzf givaro-$STABLE_GIVARO.tar.gz && OK=1
- [ "$OK" = "1" ] && cool || die
-fi
-##########################
-# install fflas-ffpack #
-##########################
+####################
+# install Givaro #
+####################
-if [ "$STABLE" = "true" ]; then
- cd fflas-ffpack-$STABLE_FFLAS/ || die
+if [ "$STABLE_VAR" = "true" ]; then
+ cd givaro-$STABLE_GIVARO || die
else
- cd fflas-ffpack/ || die
+ cd trunk/ || die
fi
-
if [ -f Makefile ] ; then
- echo -e "${BEG}cleaning Fflas-Ffpack..."
- make clean || die
- make distclean || die
- # make unistall || die
+ echo -e "${BEG}cleaning Givaro..."| tee -a ../../auto-install.log
+ ${MAKEPROG} clean | tee -a ../../auto-install.log|| die
+ ${MAKEPROG} distclean | tee -a ../../auto-install.log|| die
+ # ${MAKEPROG} unistall || die
cool
fi
-echo -e "${BEG}configuring Fflas-Ffpack..."
+echo -e "${BEG}configuring Givaro..."
-if [ "$STABLE" = "true" ]; then
- echo "./configure $PREFIX $DEBUG $OPTIM $BLAS $WARNINGS"
- ./configure $PREFIX $DEBUG $OPTIM $BLAS $WARNINGS || die
+if [ "$STABLE_VAR" = "true" ]; then
+ echo "./configure $PREFIX $DEBUG $OPTIM $GMP $WARNINGS "
+ echo "./configure $PREFIX $DEBUG $OPTIM $GMP $WARNINGS " > configure.givaro.exe
+ chmod +x configure.givaro.exe
+ ./configure.givaro.exe | tee -a ../../auto-install.log
+ rm -rf configure.givaro.exe
+ #./configure $PREFIX $DEBUG $OPTIM $GMP $WARNINGS || die
else
- echo "./autogen.sh $PREFIX $DEBUG $OPTIM $BLAS $WARNINGS"
- ./autogen.sh $PREFIX $DEBUG $OPTIM $BLAS $WARNINGS || die
+ echo "./autogen.sh $PREFIX $DEBUG $OPTIM $GMP $WARNINGS"
+ echo "./autogen.sh $PREFIX $DEBUG $OPTIM $GMP $WARNINGS" > autogen.givaro.exe
+ chmod +x autogen.givaro.exe
+ ./autogen.givaro.exe| tee -a ../../auto-install.log
+ rm -rf autogen.givaro.exe
+ #./autogen.sh $PREFIX $DEBUG $OPTIM $GMP $WARNINGS || die
fi
-echo -e "${BEG}building Fflas-Ffpack..."
-echo "make CXXFLAGS+=\"$EXTRA\""
+echo -e "${BEG}building Givaro..."| tee -a ../../auto-install.log
+echo "${MAKEPROG} CXXFLAGS+=\"$EXTRA\" LDFLAGS+=\"-Wl,-rpath,$PREFIX_LOC\""| tee -a ../../auto-install.log
+
if [ -n "$EXTRA" ] ; then
- make "CXXFLAGS+=\"$EXTRA\"" || die
+ ${MAKEPROG} "CXXFLAGS+=\"$EXTRA\" LDFLAGS+=\"-Wl,-rpath,$PREFIX_LOC\"" | tee -a ../../auto-install.log|| die
else
- make || die
+ ${MAKEPROG} | tee -a ../../auto-install.log|| die
fi
-if [ "$CHECK" = "true" ] ; then
- echo -e "${BEG}checking Fflas-Ffpack..."
- make check || die
+if [ "$CHECK_VAR" = "true" ] ; then
+ echo -e "${BEG}checking Fflas-Ffpack..."| tee -a ../../auto-install.log
+ ${MAKEPROG} check | tee -a ../../auto-install.log|| die
fi
+echo -e "${BEG}installing Givaro..."| tee -a ../../auto-install.log
+${MAKEPROG} install | tee -a ../../auto-install.log|| die
-echo -e "${BEG}installing Fflas-Ffpack..."
-make install || die
-
-cool
#return in build
cd ..
-####################
-# install Givaro #
-####################
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PREFIX_LOC}/lib
-if [ "$STABLE" = "true" ]; then
- cd givaro-$STABLE_GIVARO || die
+
+cool| tee -a ../auto-install.log
+
+##########################
+# install fflas-ffpack #
+##########################
+
+if [ "$STABLE_VAR" = "true" ]; then
+ cd fflas-ffpack-$STABLE_FFLAS/ || die
else
- cd trunk/ || die
+ cd fflas-ffpack/ || die
fi
+
if [ -f Makefile ] ; then
- echo -e "${BEG}cleaning Givaro..."
- make clean || die
- make distclean || die
- # make unistall || die
- cool
+ echo -e "${BEG}cleaning Fflas-Ffpack..."| tee -a ../../auto-install.log
+ ${MAKEPROG} clean | tee -a ../../auto-install.log|| die
+ ${MAKEPROG} distclean | tee -a ../../auto-install.log|| die
+ # ${MAKEPROG} unistall || die
+ cool| tee -a ../../auto-install.log
fi
-echo -e "${BEG}configuring Givaro..."
+echo -e "${BEG}configuring Fflas-Ffpack..."| tee -a ../../auto-install.log
-if [ "$STABLE" = "true" ]; then
- echo "./configure $PREFIX $DEBUG $OPTIM $GMP $WARNINGS"
- ./configure $PREFIX $DEBUG $OPTIM $GMP $WARNINGS || die
+if [ "$STABLE_VAR" = "true" ]; then
+ echo "./configure $PREFIX $DEBUG $OPTIM $BLAS $WARNINGS"| tee -a ../../auto-install.log
+ echo "./configure $PREFIX $DEBUG $OPTIM $BLAS $WARNINGS" > configure.fflas.exe
+ chmod +x configure.fflas.exe
+ ./configure.fflas.exe| tee -a ../../auto-install.log
+ rm -rf configure.fflas.exe
+ #./configure "$PREFIX" "$DEBUG" "$OPTIM" "$BLAS" "$GIVARO" "$WARNINGS" || die
else
- echo "./autogen.sh $PREFIX $DEBUG $OPTIM $GMP $WARNINGS"
- ./autogen.sh $PREFIX $DEBUG $OPTIM $GMP $WARNINGS || die
+ echo "./autogen.sh $PREFIX $DEBUG $OPTIM $BLAS $WARNINGS"| tee -a ../../auto-install.log
+ echo "./autogen.sh $PREFIX $DEBUG $OPTIM $BLAS $WARNINGS" > configure.fflas.exe
+ chmod +x configure.fflas.exe
+ ./configure.fflas.exe| tee -a ../../auto-install.log
+ rm -rf configure.fflas.exe
+ #./autogen.sh "$PREFIX" "$DEBUG" "$OPTIM" "$BLAS" "$GIVARO" "$WARNINGS" || die
fi
-echo -e "${BEG}building Givaro..."
-echo "make CXXFLAGS+=\"$EXTRA\""
-
+echo -e "${BEG}building Fflas-Ffpack..."| tee -a ../../auto-install.log
+echo "${MAKEPROG} CXXFLAGS+=\"$EXTRA\""
if [ -n "$EXTRA" ] ; then
- make "CXXFLAGS+=\"$EXTRA\"" || die
+ ${MAKEPROG} "CXXFLAGS+=\"$EXTRA\"" | tee -a ../../auto-install.log|| die
else
- make || die
+ ${MAKEPROG} | tee -a ../../auto-install.log|| die
fi
-if [ "$CHECK" = "true" ] ; then
- echo -e "${BEG}checking Fflas-Ffpack..."
- make check || die
+if [ "$CHECK_VAR" = "true" ] ; then
+ echo -e "${BEG}checking Fflas-Ffpack..."| tee -a ../../auto-install.log
+ ${MAKEPROG} check | tee -a ../../auto-install.log|| die
fi
-echo -e "${BEG}installing Givaro..."
-make install || die
+echo -e "${BEG}installing Fflas-Ffpack..."
+${MAKEPROG} install | tee -a ../../auto-install.log|| die
+
+cool| tee -a ../../auto-install.log
#return in build
cd ..
-cool
-
#return in linbox
cd ..
@@ -383,49 +568,58 @@ cd ..
#####################
if [ -f Makefile ] ; then
- echo -e "${BEG}cleaning LinBox..."
- make clean || die
- make distclean || die
- # make unistall || die
- cool
+ echo -e "${BEG}cleaning LinBox..."| tee -a ./auto-install.log
+ ${MAKEPROG} clean | tee -a ./auto-install.log|| die
+ ${MAKEPROG} distclean | tee -a ./auto-install.log|| die
+ # ${MAKEPROG} unistall || die
+ cool| tee -a ./auto-install.log
fi
-echo -e "${BEG}configuring LinBox..."
+echo -e "${BEG}configuring LinBox..."| tee -a ./auto-install.log
+
+echo ""| tee -a ./auto-install.log
+echo -e "${BEG}Don't forget to run something like"| tee -a ./auto-install.log
+echo -e " * 'export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:$PREFIX_LOC/lib'"| tee -a ./auto-install.log
+echo -e " * to ensure you don't get undefined symbols !"| tee -a ./auto-install.log
+echo ""| tee -a ./auto-install.log
GIVARO="--with-givaro=$PREFIX_LOC"
FFLAFLAS="--with-fflas-ffpack=$PREFIX_LOC"
if [ -x autogen.sh ] ; then
- ./autogen.sh $PREFIX $DEBUG $OPTIM $GMP $BLAS $GIVARO $FFLAFLAS $WARNINGS || die
+ echo "./autogen.sh $PREFIX $DEBUG $OPTIM $GMP $BLAS $NTL $GIVARO $FFLAFLAS $WARNINGS $IML $SAGE $DRIV"| tee -a ./auto-install.log
+ ./autogen.sh "$PREFIX" "$DEBUG" "$OPTIM" "$GMP" "$BLAS" "$NTL" "$GIVARO" "$FFLAFLAS" "$WARNINGS" "$IML" "$SAGE" "$DRIV" | tee -a ./auto-install.log|| die
else
- ./configure $PREFIX $DEBUG $OPTIM $GMP $BLAS $GIVARO $FFLAFLAS $WARNINGS || die
+ echo "./configure $PREFIX $DEBUG $OPTIM $GMP $BLAS $NTL $GIVARO $FFLAFLAS $WARNINGS $IML $SAGE $DRIV"| tee -a ./auto-install.log
+ # ./configure $PREFIX $DEBUG $OPTIM $GMP $BLAS $NTL $GIVARO $FFLAFLAS $WARNINGS $IML $SAGE $DRIV || die
+ ./configure "$PREFIX" "$DEBUG" "$OPTIM" "$GMP" "$BLAS" "$NTL" "$GIVARO" "$FFLAFLAS" "$WARNINGS" "$IML" "$SAGE" "$DRIV" | tee -a ./auto-install.log|| die
fi
-echo -e "${BEG}building LinBox..."
-echo "make CXXFLAGS+=\"$EXTRA\""
+echo -e "${BEG}building LinBox..."| tee -a ./auto-install.log
+echo "${MAKEPROG} CXXFLAGS+=\"$EXTRA\" LDFLAGS+=\"-Wl,-rpath,$PREFIX_LOC\""| tee -a ./auto-install.log
if [ -n "$EXTRA" ] ; then
- make "CXXFLAGS+=\"$EXTRA\"" || die
+ ${MAKEPROG} "CXXFLAGS+=\"$EXTRA\" LDFLAGS+=\"-Wl,-rpath,$PREFIX_LOC\"" | tee -a ./auto-install.log|| die
else
- make || die
+ ${MAKEPROG} "LDFLAGS+=\"-Wl,-rpath,$PREFIX_LOC\""| tee -a ./auto-install.log|| die
fi
-if [ "$CHECK" = "true" ] ; then
- echo -e "${BEG}checking LinBox..."
- make check || die
+if [ "$CHECK_VAR" = "true" ] ; then
+ echo -e "${BEG}checking LinBox..."| tee -a auto-install.log
+ ${MAKEPROG} check | tee -a auto-install.log|| die
fi
-echo -e "${BEG}installing LinBox..."
-make install || die
+echo -e "${BEG}installing LinBox..."| tee -a auto-install.log
+${MAKEPROG} install | tee -a auto-install.log|| die
-cool
+cool| tee -a auto-install.log
-echo
-echo -e "${BEG}Don't forget to run something like"
-echo -e " * 'export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:$PREFIX_LOC/lib'"
-echo -e " * to ensure you don't get undefined symobols !"
-echo
-echo -e " * Happy LinBoxing ! (installed in $PREFIX_LOC)"
-echo
-cool
+echo " " | tee -a auto-install.log
+echo -e "${BEG}Don't forget to run something like"| tee -a auto-install.log
+echo -e " * 'export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:$PREFIX_LOC/lib'"| tee -a auto-install.log
+echo -e " * to ensure you don't get undefined symbols !"| tee -a auto-install.log
+echo "" | tee -a auto-install.log
+echo -e " * Happy LinBoxing ! (installed in $PREFIX_LOC)"| tee -a auto-install.log
+echo " "| tee -a auto-install.log
+cool| tee -a auto-install.log
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
new file mode 100644
index 0000000..7041141
--- /dev/null
+++ b/benchmarks/Makefile.am
@@ -0,0 +1,97 @@
+# Copyright (c) 2011 the LinBox group
+# Brice Boyer <bboyer at imag.fr>
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
+
+AM_CPPFLAGS=-I$(top_srcdir) -I$(top_srcdir)/linbox
+
+# SAFER_FLAGS=-g -Wall -Wextra -Wno-unused-parameter
+
+AM_CXXFLAGS= @DEFAULT_CFLAGS@ -DLinBoxSrcOnly
+AM_CPPFLAGS+= $(GMP_CFLAGS) $(NTL_CFLAGS) $(GIVARO_CFLAGS) $(LIDIA_CFLAGS) $(FFLAS_FFPACK_CFLAGS)
+LDADD= $(NTL_LIBS) $(GIVARO_LIBS) $(LIDIA_LIBS) $(BLAS_LIBS) $(GMP_LIBS)
+AM_LDFLAGS=-static $(LDFLAGS)
+
+BENCH_BASIC= \
+ benchmark-fgemm \
+ benchmark-crafixed \
+ benchmark-ftrXm
+TODO=
+ benchmark-matmul \
+ benchmark-spmv \
+ benchmark-fields
+
+# BENCH_ALGOS= \
+TODO=
+ benchmark-solve \
+ benchmark-rank \
+ benchmark-det \
+ benchmark-nullspace
+
+# BENCH_FORMS= \
+TODO=
+ benchmark-lu
+ benchmark-echelon \
+ benchmark-hermite \
+ benchmark-smith
+
+EXTRA_PROGRAMS= $(BENCH_BASIC)
+
+EXTRA_DIST= benchmark.h benchmark.doxy
+
+benchmarks: ${EXTRA_PROGRAMS}
+
+### BASE BENCHMARK ###
+
+benchmark_fgemm_SOURCES = benchmark-fgemm.C
+benchmark_ftrXm_SOURCES = benchmark-ftrXm.C
+
+benchmark_crafixed_SOURCES = benchmark-crafixed.C
+benchmark_crafixed_CPPFLAGS = $(IML_CFLAGS) $(AM_CPPFLAGS)
+benchmark_crafixed_LDADD = $(IML_LIBS) $(LDADD)
+# benchmark_matmul_SOURCES = benchmark-matmul.C
+# benchmark_spmv_SOURCES = benchmark-spmv.C
+# benchmark_fields_SOURCES = benchmark-fields.C
+
+### BENCHMARK ALGOS and SOLUTIONS ###
+# benchmark_solve_SOURCES = benchmark-solve.C
+# benchmark_rank_SOURCES = benchmark-rank.C
+# benchmark_det_SOURCES = benchmark-det.C
+# benchmark_nullspace_SOURCES = benchmark-nullspace.C
+
+
+### BENCHMARK MATRIX FACTORISATIONS ###
+# benchmark_lu_SOURCES = benchmark-lu.C
+# benchmark_echelon_SOURCES = benchmark-echelon.C
+# benchmark_hermite_SOURCES = benchmark-hermite.C
+# benchmark_smith_SOURCES = benchmark-smith.C
+
+
+LINBOX=@prefix@
+
+LINBOX_BIN=@bindir@
+
+# for compilation of new benchmarks
+%:%.C
+ $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.C -o $@ $(LDFLAGS) $(LDADD) $(LOADLIBES) $(top_srcdir)/linbox/.libs/liblinbox.a
+
+%:%.cpp
+ $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.cpp -o $@ $(LDFLAGS) $(LDADD) $(LOADLIBES) $(top_srcdir)/linbox/.libs/liblinbox.a
diff --git a/benchmarks/Makefile.in b/benchmarks/Makefile.in
new file mode 100644
index 0000000..74e6752
--- /dev/null
+++ b/benchmarks/Makefile.in
@@ -0,0 +1,650 @@
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Copyright (c) 2011 the LinBox group
+# Brice Boyer <bboyer at imag.fr>
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+EXTRA_PROGRAMS = $(am__EXEEXT_1)
+subdir = benchmarks
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
+ $(top_srcdir)/macros/config-header.m4 \
+ $(top_srcdir)/macros/debug.m4 \
+ $(top_srcdir)/macros/expat-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
+ $(top_srcdir)/macros/givaro-check.m4 \
+ $(top_srcdir)/macros/gmp-check.m4 \
+ $(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
+ $(top_srcdir)/macros/libtool.m4 \
+ $(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
+ $(top_srcdir)/macros/linbox-doc.m4 \
+ $(top_srcdir)/macros/linbox-misc.m4 \
+ $(top_srcdir)/macros/linbox-opt.m4 \
+ $(top_srcdir)/macros/ltoptions.m4 \
+ $(top_srcdir)/macros/ltsugar.m4 \
+ $(top_srcdir)/macros/ltversion.m4 \
+ $(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
+ $(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
+ $(top_srcdir)/macros/ntl-check.m4 \
+ $(top_srcdir)/macros/saclib-check.m4 \
+ $(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__EXEEXT_1 = benchmark-fgemm$(EXEEXT) benchmark-crafixed$(EXEEXT) \
+ benchmark-ftrXm$(EXEEXT)
+am_benchmark_crafixed_OBJECTS = \
+ benchmark_crafixed-benchmark-crafixed.$(OBJEXT)
+benchmark_crafixed_OBJECTS = $(am_benchmark_crafixed_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+benchmark_crafixed_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
+am_benchmark_fgemm_OBJECTS = benchmark-fgemm.$(OBJEXT)
+benchmark_fgemm_OBJECTS = $(am_benchmark_fgemm_OBJECTS)
+benchmark_fgemm_LDADD = $(LDADD)
+benchmark_fgemm_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_benchmark_ftrXm_OBJECTS = benchmark-ftrXm.$(OBJEXT)
+benchmark_ftrXm_OBJECTS = $(am_benchmark_ftrXm_OBJECTS)
+benchmark_ftrXm_LDADD = $(LDADD)
+benchmark_ftrXm_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+SOURCES = $(benchmark_crafixed_SOURCES) $(benchmark_fgemm_SOURCES) \
+ $(benchmark_ftrXm_SOURCES)
+DIST_SOURCES = $(benchmark_crafixed_SOURCES) \
+ $(benchmark_fgemm_SOURCES) $(benchmark_ftrXm_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
+BLAS_LIBS = @BLAS_LIBS@
+CC = @CC@
+CCNAM = @CCNAM@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DBG = @DBG@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
+DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
+DEFS = @DEFS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXPAT_CFLAGS = @EXPAT_CFLAGS@
+EXPAT_LIBS = @EXPAT_LIBS@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
+FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
+GIVARO_CFLAGS = @GIVARO_CFLAGS@
+GIVARO_LIBS = @GIVARO_LIBS@
+GMP_CFLAGS = @GMP_CFLAGS@
+GMP_LIBS = @GMP_LIBS@
+GMP_VERSION = @GMP_VERSION@
+GREP = @GREP@
+IML_CFLAGS = @IML_CFLAGS@
+IML_LIBS = @IML_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIDIA_CFLAGS = @LIDIA_CFLAGS@
+LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
+LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MAPLE_CFLAGS = @MAPLE_CFLAGS@
+MAPLE_HOME = @MAPLE_HOME@
+MAPLE_LIBS = @MAPLE_LIBS@
+MAPLE_VERSION = @MAPLE_VERSION@
+MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NTL_CFLAGS = @NTL_CFLAGS@
+NTL_LIBS = @NTL_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
+RANLIB = @RANLIB@
+RM = @RM@
+SACLIB_CFLAGS = @SACLIB_CFLAGS@
+SACLIB_LIBS = @SACLIB_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TESTS_CFLAGS = @TESTS_CFLAGS@
+VERSION = @VERSION@
+WARN = @WARN@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/linbox $(GMP_CFLAGS) \
+ $(NTL_CFLAGS) $(GIVARO_CFLAGS) $(LIDIA_CFLAGS) \
+ $(FFLAS_FFPACK_CFLAGS)
+
+# SAFER_FLAGS=-g -Wall -Wextra -Wno-unused-parameter
+AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DLinBoxSrcOnly
+LDADD = $(NTL_LIBS) $(GIVARO_LIBS) $(LIDIA_LIBS) $(BLAS_LIBS) $(GMP_LIBS)
+AM_LDFLAGS = -static $(LDFLAGS)
+BENCH_BASIC = \
+ benchmark-fgemm \
+ benchmark-crafixed \
+ benchmark-ftrXm
+
+TODO =
+EXTRA_DIST = benchmark.h benchmark.doxy
+
+### BASE BENCHMARK ###
+benchmark_fgemm_SOURCES = benchmark-fgemm.C
+benchmark_ftrXm_SOURCES = benchmark-ftrXm.C
+benchmark_crafixed_SOURCES = benchmark-crafixed.C
+benchmark_crafixed_CPPFLAGS = $(IML_CFLAGS) $(AM_CPPFLAGS)
+benchmark_crafixed_LDADD = $(IML_LIBS) $(LDADD)
+# benchmark_matmul_SOURCES = benchmark-matmul.C
+# benchmark_spmv_SOURCES = benchmark-spmv.C
+# benchmark_fields_SOURCES = benchmark-fields.C
+
+### BENCHMARK ALGOS and SOLUTIONS ###
+# benchmark_solve_SOURCES = benchmark-solve.C
+# benchmark_rank_SOURCES = benchmark-rank.C
+# benchmark_det_SOURCES = benchmark-det.C
+# benchmark_nullspace_SOURCES = benchmark-nullspace.C
+
+### BENCHMARK MATRIX FACTORISATIONS ###
+# benchmark_lu_SOURCES = benchmark-lu.C
+# benchmark_echelon_SOURCES = benchmark-echelon.C
+# benchmark_hermite_SOURCES = benchmark-hermite.C
+# benchmark_smith_SOURCES = benchmark-smith.C
+LINBOX = @prefix@
+LINBOX_BIN = @bindir@
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .C .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps benchmarks/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps benchmarks/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+benchmark-crafixed$(EXEEXT): $(benchmark_crafixed_OBJECTS) $(benchmark_crafixed_DEPENDENCIES) $(EXTRA_benchmark_crafixed_DEPENDENCIES)
+ @rm -f benchmark-crafixed$(EXEEXT)
+ $(CXXLINK) $(benchmark_crafixed_OBJECTS) $(benchmark_crafixed_LDADD) $(LIBS)
+benchmark-fgemm$(EXEEXT): $(benchmark_fgemm_OBJECTS) $(benchmark_fgemm_DEPENDENCIES) $(EXTRA_benchmark_fgemm_DEPENDENCIES)
+ @rm -f benchmark-fgemm$(EXEEXT)
+ $(CXXLINK) $(benchmark_fgemm_OBJECTS) $(benchmark_fgemm_LDADD) $(LIBS)
+benchmark-ftrXm$(EXEEXT): $(benchmark_ftrXm_OBJECTS) $(benchmark_ftrXm_DEPENDENCIES) $(EXTRA_benchmark_ftrXm_DEPENDENCIES)
+ @rm -f benchmark-ftrXm$(EXEEXT)
+ $(CXXLINK) $(benchmark_ftrXm_OBJECTS) $(benchmark_ftrXm_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+.C.o:
+ $(CXXCOMPILE) -c -o $@ $<
+
+.C.obj:
+ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.C.lo:
+ $(LTCXXCOMPILE) -c -o $@ $<
+
+benchmark_crafixed-benchmark-crafixed.o: benchmark-crafixed.C
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(benchmark_crafixed_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o benchmark_crafixed-benchmark-crafixed.o `test -f 'benchmark-crafixed.C' || echo '$(srcdir)/'`benchmark-crafixed.C
+
+benchmark_crafixed-benchmark-crafixed.obj: benchmark-crafixed.C
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(benchmark_crafixed_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o benchmark_crafixed-benchmark-crafixed.obj `if test -f 'benchmark-crafixed.C'; then $(CYGPATH_W) 'benchmark-crafixed.C'; else $(CYGPATH_W) '$(srcdir)/benchmark-crafixed.C'; fi`
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am
+
+ benchmark-matmul \
+ benchmark-spmv \
+ benchmark-fields
+
+# BENCH_ALGOS= \
+#TODO=
+ benchmark-solve \
+ benchmark-rank \
+ benchmark-det \
+ benchmark-nullspace
+
+# BENCH_FORMS= \
+#TODO=
+ benchmark-lu
+ benchmark-echelon \
+ benchmark-hermite \
+ benchmark-smith
+
+benchmarks: ${EXTRA_PROGRAMS}
+
+# for compilation of new benchmarks
+%:%.C
+ $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.C -o $@ $(LDFLAGS) $(LDADD) $(LOADLIBES) $(top_srcdir)/linbox/.libs/liblinbox.a
+
+%:%.cpp
+ $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.cpp -o $@ $(LDFLAGS) $(LDADD) $(LOADLIBES) $(top_srcdir)/linbox/.libs/liblinbox.a
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/benchmarks/benchmark-crafixed.C b/benchmarks/benchmark-crafixed.C
new file mode 100644
index 0000000..b964b06
--- /dev/null
+++ b/benchmarks/benchmark-crafixed.C
@@ -0,0 +1,384 @@
+
+/* Copyright (C) 2011 LinBox
+ * Written by BB <brice.boyer at imag.fr>
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file benchmarks/benchmark-crafixed.C
+ * @ingroup benchmarks
+ * @brief Benchmarking fixed CRA routines.
+ * Here we make benchmarks for CRT (Chinese Remaindering Theorem/Algorithm) in
+ * the following case. Let \f$\mathbf{v}\f$ be a vector of size \f$n\f$ and
+ * whose entries have at most \f$l\f$ bits (signed or unsigned). Suppose that
+ * we only know \f$\mathbf{v} \mod p_i\f$ for many primes \f$p_i\f$. We try
+ * and reconstruct \f$\mathbf{v}\f$ from these residues.
+ *
+ * We benchmark for one vector or \f$m\f$ repetitions on different vectors.
+ *
+ * We use the implementations in LinBox, Givaro, IML and NTL (if the latter two
+ * are available).
+ *
+ * @warning this is not a benchmark for one integer to reconstruct or a for BlasMatrix.
+ */
+
+#include "benchmarks/benchmark.h"
+#include "linbox/util/debug.h"
+#include "linbox/field/modular.h"
+#include "linbox/field/modular-balanced.h"
+#include "linbox/matrix/random-matrix.h"
+#include "linbox/algorithms/blas-domain.h"
+#include "linbox/algorithms/rns.h"
+
+#include "linbox/algorithms/cra-domain.h"
+#include "linbox/algorithms/cra-early-multip.h"
+#include "linbox/integer.h"
+
+#ifdef __LINBOX_HAVE_IML
+#include "linbox/util/iml_wrapper.h"
+#endif
+
+#define _LB_LOG2 0.69314718055994530941
+
+using Givaro::Timer ;
+using LinBox::integer;
+
+// typedef std::vector<LinBox::integer> Ivect ;
+// typedef std::vector<double> Fvect ;
+
+struct ReductVect {
+ std::vector<integer> & _v ;
+
+ ReductVect(std::vector<integer> &v) :
+ _v(v)
+ { } ;
+
+ template<typename Field>
+ std::vector<typename Field::Element> &
+ operator()(std::vector<typename Field::Element> & r, const Field & F) const
+ {
+ typedef typename Field::Element Element;
+ typedef std::vector<Element> Fvect;
+ typedef typename Fvect::iterator Iter;
+
+ //! @todo LinBox hom or magic here ?
+ std::vector<integer>::iterator j = _v.begin();
+
+ for (Iter i = r.begin() ; i != r.end() ; ++i,++j) {
+ F.init(*i,*j);
+ }
+ return r ;
+ }
+
+};
+
+struct ReductVectIterator ;
+namespace LinBox
+{
+ template<class Element> struct CRATemporaryVectorTrait<ReductVectIterator ,Element> {
+ typedef typename std::vector<double>::iterator Type_t;
+ };
+}
+
+struct ReductVectIterator {
+ std::vector<integer> & _v ;
+ mutable std::vector<double> _r ;
+
+ ReductVectIterator(std::vector<integer> &v) :
+ _v(v)
+ {
+ _r.resize(v.size());
+ } ;
+
+ template<typename Iterator, typename Field>
+ Iterator &
+ operator()(Iterator & r, const Field & F) const
+ {
+ typedef typename Field::Element Element;
+ typedef std::vector<Element> Fvect;
+ typedef typename Fvect::iterator Iter;
+
+ //! @todo LinBox hom or magic here ?
+ std::vector<integer>::iterator j = _v.begin();
+ for (std::vector<double>::iterator i = _r.begin() ; i != _r.end() ; ++i,++j) {
+ F.init(*i,*j);
+ }
+ return r= _r.begin() ;
+ }
+
+
+};
+
+template<class Field>
+struct ReductPoint {
+ integer & _v ;
+ typedef typename Field::Element Element;
+ ReductPoint(integer &v) :
+ _v(v)
+ {} ;
+ Element & operator()(Element & r, const Field & F)
+ {
+ F.init(r,_v);
+ return r ;
+ }
+};
+
+
+
+/*! Bench CRA.
+ * @param n size of vector to reconstruct (>1)
+ * @param m number of vectors to reconstruct
+ * @param l size of the integers
+ * @tparam Unsigned use >=0 random integers or not.
+ * @param Data collects timings
+ */
+template<bool Unsigned>
+int bench_cra(index_t n, index_t m, index_t l
+ , LinBox::PlotData<index_t> & Data)
+{
+
+ Timer tim, chrono ;
+ typedef std::vector<LinBox::integer> Ivect ;
+ { /* LinBox CRA */
+ tim.clear();
+ typedef LinBox::Modular<double> ModularField ;
+ typedef LinBox::FullMultipFixedCRA< ModularField > CRAbase ;
+ unsigned int PrimeSize = 22;
+ double logV = l*_LB_LOG2 ;
+ if (!Unsigned) logV += _LB_LOG2 ;
+ std::cout << "size to reconstruct : " << logV << std::endl;
+ LinBox::RandomPrimeIterator genprime( PrimeSize );
+ for (size_t i = 0 ; i < (size_t) m ; ++i) { // repeat m times
+ // create the vector to reconstruct
+ Ivect V(n),R(n) ;
+ for (Ivect::iterator it = V.begin() ; it != V.end() ; ++it) {
+ integer::random_lessthan<Unsigned>(*it,l) ;
+ }
+#ifdef _LB_DEBUG
+ for (Ivect::iterator it = V.begin() ; it != V.end() ; ++it) {
+ if (naturallog(*it) > logV) {
+ std::cout << *it << " too big (" << naturallog(*it) << ")" << std::endl;
+ }
+ }
+#endif
+
+ LinBox::ChineseRemainder< CRAbase > cra( std::pair<size_t,double>(n, logV) );
+ ReductVectIterator iteration(V);
+ chrono.clear(); chrono.start();
+ Ivect::iterator Rit = R.begin();
+ cra(Rit, iteration, genprime);
+ chrono.stop();
+ tim += chrono ;
+ if (!std::equal(R.begin(),R.end(),V.begin())) {
+ std::cerr << "*** LinBox CRA failed " << (Unsigned?"positive":"general") << " ***" << std::endl;
+ std::cerr << R << std::endl << "expecting " << std::endl << V << std::endl;
+ }
+ // else
+ // std::cerr << "ok" << std::endl;
+ }
+ std::cout << "LinBox CRA :" << tim << std::endl;
+ }
+
+ { /* LinBox Early CRA */
+ tim.clear();
+ typedef LinBox::Modular<double> ModularField ;
+ typedef LinBox::EarlyMultipCRA< ModularField > CRAbase ;
+ unsigned int PrimeSize = 22;
+ LinBox::RandomPrimeIterator genprime( PrimeSize );
+ for (size_t i = 0 ; i < (size_t) m ; ++i) { // repeat m times
+ // create the vector to reconstruct
+ Ivect V(n),R(n) ;
+ for (Ivect::iterator it = V.begin() ; it != V.end() ; ++it) {
+ integer::random_lessthan<Unsigned>(*it,l) ;
+ }
+
+ LinBox::ChineseRemainder< CRAbase > cra (4);
+ ReductVect iteration(V);
+ chrono.clear(); chrono.start();
+ // Ivect::iterator Rit = R.begin();
+ cra(R, iteration, genprime);
+ chrono.stop();
+ tim += chrono ;
+ if (!std::equal(R.begin(),R.end(),V.begin())) {
+ std::cerr << "*** LinBox early CRA failed " << (Unsigned?"positive":"general") << " ***" << std::endl;
+ std::cerr << R << std::endl << "expecting " << std::endl << V << std::endl;
+ }
+ // else
+ // std::cerr << "ok" << std::endl;
+ }
+ std::cout << "LinBox early CRA :" << tim << std::endl;
+ }
+
+ { /* do givaro crt */
+ // Init RNS
+ typedef LinBox::Modular<double> ModularField ;
+ tim.clear();
+ LinBox::RNS<Unsigned> rns(l) ;
+ chrono.clear() ; chrono.start() ;
+ rns.initCRA();
+ chrono.stop();
+ tim += chrono;
+ for (size_t i = 0 ; i < (size_t) m ; ++i) { // repeat m times
+ Ivect V(n),R(n) ;
+ for (Ivect::iterator it = V.begin() ; it != V.end() ; ++it) {
+ integer::random_lessthan<Unsigned>(*it,l) ;
+ }
+ ReductVect iteration(V);
+ chrono.clear(); chrono.start();
+ rns.cra(R,iteration);
+ chrono.stop();
+ tim += chrono ;
+ if (!std::equal(R.begin(),R.end(),V.begin())) {
+ std::cerr << "*** Givaro CRT failed " << (Unsigned?"positive":"general") << "***" << std::endl;
+ std::cerr << R << std::endl << "expecting " << std::endl << V << std::endl;
+ }
+ // else
+ // std::cerr << "ok" << std::endl;
+
+ }
+ std::cout << "GivCRT :" << tim << std::endl;
+ }
+
+ { /* do givaro fixed */
+ // Init RNS
+ typedef LinBox::Modular<double> ModularField ;
+ tim.clear();
+ LinBox::RNSfixed<Unsigned> rns(l) ;
+ chrono.clear() ; chrono.start() ;
+ rns.initCRA();
+ chrono.stop();
+ tim += chrono;
+ for (size_t i = 0 ; i < (size_t) m ; ++i) { // repeat m times
+ Ivect V(n),R(n) ;
+ for (Ivect::iterator it = V.begin() ; it != V.end() ; ++it) {
+ integer::random_lessthan<Unsigned>(*it,l) ;
+ }
+ ReductVect iteration(V);
+ chrono.clear(); chrono.start();
+ rns.cra(R,iteration);
+ chrono.stop();
+ tim += chrono ;
+ if (!std::equal(R.begin(),R.end(),V.begin())) {
+ std::cerr << "*** givaro fixed failed " << (Unsigned?"positive":"general") << "***" << std::endl;
+ std::cerr << R << std::endl << "expecting " << std::endl << V << std::endl;
+ }
+ // else
+ // std::cerr << "ok" << std::endl;
+
+ }
+ std::cout << "Giv CRT Fixed :" << tim << std::endl;
+ }
+
+#if 1 /* IML */
+#ifdef __LINBOX_HAVE_IML
+ { /* do iml cra */
+ typedef LinBox::Modular<double> ModularField ;
+ tim.clear();
+
+ /* Init RNS */
+ chrono.clear() ; chrono.start() ;
+ long basislen = 0 ;
+ IML::Double primesize;
+ integer product ;
+ primesize = pow(2,22);
+ product = pow((integer)2,l);
+ // mpz_init(maxi); mpz_init(mp_maxInter);
+ // comment les trouver ?
+
+ IML::FiniteField ** RNS = IML::findRNS(primesize,product.get_mpz(),&basislen);
+ IML::FiniteField * liftbasis = RNS[0] ; // findLiftbasisSmall(n, maxi, &basislen);
+ IML::FiniteField * cmbasis = RNS[1] ; // combBasis(basislen,basis);
+ mpz_t mp_prod ;
+ IML::FiniteField * bdcoeffs = NULL ;
+ IML::Double * Vp = IML_XMALLOC(IML::Double,n*basislen);
+ if (!Unsigned) {
+ mpz_init(mp_prod);
+ IML::basisProd(basislen,liftbasis,mp_prod);
+ bdcoeffs = IML::repBound(basislen, liftbasis, cmbasis) ;
+ }
+ chrono.stop();
+ tim += chrono;
+
+ /* loop m times */
+ for (size_t i = 0 ; i < (size_t) m ; ++i) { // repeat m times
+ /* init result */
+ Ivect V(n),R(n) ;
+ for (Ivect::iterator it = V.begin() ; it != V.end() ; ++it) {
+ integer::random_lessthan<Unsigned>(*it,l) ;
+ }
+ ReductVect iteration(V);
+ for (size_t j = 0 ; j < (size_t)basislen ; ++j) {
+ std::vector<double> G ;
+ iteration(G,ModularField((integer)liftbasis[j]));
+ for (size_t k = 0 ; k < (size_t)n ; ++k)
+ Vp[j+k*basislen] = G[k] ;
+ }
+
+ /* CRA */
+
+ // fooooooooooooooor
+ if (!Unsigned) {
+ for (size_t j = 0 ; j < (size_t)n ; ++j)
+ IML::ChineseRemainderPos(basislen, liftbasis, cmbasis, Vp+j, R[j].get_mpz());
+ }
+ else {
+ for (size_t j = 0 ; j < (size_t)n ; ++j)
+ IML::ChineseRemainder(basislen, mp_prod, liftbasis, cmbasis, bdcoeffs, Vp+j, R[j].get_mpz()) ;
+
+ }
+ IML_XFREE(cmbasis);
+ IML_XFREE(liftbasis);
+ if (!Unsigned) {
+ mpz_clear(mp_prod);
+ IML_XFREE(bdcoeffs);
+ }
+ /* END */
+ }
+ }
+#endif // __LINBOX_HAVE_IML
+#endif
+
+ /* do ntl cra */
+ // Init primes
+ for (size_t i = 0 ; i < (size_t) m ; ++i) { // repeat m times
+ }
+ return EXIT_SUCCESS ;
+}
+
+int main(int ac, char** av)
+{
+ static index_t m = 10 ;
+ static index_t l = 200 ;
+ static index_t n = 10 ;
+ LinBox::PlotData<index_t> Data(n,m);
+ bench_cra<true>(n,m,l,Data);
+ bench_cra<false>(n,m,l,Data);
+ return EXIT_SUCCESS ;
+}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/benchmarks/benchmark-fgemm.C b/benchmarks/benchmark-fgemm.C
new file mode 100644
index 0000000..e110c1f
--- /dev/null
+++ b/benchmarks/benchmark-fgemm.C
@@ -0,0 +1,955 @@
+
+/* Copyright (C) 2011 LinBox
+ * Written by BB <brice.boyer at imag.fr>
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file benchmarks/benchmark-fgemm.C
+ * @ingroup benchmarks
+ * @brief Benchmarking dense matrix multiplication on finite fields.
+ * This file benchmarks the FFLAS::fgemm implementation for various fields,
+ * shape and parameters. Actually, we use the wrapper member \c mul of LinBox::BlasMatrixDomain.
+ * @todo make graphs look better (legends, units,...)
+ */
+
+#include "benchmarks/benchmark.h"
+#include "linbox/util/error.h"
+#include "fflas-ffpack/fflas-ffpack.h"
+#include "linbox/field/modular.h"
+#include "linbox/field/modular-balanced.h"
+#include "linbox/matrix/random-matrix.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/algorithms/blas-domain.h"
+
+#include <iomanip> // setprecision
+
+/* ********************** */
+/* Outils */
+/* ********************** */
+
+using Givaro::Timer;
+
+/*! @brief Watches a timer and a number and repet and signals if over.
+ *
+ * We want at least 2 repetions but not more than maxtime spent on timing.
+ *
+ * @param repet number of previous repetitions. Should be 0 on the first time
+ * \c whatchon is called.
+ * @param tim timer to watch
+ * @param maxtime maximum time (in seconds) until \c keepon tells stop.
+ * @return \c true if we conditions are not met to stop, \c false otherwise.
+ * @pre \c tim was clear at the beginning and never started.
+ *
+ */
+bool keepon(index_t & repet, const Timer & tim, double maxtime=0.2)
+{
+ if (repet<2 || tim.usertime() < maxtime) {
+ ++repet ;
+ return true;
+ }
+ return false ;
+}
+
+bool keepon(index_t & repet, const double & tim, double maxtime=0.2)
+{
+ if (repet<2 || tim < maxtime) {
+ ++repet ;
+ return true;
+ }
+ return false ;
+}
+
+
+/*! @brief Watches a timer and a number and repet and signals if over.
+ *
+ * We want at least 2 repetions but not more than maxtime spent on timing.
+ *
+ * @param repet number of previous repetitions. Should be 0 on the first time \c whatchon is called.
+ * @param tim timer to watch
+ * @param maxtime maximum time (in seconds) until \c watchon tells stop.
+ * @return \c true if we conditions are not met to stop, \c false otherwise.
+ * @pre \c tim should have been started previously !
+ *
+ */
+bool whatchon(index_t & repet, /* const */Timer & tim, double maxtime=0.5)
+{
+ if (repet<2 || tim.userElapsedTime() < maxtime) {
+ ++repet ;
+ return true;
+ }
+ return false ;
+}
+
+void showAdvanceLinear(int curr, int min, int max)
+{
+ std::cout << std::setprecision(4) << "\033[2K" << "\033[30D" << min <<std::flush;
+ std::cout << '<' << curr << '<' << max << " (" << std::flush;
+ std::cout << double(curr-min)/double(max-min)*100 << "%)" << std::flush;
+}
+void showFinish(int curr, int all)
+{
+ std::cout << "\033[2K" << "\033[30D" << "finished : " << curr << std::flush;
+ std::cout << '/' << all-1 << std::flush << std::endl;
+}
+void showSkip(int curr, int all)
+{
+ std::cout << "\033[2K" << "\033[30D" << "skipped : " << curr << std::flush;
+ std::cout << '/' << all-1 << std::flush << std::endl;
+}
+
+
+double fgemm_mflops(int m, int n, int k)
+{
+ return 2*(double)m/100*(double)n/100*(double)k/100 ;
+}
+
+double compute_mflops(const Timer & t, const double mflo, const int rpt = 1)
+{
+ linbox_check(rpt);
+ return (double) ((mflo*rpt)/t.usertime());
+}
+
+double compute_mflops(const double & t, const double mflo, const int rpt = 1)
+{
+ linbox_check(rpt);
+ return (double) ((mflo*rpt)/t);
+}
+
+/*! @internal
+ * @brief launches the benchmarks for the square case.
+ * @param F field
+ * @param min min size to bench
+ * @param max max size to bench
+ * @param step step between two sizes
+ * @param Data where data is stored
+ * @param series_nb index of the current series.
+ */
+template<class Field>
+void launch_bench_square(Field & F // const problem
+ , index_t min, index_t max, int step
+ , LinBox::PlotData<index_t> & Data
+ , index_t series_nb)
+{
+ index_t l = 0 ;
+ Timer fgemm_sq_tim ;
+ Timer chrono ;
+ double mflops ;
+ typedef typename Field::Element Element;
+ typedef typename Field::RandIter Randiter ;
+ Randiter R(F) ;
+ LinBox::BlasMatrixDomain<Field> BMD(F) ;
+ LinBox::RandomDenseMatrix<Randiter,Field> RandMat(F,R);
+ // index_t repet = 3 ;
+ for ( index_t i = min ; i < max ; i += step , ++l ) {
+ showAdvanceLinear(i,min,max);
+ int ii = i ; // sinon, le constructeur le plus proche serait (_Matrix,_Field)... n'impnawak...
+ LinBox::BlasMatrix<Field> A (F,ii,ii);
+ LinBox::BlasMatrix<Field> B (F,ii,ii);
+ LinBox::BlasMatrix<Field> C (F,ii,ii);
+ if (!series_nb)
+ Data.setAbsciName(l,i); // only write abscissa for serie 0
+ index_t j = 0 ; // number of repets.
+
+ RandMat.random(A);
+ RandMat.random(B);
+ RandMat.random(C);
+ fgemm_sq_tim.clear() ;
+ while( keepon(j, fgemm_sq_tim) ) {
+ chrono.clear() ; chrono.start() ;
+ BMD.mul(C,A,B) ; // C = AB
+ chrono.stop();
+ fgemm_sq_tim += chrono ;
+ }
+ if (!j){
+ std::cout << "multiplication did not happen" << std::endl;
+ }
+#ifdef _LB_DEBUG
+ else {
+ std::cout << i << ',' << j << std::endl;
+ }
+#endif
+ mflops = compute_mflops(fgemm_sq_tim,fgemm_mflops(i,i,i),j);
+ Data.setEntry(series_nb,l,mflops);
+
+ }
+ std::ostringstream nam ;
+ nam << '\"' ;
+ F.write(nam);
+ nam << '\"' ;
+ Data.setSerieName(series_nb,nam.str());
+
+}
+
+/*! @internal
+ * @brief launches the benchmarks for the square case directly BLAS.
+ * @param min min size to bench
+ * @param max max size to bench
+ * @param step step between two sizes
+ * @param Data where data is stored
+ * @param series_nb index of the current series.
+ */
+template<class Field>
+void launch_bench_blas(Field & F
+ , index_t min, index_t max, int step
+ , LinBox::PlotData<index_t> & Data
+ , index_t series_nb
+ )
+{
+ // typedef LinBox::Modular<T> Field ;
+ // Field F((int)charact);
+ index_t l = 0 ;
+ Timer fgemm_blas_tim ;
+ Timer chrono ;
+ double mflops ;
+ typedef typename Field::Element Element ;
+ typedef typename Field::RandIter Randiter;
+ Randiter R(F) ;
+ // LinBox::BlasMatrixDomain<Field> BMD(F) ;
+ // LinBox::RandomDenseMatrix<Randiter,Field> RandMat(F,R);
+ // index_t repet = 3 ;
+ index_t mm = max * max ;
+ Element * A = new Element[mm] ;
+ Element * B = new Element[mm] ;
+ Element * C = new Element[mm] ;
+ // typedef typename LinBox::UnparametricField<T> FloatingDomain ;
+ // FloatingDomain G ;
+
+ for ( index_t i = min ; i < max ; i += step , ++l ) {
+ showAdvanceLinear(i,min,max);
+
+ int ii = i ; // sinon, le constructeur le plus proche serait (_Matrix,_Field)... n'impnawak...
+ index_t mimi = (index_t) ii*ii ;
+ if (!series_nb)
+ Data.setAbsciName(l,i); // only write abscissa for serie 0
+
+ for (index_t j = 0 ; j < mimi ; ++j) R.random(A[j]);
+ for (index_t j = 0 ; j < mimi ; ++j) R.random(B[j]);
+ for (index_t j = 0 ; j < mimi ; ++j) R.random(C[j]);
+
+ index_t j = 0 ;
+ fgemm_blas_tim.clear() ;
+ // double fgemm_blas_tim = 0 ;
+ while(keepon(j,fgemm_blas_tim)) {
+ chrono.clear(); chrono.start() ;
+ FFLAS::fgemm((typename Field::Father_t)F,FFLAS::FflasNoTrans,FFLAS::FflasNoTrans,
+ ii,ii,ii,
+ F.one,
+ A,ii,B,ii,
+ F.zero,
+ C,ii) ;
+ chrono.stop() ;
+ fgemm_blas_tim += chrono ;
+ }
+ mflops = compute_mflops(fgemm_blas_tim,fgemm_mflops(i,i,i),j);
+// #ifndef NDEBUG
+ if (i >=950 && i <= 1050 ) {
+ std::cerr << std::endl<< typeid(Field).name() << ' ' << i << ':' << mflops << std::endl;
+ std::cerr << fgemm_blas_tim << std::endl;
+ }
+// #endif
+
+ Data.setEntry(series_nb,l,mflops);
+ }
+
+ delete[] A ;
+ delete[] B ;
+ delete[] C ;
+ std::ostringstream nam ;
+ nam << '\"' ;
+ F.write(nam);
+ nam << '\"' ;
+ Data.setSerieName(series_nb,nam.str());
+
+}
+
+/*! @internal
+ * @brief launches the benchmarks for the square case.
+ * C= AB
+ * @param F field
+ * @param m rows in A
+ * @param k cols in A
+ * @param n cols in C
+ * @param Data where data is stored
+ * @param point_nb point to be computed
+ */
+template<class Field>
+void launch_bench_rectangular(Field & F // const problem
+ , int m, int k, int n
+ , LinBox::PlotData<std::string> & Data
+ , index_t point_nb)
+{
+ Timer fgemm_rect_tim ;
+ Timer chrono ; chrono.clear();
+ double mflops ;
+ typedef typename Field::Element Element;
+ typedef typename Field::RandIter Randiter ;
+ Randiter R(F) ;
+ LinBox::BlasMatrixDomain<Field> BMD(F) ;
+ LinBox::RandomDenseMatrix<Randiter,Field> RandMat(F,R);
+ // index_t repet = 3 ;
+ LinBox::BlasMatrix<Field> A (F,m,k);
+ LinBox::BlasMatrix<Field> B (F,k,n);
+ LinBox::BlasMatrix<Field> C (F,m,n);
+ index_t j = 0 ;
+ fgemm_rect_tim.clear() ;
+ while (keepon(j,fgemm_rect_tim)) {
+ RandMat.random(A);
+ RandMat.random(B);
+ RandMat.random(C);
+ chrono.clear() ; chrono.start() ;
+ BMD.mul(C,A,B) ; // C = AB
+ chrono.stop();
+ fgemm_rect_tim += chrono ;
+ }
+ if (!j) {
+ std::cout << "multiplication did not happen" << std::endl;
+ }
+#ifdef _LB_DEBUG
+ else {
+ std::cout << point_nb << std::endl;
+ }
+#endif
+ mflops = compute_mflops(fgemm_rect_tim,fgemm_mflops(m,k,n),j);
+ Data.setEntry(0,point_nb,mflops);
+ std::ostringstream nam ;
+ nam << "\"(" << m << ',' << k << ',' << n << ")\"" ;
+ Data.setAbsciName(point_nb,nam.str());
+}
+
+/*! @internal
+ * @brief launches the benchmarks for various parameters of a, b.
+ * D = aAB+bC and C = aAB+bC ("in place" versions)
+ * Are tested the following couples \c (a,b) (where \c p is invertible in \p F. This has
+ * to be true when \c a=p.) :
+ * - b=0 and a=1,-1,p ;
+ * - a=1 and b=1,-1,p ;
+ * - a=-1 and id. ;
+ * - a=p and id. ;
+ * .
+ * We call xA = ^tA if tA is true, A otherwise.
+ * @param F field
+ * @param m rows in xA
+ * @param k cols in xA and rows in xB
+ * @param n cols in xB
+ * @param alpha alpha (not zero)
+ * @param beta beta
+ * @tparam tA is A transposed ?
+ * @tparam tB is B transposed ?
+ * @param Data where data is stored
+ * @param point_nb point to be computed
+ * @param inplace in place or not (ie C is overwritten or not ? default = \c false.
+ */
+template<class Field, bool tA, bool tB>
+void launch_bench_scalar(Field & F // const problem
+ , int m, int k, int n
+ , const typename Field::Element & alpha, const typename Field::Element & beta
+ , LinBox::PlotData<std::string> & Data
+ , index_t point_nb
+ , bool inplace = false)
+{
+ Timer fgemm_scal_tim ;
+ Timer chrono ;
+ fgemm_scal_tim.clear();
+ double mflops ;
+ typedef typename Field::Element Element;
+ typedef typename Field::RandIter Randiter ;
+ typedef typename LinBox::BlasMatrix<Field > Matrix ;
+ typedef typename LinBox::TransposedBlasMatrix<Matrix > TransposedMatrix ;
+ Randiter R(F) ;
+ LinBox::BlasMatrixDomain<Field> BMD(F) ;
+ LinBox::RandomDenseMatrix<Randiter,Field> RandMat(F,R);
+ // index_t repet = 3 ;
+ int mm = tA?k:m ;
+ int kk = tA?m:k ;
+ int nn = tB?k:n ;
+ Matrix A (F,mm,kk);
+ Matrix B (F,kk,nn);
+ Matrix C (F,m,n);
+ Matrix D (F,m,n);
+ TransposedMatrix At(A);
+ TransposedMatrix Bt(B);
+ // LinBox::BlasMatrix<Field > A (mm,kk);
+ // LinBox::BlasMatrix<Field > B (kk,nn);
+ // LinBox::BlasMatrix<Field > C (m,n);
+ // LinBox::BlasMatrix<Field > D (m,n);
+
+
+ // LinBox::TransposedBlasMatrix<LinBox::BlasMatrix<Field > > At(A);
+ // LinBox::TransposedBlasMatrix<LinBox::BlasMatrix<Field > > Bt(B);
+
+ index_t j = 0 ;
+ while (keepon(j,fgemm_scal_tim)) {
+ RandMat.random(A);
+ RandMat.random(B);
+ RandMat.random(C);
+
+ chrono.clear() ; chrono.start();
+
+ if (inplace) {
+ if (tA) {
+ if (tB) {
+ BMD.muladdin(beta,C,alpha,At,Bt) ; // C = alphaAB+beta C
+ }
+ else{
+ BMD.muladdin(beta,C,alpha,At,B) ;
+ }
+ }
+ else {
+ if (tB) {
+ BMD.muladdin(beta,C,alpha,A,Bt) ;
+ }
+ else{
+ BMD.muladdin(beta,C,alpha,A,B) ;
+ }
+
+ }
+ }
+ else {
+ if (tA) {
+ if (tB) {
+ BMD.muladd(D,beta,C,alpha,At,Bt) ; // D = alphaAB+beta C
+ }
+ else{
+ BMD.muladd(D,beta,C,alpha,At,B) ;
+ }
+ }
+ else {
+ if (tB) {
+ BMD.muladd(D,beta,C,alpha,A,Bt) ;
+ }
+ else{
+ BMD.muladd(D,beta,C,alpha,A,B) ;
+ }
+
+ }
+ }
+
+ chrono.stop() ; fgemm_scal_tim += chrono ;
+ }
+ if (!j) {
+ std::cout << "multiplication did not happen" << std::endl;
+ }
+#ifdef _LB_DEBUG
+ else {
+ std::cout << point_nb << std::endl;
+ }
+#endif
+ mflops = compute_mflops(fgemm_scal_tim,fgemm_mflops(m,k,n),j);
+ Data.setEntry(0,point_nb,mflops);
+ std::ostringstream nam ;
+ nam << "\"(" << m << ',' << k << ',' << n << ") ";
+ nam << (inplace?"C":"D") << "=" << alpha << " " ;
+ nam << (tA?"t":"")<< "A." << (tB?"t":"")<< "B+" << beta << " C\"" ;
+ Data.setAbsciName(point_nb,nam.str());
+}
+
+
+/* ********************** */
+/* Tests */
+/* ********************** */
+
+/*! Benchmark fgemm Y=AX for several sizes of sqare matrices.
+ * @param min min size
+ * @param max max size
+ * @param step step of the size between 2 benchmarks
+ * @param charac characteristic of the field.
+ */
+void bench_blas( index_t min, index_t max, int step, int charac )
+{
+ int nb = 1 ;// une col de plus (la première)
+ typedef LinBox::Modular<double> Field0 ; ++nb ;
+ typedef LinBox::Modular<float> Field1 ; ++nb ;
+ typedef LinBox::Modular<int32_t> Field2 ; ++nb ;
+ typedef LinBox::ModularBalanced<double> Field3 ; ++nb ;
+ typedef LinBox::ModularBalanced<float> Field4 ; ++nb ;
+ typedef LinBox::ModularBalanced<int32_t> Field5 ; ++nb ;
+ typedef LinBox::UnparametricField<double>Field6 ; ++nb ;
+ typedef LinBox::UnparametricField<float> Field7 ; ++nb ;
+
+ int nb_pts = (int) std::ceil((double)(max-min)/(double)step) ;
+ LinBox::PlotData<index_t> Data(nb_pts,nb);
+ int it = 0 ;
+
+ Field0 F0(charac) ;
+ launch_bench_blas(F0,min,max,step,Data,it++);
+ showFinish(it,nb);
+ if (charac < 2048) {
+ Field1 F1(charac) ;
+ launch_bench_blas(F1,min,max,step,Data,it++);
+ showFinish(it,nb);
+ }
+ else {
+ showSkip(it,nb);
+ }
+ Field2 F2(charac) ;
+ launch_bench_blas(F2,min,max,step,Data,it++);
+ showFinish(it,nb);
+ Field3 F3(charac) ;
+ launch_bench_blas(F3,min,max,step,Data,it++);
+ showFinish(it,nb);
+ if (charac < 2048) {
+ Field4 F4(charac) ;
+ launch_bench_blas(F4,min,max,step,Data,it++);
+ showFinish(it,nb);
+ }
+ else {
+ showSkip(it,nb);
+ }
+ Field5 F5(charac) ;
+ launch_bench_blas(F5,min,max,step,Data,it++);
+ showFinish(it,nb);
+ Field6 F6(charac) ;
+ launch_bench_blas(F6,min,max,step,Data,it++);
+ showFinish(it,nb);
+ if (charac < 2048) {
+ Field7 F7((float)charac) ;
+ launch_bench_blas(F7,min,max,step,Data,it++);
+ showFinish(it,nb);
+ }
+ else {
+ showSkip(it,nb);
+ }
+
+ linbox_check(it <= nb);
+
+
+ LinBox::PlotStyle Style;
+ // Style.setTerm(LinBox::PlotStyle::pdf);
+ // Style.setTerm(LinBox::PlotStyle::png);
+ // Style.setTerm(LinBox::PlotStyle::svg);
+ Style.setTerm(LinBox::PlotStyle::Term::eps);
+ Style.setTitle("FFLAS::fgemm","Mflops","dimensions");
+ // Style.setType(LinBox::PlotStyle::histogram);
+ // Style.setStyle("set style histogram cluster gap 1");
+ // Style.addStyle("set style fill solid border -1");
+ // Style.addStyle("set boxwidth 0.9");
+
+ Style.setPlotType(LinBox::PlotStyle::Plot::graph);
+ Style.setLineType(LinBox::PlotStyle::Line::linespoints);
+ Style.setUsingSeries(std::pair<index_t,index_t>(2,nb));
+
+ LinBox::PlotGraph<index_t> Graph(Data,Style);
+ Graph.setOutFilename("fgemm_blas");
+
+ // Graph.plot();
+
+ Graph.print_gnuplot();
+
+ Graph.print_latex();
+
+ return ;
+
+}
+
+/*! @brief Benchmark square fgemm Y=AX for several fields.
+ * @param min min size
+ * @param max max size
+ * @param step step of the size between 2 benchmarks
+ * @param charac characteristic of the field.
+ */
+void bench_square( index_t min, index_t max, int step, int charac )
+{
+
+ int nb = 1 ;// une col de plus (la première)
+ typedef LinBox::Modular<double> Field0 ; ++nb ;
+ typedef LinBox::Modular<float> Field1 ; ++nb ;
+ typedef LinBox::Modular<int32_t> Field2 ; ++nb ;
+ typedef LinBox::ModularBalanced<double> Field3 ; ++nb ;
+ typedef LinBox::ModularBalanced<float> Field4 ; ++nb ;
+ typedef LinBox::ModularBalanced<int32_t> Field5 ; ++nb ;
+ // GivaroZpZ
+
+ int nb_pts = (int) std::ceil((double)(max-min)/(double)step) ;
+ LinBox::PlotData<index_t> Data(nb_pts,nb);
+ int it = 0 ;
+
+ Field0 F0(charac) ;
+ launch_bench_square(F0,min,max,step,Data,it++);
+ showFinish(it,nb);
+ if (charac < 2048) {
+ Field1 F1(charac) ;
+ launch_bench_square(F1,min,max,step,Data,it++);
+ showFinish(it,nb);
+ }
+ else {
+ showSkip(it,nb);
+ }
+ Field2 F2(charac) ;
+ launch_bench_square(F2,min,max,step,Data,it++);
+ showFinish(it,nb);
+ Field3 F3(charac) ;
+ launch_bench_square(F3,min,max,step,Data,it++);
+ showFinish(it,nb);
+ if (charac < 2048) {
+ Field4 F4(charac) ;
+ launch_bench_square(F4,min,max,step,Data,it++);
+ showFinish(it,nb);
+ }
+ else {
+ showSkip(it,nb);
+ }
+ Field5 F5(charac) ;
+ launch_bench_square(F5,min,max,step,Data,it++);
+ showFinish(it,nb);
+ linbox_check(it <= nb);
+
+ LinBox::PlotStyle Style;
+ // Style.setTerm(LinBox::PlotStyle::Term::pdf);
+ // Style.setTerm(LinBox::PlotStyle::Term::png);
+ // Style.setTerm(LinBox::PlotStyle::Term::svg);
+ Style.setTerm(LinBox::PlotStyle::Term::eps);
+ Style.setTitle("BlasMatrixDomain mul","Mflops","dimensions");
+
+ Style.setPlotType(LinBox::PlotStyle::Plot::graph);
+ Style.setLineType(LinBox::PlotStyle::Line::linespoints);
+ Style.setUsingSeries(std::pair<index_t,index_t>(2,nb));
+
+ LinBox::PlotGraph<index_t> Graph(Data,Style);
+ Graph.setOutFilename("bmdmul_square");
+
+ // Graph.plot();
+
+ Graph.print_gnuplot();
+
+ Graph.print_latex();
+
+ return ;
+
+}
+
+/*! @brief Benchmark fgemm Y=AX for several shapes.
+ * Let n=k^2.
+ * we test the following shapes :
+ * - (l,nk,nk), (nk,l,nk), (nk,nk,l) : like vector-product
+ * - (kl,nk,n), (nk,kl,n),(nk,n,kl) : one small rectangular matrix
+ * - (kl,n,nk), (n,kl,nk),(n,nk,kl) : same
+ * - (nl,n,n),(n,nl,n),(n,n,nl) : square (or close to)
+ * .
+ * @param k parameter.
+ * @param charac characteristic of the field.
+ * @param l small parameter (ie close to 1)
+ */
+void bench_rectangular( index_t k, int charac, index_t l = 2 )
+{
+ int n = k*k ;
+ int nk = n*k ;
+ int kl = k*l ;
+ int nl = n*l ;
+ typedef LinBox::Modular<double> Field ;
+ Field F(charac) ;
+
+ index_t it = 0 ; index_t nb = 12 ;
+ LinBox::PlotData<std::string> Data(nb,1);
+ Data.setSerieName(0,"mflops");
+ launch_bench_rectangular(F,l,nk,nk,Data,it++);
+ launch_bench_rectangular(F,nk,l,nk,Data,it++);
+ launch_bench_rectangular(F,nk,nk,l,Data,it++);
+
+ launch_bench_rectangular(F,kl,nk,n,Data,it++);
+ launch_bench_rectangular(F,nk,kl,n,Data,it++);
+ launch_bench_rectangular(F,nk,n,kl,Data,it++);
+
+ launch_bench_rectangular(F,n,nk,kl,Data,it++);
+ launch_bench_rectangular(F,nk,n,kl,Data,it++);
+ launch_bench_rectangular(F,nk,kl,n,Data,it++);
+
+ launch_bench_rectangular(F,nl,n,n,Data,it++);
+ launch_bench_rectangular(F,n,nl,n,Data,it++);
+ launch_bench_rectangular(F,n,n,nl,Data,it++);
+ //!@todo resize if it>nb !!
+
+ linbox_check(it==nb);
+
+ LinBox::PlotStyle Style;
+ Style.setTerm(LinBox::PlotStyle::Term::eps);
+ Style.setTitle("fgemm","x","y");
+ Style.setPlotType(LinBox::PlotStyle::Plot::histo);
+ Style.setXtics(LinBox::PlotStyle::Options::oblique);// make long legends oblique.
+ Style.addPlotType("set style histogram cluster gap 1");
+ Style.addPlotType("set style fill solid border -1");
+ Style.addPlotType("set boxwidth 0.9");
+
+
+ // Style.setType(LinBox::PlotStyle::lines);
+ Style.setUsingSeries(2);
+
+ LinBox::PlotGraph<std::string> Graph(Data,Style);
+ Graph.setOutFilename("fgemm_rect");
+
+ // Graph.plot();
+
+ Graph.print_gnuplot();
+
+ Graph.print_latex();
+
+ return ;
+
+}
+
+/*! @brief Benchmark fgemm \f$D\gets\alpha A B+\beta C\f$ for general \f$\alpha,\beta\f$.
+ * @param k parameter.
+ * @param charac characteristic of the field.
+ * @param inplace "inplace" matmul (ie. C=D is overwritten)
+ */
+void bench_scalar( index_t k, int charac, bool inplace )
+{
+ typedef LinBox::Modular<double> Field ;
+ typedef Field::Element Element;
+ typedef Field::RandIter Randiter ;
+ Field F(charac) ;
+
+ index_t it = 0 ; index_t nb = 12 ;
+ LinBox::PlotData<std::string> Data(nb,1);
+ Data.setSerieName(0,"fgemm");
+
+ Element one, zero, mOne, alpha, beta ;
+ F.init(one,1);
+ F.init(mOne,-1);
+ F.init(zero,0);
+
+
+ Randiter R(F) ;
+ linbox_check(charac >=5) ;
+
+ do { R.random(alpha) ; } // non trivial alpha
+ while (F.areEqual(alpha,one) || F.areEqual(alpha,mOne) || F.areEqual(alpha,zero)) ;
+
+ do { R.random(beta) ; }// non trivial beta
+ while (F.areEqual(beta,one) || F.areEqual(beta,mOne) || F.areEqual(beta,zero)) ;
+
+
+ // D = AB + beta C
+ launch_bench_scalar<Field,0,0>(F,k,k,k,one,zero,Data,it++,inplace);
+ launch_bench_scalar<Field,0,0>(F,k,k,k,one,mOne,Data,it++,inplace);
+ launch_bench_scalar<Field,0,0>(F,k,k,k,one,one ,Data,it++,inplace);
+ launch_bench_scalar<Field,0,0>(F,k,k,k,one,beta,Data,it++,inplace);
+
+ // D = -AB + beta C
+ launch_bench_scalar<Field,0,0>(F,k,k,k,mOne,zero,Data,it++,inplace);
+ launch_bench_scalar<Field,0,0>(F,k,k,k,mOne,mOne,Data,it++,inplace);
+ launch_bench_scalar<Field,0,0>(F,k,k,k,mOne,one ,Data,it++,inplace);
+ launch_bench_scalar<Field,0,0>(F,k,k,k,mOne,beta,Data,it++,inplace);
+
+ // D = alpha AB + beta C
+ launch_bench_scalar<Field,0,0>(F,k,k,k,alpha,zero,Data,it++,inplace);
+ launch_bench_scalar<Field,0,0>(F,k,k,k,alpha,mOne,Data,it++,inplace);
+ launch_bench_scalar<Field,0,0>(F,k,k,k,alpha,one ,Data,it++,inplace);
+ launch_bench_scalar<Field,0,0>(F,k,k,k,alpha,beta,Data,it++,inplace);
+
+
+ linbox_check(it==nb);
+
+ LinBox::PlotStyle Style;
+ Style.setTerm(LinBox::PlotStyle::Term::eps);
+ Style.setTitle("fgemm","x","y");
+ Style.setPlotType(LinBox::PlotStyle::Plot::histo);
+ Style.setXtics(LinBox::PlotStyle::Options::oblique);// make long legends oblique.
+ Style.addPlotType("set style histogram cluster gap 1");
+ Style.addPlotType("set style fill solid border -1");
+ Style.addPlotType("set boxwidth 0.9");
+
+ // Style.setType(LinBox::PlotStyle::lines);
+ Style.setUsingSeries(2);
+
+ LinBox::PlotGraph<std::string> Graph(Data,Style);
+ Graph.setOutFilename("fgemm_scal");
+
+ // Graph.plot();
+
+ Graph.print_gnuplot();
+
+ Graph.print_latex();
+
+ return ;
+
+}
+
+/*! @brief Benchmark fgemm \f$D\gets\alpha A^x B^y+\beta C\f$ for \f$x,y=1,\top\f$ (transpose or not).
+ * @param k parameter.
+ * @param charac characteristic of the field.
+ * @param inplace "inplace" matmul (ie. C=D is overwritten)
+ */
+void bench_transpose( index_t k, int charac, bool inplace )
+{
+ typedef LinBox::Modular<double> Field ;
+ typedef Field::Element Element;
+ typedef Field::RandIter Randiter ;
+ Field F(charac) ;
+
+ index_t it = 0 ; index_t nb = 8 ;
+ LinBox::PlotData<std::string> Data(nb,1);
+ Data.setSerieName(0,"fgemm");
+
+ Element one, zero, mOne, alpha, beta ;
+ F.init(one,1);
+ F.init(mOne,-1);
+ F.init(zero,0);
+
+
+ Randiter R(F) ;
+ linbox_check(charac >=5) ;
+
+ do { R.random(alpha) ; } // non trivial alpha
+ while (F.areEqual(alpha,one) || F.areEqual(alpha,mOne) || F.areEqual(alpha,zero)) ;
+
+ do { R.random(beta) ; }// non trivial beta
+ while (F.areEqual(beta,one) || F.areEqual(beta,mOne) || F.areEqual(beta,zero)) ;
+
+
+ // D = A^xB^y
+ launch_bench_scalar<Field,0,0>(F,k,k,k,one,zero,Data,it++,inplace);
+ launch_bench_scalar<Field,1,0>(F,k,k,k,one,zero,Data,it++,inplace);
+ launch_bench_scalar<Field,0,1>(F,k,k,k,one,zero,Data,it++,inplace);
+ launch_bench_scalar<Field,1,1>(F,k,k,k,one,zero,Data,it++,inplace);
+
+ // D = alpha A^xB^y + beta C
+ launch_bench_scalar<Field,0,0>(F,k,k,k,alpha,beta,Data,it++,inplace);
+ launch_bench_scalar<Field,1,0>(F,k,k,k,alpha,beta,Data,it++,inplace);
+ launch_bench_scalar<Field,0,1>(F,k,k,k,alpha,beta,Data,it++,inplace);
+ launch_bench_scalar<Field,1,1>(F,k,k,k,alpha,beta,Data,it++,inplace);
+
+
+ linbox_check(it==nb);
+
+ LinBox::PlotStyle Style;
+ Style.setTerm(LinBox::PlotStyle::Term::eps);
+ Style.setTitle("fgemm","x","y");
+ Style.setPlotType(LinBox::PlotStyle::Plot::histo);
+ Style.setXtics(LinBox::PlotStyle::Options::oblique);// make long legends oblique.
+ Style.addPlotType("set style histogram cluster gap 1");
+ Style.addPlotType("set style fill solid border -1");
+ Style.addPlotType("set boxwidth 0.9");
+
+ // Style.setType(LinBox::PlotStyle::lines);
+ Style.setUsingSeries(2);
+
+ LinBox::PlotGraph<std::string> Graph(Data,Style);
+ Graph.setOutFilename("fgemm_trans");
+
+ // Graph.plot();
+
+ Graph.print_gnuplot();
+
+ Graph.print_latex();
+
+ return ;
+
+}
+
+
+/* Benchmark fgemm Y = a AX + b Y for various (a,b) couples */
+
+/* main */
+
+int main( int ac, char ** av)
+{
+ /* Argument parsing/setting */
+
+ static index_t min = 100; /* min size */
+ static index_t max = 1500; /* max size (not included) */
+ static index_t step = 100; /* step between 2 sizes */
+ static std::list<int> lst ; /* what bench to start ? */
+ lst.push_front(1);// ={1,2} vivement le nouveau std...
+ lst.push_front(2);
+
+ static Argument as[] = {
+ { 'm', "-m min" , "Set minimal size of matrix to test." , TYPE_INT , &min },
+ { 'M', "-M Max" , "Set maximal size." , TYPE_INT , &max },
+ { 's', "-s step", "Sets the gap between two matrix sizes.", TYPE_INT , &step },
+ { 'l', "-l list", "Only launches a subset of available benchmarks\n - 1: compare to raw blas\n - 2:various square sizes\n - 3:various shapes\n - 4: various parameters (a,b)\n - 5 : various transp. combinations", TYPE_INTLIST, &lst },
+ END_OF_ARGUMENTS
+ };
+
+ LinBox::parseArguments (ac, av, as);
+
+ if (min >= max) {
+ throw LinBox::LinBoxError("min value should be smaller than max...");
+ }
+ if (min + step >= max) {
+ std::cout << "Warning : your x axis has only one point. You should have a smaller step." << std::endl;
+ }
+
+ //! @todo use commentator.
+ lst.unique();
+ lst.sort();
+ if (lst.empty()) {
+ std::cerr << "Warning, you are not benchmarking anything. Please check the -l value." << std::endl;
+ }
+ std::list<int>::iterator it = lst.begin();
+
+ /* against pure blas routine */
+ if (*it == 1) {
+ std::cout << "bench 1 : blas" << std::endl;
+ bench_blas(min,max,step,13);
+ bench_blas(min,max,step,2011);
+ bench_blas(min,max,step,65537);
+ if (++it == lst.end()) return EXIT_SUCCESS ;
+ }
+
+ /* square for various fields */
+ if (*it == 2) {
+ std::cout << "bench 2 : square" << std::endl;
+ bench_square(min,max,step,13);
+ bench_square(min,max,step,2011);
+ bench_square(min,max,step,65537);
+ if (++it == lst.end()) return EXIT_SUCCESS ;
+ }
+
+ /* various shapes. */
+ if (*it == 3) {
+ std::cout << "bench 3 : shapes" << std::endl;
+ int cube = (int) std::pow(max,double(1/3.));
+ bench_rectangular(cube,2011);
+ if (++it == lst.end()) return EXIT_SUCCESS ;
+ }
+
+ /* various parameters */
+ if (*it == 4) {
+ std::cout << "bench 4 : scalars" << std::endl;
+ bench_scalar(max,65537,false);
+ bench_scalar(max,65537,true);
+ if (++it == lst.end()) return EXIT_SUCCESS ;
+ }
+
+ /* various tranpositions */
+ if (*it == 5) {
+ std::cout << "bench 2 : transp" << std::endl;
+ bench_transpose(max,65537,true);
+ bench_transpose(max,65537,true);
+ if (++it != lst.end()) {
+ std::cerr << "*** error *** your list contains (at least) one unknown element : " << *it << '!' << std::endl;
+ }
+ }
+ else {
+ std::cerr << "*** error *** your list contains (at least) one unknown element : " << *it << '!' << std::endl;
+ }
+ return EXIT_SUCCESS ;
+}
+
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+
diff --git a/benchmarks/benchmark-ftrXm.C b/benchmarks/benchmark-ftrXm.C
new file mode 100644
index 0000000..99726cf
--- /dev/null
+++ b/benchmarks/benchmark-ftrXm.C
@@ -0,0 +1,823 @@
+
+/* Copyright (C) 2011 LinBox
+ * Written by BB <brice.boyer at imag.fr>
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file benchmarks/benchmark-ftrXm.C
+ * @ingroup benchmarks
+ * @brief Benchmarking triangular matrix multiplication on finite fields.
+ * This file benchmarks the FFLAS::ftrmm, FFLAS::ftrsm implementation for various fields,
+ * shape and parameters. Actually, we use the wrapper member \c mul of LinBox::BlasMatrixDomain.
+ * @todo ftrmm has an 'alpha' but mul/mulin in BMd don't... That could be useful for \f$\alpha=-1\f$...
+ * @todo benchmark ftrsm too here.
+ */
+
+#include "benchmarks/benchmark.h"
+#include "linbox/util/error.h"
+#include "linbox/field/modular.h"
+#include "linbox/field/modular-balanced.h"
+#include "fflas-ffpack/ffpack/ffpack.h"
+#include "fflas-ffpack/fflas/fflas.h"
+#include "linbox/matrix/random-matrix.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/algorithms/blas-domain.h"
+
+#define _LB_LEFT true
+#define _LB_RITE false
+
+#define _LB_TRANS false
+#define _LB_NOTRS true
+
+#define _LB_UNIT true
+#define _LB_DIAG false
+
+#define _LB_TSUP true
+#define _LB_TLOW false
+
+using LinBox::Timer ;
+
+/* ********************** */
+/* Outils */
+/* ********************** */
+
+/*! @brief Watches a timer and a number and repet and signals if over.
+ *
+ * We want at least 2 repetions but not more than maxtime spent on timing.
+ *
+ * @param repet number of previous repetitions. Should be 0 on the first time
+ * \c whatchon is called.
+ * @param tim timer to watch
+ * @param maxtime maximum time (in seconds) until \c watchon tells stop.
+ * @return \c true if we conditions are not met to stop, \c false otherwise.
+ * @pre \c tim was clear at the beginning and never started.
+ *
+ */
+bool keepon(index_t & repet, Timer & tim, double maxtime=0.5)
+{
+ if (repet<2 || tim.usertime() < maxtime) {
+ ++repet ;
+ return true;
+ }
+ return false ;
+}
+
+/*! @brief Watches a timer and a number and repet and signals if over.
+ *
+ * We want at least 2 repetions but not more than maxtime spent on timing.
+ *
+ * @param repet number of previous repetitions. Should be 0 on the first time \c whatchon is called.
+ * @param tim timer to watch
+ * @param maxtime maximum time (in seconds) until \c watchon tells stop.
+ * @return \c true if we conditions are not met to stop, \c false otherwise.
+ * @pre \c tim should have been started previously !
+ *
+ */
+bool whatchon(index_t & repet, Timer & tim, double maxtime=0.5)
+{
+ if (repet<2 || tim.userElapsedTime() < maxtime) {
+ ++repet ;
+ return true;
+ }
+ return false ;
+}
+
+
+double ftrmm_mflops(index_t m, index_t n, index_t k)
+{
+ return (double)m*(double)n/1e6*(double)k ;
+}
+
+double compute_mflops(const Timer & t, const double mflo, const int rpt = 1)
+{
+ linbox_check(rpt);
+ return (double) ((mflo*rpt)/t.usertime());
+}
+
+/*! @internal
+ * @brief launches the benchmarks for the square case.
+ * @param F field
+ * @param min min size to bench
+ * @param max max size to bench
+ * @param step step between two sizes
+ * @param Data where data is stored
+ * @param series_nb index of the current series.
+ */
+template<class Field, bool LeftSide, bool UnitDiag, bool TriSup>
+void launch_bench_square(Field & F // const problem
+ , index_t min, index_t max, int step
+ , LinBox::PlotData<index_t> & Data
+ , index_t series_nb)
+{
+ index_t l = 0 ;
+ Timer fgemm_sq_tim ;
+ Timer chrono ;
+ double mflops ;
+ typedef typename Field::Element Element;
+ typedef typename Field::RandIter Randiter ;
+ Randiter R(F) ;
+ LinBox::NonzeroRandIter<Field> Rn(F,R);
+ LinBox::BlasMatrixDomain<Field> BMD(F) ;
+ LinBox::RandomDenseMatrix<Randiter,Field> RandMat(F,R);
+ // index_t repet = 3 ;
+ for ( index_t i = min ; i < max ; i += step , ++l ) {
+ int ii = i ; // sinon, le constructeur le plus proche serait (_Matrix,_Field)... n'impnawak...
+ LinBox::TriangularBlasMatrix<Element> A (ii,ii,
+ (TriSup?LinBox::LinBoxTag::Upper:LinBox::LinBoxTag::Lower),
+ (UnitDiag?LinBox::LinBoxTag::Unit:LinBox::LinBoxTag::NonUnit));
+ LinBox::BlasMatrix<Element> B (ii,ii);
+ if (!series_nb)
+ Data.setAbsciName(l,i); // only write abscissa for serie 0
+ index_t j = 0 ; // number of repets.
+ fgemm_sq_tim.clear() ;
+ while( keepon(j,fgemm_sq_tim) ) {
+ RandMat.random(A);
+ for (size_t k=0 ; k<(size_t)ii ; ++k) Rn.random(A.refEntry(k,k)) ;
+ RandMat.random(B);
+ chrono.clear() ; chrono.start() ;
+ if(LeftSide)
+ BMD.mulin_right(A,B) ; // B <- AB
+ else
+ BMD.mulin_left(B,A) ; // B <- BA
+ chrono.stop();
+ fgemm_sq_tim += chrono ;
+ }
+ if (!j){
+ std::cout << "multiplication did not happen" << std::endl;
+ }
+#ifdef _LB_DEBUG
+ else {
+ std::cout << i << ',' << j << std::endl;
+ }
+#endif
+ mflops = compute_mflops(fgemm_sq_tim,ftrmm_mflops(i,i,i),j);
+ Data.setEntry(series_nb,l,mflops);
+ }
+ std::string nam = "\"";
+ if (TriSup)
+ nam += "upper " ;
+ else
+ nam += "lower " ;
+ if (LeftSide)
+ nam += "left " ;
+ else
+ nam += "right " ;
+ if (UnitDiag)
+ nam += "non-" ;
+ nam += "unit\"" ;
+
+ Data.setSerieName(series_nb,nam);
+
+}
+
+/*! @internal
+ * @brief launches the benchmarks for the square case directly BLAS.
+ * @param min min size to bench
+ * @param max max size to bench
+ * @param step step between two sizes
+ * @param Data where data is stored
+ * @param series_nb index of the current series.
+ */
+template<class T>
+void launch_bench_blas(index_t min, index_t max, int step
+ , LinBox::PlotData<index_t> & Data
+ , index_t series_nb
+ , index_t charact)
+{
+ typedef LinBox::Modular<T> Field ;
+ Field F((int)charact);
+ index_t l = 0 ;
+ Timer ftrmm_blas_tim ;
+ Timer chrono ;
+ double mflops ;
+ typedef typename Field::Element Element ;
+ typedef typename Field::RandIter Randiter;
+ Randiter R(F) ;
+ // LinBox::BlasMatrixDomain<Field> BMD(F) ;
+ // LinBox::RandomDenseMatrix<Randiter,Field> RandMat(F,R);
+ // index_t repet = 3 ;
+ index_t mm = max * max ;
+ Element * A = new Element[mm] ;
+ Element * B = new Element[mm] ;
+ Element * C = new Element[mm] ;
+ typedef typename LinBox::UnparametricField<T> FloatingDomain ;
+ FloatingDomain G ;
+
+ for ( index_t i = min ; i < max ; i += step , ++l ) {
+ int ii = i ; // sinon, le constructeur le plus proche serait (_Matrix,_Field)... n'impnawak...
+ index_t mimi = (index_t) ii*ii ;
+ index_t j = 0 ;
+ ftrmm_blas_tim.clear() ;
+ while(keepon(j,ftrmm_blas_tim)) {
+ for (index_t j = 0 ; j < mimi ; ++j) R.random(A[j]);
+ for (index_t j = 0 ; j < mimi ; ++j) R.random(B[j]);
+ for (index_t j = 0 ; j < mimi ; ++j) R.random(C[j]);
+ chrono.clear(); chrono.start() ;
+ FFLAS::ftrmm(G,FFLAS::FflasLeft,FFLAS::FflasUpper,
+ FFLAS::FflasNoTrans,
+ FFLAS::FflasUnit,
+ ii,ii,
+ 1.,
+ A,ii, B,ii) ;
+ chrono.stop() ;
+ ftrmm_blas_tim += chrono ;
+ }
+ mflops = compute_mflops(ftrmm_blas_tim,ftrmm_mflops(i,i,i),j);
+ Data.setEntry(series_nb,l,mflops);
+ }
+
+ delete[] A ;
+ delete[] B ;
+ delete[] C ;
+ std::ostringstream nam ;
+ nam << '\"' ;
+ G.write(nam);
+ nam << '\"' ;
+ Data.setSerieName(series_nb,nam.str());
+
+}
+
+
+/*! @internal
+ * @brief launches the benchmarks for the square case.
+ * C= AB
+ * @param F field
+ * @param m rows in A
+ * @param n cols in A
+ * @param Data where data is stored
+ * @param point_nb point to be computed
+ */
+template<class Field, bool LeftSide, bool UnitDiag, bool TriSup>
+void launch_bench_rectangular(Field & F // const problem
+ , index_t m, index_t n
+ , LinBox::PlotData<std::string> & Data
+ , index_t point_nb)
+{
+ Timer ftrmm_rect_tim ;
+ Timer chrono ; chrono.clear();
+ double mflops ;
+ typedef typename Field::Element Element;
+ typedef typename Field::RandIter Randiter ;
+ typedef typename LinBox::TriangularBlasMatrix<Element> TriangularMatrix ;
+ typedef typename LinBox::BlasMatrix<Element > Matrix ;
+
+ Randiter R(F) ;
+ LinBox::BlasMatrixDomain<Field> BMD(F) ;
+ LinBox::RandomDenseMatrix<Randiter,Field> RandMat(F,R);
+
+ index_t k = (LeftSide?m:n);
+
+ TriangularMatrix A (k,k,
+ (TriSup?LinBox::LinBoxTag::Upper:LinBox::LinBoxTag::Lower),
+ (UnitDiag?LinBox::LinBoxTag::Unit:LinBox::LinBoxTag::NonUnit));
+ Matrix B ((int)m,(int)n);
+
+ index_t j = 0 ;
+ ftrmm_rect_tim.clear() ;
+ while (keepon(j,ftrmm_rect_tim)) {
+ RandMat.random(A);
+ RandMat.random(B);
+ chrono.clear() ; chrono.start() ;
+
+ if(LeftSide)
+ BMD.mulin_right(A,B) ; // B <- AB
+ else
+ BMD.mulin_left(B,A) ; // B <- BA
+
+ chrono.stop();
+ ftrmm_rect_tim += chrono ;
+ }
+ if (!j) {
+ std::cout << "multiplication did not happen" << std::endl;
+ }
+#ifdef _LB_DEBUG
+ else {
+ std::cout << point_nb << std::endl;
+ }
+#endif
+ mflops = compute_mflops(ftrmm_rect_tim,ftrmm_mflops(m,k,n),(int)j);
+ Data.setEntry(0,point_nb,mflops);
+ std::ostringstream nam ;
+ if (LeftSide)
+ nam << "\"(" << k << ':' << m << ',' << n << ")" ;
+ else
+ nam << "\"(" << m << ',' << n << ':' << k << ")" ;
+ nam << " (" << (UnitDiag?"":"non") << "unit) on ";
+ F.write(nam);
+ nam << '\"' ;
+
+
+ Data.setAbsciName(point_nb,nam.str());
+ return ;
+}
+
+/*! @internal
+ * @brief launches the benchmarks for various parameters of a, b.
+ * B = aAB or B=aBA with A triangular.
+ * @todo We test various parameters \f$alpha\f$.
+ * We test A being transposed or not.
+ * @param F field
+ * @param m rows in B
+ * @param n cols in B
+ * @param alpha alpha (not zero)
+ * @param Data where data is stored
+ * @param point_nb point to be computed
+ */
+template<class Field, bool LeftSide, bool UnitDiag, bool TriSup, bool tA>
+void launch_bench_scalar(Field & F // const problem
+ , int m, int n
+ , const typename Field::Element & alpha //!@warning not used yet.
+ , LinBox::PlotData<std::string> & Data
+ , index_t point_nb)
+{
+ Timer ftrmm_scal_tim ;
+ Timer chrono ;
+ ftrmm_scal_tim.clear();
+ double mflops ;
+ typedef typename Field::Element Element;
+ typedef typename Field::RandIter Randiter ;
+ typedef typename LinBox::BlasMatrix<Element > Matrix ;
+ typedef typename LinBox::TriangularBlasMatrix<Element> TriangularMatrix ;
+ typedef typename LinBox::TransposedBlasMatrix<TriangularMatrix > TransposedTriangular ;
+
+
+ Randiter R(F) ;
+ LinBox::BlasMatrixDomain<Field> BMD(F) ;
+ LinBox::RandomDenseMatrix<Randiter,Field> RandMat(F,R);
+
+ index_t k = (LeftSide?m:n);
+
+ TriangularMatrix A (k,k,
+ (TriSup?LinBox::LinBoxTag::Upper:LinBox::LinBoxTag::Lower),
+ (UnitDiag?LinBox::LinBoxTag::Unit:LinBox::LinBoxTag::NonUnit));
+ TransposedTriangular At(A);
+ Matrix B (m,n);
+
+ index_t j = 0 ;
+ while (keepon(j,ftrmm_scal_tim)) {
+ RandMat.random(A);
+ RandMat.random(B);
+
+ chrono.clear() ; chrono.start();
+
+ if (tA) {
+ if(LeftSide)
+ BMD.mulin_right(At,B) ; // B <- AB
+ else
+ BMD.mulin_left(B,At) ; // B <- BA
+ }
+ else {
+ if(LeftSide)
+ BMD.mulin_right(A,B) ; // B <- AB
+ else
+ BMD.mulin_left(B,A) ; // B <- BA
+ }
+
+
+ chrono.stop() ; ftrmm_scal_tim += chrono ;
+ }
+ if (!j) {
+ std::cout << "multiplication did not happen" << std::endl;
+ }
+#ifdef _LB_DEBUG
+ else {
+ std::cout << point_nb << std::endl;
+ }
+#endif
+ mflops = compute_mflops(ftrmm_scal_tim,ftrmm_mflops(m,k,n),(int)j);
+ Data.setEntry(0,point_nb,mflops);
+ std::ostringstream nam ;
+ nam << "\"(" << m << 'x' << n << ") ";
+ nam << "B=" << alpha << " " ;
+ if (LeftSide)
+ nam << (tA?"t":"")<< "A.B" ;
+ else
+ nam << "B." << (tA?"t":"")<< "A" ;
+ nam << " (" << (UnitDiag?"":"non") << "unit) on ";
+ F.write(nam);
+ nam << '\"' ;
+
+ Data.setAbsciName(point_nb,nam.str());
+}
+
+/* ********************** */
+/* Tests */
+/* ********************** */
+
+/*! @brief Benchmark square ftrmm for differenct parameters.
+ * @param min min size
+ * @param max max size
+ * @param step step of the size between 2 benchmarks
+ * @param charac characteristic of the field.
+ */
+void bench_square( index_t min, index_t max, int step, int charac )
+{
+
+ int nb = 9 ;// une col de plus (la première)
+ typedef LinBox::Modular<double> Field ; ++nb ;
+
+ int nb_pts = (int) std::ceil((double)(max-min)/(double)step) ;
+ LinBox::PlotData<index_t> Data(nb_pts,nb);
+ LinBox::PlotStyle Style;
+ int it = 0 ;
+ Field F(charac) ;
+ std::cout << "0.." << std::flush;
+ /* _LB_LEFT,_LB_UNIT,_LB_TSUP */
+ launch_bench_square<Field,true,true,true>(F,min,max,step,Data,it++);
+ std::cout << "1.." << std::flush;
+ launch_bench_square<Field,true,true,false>(F,min,max,step,Data,it++);
+ std::cout << "2.." << std::flush;
+ launch_bench_square<Field,true,false,true>(F,min,max,step,Data,it++);
+ std::cout << "3.." << std::flush;
+ launch_bench_square<Field,true,false,false>(F,min,max,step,Data,it++);
+ std::cout << "4.." << std::flush;
+ launch_bench_square<Field,false,true,true>(F,min,max,step,Data,it++);
+ std::cout << "5.." << std::flush;
+ launch_bench_square<Field,false,true,false>(F,min,max,step,Data,it++);
+ std::cout << "6.." << std::flush;
+ launch_bench_square<Field,false,false,true>(F,min,max,step,Data,it++);
+ std::cout << "7.." << std::flush;
+ launch_bench_square<Field,false,false,false>(F,min,max,step,Data,it++);
+ std::cout << "9!!" << std::endl;
+
+
+
+ linbox_check(it <= nb);
+
+ Style.setTerm(LinBox::PlotStyle::Term::eps);
+ Style.setTitle("ftrmm","x","y");
+
+ Style.setPlotType(LinBox::PlotStyle::Plot::graph);
+ Style.setLineType(LinBox::PlotStyle::Line::linespoints);
+ Style.setUsingSeries(std::pair<index_t,index_t>(2,nb));
+
+ LinBox::PlotGraph<index_t> Graph(Data,Style);
+ Graph.setOutFilename("ftrmm_square");
+
+ // Graph.plot();
+
+ Graph.print_gnuplot();
+
+ Graph.print_latex();
+
+ return ;
+
+}
+
+/*! @brief Benchmark square ftrmm for several fields.
+ * @param min min size
+ * @param max max size
+ * @param step step of the size between 2 benchmarks
+ */
+void bench_fields( index_t min, index_t max, int step )
+{
+
+ int nb = 1 ;// une col de plus (la première)
+ typedef LinBox::Modular<float> Field0 ; ++nb ;
+ typedef LinBox::Modular<double> Field1 ; ++nb ;
+ typedef LinBox::ModularBalanced<float> Field2 ; ++nb ;
+ typedef LinBox::ModularBalanced<double> Field3 ; ++nb ;
+
+ Field0 F0(2011);
+ Field1 F1(65537);
+ Field2 F2(2011);
+ Field3 F3(65537);
+
+ int nb_pts = (int) std::ceil((double)(max-min)/(double)step) ;
+ LinBox::PlotData<index_t> Data(nb_pts,nb);
+ LinBox::PlotStyle Style;
+ int it = 0 ;
+ std::cout << "0.." << std::flush;
+ /* _LB_LEFT,_LB_UNIT,_LB_TSUP */
+ launch_bench_square<Field0,true,true,true>(F0,min,max,step,Data,it++);
+ std::cout << "1.." << std::flush;
+ launch_bench_square<Field1,true,true,true>(F1,min,max,step,Data,it++);
+ std::cout << "2.." << std::flush;
+ launch_bench_square<Field2,true,true,true>(F2,min,max,step,Data,it++);
+ std::cout << "3.." << std::flush;
+ launch_bench_square<Field3,true,true,true>(F3,min,max,step,Data,it++);
+ std::cout << "4!!" << std::endl;
+
+
+
+ linbox_check(it <= nb);
+
+ Style.setTerm(LinBox::PlotStyle::Term::eps);
+ Style.setTitle("ftrmm for various fields","x","y");
+
+ Style.setPlotType(LinBox::PlotStyle::Plot::graph);
+ Style.setLineType(LinBox::PlotStyle::Line::linespoints);
+ Style.setUsingSeries(std::pair<index_t,index_t>(2,nb));
+
+ LinBox::PlotGraph<index_t> Graph(Data,Style);
+ Graph.setOutFilename("ftrmm_fields");
+
+ // Graph.plot();
+
+ Graph.print_gnuplot();
+
+ Graph.print_latex();
+
+ return ;
+
+}
+
+
+/*! Benchmark fgemm Y=AX for several sizes of sqare matrices.
+ * @param min min size
+ * @param max max size
+ * @param step step of the size between 2 benchmarks
+ */
+void bench_blas( index_t min, index_t max, int step )
+{
+ //!@todo compare to cblas_dgemm instead.
+ typedef LinBox::Modular<double> DoubleField ;
+ typedef LinBox::Modular<float> FloatField ;
+
+ int nb_pts = (int) std::ceil((double)(max-min)/(double)step) ;
+ int it = 0 ; int nb = 5 ;
+ LinBox::PlotData<index_t> Data(nb_pts,nb);
+ FloatField F0(13) ;
+ /* _LB_LEFT,_LB_UNIT,_LB_TSUP */
+ launch_bench_square<FloatField,true,true,true>(F0,min,max,step,Data,it++);
+ launch_bench_blas<float>(min,max,step,Data,it++,13);
+
+ DoubleField F1(65537) ;
+ /* _LB_LEFT,_LB_UNIT,_LB_TSUP */
+ launch_bench_square<DoubleField,true,true,true>(F1,min,max,step,Data,it++);
+ launch_bench_blas<double>(min,max,step,Data,it++,65537);
+
+ linbox_check(it+1==nb);
+
+
+ LinBox::PlotStyle Style;
+ Style.setTerm(LinBox::PlotStyle::Term::eps);
+ Style.setTitle("ftrmm","x","y");
+
+ Style.setPlotType(LinBox::PlotStyle::Plot::graph);
+ Style.setLineType(LinBox::PlotStyle::Line::linespoints);
+ Style.setUsingSeries(std::pair<index_t,index_t>(2,nb));
+
+ LinBox::PlotGraph<index_t> Graph(Data,Style);
+ Graph.setOutFilename("ftrmm_blas");
+
+ // Graph.plot();
+
+ Graph.print_gnuplot();
+
+ Graph.print_latex();
+
+ return ;
+
+}
+
+
+/*! @brief Benchmark fgemm Y=AX for several shapes.
+ * we test the following shapes :
+ * - (2k,2k):2k, 2k:(2k,2k)
+ * - (k,2k):2k, 2k:(2k,k)
+ * - (4k,2k):2k , 2k:(2k,4k)
+ * .
+ * @param k parameter.
+ * @param charac characteristic of the field.
+ */
+void bench_rectangular( index_t k, int charac )
+{
+ typedef LinBox::Modular<double> Field ;
+ Field F(charac) ;
+
+ index_t it = 0 ; index_t nb = 6 ;
+ LinBox::PlotData<std::string> Data(nb,1);
+ Data.setSerieName(0,"mflops");
+
+ launch_bench_rectangular<Field,_LB_LEFT,_LB_UNIT,_LB_TSUP>(F,2*k,2*k,Data,it++);
+ launch_bench_rectangular<Field,_LB_RITE,_LB_UNIT,_LB_TSUP>(F,2*k,2*k,Data,it++);
+
+ launch_bench_rectangular<Field,_LB_LEFT,_LB_UNIT,_LB_TSUP>(F,2*k,k,Data,it++);
+ launch_bench_rectangular<Field,_LB_RITE,_LB_UNIT,_LB_TSUP>(F,k,2*k,Data,it++);
+
+ launch_bench_rectangular<Field,_LB_LEFT,_LB_UNIT,_LB_TSUP>(F,2*k,4*k,Data,it++);
+ launch_bench_rectangular<Field,_LB_RITE,_LB_UNIT,_LB_TSUP>(F,4*k,2*k,Data,it++);
+
+ //!@todo resize if it>nb !!
+
+ linbox_check(it==nb);
+
+ LinBox::PlotStyle Style;
+ Style.setTerm(LinBox::PlotStyle::Term::eps);
+ Style.setTitle("ftrmm","x","y");
+ Style.setPlotType(LinBox::PlotStyle::Plot::histo);
+ Style.setXtics(LinBox::PlotStyle::Options::oblique);// make long legends oblique.
+ Style.addPlotType("set style histogram cluster gap 1");
+ Style.addPlotType("set style fill solid border -1");
+ Style.addPlotType("set boxwidth 0.9");
+ //! @todo make long legends oblique.
+
+ // Style.setType(LinBox::PlotStyle::lines);
+ Style.setUsingSeries(2);
+
+ LinBox::PlotGraph<std::string> Graph(Data,Style);
+ Graph.setOutFilename("ftrmm_rect");
+
+ // Graph.plot();
+
+ Graph.print_gnuplot();
+
+ Graph.print_latex();
+
+ return ;
+
+}
+
+/*! @brief Benchmark ftrmm with transpose or alpha parameters on.
+ * @param k parameter.
+ * @param charac characteristic of the field.
+ */
+void bench_transpose( index_t k, int charac)
+{
+ typedef LinBox::Modular<double> Field ;
+ typedef Field::Element Element;
+ typedef Field::RandIter Randiter ;
+ Field F(charac) ;
+
+ index_t it = 0 ; index_t nb = 2 ;
+ LinBox::PlotData<std::string> Data(nb,1);
+ Data.setSerieName(0,"fgemm");
+
+ Element one, zero, mOne, alpha, beta ;
+ F.init(one,1);
+ F.init(mOne,-1);
+ F.init(zero,0);
+
+
+ Randiter R(F) ;
+ linbox_check(charac >=5) ;
+
+ do { R.random(alpha) ; } // non trivial alpha
+ while (F.areEqual(alpha,one) || F.areEqual(alpha,mOne) || F.areEqual(alpha,zero)) ;
+
+ do { R.random(beta) ; }// non trivial beta
+ while (F.areEqual(beta,one) || F.areEqual(beta,mOne) || F.areEqual(beta,zero)) ;
+
+
+ // D = A^xB^y
+ launch_bench_scalar<Field,true,true,true,true>(F,k,k,one,Data,it++);
+ launch_bench_scalar<Field,true,true,true,false>(F,k,k,one,Data,it++);
+
+ linbox_check(it==nb);
+
+ LinBox::PlotStyle Style;
+ Style.setTerm(LinBox::PlotStyle::Term::eps);
+ Style.setTitle("fgemm","x","y");
+ Style.setPlotType(LinBox::PlotStyle::Plot::histo);
+ Style.setXtics(LinBox::PlotStyle::Options::oblique);// make long legends oblique.
+ Style.addPlotType("set style histogram cluster gap 1");
+ Style.addPlotType("set style fill solid border -1");
+ Style.addPlotType("set boxwidth 0.9");
+
+ // Style.setType(LinBox::PlotStyle::lines);
+ Style.setUsingSeries(2);
+
+ LinBox::PlotGraph<std::string> Graph(Data,Style);
+ Graph.setOutFilename("fgemm_trans");
+
+ // Graph.plot();
+
+ Graph.print_gnuplot();
+
+ Graph.print_latex();
+
+ return ;
+
+}
+
+/* main */
+
+int main( int ac, char ** av)
+{
+ /* Argument parsing/setting */
+
+ static index_t min = 100; /* min size */
+ static index_t max = 2000; /* max size (not included) */
+ static index_t step = 200; /* step between 2 sizes */
+ static std::list<int> lst ; /* what bench to start ? */
+ lst.push_front(1);// ={1,2} vivement le nouveau std...
+ lst.push_front(2);
+
+ static Argument as[] = {
+ { 'm', "-m min" , "Set minimal size of matrix to test." , TYPE_INT , &min },
+ { 'M', "-M Max" , "Set maximal size." , TYPE_INT , &max },
+ { 's', "-s step", "Sets the gap between two matrix sizes.", TYPE_INT , &step },
+ { 'l', "-l list", "Only launches a subset of available benchmarks\n - 1: compare to raw blas\n - 2:various square sizes\n - 3:various shapes\n - 4: various parameters (a,b)\n - 5 : various transp. combinations", TYPE_INTLIST, &lst },
+ END_OF_ARGUMENTS
+ };
+
+ parseArguments (ac, av, as);
+
+ if (min >= max) {
+ throw LinBox::LinBoxError("min value should be smaller than max...");
+ }
+ if (min + step >= max) {
+ std::cout << "Warning : your x axis has only one point. You should have a smaller step." << std::endl;
+ }
+
+ //! @todo use commentator.
+ lst.unique();
+ lst.sort();
+
+ bench_square(min,max,step,2011);
+ bench_fields(min,max,step);
+ bench_blas(min,max,step);
+ bench_rectangular(max/2,2011);
+ bench_transpose(max,2011);
+
+#if 0 /* to be uncommented */
+ if (lst.empty()) {
+ std::cerr << "Warning, you are not benchmarking anything. Please check the -l value." << std::endl;
+ }
+ std::list<int>::iterator it = lst.begin();
+
+ /* against pure blas routine */
+ if (*it == 1) {
+ std::cout << "bench 1 : blas" << std::endl;
+ bench_blas(min,max,step);
+ if (++it == lst.end()) return EXIT_SUCCESS ;
+ }
+
+ /* square for various fields */
+ if (*it == 2) {
+ std::cout << "bench 2 : square" << std::endl;
+ bench_square(min,max,step,13);
+ bench_square(min,max,step,2011);
+ bench_square(min,max,step,65537);
+ if (++it == lst.end()) return EXIT_SUCCESS ;
+ }
+
+ /* various shapes. */
+ if (*it == 3) {
+ std::cout << "bench 3 : shapes" << std::endl;
+ int cube = (int) std::pow(max,double(1/3.));
+ bench_rectangular(cube,2011);
+ if (++it == lst.end()) return EXIT_SUCCESS ;
+ }
+
+ /* various parameters */
+ if (*it == 4) {
+ std::cout << "bench 4 : scalars" << std::endl;
+ bench_scalar(max,65537,false);
+ bench_scalar(max,65537,true);
+ if (++it == lst.end()) return EXIT_SUCCESS ;
+ }
+
+ /* various tranpositions */
+ if (*it == 5) {
+ std::cout << "bench 2 : transp" << std::endl;
+ bench_transpose(max,65537,true);
+ bench_transpose(max,65537,true);
+ if (++it != lst.end()) {
+ std::cerr << "*** error *** your list contains (at least) one unknown element : " << *it << '!' << std::endl;
+ }
+ }
+ else {
+ std::cerr << "*** error *** your list contains (at least) one unknown element : " << *it << '!' << std::endl;
+ }
+#endif
+ return EXIT_SUCCESS ;
+}
+
+#undef _LB_RITE
+#undef _LB_LEFT
+#undef _LB_TSUP
+#undef _LB_TLOW
+#undef _LB_UNIT
+#undef _LB_DIAG
+#undef _LB_TRANS
+#undef _LB_NOTRS
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/benchmarks/benchmark.doxy b/benchmarks/benchmark.doxy
new file mode 100644
index 0000000..d437ef2
--- /dev/null
+++ b/benchmarks/benchmark.doxy
@@ -0,0 +1,47 @@
+/*
+ * Coypright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
+
+/*! \ingroup linbox
+ * \defgroup benchmarks Benchmarks
+ * @brief This directory is used to perform benchmarks on LinBox.
+ * The benchmarks are meant for :
+ * - the \e user to guide her through the various choices of
+ * algorithms/implementation provided in her particular case.
+ * - the \e developper to test her new algorithms against the others or check
+ * that the newest shiny subroutine she just wrote didn't deteriorate too much
+ * the performance of LinBox :) (regression testing purpose).
+ * .
+ *
+ * Benchmarks can be grouped in :
+ * - basic routines (fflas/ffpack, integer operations,...) ;
+ * - algorithms ;
+ * - solutions.
+ * .
+ *
+ * When another free library (NTL, IML,...) provides a routine that exists in
+ * LinBox, we want to be able to compare it to our implementation.
+ *
+ * Default parameters can be changed on the command-line, just as in \c
+ * examples/ and \c tests/.
+ */
+
+// vim:syntax=doxygen
diff --git a/benchmarks/benchmark.h b/benchmarks/benchmark.h
new file mode 100644
index 0000000..e30843b
--- /dev/null
+++ b/benchmarks/benchmark.h
@@ -0,0 +1,1043 @@
+/* Copyright (C) 2011 LinBox
+ * Written by BB <brice.boyer at imag.fr>
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file benchmarks/benchmark.h
+ * @ingroup benchmarks
+ * @brief Common header to ease benchmarking routines.
+ * We provide a class to easily populate and plot files that represent
+ * benchmarks.
+ *
+ * We use <a href="http://www.gnuplot.info/">gnuplot</a> for the plotting part
+ * or LaTeX to provide tables. A minimum knowledge of \c Gnuplot is a plus but
+ * the \c benchmark-* files should provide enough examples for creating
+ * standard (not too fancy) plots.
+ *
+ * We fall back to plain latex tabulars when gnuplot is not available. We plot
+ * graphs in files whose name is extended by a random 8-char string to avoid
+ * écraser files.
+ *
+ */
+
+#ifndef __LINBOX_benchmark_H
+#define __LINBOX_benchmark_H
+
+#include <stdlib.h>
+#include "linbox/integer.h"
+#include "linbox/util/debug.h"
+#include "tests/test-common.h"
+#include "linbox/util/timer.h"
+#include <string>
+#include <fstream>
+
+typedef uint32_t index_t ;
+
+namespace LinBox
+{
+
+
+ /*! @brief Represents a table of values to plot.
+ * list of values are reprensented by vectors. the table is a vector
+ * of these vectors.
+ *
+ * @warning NaN, inf are used as missing data. More genenally
+ * we could store data in strings.
+ * @todo Allow for 'speed up against col X' style
+ */
+ class PlotStyle {
+ public:
+ //! What format the plot should be in?
+ struct Term
+ {
+ //! Term type
+ enum Type {
+ png = 100, //!< png. Portable Network Graphics file.
+ pdf = 101, //!< pdf. Portable Document Format actually, this is eps converted to pdf.
+ eps = 102, //!< eps. Encapsulated PostScript. Cool for inclusion in LaTex files. This is the default.
+ svg = 103, //!< sgv. Scalable Vector Graphics.
+ tex = 104, //!< tex. Simple tabular.
+ html = 105, //!< html. HTML table.
+ other= 106 //!< don't know yet...
+ } ;
+ };
+
+ // enum NoType { other = 0 } ;
+ //! What style of graphic : histogram ? graph ?
+ struct Plot
+ {
+ //! Plot type
+ enum Type {
+ histo = 200, //! histogram plot. This is the default. x ticks are evenly spaced, whatever there value and are labelled with their value.
+ graph = 201, //! standard plot. Plots y_i=f(x) with x in the first colum and y_i in ith column. x-ticks are well spaced.
+ other = 202 //! other (ie user supplied).
+ } ;
+ };
+
+ struct Line
+ {
+ enum Type {
+ lines = 300, //! lines.
+ histogram = 301, //! histogram (boxes).
+ linespoints= 302, //! lines with points. (default)
+ points = 303, //! only the points.
+ other = 304 //! rien.
+ } ;
+ };
+
+ struct Options
+ {
+ enum Type {
+ oblique = 400,
+ other = 401
+ };
+ };
+
+ /*! @brief Constructor.
+ * By default, creates an histogram representing the data in an eps plot.
+ */
+ PlotStyle() :
+ _term_(Term::eps),_plot_type_(Plot::histo),_line_type_(Line::histogram)
+ {
+
+ }
+
+ /*! @brief sets the titles in the graph.
+ * @param titre Title of the graph
+ * @param titre_y Title of the y-axis (series)
+ * @param titre_x Title of the x-axis (data points)
+ */
+ void setTitle ( std::string titre
+ , std::string titre_y
+ , std::string titre_x)
+ {
+ _title_ = titre ;
+ _title_x_ = titre_x ;
+ _title_y_ = titre_y ;
+ }
+
+ /*! @brief Gets the title of the graph.
+ * @return a gnuplot command to set the title of the graph.
+ */
+ std::string getTitle()
+ {
+ std::string title = "#title\nset title \"" + _title_ + '\"';
+ if (!_title_x_.empty())
+ title +="\nset xlabel \"" + _title_x_ +'\"' ;
+ if (!_title_y_.empty())
+ title +="\nset ylabel \"" + _title_y_ +'\"' ;
+ return title ;
+ }
+
+ /*! @brief Gets the title of points abscissa.
+ * @return a gnuplot command to set the title of the abscissa.
+ */
+ std::string getTitleX()
+ {
+ return "\nset xlabel \"" + _title_x_ + '\"' ;
+ }
+
+ /*! @brief Gets the title of the series.
+ * @return a gnuplot command to set the title of the ordinate (series).
+ */
+ std::string getTitleY()
+ {
+ return "\nset ylabel \"" + _title_y_ + '\"' ;
+ }
+
+ /*! @brief get the title string.
+ * @param index can be (0,1,2)
+ */
+ std::string getRawTitle(int index=0)
+ {
+ switch (index) {
+ case 0 :
+ return _title_ ;
+ case 1 :
+ return _title_x_ ;
+ case 2 :
+ return _title_y_ ;
+ default :
+ return "bad index" ;
+ }
+ }
+
+ /*! @brief Sets the output format.
+ * @sa TermType
+ * @param term type
+ */
+ void setTerm( enum Term::Type term)
+ {
+ _term_ = term ;
+ }
+
+#if 0
+ /*! Set additionnal term features
+ */
+ void setTermOption(std::string & opts)
+ {
+ _termopts_ = opts;
+ }
+#endif
+
+ /*! @brief Gets the output format.
+ * @return string for setting the expected output format in gnuplot.
+ */
+ std::string getTerm()
+ {
+ std::string term = "#term\nset term " ;
+ switch(_term_) {
+ case (Term::png) :
+ term += "png enhanced" ;
+ break;
+ case (Term::pdf) :
+ std::cerr << "warning, pdf not really working for now" << std::endl;
+ term += "postscript eps enhanced color" ;
+ break;
+ case (Term::eps) :
+ term += "postscript eps enhanced color" ;
+ break;
+ case (Term::svg) :
+ term += "svg" ;
+ break;
+ case (Term::other) :
+ default :
+ std::cerr << " *** error ***" << std::endl << "No supported term set" << std::endl;
+ term += "unknown" ;
+ }
+ return term ;
+ }
+
+ /*! @brief Gets the graph output extension.
+ * By default, this is ".eps".
+ * @return a string for this extension, including the sepatating dot.
+ *
+ */
+ std::string getExt()
+ {
+ switch(_term_) {
+ case (Term::png) :
+ return ".png" ;
+ case (Term::pdf) :
+#ifndef __LINBOX_HAVE_GHOSTSCRIPT
+ std::cerr << "warning, pdf not available. falling back to eps" << std::endl;
+#endif
+ return ".pdf" ;
+ case (Term::eps) :
+ return ".eps" ;
+ case (Term::svg) :
+ return ".svg" ;
+ default :
+ std::cerr << "unknown extension set" << std::endl;
+ return ".xxx" ;
+ }
+ }
+
+#if 0
+ /*! @brief gets the style of the graph.
+ * This is very user-tweakable !!
+ * @return the style for gnuplot.
+ */
+ std::string getStyle()
+ {
+ return "#style\n"+_styleopts_ ;
+ }
+
+ /*! @brief sets the style of the graph.
+ * This is very user-tweakable !!
+ * @param style the style for gnuplot as a gnuplot command.
+ */
+ void setStyle(std::string style)
+ {
+ _styleopts_ = style ;
+ }
+#endif
+
+ /*! @brief sets the legend position.
+ * @param keypos the arguments to key (where the legend should be put)
+ * can be : inside, outside,...
+ */
+ void setKeyPos(std::string keypos)
+ {
+ _legend_pos_ = keypos ;
+ }
+
+
+ /*! @brief Gets the legend position.
+ * by default, it is "under".
+ */
+ std::string getKeyPos()
+ {
+ std::string lgd ="#legend\nset key " ;
+ if (!_legend_pos_.empty())
+ lgd += _legend_pos_ ;
+ else
+ lgd += " under" ;
+ return lgd;
+ }
+
+ /*! @brief sets the position of the labels on the X absciss.
+ * @param opt
+ * @param more more stuff
+ */
+ void setXtics ( enum Options::Type opt, std::string more="")
+ {
+ _xtics_ = "#xtics\nset xtics ";
+ if (opt == Options::oblique)
+ _xtics_ += "nomirror rotate by -45 scale 0 ";
+ else {
+ linbox_check(opt == Options::other);
+ _xtics_ += more ;
+ }
+ }
+
+ /*! @brief Gets the legend position.
+ * by default, it is 45° inclined (use in on long tics legends).
+ */
+ std::string getXtics()
+ {
+ return _xtics_ ;
+ }
+
+ /*! @brief Gets the name of the output graph.
+ * @param basnam the raw name for the output.
+ * @return basnam+extenstion.
+ */
+ std::string getOutput(std::string basnam)
+ {
+ std::string setout = "#output\nset output \'" ;
+#ifdef __LINBOX_HAVE_GHOSTSCRIPT
+ if (_term_ == Term::pdf)
+ setout += "| ps2pdf - " ;
+ setout += basnam + getExt() + '\'' ;
+#else
+ setout += basnam + ".eps\'" ;
+#endif
+
+ return setout ;
+ }
+
+ /*! @brief Sets the type of plot.
+ * @param type the type.
+ * @sa PlotType
+ *
+ */
+ void setPlotType(enum Plot::Type type)
+ {
+ _plot_type_ = type ;
+ // _plot_extra_ = moreargs ;
+ }
+
+ /*! @brief Sets the way dots are linked.
+ * @sa LineType
+ * @param type type
+ */
+ void setLineType( enum Line::Type type)
+ {
+ _line_type_ = type ;
+ }
+
+ /*! @brief Gets the type of plot.
+ * default is histogram, or if graph is supplied, then the default is linespoints.
+ * Can be totally customized.
+ * @return a string for gnuplot to set the plot type.
+ * @sa PlotType
+ *
+ */
+ std::string getPlotType()
+ {
+ _styleopts_ += "\nset datafile missing \"inf\"" ;
+ std::string mystyle = "#style\nset style data " ;
+ if (_line_type_ != Line::other) {
+ switch (_line_type_) {
+ case (Line::lines) :
+ mystyle += "lines" ;
+ break;
+ case (Line::histogram) :
+ mystyle += "histogram" ;
+ break;
+ case (Line::points) :
+ mystyle += "points" ;
+ break;
+ case (Line::linespoints) :
+ mystyle += "linespoints" ;
+ break;
+ default :
+ std::cout << __func__ << " : you should have set the LineType when ploting PlotType::graph !" << std::endl;
+ mystyle += "other" ;
+ }
+ }
+ else { // userd defined datastyle
+ return _styleopts_ ;
+ }
+ // some more style args :
+ mystyle += "\n" + _styleopts_ + "\n";
+ return mystyle ;
+ }
+
+ /*! @brief adds some style line to the graph.
+ * This is very user-tweakable !!
+ * @param style a style line for gnuplot as a gnuplot command.
+ */
+ void addPlotType(std::string style)
+ {
+ _styleopts_ += "\n" + style ;
+ }
+
+ /*! @brief tells which columns to use.
+ * @param col a column to use.
+ * @param moreargs more stuff
+ */
+ void setUsingSeries(index_t col, std::string moreargs= "")
+ {
+ linbox_check(col>1);
+ std::ostringstream usingcols ;
+ if (_plot_type_ == Plot::histo) {
+ usingcols << " using " << col << ":xtic(1) title columnheader(" << col << ") " << moreargs << " ";
+ }
+ else {
+ linbox_check(_plot_type_ == Plot::graph);
+ usingcols << " using 1:" << col << " title columnheader(" << col << ") " << moreargs << " ";
+ }
+ _usingcols_ = usingcols.str();
+ }
+
+ /*! @brief adds a column to use
+ * @param col a column to use.
+ * @param moreargs more stuff
+ * @pre \p _usingcols_ is not empty, ie \c setUsingSeries has already been called.
+ */
+ void addUsingSeries(index_t col, std::string moreargs= "")
+ {
+ linbox_check(col>2);
+ linbox_check(!_usingcols_.empty());
+ std::ostringstream usingcols ;
+ usingcols << ", \'\' using " ;
+ if (_plot_type_ == Plot::graph)
+ usingcols << "1:" ;
+ usingcols << col << " ti col " << moreargs << " ";
+ _usingcols_ += usingcols.str();
+ }
+
+ /*! @brief tells which columns to use.
+ * @param cols a list of column to use.
+ * @param moreargs more stuff
+ */
+ void setUsingSeries(std::list<index_t> cols, std::string moreargs= "")
+ {
+ linbox_check(!cols.empty());
+ std::list<index_t>::iterator it = cols.begin();
+ // no way to check *it< coldim...
+ std::ostringstream usingcols ;
+ if (_plot_type_ == Plot::histo) {
+ usingcols << " using " << *it << ":xtic(1) title columnheader(" << *it << ") " << moreargs << " " ;
+ ++it ;
+ for (;it != cols.end();++it) {
+ usingcols << ", \'\' using " << *it << " ti col " << moreargs << " ";
+ }
+ }
+ else {
+ linbox_check(_plot_type_ == Plot::graph);
+ usingcols << " using 1:" << *it << " title columnheader(" << *it << ") " << moreargs << " ";
+ ++it ;
+ for (;it != cols.end();++it) {
+ usingcols << ", \'\' using 1:" << *it << " ti col " << moreargs << " ";
+ }
+ }
+
+ _usingcols_ = usingcols.str();
+ return;
+ }
+
+ /*! @brief adds a set of columns to use.
+ * @param cols a list of column to use.
+ * @param moreargs more stuff
+ * @pre \p _usingcols_ is not empty, ie \c setUsingSeries has already been called.
+ */
+ void addUsingSeries(std::list<index_t> cols, std::string moreargs= "")
+ {
+ linbox_check(!cols.empty());
+ linbox_check(!_usingcols_.empty());
+ std::list<index_t>::iterator it = cols.begin();
+ std::ostringstream usingcols ;
+ if (_plot_type_ == Plot::histo) {
+ for (;it != cols.end();++it) {
+ usingcols << ", \'\' using " << *it << " ti col " << moreargs << " ";
+
+ }
+ }
+ else {
+ linbox_check(_plot_type_ == Plot::graph);
+ for (;it != cols.end();++it) {
+ usingcols << ", \'\' using 1:" << *it << " ti col " << moreargs << " ";
+
+ }
+ }
+ _usingcols_ += usingcols.str();
+ return;
+ }
+
+ /*! @brief tells which columns to use.
+ * @param cols all colums between \c cols.first and \c cols.second
+ * will be used.
+ * @param moreargs more stuff
+ *
+ */
+ void setUsingSeries(std::pair<index_t,index_t> cols, std::string moreargs= "")
+ {
+ std::ostringstream usingcols ;
+ if (_plot_type_ == Plot::histo) {
+ usingcols << " using " << cols.first << ":xtic(1) title columnheader(" << cols.first << ") " << moreargs << " ";
+ usingcols << ", for [i=" << cols.first+1 << ":" << cols.second << "] \'\' using i title columnheader(i) " << moreargs << " ";
+ }
+ else {
+ linbox_check(_plot_type_ == Plot::graph);
+ usingcols << " using 1:" << cols.first << " title columnheader(" << cols.first << ") " << moreargs << " ";
+ usingcols << ", for [i=" << cols.first+1 << ":" << cols.second << "] \'\' using 1:i title columnheader(i) " << moreargs << " ";
+ }
+
+ _usingcols_ = usingcols.str();
+ return;
+
+ }
+
+ /*! @brief adds contiguous columns to use.
+ * @param cols all colums between \c cols.first and \c
+ * cols.second will be used.
+ * @param moreargs more stuff
+ * @pre \p _usingcols_ is not empty, ie \c setUsingSeries has
+ * already been called.
+ *
+ */
+ void addUsingSeries(std::pair<index_t,index_t> cols, std::string moreargs= "")
+ {
+ linbox_check(!_usingcols_.empty());
+ std::ostringstream usingcols ;
+ if (_plot_type_ == Plot::histo) {
+ usingcols << ", for i=[" << cols.first << ":" << cols.second << "] \'\' using i title columnheader(i) " << moreargs << " ";
+ }
+ else {
+ usingcols << ", for i=[" << cols.first << ":" << cols.second << "] \'\' using 1:i title columnheader(i) " << moreargs << " ";
+ linbox_check(_plot_type_ == Plot::graph);
+ }
+
+ _usingcols_ += usingcols.str();
+
+ }
+
+ /*! @brief Gets the plot command line.
+ * @param File the name of/path to the data file (with extension)
+ * @return a gnuplot "plot" command stream.
+ */
+ std::string getPlotCommand(std::string File)
+ {
+ std::string PC = "#plot\nplot \'" + File + "\' ";
+ PC += _usingcols_ ;
+ return PC ;
+ // "plot './data/fgemm_square_2ex03aS2.dat' using 1:2 title columnheader(2), for [i=3:5] '' using 1:i title columnheader(i)"
+ }
+
+ private :
+ // int _precision_ ; //!< precision of the output. by default 2.
+ /* Legend. */
+ std::string _legend_pos_; //!< legend position
+ /* titles */
+ std::string _title_ ; //!< name of the graph
+ std::string _title_x_ ; //!< title for the points
+ std::string _title_y_ ; //!< title for the series
+ std::string _xtics_ ; //!< format for the x tics.
+ /* units */
+ // std::string _unit_ ;
+ /* terminal output */
+ enum Term::Type _term_ ; //!< output data format.
+ // std::string _termopts_ ;
+ /* plotting style */
+ enum Plot::Type _plot_type_ ; //!< histogram/graph style
+ // std::string _plot_extra_; //!< extra specification for the plot style. default empty.
+ enum Line::Type _line_type_ ; //!< style for the representation of points
+ std::string _styleopts_ ; //!< gp style command.
+ /* columns to use */
+ std::string _usingcols_ ; //!< columns to be used (gp command)
+
+
+ } ;
+
+ /*! @brief The raw data to plot.
+ * Represents the series of points and the labels for the points (X)
+ * axis and the series (Y) axis. The internal representation is a
+ * vector of vector, each series of point being a vector of double.
+ * @tparam NAM the X axis is parametered by NAM (string, int, double...)
+ * @todo write members that permute, add, scale,... data.
+ */
+ template<class NAM>
+ class PlotData {
+ private :
+ std::vector< std::vector< double > > _tableau_ ; //!< data. \c _tableau_[i][j] is the \e jth value of serie \e i.
+ index_t _nb_points_ ; //!< number of points in each series. (size of \c _tableau_[0])
+ index_t _nb_series_ ; //!< number of series. (size of \c _tableau_)
+ std::vector< std::string > _serie_name_; //!< name for each serie of points
+ std::vector< NAM > _absci_name_; //!< values of the x axis.
+ public :
+ /*! Inits a plot with series of data.
+ * @param nb_pts number of points in each serie.
+ * @param nb_srs number of series of points. Default is 1.
+ */
+ PlotData(index_t nb_pts, index_t nb_srs=1) :
+ _tableau_(nb_srs),_nb_points_(nb_pts),_nb_series_(nb_srs),_serie_name_(nb_srs),_absci_name_(nb_pts)
+ {
+ linbox_check(nb_srs);
+ linbox_check(nb_pts);
+ for (index_t i = 0 ; i < nb_srs ; ++i)
+ _tableau_[i].resize(nb_pts);
+ }
+
+ //! destructor.
+ ~PlotData() {} ;
+
+ //! copy constructor.
+ //! @param PD a PlotData to copy.
+ PlotData(const PlotData<NAM> & PD):
+ _tableau_(PD.getTable()),_nb_points_(PD.getPointsDim()),_nb_series_(PD.getSeriesDim()),_serie_name_(PD.getSerieNames()),_absci_name_(PD.getAbsciNames())
+ {
+
+ }
+
+ /*! @brief get the number of series.
+ * @return number of series.
+ */
+ index_t getSeriesDim()
+ {
+ return _nb_series_ ;
+ }
+
+ /*! @brief get the common number of points in each serie.
+ * @return number of points.
+ */
+ index_t getPointsDim()
+ {
+ return _nb_points_ ;
+ }
+
+ /*! @brief Sets the name of a serie.
+ * @param i index of the serie
+ * @param nom name of the serie
+ */
+ void setSerieName(index_t i, std::string nom)
+ {
+ linbox_check(i<_nb_series_);
+ _serie_name_[i] = nom ;
+ }
+
+ /*! @brief Sets the name of a point.
+ * @param j index for the the point
+ * @param nom name of the point
+ */
+ void setAbsciName(index_t j, NAM nom)
+ {
+ linbox_check(j<_nb_points_);
+ _absci_name_[j] = nom ;
+ }
+
+ /*! @brief gets the name of a serie.
+ * Defaults to \c "serie.i"
+ * @param i its index.
+ * @return its name.
+ */
+ std::string getSerieName(index_t i)
+ {
+ linbox_check(i<_nb_series_);
+ if (_serie_name_[i].empty()) {
+ std::ostringstream emptytitle ;
+ emptytitle << "serie." << i ;
+ return emptytitle.str();
+ }
+ return(_serie_name_[i]);
+ }
+
+ /*! @brief gets the name of a point.
+ * @param j its index.
+ * @return its name.
+ * @warning no default. \c setAbsciName has to be used beforehands.
+ */
+ NAM getAbsciName(index_t j)
+ {
+ linbox_check(j<_nb_points_);
+ return(_absci_name_[j]) ;
+ }
+
+ /*! @brief gets all the names in the series.
+ * @return a vector of names.
+ */
+ std::vector<std::string > getSerieNames()
+ {
+ return _serie_name_ ;
+ }
+
+ /*! @brief gets all the names in the points.
+ * @return a vector of names.
+ */
+ std::vector<NAM > getAbsciNames()
+ {
+ return _absci_name_ ;
+ }
+
+ /*! @brief modifies the number of series.
+ * @param n the new number of series. Some data will be lost if n is smaller than
+ * the current size.
+ */
+ void resizeSeries( index_t & n)
+ {
+ if (n<_nb_series_) {
+ std::cerr << "warning, you are dropping series" << std::endl;
+ }
+ _tableau_.resize(n);
+ return;
+ }
+
+ /*! @brief modifies the number of points.
+ * @param n the new number of points in every series. Some data
+ * will be lost if n is smaller than the current size.
+ */
+ void resizePoints( index_t & n)
+ {
+ if (n<_nb_points_) {
+ std::cerr << "warning, you are dropping points in the series" << std::endl;
+ }
+ for (index_t i = 0 ; i < _nb_series_ ; ++i)
+ _tableau_[i].resize(n);
+ }
+
+ /*! @brief sets a new entry.
+ * @param i index of the serie
+ * @param j index of the point
+ * @param val value to be inserted.
+ */
+ void setEntry(index_t i, index_t j, double val)
+ {
+ linbox_check(i<_nb_series_);
+ linbox_check(j<_nb_points_);
+ _tableau_[i][j] = val ;
+ return ;
+ }
+
+ /*! @brief gets a value for an entry.
+ * @param i index of the serie
+ * @param j index of the point
+ * @return val value of point j in serie j.
+ */
+ double getEntry(index_t i, index_t j)
+ {
+ linbox_check(i<_nb_series_);
+ linbox_check(j<_nb_points_);
+ return _tableau_[i][j] ;
+ }
+
+ /*! gets a reference to the array of data.
+ * @return a reference to the member \c _tableau_ representing the data.
+ */
+ std::vector<std::vector< float > > & getTable()
+ {
+ return _tableau_ ;
+ }
+
+ };
+
+ /*! @brief The graph.
+ * This class joins a PlotStyle and a PlotData to build up a graph. A
+ * filename should be provided as well, indicating where the output
+ * graph and scripts will be generated.
+ *
+ * @warning the filename will get a random suffix before the extension
+ * so as not to overwrite files "par inadvertance".
+ */
+ template<class NAM>
+ class PlotGraph {
+ private :
+ PlotData<NAM> & _data_ ; //!< reference to the data points
+ PlotStyle & _style_ ; //!< reference to a plotting style
+ std::string _filename_ ; //!< name for the output file (without extension). a random \c _XXXXXX suffix will be added to make it unique.
+
+ /*! @internal
+ * @brief random <code>:alnum:</code> \c char.
+ * [[:alnum:]] characters are in range
+ * - num : 48-57
+ * - AL : 67-90
+ * - al : 97-122
+ * .
+ * @return a random alphabetic or numeric char.
+ */
+ char _randomAlNum()
+ {
+ int c = rand()%62 ;
+ c += 48 ; // c entre 48 et 109
+ if (c < 58) {
+ return (char) c;
+ }
+ else {
+ c += 7 ;
+ if (c < 91) {
+ return (char)c ;
+ }
+ else {
+ c += 6 ;
+ return (char)c;
+ }
+ }
+
+
+ }
+
+ /*! @internal
+ * @brief Appends random suffix.
+ * Appends to \p _filename_ a random string constituted of an
+ * underscore followed by 8 random alnum chars.
+ * @return the concatenation of \c _filename_ and this suffix.
+ */
+ std::string _randomName()
+ {
+ std::ostringstream unique_filename ;
+ unique_filename << _filename_ << '_' ;
+ for (index_t i = 8 ; i-- ; ) {
+ unique_filename << _randomAlNum() ;
+ }
+ // std::cout << unique_filename.str() << std::endl;
+ return unique_filename.str() ;
+
+ }
+
+ /*! @brief Sets a new data structure.
+ * @param data a reference to a PlotData class.
+ */
+ void setData( PlotData<NAM> & data )
+ {
+ _data_ = data ;
+ }
+
+ /*! @brief Gets the data.
+ * @param[in,out] data a reference to a PlotData class.
+ */
+ PlotData<NAM> & refData( PlotData<NAM> & data)
+ {
+ return data = _data_ ;
+ }
+
+ /*! @brief Sets a new style structure.
+ * @param style a reference to a PlotStyle class.
+ */
+ void setStyle( PlotStyle & style )
+ {
+ _style_ = style ;
+ }
+
+ /*! @brief Gets the style.
+ * @param[in,out] style a reference to a PlotStyle class.
+ */
+ PlotStyle & refStyle( PlotStyle & style)
+ {
+ return style = _style_ ;
+ }
+
+ public :
+
+ /*! @brief Constructor for the PlotGraph class.
+ * Plots a series of data according to a style.
+ * @param data data to be plot, will be processed by the style
+ * @param style sets parameters to gnuplot to achieve a nice
+ * plot.
+ */
+ PlotGraph( PlotData<NAM> & data, PlotStyle & style ) :
+ _data_(data),_style_(style)
+ {
+ srand((unsigned)time(NULL));
+ }
+
+ /*! @brief sets the ouput file name.
+ * All output is put in a "data" subfolder.
+ * @warning Since no file is overwritten, this
+ * directory can rapidly get very populated.
+ */
+ void setOutFilename( std::string filename )
+ {
+ if ( filename.empty() ) {
+ _filename_ = "./data/plotdata" ;
+ std::cerr << "you should provide a filename. Using " << _filename_ << " as default ."<<std::endl;
+ }
+ else {
+ _filename_ = "./data/" + filename;
+ }
+
+ } ;
+
+ /*! @brief Prints data in a latex tabular.
+ */
+ void print_latex()
+ {
+ index_t nb_points = _data_.getPointsDim();
+ index_t nb_series = _data_.getSeriesDim();
+
+ linbox_check(nb_points);
+ linbox_check(nb_series);
+ // srand(time(NULL));
+ // std::ostringstream unique_filename ;
+ std::string unique_filename = _randomName();
+ unique_filename += ".tex" ;
+ // std::cout << _filename_ << " plot in " << unique_filename << '.'<< std::endl;
+ std::ofstream FN(unique_filename.c_str());
+ //!@todo check FN opened.
+ // begin
+ FN << "%\\usepackage{slashbox}" << std::endl;
+ FN << "\\begin{table}" << std::endl;
+ FN << "\\centering" << std::endl;
+ // format
+ FN << "\\begin{tabular}{c||" ;
+ for (index_t j = nb_points ; j-- ; )
+ FN << 'c' ;
+ FN << "|}" << std::endl;
+ // top left case
+ std::string series = _style_.getRawTitle(2);
+ std::string points = _style_.getRawTitle(1);
+ if (!points.empty()) {
+ FN << "\\backslashbox{" << points << "}{" << series << "}" ;
+ }
+ else {
+ FN << series ;
+ }
+ // first line
+ for (index_t j = 0 ; j < nb_points ; ++j ) {
+ FN << " & " << _data_.getAbsciName(j) ;
+ }
+ // lines of data
+ FN << std::endl << "\\hline" << std::endl;
+ FN.precision(2);
+ for (index_t i = 0 ; i < nb_series ; ++i) {
+ FN << _data_.getSerieName(i) ;
+ for (index_t j = 0 ; j < nb_points ; ++j )
+ FN << " & " << _data_.getEntry(i,j) ;
+ if (i+1 < nb_series )
+ FN << "\\\\" ;
+ FN << std::endl;
+ }
+ // end
+ FN << "\\end{tabular}" << std::endl;
+ FN << "\\caption{" << _style_.getRawTitle() << "}" << std::endl;
+ FN << "\\label{tab:<+" << "label+>}" << std::endl;
+ FN << "\\end{table}" << std::endl ;
+
+ FN.close();
+
+ std::cout << "latex table in " << unique_filename << '.' << std::endl;
+ return ;
+
+ }
+
+ /*!@brief Plots the data with gnuplot.
+ * Produces data in a .dat file, creates a .gp gnuplot script and
+ * outputs a graph calling gnuplot.
+ * @warning If gnuplot is not available, fall back to the latex method.
+ */
+ void print_gnuplot()
+ {
+#ifndef __LINBOX_HAVE_GNUPLOT
+ std::cout << "gnuplot is not available on your system. using latex table as fallback" << std::endl;
+ print_latex();
+#else
+ // srand(time(NULL));
+ index_t nb_points = _data_.getPointsDim() ;
+ index_t nb_series = _data_.getSeriesDim() ;
+
+ std::string unique_filename = _randomName();
+ std::string DataFileName = unique_filename + ".dat" ;
+ std::string PlotFileName = unique_filename + ".gp" ;
+ std::ofstream DF(DataFileName.c_str());
+ std::ofstream PF(PlotFileName.c_str());
+ /* Data file to be plot */
+ // DF.precision(_style_.getPrecision());
+ DF.precision(2);
+ DF << "legend " ;
+ for (index_t i = 0 ; i < nb_series ; ++i) {
+ DF << _data_.getSerieName(i) << ' ' ;
+ }
+ DF << std::endl;
+
+ for (index_t j = 0 ; j < nb_points ; ++j) {
+ DF << _data_.getAbsciName(j) ;
+ for (index_t i = 0 ; i < nb_series ; ++i) {
+ DF << " " << _data_.getEntry(i,j) ;
+ }
+ DF << std::endl;
+ }
+
+ /* Ploting script */
+ PF << "#" << _filename_ << std::endl;
+ PF << _style_.getTerm() << std::endl;
+ PF << _style_.getOutput(unique_filename) << std::endl;
+ PF << _style_.getTitle() << std::endl;
+ PF << _style_.getKeyPos() << std::endl;
+ PF << _style_.getXtics() << std::endl;
+ PF << _style_.getPlotType() << std::endl;
+#if 0
+ for (index_t i = 0 ; i < nb_series ; ++i) {
+ PF << "set style line " << _style_.getLineStyle() << std::endl;
+ }
+#endif
+ PF << _style_.getPlotCommand(DataFileName) << std::endl;
+#if 0
+ for (index_t i = 0 ; i < nb_series ; ++i) {
+ PF << '\"' << DataFileName << "\" using 1:" << i+2 << " with lines " ;
+ PF << " ls " << i+1 ;
+ PF << " title '" << names[i] << "'";
+ if (i < (nb_series-1))
+ PF << ",\\" << std::endl;
+ else
+ PF << ';' ;
+ }
+ PF << std::endl;
+#endif
+ PF.close();
+
+ std::string command( "gnuplot " ) ;
+ command += PlotFileName ;
+ int err = system( command.c_str() ) ;
+ if (err) {
+ std::cout << "errors have occured. Look at gnuplot output." << std::endl;
+ }
+ else {
+ std::cout << "Output generated as " << unique_filename + _style_.getExt() << std::endl;
+ }
+
+
+#endif
+ }
+
+ };
+
+}
+#endif // __LINBOX_benchmark_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 187cd54..a3b0d66 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -2,9 +2,9 @@
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2011-02-02'
+timestamp='2012-02-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2011-02-02'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -140,12 +138,35 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_SYSTEM}" in
+Linux|GNU/*)
+ eval $set_cc_for_build
+ cat <<-EOF > $dummy.c
+ #include <features.h>
+ #ifdef __UCLIBC__
+ # ifdef __UCLIBC_CONFIG_VERSION__
+ LIBC=uclibc __UCLIBC_CONFIG_VERSION__
+ # else
+ LIBC=uclibc
+ # endif
+ #else
+ # ifdef __dietlibc__
+ LIBC=dietlibc
+ # else
+ LIBC=gnu
+ # endif
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ ;;
+esac
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
@@ -792,13 +813,12 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- case ${UNAME_MACHINE} in
- pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ case ${UNAME_PROCESSOR} in
amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
@@ -807,6 +827,9 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
+ i*:MSYS*:*)
+ echo ${UNAME_MACHINE}-pc-msys
+ exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
@@ -852,15 +875,22 @@ EOF
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -872,50 +902,51 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ hexagon:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
- LIBC=gnu
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -934,54 +965,54 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
+ echo sparc-unknown-linux-${LIBC}
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ echo hppa64-unknown-linux-${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+ *) echo hppa-unknown-linux-${LIBC} ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
+ echo powerpc64-unknown-linux-${LIBC}
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ echo powerpc-unknown-linux-${LIBC}
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-tilera-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1309,6 +1340,9 @@ EOF
i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros
exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 30fdca8..42adc67 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,9 +2,9 @@
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2011-03-23'
+timestamp='2012-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2011-03-23'
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@ version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,6 +130,10 @@ case $maybe_os in
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -247,17 +249,22 @@ case $basic_machine in
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
+ | d10v | d30v | dlx | dsp16xx | dvp \
+ | epiphany \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep | metag \
@@ -291,7 +298,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | rx \
+ | rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
@@ -300,7 +307,7 @@ case $basic_machine in
| spu \
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
- | v850 | v850e \
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -315,8 +322,7 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -329,7 +335,10 @@ case $basic_machine in
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
-
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
xscaleeb)
basic_machine=armeb-unknown
;;
@@ -352,11 +361,13 @@ case $basic_machine in
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
@@ -365,8 +376,10 @@ case $basic_machine in
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -400,7 +413,7 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* | rx-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -408,10 +421,11 @@ case $basic_machine in
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \
+ | tile*-* \
| tron-* \
| ubicom32-* \
- | v850-* | v850e-* | vax-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -711,7 +725,6 @@ case $basic_machine in
i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
@@ -787,6 +800,24 @@ case $basic_machine in
basic_machine=m68k-atari
os=-mint
;;
+ mipsEE* | ee | ps2)
+ basic_machine=mips64r5900el-scei
+ case $os in
+ -linux*)
+ ;;
+ *)
+ os=-elf
+ ;;
+ esac
+ ;;
+ iop)
+ basic_machine=mipsel-scei
+ os=-irx
+ ;;
+ dvp)
+ basic_machine=dvp-scei
+ os=-elf
+ ;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
@@ -808,10 +839,18 @@ case $basic_machine in
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
+ msys)
+ basic_machine=i386-pc
+ os=-msys
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
;;
+ nacl)
+ basic_machine=le32-unknown
+ os=-nacl
+ ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
@@ -1120,13 +1159,8 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
- ;;
tile*)
- basic_machine=tile-unknown
+ basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
tx39)
@@ -1336,13 +1370,13 @@ case $os in
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
@@ -1548,9 +1582,6 @@ case $basic_machine in
;;
m68000-sun)
os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
;;
m68*-cisco)
os=-aout
diff --git a/build-aux/install-sh b/build-aux/install-sh
index 6781b98..a9244eb 100755
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@ while test $# -ne 0; do
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
+ # Protect names problematic for `test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
shift;;
-T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
+ # Protect names problematic for `test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
done
fi
@@ -200,7 +208,11 @@ if test $# -eq 0; then
fi
if test -z "$dir_arg"; then
- trap '(exit $?); exit' 1 2 13 15
+ do_exit='(exit $ret); exit $ret'
+ trap "ret=129; $do_exit" 1
+ trap "ret=130; $do_exit" 2
+ trap "ret=141; $do_exit" 13
+ trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
for src
do
- # Protect names starting with `-'.
+ # Protect names problematic for `test' and other utilities.
case $src in
- -*) src=./$src;;
+ -* | [=\(\)!]) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
echo "$0: no destination specified." >&2
exit 1
fi
-
dst=$dst_arg
- # Protect names starting with `-'.
- case $dst in
- -*) dst=./$dst;;
- esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
@@ -385,7 +392,7 @@ do
case $dstdir in
/*) prefix='/';;
- -*) prefix='./';;
+ [-=\(\)!]*) prefix='./';;
*) prefix='';;
esac
@@ -403,7 +410,7 @@ do
for d
do
- test -z "$d" && continue
+ test X"$d" = X && continue
prefix=$prefix$d
if test -d "$prefix"; then
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
old mode 100755
new mode 100644
index 6f650ae..63ae69d
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -1,9 +1,9 @@
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -41,6 +41,7 @@
# --quiet, --silent don't print informational messages
# --no-quiet, --no-silent
# print informational messages (default)
+# --no-warn don't display warning messages
# --tag=TAG use configuration variables from tag TAG
# -v, --verbose print more informational messages than default
# --no-verbose don't print the extra informational messages
@@ -69,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4 Debian-2.4-2
+# $progname: (GNU libtool) 2.4.2
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -79,9 +80,9 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4 Debian-2.4-2"
+VERSION=2.4.2
TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@ progpath="$0"
: ${CP="cp -f"}
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@ -387,7 +383,7 @@ case $progpath in
;;
*)
save_IFS="$IFS"
- IFS=:
+ IFS=${PATH_SEPARATOR-:}
for progdir in $PATH; do
IFS="$save_IFS"
test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@ func_help ()
s*\$LTCFLAGS*'"$LTCFLAGS"'*
s*\$LD*'"$LD"'*
s/\$with_gnu_ld/'"$with_gnu_ld"'/
- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
p
d
}
@@ -1052,6 +1048,7 @@ opt_finish=false
opt_help=false
opt_help_all=false
opt_silent=:
+opt_warning=:
opt_verbose=:
opt_silent=false
opt_verbose=false
@@ -1120,6 +1117,10 @@ esac
opt_silent=false
func_append preserve_args " $opt"
;;
+ --no-warning|--no-warn)
+ opt_warning=false
+func_append preserve_args " $opt"
+ ;;
--no-verbose)
opt_verbose=false
func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+ *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@ -3201,11 +3202,13 @@ func_mode_install ()
# Set up the ranlib parameters.
oldlib="$destdir/$name"
+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+ tool_oldlib=$func_to_tool_file_result
func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
if test -n "$stripme" && test -n "$old_striplib"; then
- func_show_eval "$old_striplib $oldlib" 'exit $?'
+ func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
fi
# Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() {
# linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
@@ -3982,14 +3985,17 @@ func_exec_program_core ()
# launches target application with the remaining arguments.
func_exec_program ()
{
- for lt_wr_arg
- do
- case \$lt_wr_arg in
- --lt-*) ;;
- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
- esac
- shift
- done
+ case \" \$* \" in
+ *\\ --lt-*)
+ for lt_wr_arg
+ do
+ case \$lt_wr_arg in
+ --lt-*) ;;
+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+ esac
+ shift
+ done ;;
+ esac
func_exec_program_core \${1+\"\$@\"}
}
@@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f)
{
EOF
func_emit_wrapper yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
-
+ $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/ fputs ("\1", f);/p
+g
+D'
cat <<"EOF"
}
EOF
@@ -5643,7 +5655,8 @@ func_mode_link ()
continue
;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -6111,10 +6124,7 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link)
- libs="$deplibs %DEPLIBS%"
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
- ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6150,7 +6160,8 @@ func_mode_link ()
lib=
found=no
case $deplib in
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
@@ -6433,19 +6444,19 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- func_append tmp_libs " $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+ func_append tmp_libs " $deplib"
+ done
continue
fi # $pass = conv
@@ -6834,7 +6845,7 @@ func_mode_link ()
test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$dir"
+ add_dir="-L$absdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -7319,6 +7330,7 @@ func_mode_link ()
# which has an extra 1 added just for fun
#
case $version_type in
+ # correct linux to gnu/linux during the next big refactor
darwin|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
@@ -7337,9 +7349,6 @@ func_mode_link ()
revision="$number_minor"
lt_irix_increment=no
;;
- *)
- func_fatal_configuration "$modename: unknown library version type \`$version_type'"
- ;;
esac
;;
no)
@@ -7438,7 +7447,7 @@ func_mode_link ()
versuffix="$major.$revision"
;;
- linux)
+ linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
versuffix="$major.$age.$revision"
@@ -8026,6 +8035,11 @@ EOF
# Test again, we may have decided not to build it any more
if test "$build_libtool_libs" = yes; then
+ # Remove ${wl} instances when linking with ld.
+ # FIXME: should test the right _cmds variable.
+ case $archive_cmds in
+ *\$LD\ *) wl= ;;
+ esac
if test "$hardcode_into_libs" = yes; then
# Hardcode the library paths
hardcode_libdirs=
@@ -8056,7 +8070,7 @@ EOF
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_apped perm_rpath " $libdir" ;;
+ *) func_append perm_rpath " $libdir" ;;
esac
fi
done
@@ -8064,11 +8078,7 @@ EOF
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
- if test -n "$hardcode_libdir_flag_spec_ld"; then
- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
- else
- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
- fi
+ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
# We should set the runpath_var.
@@ -9158,6 +9168,8 @@ EOF
esac
done
fi
+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+ tool_oldlib=$func_to_tool_file_result
eval cmds=\"$old_archive_cmds\"
func_len " $cmds"
@@ -9267,7 +9279,8 @@ EOF
*.la)
func_basename "$deplib"
name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ func_resolve_sysroot "$deplib"
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff --git a/build-aux/missing b/build-aux/missing
index ac3d51c..86a8fc3 100755
--- a/build-aux/missing
+++ b/build-aux/missing
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@ scriptversion=2009-04-28.21; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -86,7 +84,6 @@ Supported PROGRAM values:
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -124,15 +121,6 @@ case $1 in
# Not GNU programs, they don't have --version.
;;
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
@@ -228,7 +216,7 @@ WARNING: \`$1' $msg. You should only need it if
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -258,7 +246,7 @@ WARNING: \`$1' is $msg. You should only need it if
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -320,41 +308,6 @@ WARNING: \`$1' is $msg. You should only need it if
touch $file
;;
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and is $msg.
diff --git a/config.h.in b/config.h.in
index 78d4dc9..44eb0b5 100644
--- a/config.h.in
+++ b/config.h.in
@@ -3,6 +3,9 @@
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
+/* what version of FFLAS-FFPACK is installed */
+#undef FFLAS_FFPACK_VERSION
+
/* Define if GMP is version 3.xxx */
#undef GMP_VERSION_3
@@ -12,24 +15,36 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if FFLAFLAS is installed */
-#undef HAVE_FFLAFLAS
+/* Define if FFLAS-FFPACK is installed */
+#undef HAVE_FFLAS_FFPACK
/* Define to 1 if you have the <float.h> header file. */
#undef HAVE_FLOAT_H
+/* Define if FPLLL is installed */
+#undef HAVE_FPLLL
+
+/* ps2pdf available as external program */
+#undef HAVE_GHOSTSCRIPT
+
/* Define if GIVARO is installed */
#undef HAVE_GIVARO
/* Define if GMP is installed */
#undef HAVE_GMP
+/* gnuplot available as external program */
+#undef HAVE_GNUPLOT
+
/* Define if IML is installed */
#undef HAVE_IML
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+/* Define if LAPACK is available */
+#undef HAVE_LAPACK
+
/* Define if LIDIA is installed */
#undef HAVE_LIDIA
@@ -39,12 +54,21 @@
/* Define that architecture uses little endian storage */
#undef HAVE_LITTLE_ENDIAN
+/* Define if M4RI is installed */
+#undef HAVE_M4RI
+
+/* Define if M4RIE is installed */
+#undef HAVE_M4RIE
+
/* Define if MAPLE is installed */
#undef HAVE_MAPLE
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
+/* Define if MPFR is installed */
+#undef HAVE_MPFR
+
/* Define if NTL is installed */
#undef HAVE_NTL
@@ -78,18 +102,6 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Canonical 16-bit data type */
-#undef INT16
-
-/* Canonical 32-bit data type */
-#undef INT32
-
-/* Canonical 64-bit data type */
-#undef INT64
-
-/* Canonical 8-bit data type */
-#undef INT8
-
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
@@ -139,10 +151,6 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Define if optimized threshold for Strassen-Winograd matrix multiplication
- is available */
-#undef STRASSEN_OPTIMIZATION
-
/* Version number of package */
#undef VERSION
diff --git a/configure b/configure
index b89c629..77bd52d 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for LinBox 1.2.0.
+# Generated by GNU Autoconf 2.69 for LinBox 1.3.1.
#
# Report bugs to <linbox-use at googlegroups.com>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -339,6 +367,14 @@ $as_echo X"$as_dir" |
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -515,28 +555,8 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -570,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='LinBox'
PACKAGE_TARNAME='linbox'
-PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='LinBox 1.2.0'
+PACKAGE_VERSION='1.3.1'
+PACKAGE_STRING='LinBox 1.3.1'
PACKAGE_BUGREPORT='linbox-use at googlegroups.com'
PACKAGE_URL='http://www.linalg.org/'
@@ -611,21 +631,27 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='LTLIBOBJS
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
LIBOBJS
LINBOX_BUILD_DOC_FALSE
LINBOX_BUILD_DOC_TRUE
LINBOX_DOC_PATH
+LINBOX_BENCH_PATH
LINBOX_HAVE_EXPAT_FALSE
LINBOX_HAVE_EXPAT_TRUE
EXPAT_LIBS
EXPAT_CFLAGS
-LINBOX_HAVE_FFLAFLAS_FALSE
-LINBOX_HAVE_FFLAFLAS_TRUE
+LINBOX_HAVE_LAPACK_FALSE
+LINBOX_HAVE_LAPACK_TRUE
+LINBOX_HAVE_FFLAS_FFPACK_FALSE
+LINBOX_HAVE_FFLAS_FFPACK_TRUE
+BLAS_CFLAGS
BLAS_LIBS
-FFLAFLAS_LOC
-FFLAFLAS_LIBS
-FFLAFLAS_CFLAGS
+FFLAS_FFPACK_LOC
+FFLAS_FFPACK_LIBS
+FFLAS_FFPACK_CFLAGS
LINBOX_HAVE_SAGE_FALSE
LINBOX_HAVE_SAGE_TRUE
LINBOX_HAVE_MAPLE_FALSE
@@ -650,6 +676,22 @@ LINBOX_HAVE_NTL_FALSE
LINBOX_HAVE_NTL_TRUE
NTL_LIBS
NTL_CFLAGS
+LINBOX_HAVE_FPLLL_FALSE
+LINBOX_HAVE_FPLLL_TRUE
+FPLLL_LIBS
+FPLLL_CFLAGS
+LINBOX_HAVE_MPFR_FALSE
+LINBOX_HAVE_MPFR_TRUE
+MPFR_LIBS
+MPFR_CFLAGS
+LINBOX_HAVE_M4RIE_FALSE
+LINBOX_HAVE_M4RIE_TRUE
+M4RIE_LIBS
+M4RIE_CFLAGS
+LINBOX_HAVE_M4RI_FALSE
+LINBOX_HAVE_M4RI_TRUE
+M4RI_LIBS
+M4RI_CFLAGS
LINBOX_HAVE_IML_FALSE
LINBOX_HAVE_IML_TRUE
IML_LIBS
@@ -704,13 +746,15 @@ LDFLAGS
CXXFLAGS
CXX
WARN
-WARNINGS_FALSE
-WARNINGS_TRUE
+PROF
+PROFILE_FALSE
+PROFILE_TRUE
DBG
DEBUG_FALSE
DEBUG_TRUE
INSIDE_GNOME_COMMON_FALSE
INSIDE_GNOME_COMMON_TRUE
+am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
@@ -785,6 +829,7 @@ enable_option_checking
enable_maintainer_mode
enable_dependency_tracking
enable_debug
+enable_profile
enable_warnings
enable_shared
enable_static
@@ -798,6 +843,10 @@ with_all
enable_drivers
with_gmp
with_iml
+with_m4ri
+with_m4rie
+with_mpfr
+with_fplll
with_ntl
with_givaro
with_saclib
@@ -805,8 +854,10 @@ with_lidia
with_maple
enable_sage
with_fflas_ffpack
-with___with_expat=<path>|yes|no
with_expat
+with_benchdir
+with_gnuplot
+with_ghostscript
enable_optimization
with_docdir
with_doxygen
@@ -1279,8 +1330,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1366,7 +1415,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures LinBox 1.2.0 to adapt to many kinds of systems.
+\`configure' configures LinBox 1.3.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1436,7 +1485,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of LinBox 1.2.0:";;
+ short | recursive ) echo "Configuration of LinBox 1.3.1:";;
esac
cat <<\_ACEOF
@@ -1449,7 +1498,13 @@ Optional Features:
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--enable-debug enable debugging options in library
- --enable-warnings enable warings when compiling the library
+ --enable-profile enable profiling options in library
+ --enable-warnings=yes|full|no
+ enable warnings when compiling the library. If
+ nothing or yes is given, more aggressive compiler
+ warnings are passed to the compiler. If full is
+ given, we become paranoïd about warnings and treat
+ them as errors.
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
@@ -1458,7 +1513,7 @@ Optional Features:
--enable-drivers Enable the compilation of the drivers
--enable-shared Check for shared compilation (needed by
--with-maple)
- --enable-sage Enable the compilation of the sage interface
+ --enable-sage Enable the compilation of the SAGE interface
--enable-optimization Enable run time optimization in LinBox code (only
Strassen matrix threshold for now)
--enable-doc Enable building documentation
@@ -1466,7 +1521,7 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-pic try to use only PIC/non-PIC objects [default=use
+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot=DIR Search for dependent libraries within DIR
@@ -1492,6 +1547,32 @@ Optional Packages:
reachable with the standard search path (/usr or
/usr/local). Otherwise you give the <path> to the
directory which contains the library.
+ --with-m4ri=<path>|yes Use M4RI library. This library is (not yet)
+ mandatory for LinBox compilation. If argument is yes
+ or <empty> or <bad> that means the library is
+ reachable with the standard search path (/usr or
+ /usr/local). Otherwise you give the <path> to the
+ directory which contains the library.
+
+ --with-m4rie=<path>|yes Use M4RIE library. This library is (not yet)
+ mandatory for LinBox compilation. If argument is yes
+ or <empty> or <bad> that means the library is
+ reachable with the standard search path (/usr or
+ /usr/local). Otherwise you give the <path> to the
+ directory which contains the library.
+
+ --with-mpfr=<path>|yes Use MPFR library. This library is (not yet)
+ mandatory for LinBox compilation. If argument is yes
+ or <empty> or <bad> :) that means the library is
+ reachable with the standard search path (/usr or
+ /usr/local). Otherwise you give the <path> to the
+ directory which contains the library.
+ --with-fplll=<path>|yes Use FPLLL library. This library is (not yet)
+ mandatory for LinBox compilation. If argument is yes
+ or <empty> or <bad> :) that means the library is
+ reachable with the standard search path (/usr or
+ /usr/local). Otherwise you give the <path> to the
+ directory which contains the library.
--with-ntl=<path>|yes|no
Use NTL library. If argument is no, you do not have
the library installed on your machine (set as
@@ -1535,20 +1616,17 @@ Optional Packages:
/usr/local). Otherwise you give the <path> to the
directory which contains the library. Available at
"http://linalg.org/projects/fflas-ffpack".
-
-Use Expat library. If argument is no, you do not
- have the library installed on your machine (set
- as default). If argument is yes or <empty> that
- means the library is reachable with the standard
- search path (/usr or /usr/local). Otherwise you
- give the <path> to the directory which contain the
- library.
-
-# Check whether --with---with-expat=<path>|yes|no was given.
-if test "${with___with_expat=<path>|yes|no+set}" = set; then :
- withval=$with___with_expat=<path>|yes|no;
-fi
-
+ --with-expat=<path>|yes|no
+ Use Expat library. If argument is no, you do not
+ have the library installed on your machine (set as
+ default). If argument is yes or <empty> that means
+ the library is reachable with the standard search
+ path (/usr or /usr/local). Otherwise you give the
+ <path> to the directory which contain the library.
+ --with-benchdir=<path> Where the LinBox benchmarks should be performed
+ --with-gnuplot=<path> Give the path to Gnuplot.
+ --with-ghostscript=<path>
+ Give the path to ghostscript.
--with-docdir=<path> Where the LinBox documentation should be installed
--with-doxygen=<path> Give the path to Doxygen. Note: --enable-doc needed
@@ -1631,10 +1709,10 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-LinBox configure 1.2.0
-generated by GNU Autoconf 2.68
+LinBox configure 1.3.1
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1827,7 +1905,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -1971,7 +2049,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -2007,7 +2085,8 @@ int
main ()
{
static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2023,7 +2102,8 @@ int
main ()
{
static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2049,7 +2129,8 @@ int
main ()
{
static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2065,7 +2146,8 @@ int
main ()
{
static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2099,7 +2181,8 @@ int
main ()
{
static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
;
return 0;
@@ -2262,8 +2345,8 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by LinBox $as_me 1.2.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+It was created by LinBox $as_me 1.3.1, which was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2640,7 +2723,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.10'
+am__api_version='1.11'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2679,7 +2762,7 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -2740,16 +2823,29 @@ $as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+esac
+
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
if test "$*" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
+ set X `ls -t "$srcdir/configure" conftest.file`
fi
rm -f conftest.file
if test "$*" != "X $srcdir/configure conftest.file" \
@@ -2787,7 +2883,14 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
@@ -2797,7 +2900,14 @@ else
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
@@ -2821,7 +2931,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2861,7 +2971,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2912,7 +3022,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -2965,7 +3075,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3051,7 +3161,7 @@ fi
# Define the identity of the package.
PACKAGE='linbox'
- VERSION='1.2.0'
+ VERSION='1.3.1'
cat >>confdefs.h <<_ACEOF
@@ -3081,11 +3191,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
@@ -3093,8 +3203,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
ac_config_headers="$ac_config_headers config.h"
-ac_config_headers="$ac_config_headers "
-
ac_config_commands="$ac_config_commands linbox/linbox-config.h"
@@ -3116,7 +3224,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3142,6 +3250,7 @@ fi
RM="$RM -f"
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -3172,6 +3281,7 @@ fi
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
@@ -3211,6 +3321,8 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+echo "-----------------------------------------------"
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable debugging options in the library" >&5
$as_echo_n "checking whether to enable debugging options in the library... " >&6; }
# Check whether --enable-debug was given.
@@ -3233,7 +3345,28 @@ fi
DBG=$USE_DEBUG
-# AC_FULL_DEBUG
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable profiling everything in the library" >&5
+$as_echo_n "checking whether to enable profiling everything in the library... " >&6; }
+ # Check whether --enable-profile was given.
+if test "${enable_profile+set}" = set; then :
+ enableval=$enable_profile; USE_PROFILE=$enableval
+else
+ USE_PROFILE=no
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_PROFILE" >&5
+$as_echo "$USE_PROFILE" >&6; }
+ if test $USE_PROFILE = yes; then
+ PROFILE_TRUE=
+ PROFILE_FALSE='#'
+else
+ PROFILE_TRUE='#'
+ PROFILE_FALSE=
+fi
+
+ PROF=$USE_PROFILE
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable warnings when compiling the library" >&5
$as_echo_n "checking whether to enable warnings when compiling the library... " >&6; }
# Check whether --enable-warnings was given.
@@ -3245,17 +3378,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_WARNINGS" >&5
$as_echo "$USE_WARNINGS" >&6; }
- if test $USE_WARNINGS = yes; then
- WARNINGS_TRUE=
- WARNINGS_FALSE='#'
-else
- WARNINGS_TRUE='#'
- WARNINGS_FALSE=
-fi
-
- WARN=$USE_WARNINGS
+ WARN=$USE_WARNINGS
+echo "-----------------------------------------------"
# CFLAGS=${CFLAGS:-$DEFAULT_CFLAGS}
# CXXFLAGS=${CXXFLAGS:-$DEFAULT_CXXFLAGS}
@@ -3297,7 +3423,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3341,7 +3467,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3779,60 +3905,89 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for family name of compiler" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for family name of compiler" >&5
$as_echo_n "checking for family name of compiler... " >&6; }
-if test "$cross_compiling" = yes; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
-$as_echo "unknown" >&6; }
- CCNAM=unknown
-
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #ifdef __INTEL_COMPILER
- int main() { return 0 ; }
- #else
- pas intel
- #endif
+
+ #ifdef __INTEL_COMPILER
+ int main() { return 0 ; }
+ #else
+ pas intel
+ #endif
_ACEOF
if ac_fn_cxx_try_run "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: icc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: icc" >&5
$as_echo "icc" >&6; }
- CCNAM=icc
+ CCNAM=icc
-else
- if test "$cross_compiling" = yes; then :
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
-$as_echo "unknown" >&6; }
- CCNAM=unknown
+ if test -z "${CCNAM}"; then :
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#ifdef __GNUC__
- int main() { return 0 ; }
- #else
- pas gcc non plus.
- #endif
+
+ #ifdef __PATHSCALE__
+ int main() { return !(__PATHCC__ >= 4) ; }
+ #else
+ pas ekopath non plus.
+ #endif
_ACEOF
if ac_fn_cxx_try_run "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: gcc" >&5
-$as_echo "gcc" >&6; }
- CCNAM=gcc
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: eko" >&5
+$as_echo "eko" >&6; }
+ CCNAM=eko
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+fi
+ if test -z "${CCNAM}"; then :
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
-$as_echo "unknown" >&6; }
- CCNAM=unknown
+ #ifdef __clang__
+ int main() { return !(__clang_major >=3) ; }
+ #else
+ pas clang non plus.
+ #endif
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: clang" >&5
+$as_echo "clang" >&6; }
+ CCNAM=clang
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -3841,47 +3996,102 @@ fi
fi
+
+ if test -z "${CCNAM}"; then :
+
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #ifdef __GNUC__
+ int main() { return !(__GNUC__ >= 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) ; }
+ #else
+ pas gcc non plus ???
+ #endif
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+
+ CCNOM=gcc
+ if test -n "${CC}" ; then :
+ CCNOM="`$CC --version 2>&1| awk 'NR<2{print }'`"
+fi
+ CCNAM=gcc
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCNOM" >&5
+$as_echo "$CCNOM" >&6; }
+
+fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+fi
+
+
+ if test -z "${CCNAM}"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+$as_echo "unknown" >&6; }
+ CCNAM=unknown
+
+ echo
+ echo " *** unknow compiler. please file a bug "
+ echo
+
+fi
+
-TESTS_CFLAGS="-O0 -g"
+TESTS_CFLAGS="-O0"
DEBUG_CFLAGS="-g"
-DEFAULT_CFLAGS="-pipe"
-WARN_CFLAGS="-Wall"
+DEFAULT_CFLAGS=""
+# WARN_CFLAGS="-Wall"
+
+#TODO use -fast for icc, -ipa for eko...
if test "x$DBG" = "xyes" ; then
- DEFAULT_CFLAGS="-O0 ${DEFAULT_CFLAGS} -g -pg" #those are CXXFLAGS
+ DEFAULT_CFLAGS="-O0 ${DEFAULT_CFLAGS} " #those are CXXFLAGS
DEBUG_CFLAGS="${DEBUG_CFLAGS} -DDEBUG -D_LB_DEBUG"
else
- DEFAULT_CFLAGS="-O2 ${DEFAULT_CFLAGS} -DNDEBUG -U_LB_DEBUG"
+ DEFAULT_CFLAGS="-O2 ${DEFAULT_CFLAGS} "
+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -DNDEBUG -U_LB_DEBUG"
fi
+if test "x$PROF" = "xyes" ; then
+ DEFAULT_CFLAGS="${DEFAULT_CFLAGS} -pg"
+fi
-
-if test "x$WARN" = "xyes" ; then
- # if test "x${CXX}" = "xicpc" -o "x${CXX}" = "xicc" ; then
- if test "x${CCNAM}" = "xicc" ; then
+if test "x$WARN" = "xyes" -o "x$WARN" = "xfull" ; then
+ case x${CCNAM} in
+ xicc)
WARN_CFLAGS="${WARN_CFLAGS} -Wcheck"
# DEBUG_CFLAGS="-fast"
- else
- if test "x${CCNAM}" = "xgcc" ; then
+ ;;
+ xeko)
+ WARN_CFLAGS="${WARN_CFLAGS} -Wno-unused-parameter"
+ ;;
+ xgcc|xclang)
WARN_CFLAGS="${WARN_CFLAGS} -Wextra -Wno-unused-parameter"
- else
+ if test "x${WARN}" = "xfull" ; then
+ WARN_CFLAGS="${WARN_CFLAGS} -Wuninitialized -Wconversion -Wcast-qual -ansi -pedantic -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wno-long-long"
+ fi
+ ;;
+ *)
echo
echo "*******************************************************"
echo "unsupported compiler ($CCNAM). Please file a bug."
echo "*******************************************************"
echo
WARN_CFLAGS="${WARN_CFLAGS}"
- fi
- fi
+ esac
fi
@@ -4039,7 +4249,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -4105,7 +4315,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -4273,8 +4483,8 @@ esac
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
@@ -4452,7 +4662,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4492,7 +4702,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4545,7 +4755,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4586,7 +4796,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -4644,7 +4854,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4688,7 +4898,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4884,8 +5094,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4992,7 +5201,7 @@ do
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
@@ -5071,7 +5280,7 @@ do
for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ as_fn_executable_p "$ac_path_FGREP" || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
case `"$ac_path_FGREP" --version 2>&1` in
@@ -5327,7 +5536,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5371,7 +5580,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5529,6 +5738,11 @@ else
lt_cv_sys_max_cmd_len=196608
;;
+ os2*)
+ # The test takes a long time on OS/2.
+ lt_cv_sys_max_cmd_len=8192
+ ;;
+
osf*)
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -5568,7 +5782,7 @@ else
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
@@ -5790,7 +6004,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5830,7 +6044,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5997,12 +6211,12 @@ irix5* | irix6* | nonstopux*)
lt_cv_deplibs_check_method=pass_all
;;
-# This must be Linux ELF.
+# This must be glibc/ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -6136,7 +6350,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6176,7 +6390,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6279,7 +6493,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6323,7 +6537,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AR="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6448,7 +6662,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6488,7 +6702,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6547,7 +6761,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6587,7 +6801,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6637,13 +6851,13 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
;;
esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
fi
case $host_os in
@@ -6790,6 +7004,7 @@ for ac_symprfx in "" "_"; do
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK '"\
" {last_section=section; section=\$ 3};"\
+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -7179,7 +7394,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
CFLAGS="$SAVE_CFLAGS"
fi
;;
-sparc*-*solaris*)
+*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -7190,7 +7405,20 @@ sparc*-*solaris*)
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ yes*)
+ case $host in
+ i?86-*-solaris*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ sparc*-*-solaris*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+ LD="${LD-ld}_sol2"
+ fi
+ ;;
*)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64"
@@ -7223,7 +7451,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7263,7 +7491,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7343,7 +7571,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7383,7 +7611,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7435,7 +7663,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7475,7 +7703,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7527,7 +7755,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7567,7 +7795,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_LIPO="lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7619,7 +7847,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7659,7 +7887,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL="otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7711,7 +7939,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7751,7 +7979,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7830,7 +8058,13 @@ else
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-dynamiclib -Wl,-single_module conftest.c 2>conftest.err
_lt_result=$?
- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ # If there is a non-empty error log, and "single_module"
+ # appears in it, assume the flag caused a linker warning
+ if test -s conftest.err && $GREP single_module conftest.err; then
+ cat conftest.err >&5
+ # Otherwise, if the output was created with a 0 exit code from
+ # the compiler, it worked.
+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&5
@@ -7841,6 +8075,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -7873,6 +8108,7 @@ rm -f core conftest.err conftest.$ac_objext \
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
$as_echo_n "checking for -force_load linker flag... " >&6; }
if ${lt_cv_ld_force_load+:} false; then :
@@ -7894,7 +8130,9 @@ _LT_EOF
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
_lt_result=$?
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ if test -s conftest.err && $GREP force_load conftest.err; then
+ cat conftest.err >&5
+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&5
@@ -8059,7 +8297,22 @@ fi
# Check whether --with-pic was given.
if test "${with_pic+set}" = set; then :
- withval=$with_pic; pic_mode="$withval"
+ withval=$with_pic; lt_p=${PACKAGE-default}
+ case $withval in
+ yes|no) pic_mode=$withval ;;
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for lt_pkg in $withval; do
+ IFS="$lt_save_ifs"
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
else
pic_mode=default
fi
@@ -8137,6 +8390,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
test -z "$LN_S" && LN_S="ln -s"
@@ -8596,7 +8853,9 @@ lt_prog_compiler_static=
case $cc_basename in
nvcc*) # Cuda Compiler Driver 2.2
lt_prog_compiler_wl='-Xlinker '
- lt_prog_compiler_pic='-Xcompiler -fPIC'
+ if test -n "$lt_prog_compiler_pic"; then
+ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+ fi
;;
esac
else
@@ -8687,18 +8946,33 @@ lt_prog_compiler_static=
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ F* | *Sun*Fortran*)
+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
# Sun Fortran 8.3 passes all unrecognized flags to the linker
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
lt_prog_compiler_wl=''
;;
+ *Sun\ F* | *Sun*Fortran*)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl='-Qoption ld '
+ ;;
*Sun\ C*)
# Sun C 5.9
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
lt_prog_compiler_wl='-Wl,'
;;
+ *Intel*\ [CF]*Compiler*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
+ *Portland\ Group*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fpic'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
esac
;;
esac
@@ -9060,7 +9334,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
hardcode_direct=no
hardcode_direct_absolute=no
hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld=
hardcode_libdir_separator=
hardcode_minus_L=no
hardcode_shlibpath_var=unsupported
@@ -9104,9 +9377,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- link_all_deplibs=no
- ;;
esac
ld_shlibs=yes
@@ -9313,8 +9583,7 @@ _LT_EOF
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -9329,7 +9598,7 @@ _LT_EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -9506,7 +9775,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -9694,6 +9962,7 @@ fi
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
enable_shared_with_static_runtimes=yes
+ exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
# Don't use ranlib
old_postinstall_cmds='chmod 644 $oldlib'
@@ -9739,6 +10008,7 @@ fi
hardcode_shlibpath_var=unsupported
if test "$lt_cv_ld_force_load" = "yes"; then
whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
else
whole_archive_flag_spec=''
fi
@@ -9767,10 +10037,6 @@ fi
hardcode_shlibpath_var=no
;;
- freebsd1*)
- ld_shlibs=no
- ;;
-
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
# support. Future versions do this automatically, but an explicit c++rt0.o
# does not break anything, and helps significantly (at the cost of a little
@@ -9783,7 +10049,7 @@ fi
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
+ freebsd2.*)
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
@@ -9822,7 +10088,6 @@ fi
fi
if test "$with_gnu_ld" = no; then
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_flag_spec_ld='+b $libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
hardcode_direct_absolute=yes
@@ -9963,7 +10228,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -10446,11 +10711,6 @@ esac
-
-
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
@@ -10540,7 +10800,7 @@ need_version=unknown
case $host_os in
aix3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
@@ -10549,7 +10809,7 @@ aix3*)
;;
aix[4-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
@@ -10614,7 +10874,7 @@ beos*)
;;
bsdi[45]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -10753,7 +11013,7 @@ darwin* | rhapsody*)
;;
dgux*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -10761,10 +11021,6 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
- dynamic_linker=no
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -10772,11 +11028,18 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
- version_type=freebsd-$objformat
+ # Handle Gentoo/FreeBSD as it was Linux
+ case $host_vendor in
+ gentoo)
+ version_type=linux ;;
+ *)
+ version_type=freebsd-$objformat ;;
+ esac
+
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -10787,10 +11050,16 @@ freebsd* | dragonfly*)
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
+ linux)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ need_lib_prefix=no
+ need_version=no
+ ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10810,7 +11079,7 @@ freebsd* | dragonfly*)
;;
gnu*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
@@ -10821,7 +11090,7 @@ gnu*)
;;
haiku*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
@@ -10882,7 +11151,7 @@ hpux9* | hpux10* | hpux11*)
;;
interix[3-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -10898,7 +11167,7 @@ irix5* | irix6* | nonstopux*)
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
fi ;;
@@ -10935,9 +11204,9 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
-# This must be Linux ELF.
+# This must be glibc/ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11000,18 +11269,6 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -11031,7 +11288,7 @@ netbsd*)
;;
newsos6)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -11100,7 +11357,7 @@ rdos*)
;;
solaris*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11125,7 +11382,7 @@ sunos4*)
;;
sysv4 | sysv4.3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -11149,7 +11406,7 @@ sysv4 | sysv4.3*)
sysv4*MP*)
if test -d /usr/nec ;then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
soname_spec='$libname${shared_ext}.$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -11180,7 +11437,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11190,7 +11447,7 @@ tpf*)
;;
uts4*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -12115,7 +12372,6 @@ export_dynamic_flag_spec_CXX=
hardcode_direct_CXX=no
hardcode_direct_absolute_CXX=no
hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
hardcode_shlibpath_var_CXX=unsupported
@@ -12699,6 +12955,7 @@ fi
hardcode_shlibpath_var_CXX=unsupported
if test "$lt_cv_ld_force_load" = "yes"; then
whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
else
whole_archive_flag_spec_CXX=''
fi
@@ -12743,7 +13000,7 @@ fi
esac
;;
- freebsd[12]*)
+ freebsd2.*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
@@ -13419,6 +13676,7 @@ _lt_libdeps_save_CFLAGS=$CFLAGS
case "$CC $CFLAGS " in #(
*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
esac
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -13846,7 +14104,7 @@ lt_prog_compiler_static_CXX=
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -14208,16 +14466,15 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
- cl*) ;;
+ cl*)
+ exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
;;
esac
;;
- linux* | k*bsd*-gnu | gnu*)
- link_all_deplibs_CXX=no
- ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -14364,8 +14621,6 @@ esac
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
@@ -14391,7 +14646,7 @@ need_version=unknown
case $host_os in
aix3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
@@ -14400,7 +14655,7 @@ aix3*)
;;
aix[4-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
@@ -14465,7 +14720,7 @@ beos*)
;;
bsdi[45]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -14602,7 +14857,7 @@ darwin* | rhapsody*)
;;
dgux*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -14610,10 +14865,6 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
- dynamic_linker=no
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -14621,11 +14872,18 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
- version_type=freebsd-$objformat
+ # Handle Gentoo/FreeBSD as it was Linux
+ case $host_vendor in
+ gentoo)
+ version_type=linux ;;
+ *)
+ version_type=freebsd-$objformat ;;
+ esac
+
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -14636,10 +14894,16 @@ freebsd* | dragonfly*)
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
+ linux)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ need_lib_prefix=no
+ need_version=no
+ ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
@@ -14659,7 +14923,7 @@ freebsd* | dragonfly*)
;;
gnu*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
@@ -14670,7 +14934,7 @@ gnu*)
;;
haiku*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
@@ -14731,7 +14995,7 @@ hpux9* | hpux10* | hpux11*)
;;
interix[3-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -14747,7 +15011,7 @@ irix5* | irix6* | nonstopux*)
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
fi ;;
@@ -14784,9 +15048,9 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
-# This must be Linux ELF.
+# This must be glibc/ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14849,18 +15113,6 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -14880,7 +15132,7 @@ netbsd*)
;;
newsos6)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -14949,7 +15201,7 @@ rdos*)
;;
solaris*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14974,7 +15226,7 @@ sunos4*)
;;
sysv4 | sysv4.3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -14998,7 +15250,7 @@ sysv4 | sysv4.3*)
sysv4*MP*)
if test -d /usr/nec ;then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
soname_spec='$libname${shared_ext}.$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -15029,7 +15281,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -15039,7 +15291,7 @@ tpf*)
;;
uts4*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -15178,6 +15430,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
ac_config_commands="$ac_config_commands libtool"
@@ -15192,6 +15446,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+echo "-----------------------------------------------"
# Machine characteristics
@@ -15755,93 +16010,78 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
# Create some useful data types of fixed, known lengths
# We hereby assume that a character is always one byte
-LINBOX_INT8="char";
+# LINBOX_INT8="char";
+
+# case $ac_cv_sizeof_char in
+ # 1)
+ # TWO_BYTES=2;
+ # FOUR_BYTES=4;
+ # EIGHT_BYTES=8;
+ # ;;
+ # 8)
+ # TWO_BYTES=16;
+ # FOUR_BYTES=32;
+ # EIGHT_BYTES=64;
+# esac
+
+# case $TWO_BYTES in
+ # $ac_cv_sizeof_short)
+ # LINBOX_INT16="short";
+ # ;;
+ # $ac_cv_sizeof_int)
+ # LINBOX_INT16="int";
+ # ;;
+# esac
+
+# case $FOUR_BYTES in
+ # $ac_cv_sizeof_short)
+ # LINBOX_INT32="short";
+ # ;;
+ # $ac_cv_sizeof_int)
+ # LINBOX_INT32="int";
+ # ;;
+ # $ac_cv_sizeof_long)
+ # LINBOX_INT32="long";
+ # ;;
+# esac
+
+# case $EIGHT_BYTES in
+ # $ac_cv_sizeof_short)
+ # LINBOX_INT64="short";
+ # ;;
+ # $ac_cv_sizeof_int)
+ # LINBOX_INT64="int";
+ # ;;
+ # $ac_cv_sizeof_long)
+ # LINBOX_INT64="long";
+ # ;;
+ # $ac_cv_sizeof_long_long)
+ # LINBOX_INT64="long long";
+ # ;;
+ # $ac_cv_sizeof___int64)
+ # LINBOX_INT64="__int64";
+ # ;;
+# esac
+
+# AC_DEFINE_UNQUOTED(INT8, $LINBOX_INT8, Canonical 8-bit data type)
+# AC_DEFINE_UNQUOTED(INT16, $LINBOX_INT16, Canonical 16-bit data type)
+# AC_DEFINE_UNQUOTED(INT32, $LINBOX_INT32, Canonical 32-bit data type)
+# AC_DEFINE_UNQUOTED(INT64, $LINBOX_INT64, Canonical 64-bit data type)
+
+echo "-----------------------------------------------"
+# Feature checks
-case $ac_cv_sizeof_char in
- 1)
- TWO_BYTES=2;
- FOUR_BYTES=4;
- EIGHT_BYTES=8;
- ;;
- 8)
- TWO_BYTES=16;
- FOUR_BYTES=32;
- EIGHT_BYTES=64;
-esac
-case $TWO_BYTES in
- $ac_cv_sizeof_short)
- LINBOX_INT16="short";
- ;;
- $ac_cv_sizeof_int)
- LINBOX_INT16="int";
- ;;
-esac
-case $FOUR_BYTES in
- $ac_cv_sizeof_short)
- LINBOX_INT32="short";
- ;;
- $ac_cv_sizeof_int)
- LINBOX_INT32="int";
- ;;
- $ac_cv_sizeof_long)
- LINBOX_INT32="long";
- ;;
-esac
-
-case $EIGHT_BYTES in
- $ac_cv_sizeof_short)
- LINBOX_INT64="short";
- ;;
- $ac_cv_sizeof_int)
- LINBOX_INT64="int";
- ;;
- $ac_cv_sizeof_long)
- LINBOX_INT64="long";
- ;;
- $ac_cv_sizeof_long_long)
- LINBOX_INT64="long long";
- ;;
- $ac_cv_sizeof___int64)
- LINBOX_INT64="__int64";
- ;;
-esac
-
-
-cat >>confdefs.h <<_ACEOF
-#define INT8 $LINBOX_INT8
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define INT16 $LINBOX_INT16
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define INT32 $LINBOX_INT32
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define INT64 $LINBOX_INT64
-_ACEOF
-
-
-# Feature checks
-
-
-
-# Check whether --with-default was given.
-if test "${with_default+set}" = set; then :
- withval=$with_default; if test "$withval" = yes ; then
- echo "Default path = /usr /usr/local "
- DEFAULT_CHECKING_PATH="/usr /usr/local "
- else
- echo "Default path = $withval /usr /usr/local "
- DEFAULT_CHECKING_PATH="$withval /usr /usr/local "
- fi
+# Check whether --with-default was given.
+if test "${with_default+set}" = set; then :
+ withval=$with_default; if test "$withval" = yes ; then
+ echo "Default path = /usr /usr/local "
+ DEFAULT_CHECKING_PATH="/usr /usr/local "
+ else
+ echo "Default path = $withval /usr /usr/local "
+ DEFAULT_CHECKING_PATH="$withval /usr /usr/local "
+ fi
else
@@ -15873,10 +16113,11 @@ if test -n "$check_all"; then
GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
GIVARO_HOME_PATH="${DEFAULT_CHECKING_PATH}"
NTL_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+ IML_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+ FFLAS_FFPACK_HOME_PATH="${DEFAULT_CHECKING_PATH}"
LIDIA_HOME_PATH="${DEFAULT_CHECKING_PATH}"
SACLIB_HOME_PATH="${DEFAULT_CHECKING_PATH}"
MAPLE_HOME_PATH="${DEFAULT_CHECKING_PATH} unknown"
-# EXPAT_HOME_PATH="${DEFAULT_CHECKING_PATH}"
BLAS_HOME_PATH="${DEFAULT_CHECKING_PATH}"
fi
@@ -15918,6 +16159,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+echo "-----------------------------------------------"
@@ -15958,7 +16200,14 @@ for GMP_HOME in ${GMP_HOME_PATH}
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <gmp.h>
+
+#ifdef __PATHCC__
+#include <rw/_defs.h>
+#include <ansi/_cstddef.h>
+#endif
+#include "stddef.h"
+ #include <gmp.h>
+
int
main ()
{
@@ -15986,7 +16235,13 @@ $as_echo "#define HAVE_GMP 1" >>confdefs.h
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <gmp.h>
+
+#ifdef __PATHCC__
+#include <rw/_defs.h>
+ #include <ansi/_cstddef.h>
+ #include "stddef.h"
+#endif
+ #include <gmp.h>
int main () { if (__GNU_MP_VERSION < 3) return -1; else return 0; }
_ACEOF
@@ -16010,6 +16265,12 @@ $as_echo "no" >&6; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+
+#ifdef __PATHCC__
+#include <rw/_defs.h>
+ #include <ansi/_cstddef.h>
+ #include "stddef.h"
+#endif
#include <gmp.h>
int main () { if (__GNU_MP_VERSION < 4) return -1; else return 0; }
@@ -16110,8 +16371,8 @@ $as_echo "not found" >&6; }
echo '*******************************************************************************'
echo ' ERROR: GMP not found!'
echo
-echo ' GMP version 3.1.1 or greater with --enable-cxx is required for this library to compile. Please'
-echo ' make sure GMP is installed and specify its location with the option'
+echo ' GMP library compiled with --enable-cxx is required for this library to compile.'
+echo ' Please make sure GMP is installed and specify its location with the option'
echo ' --with-gmp=<prefix> when running configure.'
echo '*******************************************************************************'
exit 1
@@ -16172,7 +16433,597 @@ for IML_HOME in ${IML_HOME_PATH}
int
main ()
{
-Double a;
+Double a;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+ if test "$cross_compiling" = yes; then :
+
+ iml_found="yes"
+ iml_cross="yes"
+ break
+
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ int main () { return 0; /* not possible to check version */ }
+
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+
+ iml_found="yes"
+ break
+
+else
+
+ iml_problem="$problem $IML_HOME"
+ unset IML_CFLAGS
+ unset IML_LIBS
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+else
+
+ iml_found="no"
+ iml_checked="$checked $IML_HOME"
+ unset IML_CFLAGS
+ unset IML_LIBS
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ else
+ iml_found="no"
+ fi
+done
+
+if test "x$iml_found" = "xyes" ; then
+
+
+
+$as_echo "#define HAVE_IML 1" >>confdefs.h
+
+ HAVE_IML=yes
+ if test "x$iml_cross" != "xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+$as_echo "unknown" >&6; }
+ echo "WARNING: You appear to be cross compiling, so there is no way to determine"
+ echo "whether your IML version is new enough. I am assuming it is."
+ fi
+ :
+elif test -n "$iml_problem"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: problem" >&5
+$as_echo "problem" >&6; }
+ echo "Sorry, your IML version is too old. Disabling."
+ :
+elif test "x$iml_found" = "xno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+ :
+fi
+
+ if test "x$HAVE_IML" = "xyes"; then
+ LINBOX_HAVE_IML_TRUE=
+ LINBOX_HAVE_IML_FALSE='#'
+else
+ LINBOX_HAVE_IML_TRUE='#'
+ LINBOX_HAVE_IML_FALSE=
+fi
+
+
+CXXFLAGS=${BACKUP_CXXFLAGS}
+LIBS=${BACKUP_LIBS}
+#unset LD_LIBRARY_PATH
+
+
+
+
+
+# Check whether --with-m4ri was given.
+if test "${with_m4ri+set}" = set; then :
+ withval=$with_m4ri;
+fi
+
+
+if test "$withval" = yes ; then :
+ M4RI_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+elif test "$withval" != no ; then :
+ M4RI_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}"
+else
+ M4RI_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+fi
+
+
+
+BACKUP_CXXFLAGS=${CXXFLAGS}
+BACKUP_LIBS=${LIBS}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for M4RI" >&5
+$as_echo_n "checking for M4RI... " >&6; }
+
+for M4RI_HOME in ${M4RI_HOME_PATH}
+ do
+ if test -r "$M4RI_HOME/include/m4ri/m4ri.h"; then :
+
+
+ if test "x$M4RI_HOME" != "x/usr" -a "x$M4RI_HOME" != "x/usr/local"; then :
+
+ M4RI_CFLAGS="-I${M4RI_HOME}/include"
+ M4RI_LIBS="-L${M4RI_HOME}/lib -lm4ri"
+else
+
+ M4RI_CFLAGS=
+ M4RI_LIBS="-lm4ri"
+fi
+
+ CXXFLAGS="${BACKUP_CXXFLAGS} ${M4RI_CFLAGS} ${GMP_CFLAGS}"
+ LIBS="${BACKUP_LIBS} ${M4RI_LIBS} ${GMP_LIBS}"
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <m4ri/m4ri.h>
+int
+main ()
+{
+mzd_t a;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+ if test "$cross_compiling" = yes; then :
+
+ m4ri_found="yes"
+ m4ri_cross="yes"
+ break
+
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ int main () { return 0; /* not possible to check version */ }
+
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+
+ m4ri_found="yes"
+ break
+
+else
+
+ m4ri_problem="$problem $M4RI_HOME"
+ unset M4RI_CFLAGS
+ unset M4RI_LIBS
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+else
+
+ m4ri_found="no"
+ m4ri_checked="$checked $M4RI_HOME"
+ unset M4RI_CFLAGS
+ unset M4RI_LIBS
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+else
+
+ m4ri_found="no"
+
+fi
+done
+
+if test "x$m4ri_found" = "xyes"; then :
+
+
+
+
+$as_echo "#define HAVE_M4RI 1" >>confdefs.h
+
+ HAVE_M4RI=yes
+ if test "x$m4ri_cross" != "xyes"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+$as_echo "unknown" >&6; }
+ echo "WARNING: You appear to be cross compiling, so there is no way to determine"
+ echo "whether your M4RI version is new enough. I am assuming it is."
+
+fi
+ :
+elif test -n "$m4ri_problem" ; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: problem" >&5
+$as_echo "problem" >&6; }
+ echo "Sorry, your M4RI version is too old. Disabling."
+ :
+elif test "x$m4ri_found" = "xno" ; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+ :
+fi
+
+ if test "x$HAVE_M4RI" = "xyes"; then
+ LINBOX_HAVE_M4RI_TRUE=
+ LINBOX_HAVE_M4RI_FALSE='#'
+else
+ LINBOX_HAVE_M4RI_TRUE='#'
+ LINBOX_HAVE_M4RI_FALSE=
+fi
+
+
+CXXFLAGS=${BACKUP_CXXFLAGS}
+LIBS=${BACKUP_LIBS}
+#unset LD_LIBRARY_PATH
+
+
+
+
+
+# Check whether --with-m4rie was given.
+if test "${with_m4rie+set}" = set; then :
+ withval=$with_m4rie;
+fi
+
+
+if test "$withval" = yes ; then :
+ M4RIE_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+elif test "$withval" != no ; then :
+ M4RIE_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}"
+else
+ M4RIE_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+fi
+
+
+
+BACKUP_CXXFLAGS=${CXXFLAGS}
+BACKUP_LIBS=${LIBS}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for M4RIE" >&5
+$as_echo_n "checking for M4RIE... " >&6; }
+
+for M4RIE_HOME in ${M4RIE_HOME_PATH}
+ do
+ if test -r "$M4RIE_HOME/include/m4rie/m4rie.h"; then :
+
+
+ if test "x$M4RIE_HOME" != "x/usr" -a "x$M4RIE_HOME" != "x/usr/local"; then :
+
+ M4RIE_CFLAGS="-I${M4RIE_HOME}/include"
+ M4RIE_LIBS="-L${M4RIE_HOME}/lib -lm4rie"
+else
+
+ M4RIE_CFLAGS=
+ M4RIE_LIBS="-lm4rie"
+fi
+
+ CXXFLAGS="${BACKUP_CXXFLAGS} ${M4RIE_CFLAGS} ${GMP_CFLAGS}"
+ LIBS="${BACKUP_LIBS} ${M4RIE_LIBS} ${GMP_LIBS}"
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <m4rie/m4rie.h>
+int
+main ()
+{
+gf2e a;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+ if test "$cross_compiling" = yes; then :
+
+ m4rie_found="yes"
+ m4rie_cross="yes"
+ break
+
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ int main () { return 0; /* not possible to check version */ }
+
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+
+ m4rie_found="yes"
+ break
+
+else
+
+ m4rie_problem="$problem $M4RIE_HOME"
+ unset M4RIE_CFLAGS
+ unset M4RIE_LIBS
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+else
+
+ m4rie_found="no"
+ m4rie_checked="$checked $M4RIE_HOME"
+ unset M4RIE_CFLAGS
+ unset M4RIE_LIBS
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+else
+
+ m4rie_found="no"
+
+fi
+done
+
+if test "x$m4rie_found" = "xyes"; then :
+
+
+
+
+$as_echo "#define HAVE_M4RIE 1" >>confdefs.h
+
+ HAVE_M4RIE=yes
+ if test "x$m4rie_cross" != "xyes"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+$as_echo "unknown" >&6; }
+ echo "WARNING: You appear to be cross compiling, so there is no way to determine"
+ echo "whether your M4RIE version is new enough. I am assuming it is."
+
+fi
+ :
+elif test -n "$m4rie_problem" ; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: problem" >&5
+$as_echo "problem" >&6; }
+ echo "Sorry, your M4RIE version is too old. Disabling."
+ :
+elif test "x$m4rie_found" = "xno" ; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+ :
+fi
+
+ if test "x$HAVE_M4RIE" = "xyes"; then
+ LINBOX_HAVE_M4RIE_TRUE=
+ LINBOX_HAVE_M4RIE_FALSE='#'
+else
+ LINBOX_HAVE_M4RIE_TRUE='#'
+ LINBOX_HAVE_M4RIE_FALSE=
+fi
+
+
+CXXFLAGS=${BACKUP_CXXFLAGS}
+LIBS=${BACKUP_LIBS}
+#unset LD_LIBRARY_PATH
+
+
+
+
+
+# Check whether --with-mpfr was given.
+if test "${with_mpfr+set}" = set; then :
+ withval=$with_mpfr; if test "$withval" = yes ; then
+ MPFR_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+ elif test "$withval" != no ; then
+ MPFR_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}"
+ fi
+else
+ MPFR_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+fi
+
+
+
+
+BACKUP_CXXFLAGS=${CXXFLAGS}
+BACKUP_LIBS=${LIBS}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPFR" >&5
+$as_echo_n "checking for MPFR... " >&6; }
+
+for MPFR_HOME in ${MPFR_HOME_PATH}
+ do
+ if test -r "$MPFR_HOME/include/mpfr.h"; then
+
+ if test "x$MPFR_HOME" != "x/usr" -a "x$MPFR_HOME" != "x/usr/local"; then :
+
+ MPFR_CFLAGS="-I${MPFR_HOME}/include"
+ MPFR_LIBS="-L${MPFR_HOME}/lib -lmpfr"
+
+else
+
+ MPFR_CFLAGS=
+ MPFR_LIBS="-lmpfr"
+
+fi
+
+ CXXFLAGS="${BACKUP_CXXFLAGS} ${MPFR_CFLAGS} ${GMP_CFLAGS}"
+ LIBS="${BACKUP_LIBS} ${GMP_LIBS} ${MPFR_LIBS} "
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <mpfr.h>
+
+int
+main ()
+{
+mpfr_t a ;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+ if test "$cross_compiling" = yes; then :
+
+ mpfr_found="yes"
+ mpfr_cross="yes"
+ break
+
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ int main () { return 0; /* not important to check for version */ }
+
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+
+ mpfr_found="yes"
+ break
+
+else
+
+ mpfr_problem="$problem $MPFR_HOME"
+ unset MPFR_CFLAGS
+ unset MPFR_LIBS
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+else
+
+ mpfr_found="no"
+ mpfr_checked="$checked $MPFR_HOME"
+ unset MPFR_CFLAGS
+ unset MPFR_LIBS
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ else
+ mpfr_found="no"
+ fi
+done
+
+if test "x$mpfr_found" = "xyes" ; then
+
+
+
+$as_echo "#define HAVE_MPFR 1" >>confdefs.h
+
+ HAVE_MPFR=yes
+ if test "x$mpfr_cross" != "xyes" ; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+$as_echo "unknown" >&6; }
+ echo "WARNING: You appear to be cross compiling, so there is no way to determine"
+ echo "whether your MPFR version is new enough. I am assuming it is."
+
+fi
+ :
+elif test -n "$mpfr_problem"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: problem" >&5
+$as_echo "problem" >&6; }
+ echo "Sorry, your MPFR version is too old. Disabling."
+ :
+elif test "x$mpfr_found" = "xno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+ :
+fi
+
+ if test "x$HAVE_MPFR" = "xyes"; then
+ LINBOX_HAVE_MPFR_TRUE=
+ LINBOX_HAVE_MPFR_FALSE='#'
+else
+ LINBOX_HAVE_MPFR_TRUE='#'
+ LINBOX_HAVE_MPFR_FALSE=
+fi
+
+
+CXXFLAGS=${BACKUP_CXXFLAGS}
+LIBS=${BACKUP_LIBS}
+#unset LD_LIBRARY_PATH
+
+
+# we nedd mpfr next :
+
+
+
+# Check whether --with-fplll was given.
+if test "${with_fplll+set}" = set; then :
+ withval=$with_fplll; if test "$withval" = yes ; then
+ FPLLL_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+ elif test "$withval" != no ; then
+ FPLLL_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}"
+ fi
+else
+ FPLLL_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+fi
+
+
+
+
+BACKUP_CXXFLAGS=${CXXFLAGS}
+BACKUP_LIBS=${LIBS}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FPLLL" >&5
+$as_echo_n "checking for FPLLL... " >&6; }
+
+for FPLLL_HOME in ${FPLLL_HOME_PATH}
+ do
+ if test -r "$FPLLL_HOME/include/fplll/fplll.h"; then
+
+ if test "x$FPLLL_HOME" != "x/usr" -a "x$FPLLL_HOME" != "x/usr/local"; then :
+
+ FPLLL_CFLAGS="-I${FPLLL_HOME}/include"
+ FPLLL_LIBS="-L${FPLLL_HOME}/lib -lfplll"
+
+else
+
+ FPLLL_CFLAGS=
+ FPLLL_LIBS="-lfplll"
+
+fi
+
+ CXXFLAGS="${BACKUP_CXXFLAGS} ${MPFR_CFLAGS} ${FPLLL_CFLAGS} ${GMP_CFLAGS}"
+ LIBS="${BACKUP_LIBS} ${GMP_LIBS} ${MPFR_LIBS} ${FPLLL_LIBS} "
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <fplll/fplll.h>
+ #include <fplll/solver.h>
+
+int
+main ()
+{
+enum EvaluatorType a ;
;
return 0;
}
@@ -16181,27 +17032,27 @@ if ac_fn_cxx_try_link "$LINENO"; then :
if test "$cross_compiling" = yes; then :
- iml_found="yes"
- iml_cross="yes"
+ fplll_found="yes"
+ fplll_cross="yes"
break
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- int main () { return 0; /* not possible to check version */ }
+ int main () { return 0; /* not important to check for version */ }
_ACEOF
if ac_fn_cxx_try_run "$LINENO"; then :
- iml_found="yes"
+ fplll_found="yes"
break
else
- iml_problem="$problem $IML_HOME"
- unset IML_CFLAGS
- unset IML_LIBS
+ fplll_problem="$problem $FPLLL_HOME"
+ unset FPLLL_CFLAGS
+ unset FPLLL_LIBS
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -16211,53 +17062,57 @@ fi
else
- iml_found="no"
- iml_checked="$checked $IML_HOME"
- unset IML_CFLAGS
- unset IML_LIBS
+ fplll_found="no"
+ fplll_checked="$checked $FPLLL_HOME"
+ unset FPLLL_CFLAGS
+ unset FPLLL_LIBS
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
else
- iml_found="no"
+ fplll_found="no"
fi
done
-if test "x$iml_found" = "xyes" ; then
+if test "x$fplll_found" = "xyes" ; then
-$as_echo "#define HAVE_IML 1" >>confdefs.h
+$as_echo "#define HAVE_FPLLL 1" >>confdefs.h
+
+ HAVE_FPLLL=yes
+ if test "x$fplll_cross" != "xyes" ; then :
- HAVE_IML=yes
- if test "x$iml_cross" != "xyes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
$as_echo "found" >&6; }
- else
+
+else
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
$as_echo "unknown" >&6; }
echo "WARNING: You appear to be cross compiling, so there is no way to determine"
- echo "whether your IML version is new enough. I am assuming it is."
- fi
+ echo "whether your FPLLL version is new enough. I am assuming it is."
+
+fi
:
-elif test -n "$iml_problem"; then
+elif test -n "$fplll_problem"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: problem" >&5
$as_echo "problem" >&6; }
- echo "Sorry, your IML version is too old. Disabling."
+ echo "Sorry, your FPLLL version is too old. Disabling."
:
-elif test "x$iml_found" = "xno" ; then
+elif test "x$fplll_found" = "xno" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; }
:
fi
- if test "x$HAVE_IML" = "xyes"; then
- LINBOX_HAVE_IML_TRUE=
- LINBOX_HAVE_IML_FALSE='#'
+ if test "x$HAVE_FPLLL" = "xyes"; then
+ LINBOX_HAVE_FPLLL_TRUE=
+ LINBOX_HAVE_FPLLL_FALSE='#'
else
- LINBOX_HAVE_IML_TRUE='#'
- LINBOX_HAVE_IML_FALSE=
+ LINBOX_HAVE_FPLLL_TRUE='#'
+ LINBOX_HAVE_FPLLL_FALSE=
fi
@@ -16275,8 +17130,10 @@ if test "${with_ntl+set}" = set; then :
withval=$with_ntl; if test "$withval" = yes ; then
NTL_HOME_PATH="${DEFAULT_CHECKING_PATH}"
elif test "$withval" != no ; then
- NTL_HOME_PATH="$withval"
+ NTL_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}"
fi
+else
+ NTL_HOME_PATH=${DEFAULT_CHECKING_PATH}
fi
@@ -16427,16 +17284,15 @@ fi
-version_min=30400
-min_givaro_version=3.4.0
-max_givaro_version=3.5.0
+version_min=30700
+version_max=30800
BACKUP_CXXFLAGS=${CXXFLAGS}
BACKUP_LIBS=${LIBS}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIVARO >= $min_givaro_version and < $max_givaro_version" >&5
-$as_echo_n "checking for GIVARO >= $min_givaro_version and < $max_givaro_version... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIVARO >= $version_min and < $version_max" >&5
+$as_echo_n "checking for GIVARO >= $version_min and < $version_max... " >&6; }
for GIVARO_HOME in ${GIVARO_HOME_PATH}
do
@@ -16444,7 +17300,7 @@ if test -r "$GIVARO_HOME/include/givaro/givconfig.h"; then
if test "x$GIVARO_HOME" != "x/usr" -a "x$GIVARO_HOME" != "x/usr/local"; then
GIVARO_CFLAGS="-I${GIVARO_HOME}/include"
- GIVARO_LIBS="-L${GIVARO_HOME}/lib -lgivaro ${GIVARO_HOME}/lib/libgivaro.so"
+ GIVARO_LIBS="-L${GIVARO_HOME}/lib -lgivaro"
else
GIVARO_CFLAGS=
GIVARO_LIBS="-lgivaro"
@@ -16476,7 +17332,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <givaro/givconfig.h>
- int main () { if (GIVARO_VERSION < $version_min || GIVARO_VERSION >= (($version_min/100+1)*100) || GIVARO_VERSION>0x030000) return -1; else return 0; /* old version of Givaro are defined as hexa 0x03yyzz*/ }
+ int main () { if (GIVARO_VERSION < $version_min || GIVARO_VERSION >= $version_max || GIVARO_VERSION>0x030000) return -1; else return 0; /* old version of Givaro are defined as hexa 0x03yyzz*/ }
_ACEOF
if ac_fn_cxx_try_run "$LINENO"; then :
@@ -16537,7 +17393,7 @@ $as_echo "problem" >&6; }
echo '*******************************************************************************'
echo ' ERROR: GIVARO not found!'
echo
-echo ' GIVARO version 3.4.0 or greater (<3.5) is required for this library to compile.'
+echo ' GIVARO library is required for this library to compile.'
echo ' Please make sure GIVARO is installed and specify its location with the'
echo ' option --with-givaro=<prefix> when running configure.'
echo '*******************************************************************************'
@@ -16550,7 +17406,7 @@ $as_echo "not found" >&6; }
echo '*******************************************************************************'
echo ' ERROR: GIVARO not found!'
echo
-echo ' GIVARO version 3.4.0 or greater (<3.5) is required for this library to compile.'
+echo ' GIVARO library is required for this library to compile.'
echo ' Please make sure GIVARO is installed and specify its location with the'
echo ' option --with-givaro=<prefix> when running configure.'
echo '*******************************************************************************'
@@ -16575,6 +17431,8 @@ LIBS=${BACKUP_LIBS}
+
+
# Check whether --with-saclib was given.
if test "${with_saclib+set}" = set; then :
withval=$with_saclib; if test "$withval" = yes ; then
@@ -16984,51 +17842,37 @@ fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compile the sage interface" >&5
-$as_echo_n "checking whether to compile the sage interface... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compile the SAGE interface" >&5
+$as_echo_n "checking whether to compile the SAGE interface... " >&6; }
# Check whether --enable-sage was given.
if test "${enable_sage+set}" = set; then :
enableval=$enable_sage;
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-sage_interface="yes"
+fi
-if test "x$HAVE_NTL" = "xyes" ; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NTL was built with -fPIC" >&5
-$as_echo_n "checking whether NTL was built with -fPIC... " >&6; }
-res=yes;
-$OBJDUMP --reloc $NTL_HOME/lib/libntl.a | $EGREP '(GOT|PLT|JU?MP_SLOT)' >/dev/null || res=no
-if test "x$res" = "xno" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- echo
- echo "You must have NTL compiled with -fPIC for Sage interface "
- exit 1
+ if test "x$enable_sage" = "xyes"; then
+ LINBOX_HAVE_SAGE_TRUE=
+ LINBOX_HAVE_SAGE_FALSE='#'
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
+ LINBOX_HAVE_SAGE_TRUE='#'
+ LINBOX_HAVE_SAGE_FALSE=
fi
+if test "x$enable_sage" = "xyes"; then :
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-sage_interface="no"
fi
- if test "x$sage_interface" = "xyes"; then
- LINBOX_HAVE_SAGE_TRUE=
- LINBOX_HAVE_SAGE_FALSE='#'
-else
- LINBOX_HAVE_SAGE_TRUE='#'
- LINBOX_HAVE_SAGE_FALSE=
-fi
-
-
#LB_CHECK_ATLAS
# LB_CHECK_BLAS(,,[
@@ -17050,37 +17894,42 @@ fi
# Check whether --with-fflas-ffpack was given.
if test "${with_fflas_ffpack+set}" = set; then :
withval=$with_fflas_ffpack; if test "$withval" = yes ; then
- FFLAFLAS_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+ FFLAS_FFPACK_HOME_PATH="${DEFAULT_CHECKING_PATH}"
elif test "$withval" != no ; then
- FFLAFLAS_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}"
+ FFLAS_FFPACK_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}"
fi
else
- FFLAFLAS_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+ FFLAS_FFPACK_HOME_PATH="${DEFAULT_CHECKING_PATH}"
fi
+version_min=10600
+version_max=10700
+
+
BACKUP_CXXFLAGS=${CXXFLAGS}
BACKUP_LIBS=${LIBS}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFLAFLAS" >&5
-$as_echo_n "checking for FFLAFLAS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFLAS-FFPACK >= $version_min and < $version_max" >&5
+$as_echo_n "checking for FFLAS-FFPACK >= $version_min and < $version_max... " >&6; }
-for FFLAFLAS_HOME in ${FFLAFLAS_HOME_PATH}
+for FFLAS_FFPACK_HOME in ${FFLAS_FFPACK_HOME_PATH}
do
- if test -r "$FFLAFLAS_HOME/include/fflas-ffpack/fflas-ffpack.h"; then
+ if test -r "$FFLAS_FFPACK_HOME/include/fflas-ffpack/fflas-ffpack.h" -a -x "$FFLAS_FFPACK_HOME/bin/fflas-ffpack-config"; then
- BLAS_LIBS=`$FFLAFLAS_HOME/bin/fflasffpack-config --blas-libs`
+ BLAS_LIBS=`$FFLAS_FFPACK_HOME/bin/fflas-ffpack-config --blas-libs`
+ BLAS_CFLAGS=`$FFLAS_FFPACK_HOME/bin/fflas-ffpack-config --cflags`
- if test "x$FFLAFLAS_HOME" != "x/usr" -a "x$FFLAFLAS_HOME" != "x/usr/local"; then
- FFLAFLAS_CFLAGS="-I${FFLAFLAS_HOME}/include"
+ if test "x$FFLAS_FFPACK_HOME" != "x/usr" -a "x$FFLAS_FFPACK_HOME" != "x/usr/local"; then
+ FFLAS_FFPACK_CFLAGS="-I${FFLAS_FFPACK_HOME}/include"
else
- FFLAFLAS_CFLAGS=
+ FFLAS_FFPACK_CFLAGS=
fi
- CXXFLAGS="${BACKUP_CXXFLAGS} ${FFLAFLAS_CFLAGS} ${BLAS_CFLAGS}"
+ CXXFLAGS="${BACKUP_CXXFLAGS} ${FFLAS_FFPACK_CFLAGS} ${BLAS_CFLAGS}"
LIBS="${BACKUP_LIBS} ${BLAS_LIBS}"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17096,16 +17945,29 @@ FFLAS::FFLAS_TRANSPOSE a;
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
- fflaflas_found="yes"
- FFLAFLAS_LOC="$FFLAFLAS_HOME"
+
+ FF_VER=`$FFLAS_FFPACK_HOME/bin/fflas-ffpack-config --decimal-version`
+ if test $FF_VER -ge $version_min -a $FF_VER -lt $version_max ; then :
+
+ ffflasffpack_found="yes"
+ FFLAS_FFPACK_LOC="$FFLAS_FFPACK_HOME"
+ break
else
- fflaflas_found="no"
- fflaflas_checked="$checked $FFLAFLAS_HOME"
- unset FFLAFLAS_CFLAGS
- unset FFLAFLAS_LOC
+ ffflasffpack_found="no"
+
+
+fi
+
+else
+
+ ffflasffpack_found="no"
+ ffflasffpack_checked="$checked $FFLAS_FFPACK_HOME"
+ unset FFLAS_FFPACK_CFLAGS
+ unset FFLAS_FFPACK_LOC
unset BLAS_LIBS
+ unset BLAS_CFLAGS
fi
rm -f core conftest.err conftest.$ac_objext \
@@ -17115,15 +17977,22 @@ rm -f core conftest.err conftest.$ac_objext \
fi
done
-if test "x$fflaflas_found" = "xyes" ; then
+if test "x$ffflasffpack_found" = "xyes" ; then
+
+
+$as_echo "#define HAVE_FFLAS_FFPACK 1" >>confdefs.h
-$as_echo "#define HAVE_FFLAFLAS 1" >>confdefs.h
+ FF_VER=`$FFLAS_FFPACK_LOC/bin/fflas-ffpack-config --decimal-version`
- HAVE_FFLAFLAS=yes
+cat >>confdefs.h <<_ACEOF
+#define FFLAS_FFPACK_VERSION $FF_VER
+_ACEOF
+
+ HAVE_FFLAS_FFPACK=yes
if test "x$fflasflas_cross" != "xyes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
$as_echo "found" >&6; }
@@ -17131,19 +18000,19 @@ $as_echo "found" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
$as_echo "unknown" >&6; }
echo "WARNING: You appear to be cross compiling, so there is no way to determine"
- echo "whether your FFLAFLAS version is new enough. I am assuming it is."
+ echo "whether your FFLAS-FFPACK version is new enough. I am assuming it is."
fi
:
elif test -n "$fflasflas_problem"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: problem" >&5
$as_echo "problem" >&6; }
- echo "Sorry, your FFLAFLAS version is too old. Disabling."
+ echo "Sorry, your FFLAS-FFPACK version is too old. Disabling."
echo ''
echo '*******************************************************************************'
echo ' ERROR: Fflas-Ffpack not found!'
echo
-echo ' Fflas-Ffpack routines are required for this library to compile. Please'
+echo ' Fflas-Ffpack routines are required for this library to compile. Please'
echo ' make sure they are installed and specify its location with the option'
echo ' --with-fflas-ffpack=<lib> when running configure.'
echo '*******************************************************************************'
@@ -17157,7 +18026,7 @@ echo ''
echo '*******************************************************************************'
echo ' ERROR: Fflas-Ffpack not found!'
echo
-echo ' Fflas-Ffpack routines are required for this library to compile. Please'
+echo ' Fflas-Ffpack routines are required for this library to compile. Please'
echo ' make sure they are installed and specify its location with the option'
echo ' --with-fflas-ffpack=<lib> when running configure.'
echo '*******************************************************************************'
@@ -17165,12 +18034,12 @@ exit 1
fi
- if test "x$HAVE_FFLAFLAS" = "xyes"; then
- LINBOX_HAVE_FFLAFLAS_TRUE=
- LINBOX_HAVE_FFLAFLAS_FALSE='#'
+ if test "x$HAVE_FFLAS_FFPACK" = "xyes"; then
+ LINBOX_HAVE_FFLAS_FFPACK_TRUE=
+ LINBOX_HAVE_FFLAS_FFPACK_FALSE='#'
else
- LINBOX_HAVE_FFLAFLAS_TRUE='#'
- LINBOX_HAVE_FFLAFLAS_FALSE=
+ LINBOX_HAVE_FFLAS_FFPACK_TRUE='#'
+ LINBOX_HAVE_FFLAS_FFPACK_FALSE=
fi
@@ -17181,6 +18050,80 @@ LIBS=${BACKUP_LIBS}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LAPACK in fflas-ffpack" >&5
+$as_echo_n "checking for LAPACK in fflas-ffpack... " >&6; }
+
+BACKUP_CXXFLAGS=${CXXFLAGS}
+BACKUP_LIBS=${LIBS}
+
+CXXFLAGS="${BACKUP_CXXFLAGS} ${FFLAS_FFPACK_CFLAGS} ${BLAS_CFLAGS}"
+LIBS="${BACKUP_LIBS} ${BLAS_LIBS}"
+
+if test "$cross_compiling" = yes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+$as_echo "unknown" >&6; }
+ if false; then
+ LINBOX_HAVE_LAPACK_TRUE=
+ LINBOX_HAVE_LAPACK_FALSE='#'
+else
+ LINBOX_HAVE_LAPACK_TRUE='#'
+ LINBOX_HAVE_LAPACK_FALSE=
+fi
+
+
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+ #include "fflas-ffpack/fflas-ffpack-config.h"
+ #ifdef __FFLAS_FFPACK_HAVE_LAPACK
+ int main() { return 0 ; }
+ #else
+ a pas lapack
+ #endif
+
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+
+$as_echo "#define HAVE_LAPACK 1" >>confdefs.h
+
+ if true; then
+ LINBOX_HAVE_LAPACK_TRUE=
+ LINBOX_HAVE_LAPACK_FALSE='#'
+else
+ LINBOX_HAVE_LAPACK_TRUE='#'
+ LINBOX_HAVE_LAPACK_FALSE=
+fi
+
+
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if false; then
+ LINBOX_HAVE_LAPACK_TRUE=
+ LINBOX_HAVE_LAPACK_FALSE='#'
+else
+ LINBOX_HAVE_LAPACK_TRUE='#'
+ LINBOX_HAVE_LAPACK_FALSE=
+fi
+
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+CXXFLAGS=${BACKUP_CXXFLAGS}
+LIBS=${BACKUP_LIBS}
+
+
+
+
# AC_MSG_RESULT($BLAS_LIBS)
# AC_MSG_RESULT($BLAS_CFLAGS)
@@ -17326,60 +18269,113 @@ LIBS=${BACKUP_LIBS}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use run time optimization" >&5
-$as_echo_n "checking whether to use run time optimization... " >&6; }
-# Check whether --enable-optimization was given.
-if test "${enable_optimization+set}" = set; then :
- enableval=$enable_optimization;
-BACKUP_CXXFLAGS=${CXXFLAGS}
-BACKUP_LIBS=${LIBS}
+# Check whether --with-benchdir was given.
+if test "${with_benchdir+set}" = set; then :
+ withval=$with_benchdir;
+ LINBOX_BENCH_PATH="$withval"
+
+else
-CXXFLAGS=${FFLAFLAS_CFLAGS}
+ eval LINBOX_BENCH_PATH="${prefix}/benchmarks"
+
+fi
-if test "$cross_compiling" = yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross compilation" >&5
-$as_echo "cross compilation" >&6; }
- strassen_opti="no"
+
+
+
+
+# Check whether --with-gnuplot was given.
+if test "${with_gnuplot+set}" = set; then :
+ withval=$with_gnuplot;
+ GNUPLOT_PATH="$PATH $withval"
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- #include "fflasffpack-config.h"
- int main() {
-#ifdef __FFLAFLAS_STRASSEN_OPTIMIZATION
-return 0;
-#else
-pas bon !
-#endif
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
- strassen_opti="yes"
-$as_echo "#define STRASSEN_OPTIMIZATION /**/" >>confdefs.h
+ GNUPLOT_PATH="$PATH"
+
+fi
- WINO="`grep "define.*__FFLAFLAS_WINOTHRESHOLD" ${FFLAFLAS_LOC}/include/fflasffpack-config.h | awk '{print $NF}'`"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok : $WINO" >&5
-$as_echo "ok : $WINO" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define WINOTHRESHOLD $WINO
-_ACEOF
+# Check whether --with-ghostscript was given.
+if test "${with_ghostscript+set}" = set; then :
+ withval=$with_ghostscript;
+ GHOSTSCRIPT_PATH="$PATH $withval"
+else
+
+ GHOSTSCRIPT_PATH="$PATH"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gnuplot works" >&5
+$as_echo_n "checking whether gnuplot works... " >&6; }
+res=yes;
+export PATH=$GNUPLOT_PATH
+(gnuplot --version) < /dev/null > /dev/null 2>&1 || res=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $res" >&5
+$as_echo "$res" >&6; }
+if test $res = no ; then
+ echo
+ echo "You must have gnuplot installed to create benchmark "
+ echo "graphics for LinBox. Download the appropriate package"
+ echo "for your distribution, or get the source tarball from"
+ echo "http://www.gnuplot.info/download.html "
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not enabled. Please optimise Strassen threshold in Fflas-Ffpack" >&5
-$as_echo "not enabled. Please optimise Strassen threshold in Fflas-Ffpack" >&6; }
- strassen_opti="no"
+
+$as_echo "#define HAVE_GNUPLOT 1" >>confdefs.h
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ps2pdf works" >&5
+$as_echo_n "checking whether ps2pdf works... " >&6; }
+res=yes;
+export PATH=$GHOSTSCRIPT_PATH
+(ps2pdf --version -) < /dev/null > /dev/null 2>&1 || res=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $res" >&5
+$as_echo "$res" >&6; }
+if test $res = no ; then
+ echo
+ echo "You must have ps2pdf installed to create pdf benchmarks"
+ echo "graphics for LinBox. Download the appropriate package "
+ echo "for your distribution, or get the source tarball from "
+ echo "http://pages.cs.wisc.edu/~ghost/ "
+else
+
+$as_echo "#define HAVE_GHOSTSCRIPT 1" >>confdefs.h
+
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use run time optimization" >&5
+$as_echo_n "checking whether to use run time optimization... " >&6; }
+
+# Check whether --enable-optimization was given.
+if test "${enable_optimization+set}" = set; then :
+ enableval=$enable_optimization;
+
+ WINO="`grep "define.*__FFLASFFPACK_WINOTHRESHOLD" ${FFLAS_FFPACK_LOC}/include/fflas-ffpack/fflas-ffpack-optimise.h | awk '{print $NF}'`"
+ if test -z "{WINO}"; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"fflas-ffpack was not optimised. Defaulting\"" >&5
+$as_echo "\"fflas-ffpack was not optimised. Defaulting\"" >&6; }
+ WINO="`grep "define.*__FFLASFFPACK_WINOTHRESHOLD" ${FFLAS_FFPACK_LOC}/include/fflas-ffpack/fflas-ffpack-config.h | awk '{print $NF}'`"
+
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+$as_echo "OK" >&6; }
+
fi
+cat >>confdefs.h <<_ACEOF
+#define WINOTHRESHOLD $WINO
+_ACEOF
+
else
@@ -17425,37 +18421,36 @@ fi
# Check whether --enable-doc was given.
if test "${enable_doc+set}" = set; then :
enableval=$enable_doc;
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+fi
+
+WANTDOC="no"
+if test "x$enable_doc" = "xyes"; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether doxygen works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether doxygen works" >&5
$as_echo_n "checking whether doxygen works... " >&6; }
-export PATH=$DOXYGEN_PATH
-(doxygen --version) < /dev/null > /dev/null 2>&1 || {
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ export PATH=$DOXYGEN_PATH
+ (doxygen --version) < /dev/null > /dev/null 2>&1 || {
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- echo
- echo "You must have doxygen installed to create documentation for"
- echo "LinBox. This error only happens if you use --enable-doc."
- echo "Download the appropriate package for your distribution, or get"
- echo "the source tarball from http://www.stack.nl/~dimitri/doxygen/"
- exit -1
-}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ echo
+ echo "You must have doxygen installed to create documentation for"
+ echo "LinBox. This error only happens if you use --enable-doc."
+ echo "Download the appropriate package for your distribution, or get"
+ echo "the source tarball from http://www.stack.nl/~dimitri/doxygen/"
+ exit -1
+ }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- if true; then
- LINBOX_BUILD_DOC_TRUE=
- LINBOX_BUILD_DOC_FALSE='#'
-else
- LINBOX_BUILD_DOC_TRUE='#'
- LINBOX_BUILD_DOC_FALSE=
-fi
-
+ WANTDOC="yes"
else
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- if false; then
+fi
+
+ if test "x$WANTDOC" != "xno" ; then
LINBOX_BUILD_DOC_TRUE=
LINBOX_BUILD_DOC_FALSE='#'
else
@@ -17464,11 +18459,32 @@ else
fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dot works" >&5
+$as_echo_n "checking whether dot works... " >&6; }
+res=yes;
+(dot -V) < /dev/null > /dev/null 2>&1 || res=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $res" >&5
+$as_echo "$res" >&6; }
+if test $res = yes; then :
+
+sed 's/^HAVE_DOT.*/HAVE_DOT = YES/' doc/Doxyfile.mod > doc/Doxyfile
+sed 's/^HAVE_DOT.*/HAVE_DOT = YES/' doc/DoxyfileDev.mod > doc/DoxyfileDev
+
+else
+ cp doc/Doxyfile.mod doc/Doxyfile ;
+cp doc/DoxyfileDev.mod doc/DoxyfileDev
+
fi
+if test ! -d ./benchmarks/data ; then
+ echo "Creating data dir in benchmark" ;
+ mkdir ./benchmarks/data ;
+fi
+
# this is bogus so far as I can tell. -bds
#CXXFLAGS="${GMP_CFLAGS} ${NTL_CFLAGS} ${GIVARO_CFLAGS} ${SACLIB_CFLAGS} ${CXXFLAGS}"
#AC_SUBST(CXXFLAGS)
@@ -17476,8 +18492,9 @@ fi
CXXFLAGS="${GMP_CFLAGS} ${CXXFLAGS}"
+echo "-----------------------------------------------"
-ac_config_files="$ac_config_files Makefile linbox-config examples/Makefile examples/fields/Makefile examples/Readme-make doc/Makefile linbox/Makefile linbox/algorithms/Makefile linbox/blackbox/Makefile linbox/element/Makefile linbox/field/Makefile linbox/matrix/Makefile linbox/randiter/Makefile linbox/ring/Makefile linbox/solutions/Makefile linbox/switch/Makefile linbox/util/Makefile linbox/util/formats/Makefile linbox/vector/Makefile tests/Makefile tests/data/Makefile tests/matrix/Makefile interfaces/Makefile interfaces/driver/Makefile interfaces/maple/Makefile interfaces/kaapi/Makefile interfaces/sage/Makefile macros/Makefile"
+ac_config_files="$ac_config_files Makefile linbox-config examples/Makefile examples/fields/Makefile examples/Readme-make doc/Makefile linbox/Makefile linbox/algorithms/Makefile linbox/algorithms/gauss/Makefile linbox/algorithms/matrix-blas3/Makefile linbox/blackbox/Makefile linbox/element/Makefile linbox/field/Makefile linbox/field/NTL/Makefile linbox/field/Givaro/Makefile linbox/field/Modular/Makefile linbox/matrix/Makefile linbox/randiter/Makefile linbox/ring/Makefile linbox/solutions/Makefile linbox/switch/Makefile linbox/util/Makefile linbox/util/formats/Makefile linbox/vector/Makefile tests/Makefile tests/data/Makefile tests/matrix/Makefile interfaces/Makefile interfaces/driver/Makefile interfaces/maple/Makefile interfaces/kaapi/Makefile interfaces/sage/Makefile macros/Makefile benchmarks/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -17588,6 +18605,14 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
+ if test -n "$EXEEXT"; then
+ am__EXEEXT_TRUE=
+ am__EXEEXT_FALSE='#'
+else
+ am__EXEEXT_TRUE='#'
+ am__EXEEXT_FALSE=
+fi
+
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17604,8 +18629,8 @@ if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then
as_fn_error $? "conditional \"DEBUG\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${WARNINGS_TRUE}" && test -z "${WARNINGS_FALSE}"; then
- as_fn_error $? "conditional \"WARNINGS\" was never defined.
+if test -z "${PROFILE_TRUE}" && test -z "${PROFILE_FALSE}"; then
+ as_fn_error $? "conditional \"PROFILE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -17617,6 +18642,22 @@ if test -z "${LINBOX_HAVE_IML_TRUE}" && test -z "${LINBOX_HAVE_IML_FALSE}"; then
as_fn_error $? "conditional \"LINBOX_HAVE_IML\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${LINBOX_HAVE_M4RI_TRUE}" && test -z "${LINBOX_HAVE_M4RI_FALSE}"; then
+ as_fn_error $? "conditional \"LINBOX_HAVE_M4RI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${LINBOX_HAVE_M4RIE_TRUE}" && test -z "${LINBOX_HAVE_M4RIE_FALSE}"; then
+ as_fn_error $? "conditional \"LINBOX_HAVE_M4RIE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${LINBOX_HAVE_MPFR_TRUE}" && test -z "${LINBOX_HAVE_MPFR_FALSE}"; then
+ as_fn_error $? "conditional \"LINBOX_HAVE_MPFR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${LINBOX_HAVE_FPLLL_TRUE}" && test -z "${LINBOX_HAVE_FPLLL_FALSE}"; then
+ as_fn_error $? "conditional \"LINBOX_HAVE_FPLLL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${LINBOX_HAVE_NTL_TRUE}" && test -z "${LINBOX_HAVE_NTL_FALSE}"; then
as_fn_error $? "conditional \"LINBOX_HAVE_NTL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17645,16 +18686,24 @@ if test -z "${LINBOX_HAVE_SAGE_TRUE}" && test -z "${LINBOX_HAVE_SAGE_FALSE}"; th
as_fn_error $? "conditional \"LINBOX_HAVE_SAGE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${LINBOX_HAVE_FFLAFLAS_TRUE}" && test -z "${LINBOX_HAVE_FFLAFLAS_FALSE}"; then
- as_fn_error $? "conditional \"LINBOX_HAVE_FFLAFLAS\" was never defined.
+if test -z "${LINBOX_HAVE_FFLAS_FFPACK_TRUE}" && test -z "${LINBOX_HAVE_FFLAS_FFPACK_FALSE}"; then
+ as_fn_error $? "conditional \"LINBOX_HAVE_FFLAS_FFPACK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${LINBOX_HAVE_EXPAT_TRUE}" && test -z "${LINBOX_HAVE_EXPAT_FALSE}"; then
- as_fn_error $? "conditional \"LINBOX_HAVE_EXPAT\" was never defined.
+if test -z "${LINBOX_HAVE_LAPACK_TRUE}" && test -z "${LINBOX_HAVE_LAPACK_FALSE}"; then
+ as_fn_error $? "conditional \"LINBOX_HAVE_LAPACK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${LINBOX_BUILD_DOC_TRUE}" && test -z "${LINBOX_BUILD_DOC_FALSE}"; then
- as_fn_error $? "conditional \"LINBOX_BUILD_DOC\" was never defined.
+if test -z "${LINBOX_HAVE_LAPACK_TRUE}" && test -z "${LINBOX_HAVE_LAPACK_FALSE}"; then
+ as_fn_error $? "conditional \"LINBOX_HAVE_LAPACK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${LINBOX_HAVE_LAPACK_TRUE}" && test -z "${LINBOX_HAVE_LAPACK_FALSE}"; then
+ as_fn_error $? "conditional \"LINBOX_HAVE_LAPACK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${LINBOX_HAVE_EXPAT_TRUE}" && test -z "${LINBOX_HAVE_EXPAT_FALSE}"; then
+ as_fn_error $? "conditional \"LINBOX_HAVE_EXPAT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${LINBOX_BUILD_DOC_TRUE}" && test -z "${LINBOX_BUILD_DOC_FALSE}"; then
@@ -17959,16 +19008,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -18028,28 +19077,16 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -18070,8 +19107,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by LinBox $as_me 1.2.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+This file was extended by LinBox $as_me 1.3.1, which was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -18137,11 +19174,11 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-LinBox config.status 1.2.0
-configured by $0, generated by GNU Autoconf 2.68,
+LinBox config.status 1.3.1
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -18232,7 +19269,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
@@ -18275,6 +19312,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -18357,7 +19395,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -18429,7 +19466,6 @@ with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
@@ -18468,6 +19504,7 @@ _LTECHO_EOF'
# Quote evaled strings.
for var in SHELL \
ECHO \
+PATH_SEPARATOR \
SED \
GREP \
EGREP \
@@ -18518,7 +19555,6 @@ with_gnu_ld \
allow_undefined_flag \
no_undefined_flag \
hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
hardcode_libdir_separator \
exclude_expsyms \
include_expsyms \
@@ -18552,7 +19588,6 @@ with_gnu_ld_CXX \
allow_undefined_flag_CXX \
no_undefined_flag_CXX \
hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_flag_spec_ld_CXX \
hardcode_libdir_separator_CXX \
exclude_expsyms_CXX \
include_expsyms_CXX \
@@ -18656,9 +19691,14 @@ do
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"linbox/Makefile") CONFIG_FILES="$CONFIG_FILES linbox/Makefile" ;;
"linbox/algorithms/Makefile") CONFIG_FILES="$CONFIG_FILES linbox/algorithms/Makefile" ;;
+ "linbox/algorithms/gauss/Makefile") CONFIG_FILES="$CONFIG_FILES linbox/algorithms/gauss/Makefile" ;;
+ "linbox/algorithms/matrix-blas3/Makefile") CONFIG_FILES="$CONFIG_FILES linbox/algorithms/matrix-blas3/Makefile" ;;
"linbox/blackbox/Makefile") CONFIG_FILES="$CONFIG_FILES linbox/blackbox/Makefile" ;;
"linbox/element/Makefile") CONFIG_FILES="$CONFIG_FILES linbox/element/Makefile" ;;
"linbox/field/Makefile") CONFIG_FILES="$CONFIG_FILES linbox/field/Makefile" ;;
+ "linbox/field/NTL/Makefile") CONFIG_FILES="$CONFIG_FILES linbox/field/NTL/Makefile" ;;
+ "linbox/field/Givaro/Makefile") CONFIG_FILES="$CONFIG_FILES linbox/field/Givaro/Makefile" ;;
+ "linbox/field/Modular/Makefile") CONFIG_FILES="$CONFIG_FILES linbox/field/Modular/Makefile" ;;
"linbox/matrix/Makefile") CONFIG_FILES="$CONFIG_FILES linbox/matrix/Makefile" ;;
"linbox/randiter/Makefile") CONFIG_FILES="$CONFIG_FILES linbox/randiter/Makefile" ;;
"linbox/ring/Makefile") CONFIG_FILES="$CONFIG_FILES linbox/ring/Makefile" ;;
@@ -18676,6 +19716,7 @@ do
"interfaces/kaapi/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/kaapi/Makefile" ;;
"interfaces/sage/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/sage/Makefile" ;;
"macros/Makefile") CONFIG_FILES="$CONFIG_FILES macros/Makefile" ;;
+ "benchmarks/Makefile") CONFIG_FILES="$CONFIG_FILES benchmarks/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
@@ -19477,8 +20518,8 @@ $as_echo X"$file" |
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -19532,6 +20573,9 @@ SHELL=$lt_SHELL
# An echo program that protects backslashes.
ECHO=$lt_ECHO
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
# The host system.
host_alias=$host_alias
host=$host
@@ -19833,10 +20877,6 @@ no_undefined_flag=$lt_no_undefined_flag
# This must work even if \$libdir does not exist
hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking. This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator
@@ -20179,10 +21219,6 @@ no_undefined_flag=$lt_no_undefined_flag_CXX
# This must work even if \$libdir does not exist
hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking. This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
diff --git a/configure.ac b/configure.ac
index eefea8c..f7566b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,25 @@
# Copyright (c) 2010 the LinBox group
# This file is part of LinBox (and probably stolen here and there)
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+ LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
AC_PREREQ(2.61)
-AC_INIT([LinBox], [1.2.0],[linbox-use at googlegroups.com],[linbox],
+AC_INIT([LinBox], [1.3.1],[linbox-use at googlegroups.com],[linbox],
[http://www.linalg.org/])
AC_CONFIG_MACRO_DIR([macros])
AC_CONFIG_AUX_DIR([build-aux])
@@ -25,10 +41,14 @@ AC_SUBST([MKDIR_P])
AC_LANG([C++])
+echo "-----------------------------------------------"
+
AC_DEBUG
-# AC_FULL_DEBUG
+AC_PROFILE
AC_WARNINGS
+echo "-----------------------------------------------"
+
# CFLAGS=${CFLAGS:-$DEFAULT_CFLAGS}
# CXXFLAGS=${CXXFLAGS:-$DEFAULT_CXXFLAGS}
@@ -49,37 +69,48 @@ AC_SUBST([DEFAULT_CFLAGS])
AC_SUBST([DEBUG_CFLAGS])
AC_SUBST([TESTS_CFLAGS])
-TESTS_CFLAGS="-O0 -g"
+TESTS_CFLAGS="-O0"
DEBUG_CFLAGS="-g"
-DEFAULT_CFLAGS="-pipe"
-WARN_CFLAGS="-Wall"
+DEFAULT_CFLAGS=""
+# WARN_CFLAGS="-Wall"
+
+#TODO use -fast for icc, -ipa for eko...
if test "x$DBG" = "xyes" ; then
- DEFAULT_CFLAGS="-O0 ${DEFAULT_CFLAGS} -g -pg" #those are CXXFLAGS
+ DEFAULT_CFLAGS="-O0 ${DEFAULT_CFLAGS} " #those are CXXFLAGS
DEBUG_CFLAGS="${DEBUG_CFLAGS} -DDEBUG -D_LB_DEBUG"
else
- DEFAULT_CFLAGS="-O2 ${DEFAULT_CFLAGS} -DNDEBUG -U_LB_DEBUG"
+ DEFAULT_CFLAGS="-O2 ${DEFAULT_CFLAGS} "
+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -DNDEBUG -U_LB_DEBUG"
fi
+if test "x$PROF" = "xyes" ; then
+ DEFAULT_CFLAGS="${DEFAULT_CFLAGS} -pg"
+fi
-
-if test "x$WARN" = "xyes" ; then
- # if test "x${CXX}" = "xicpc" -o "x${CXX}" = "xicc" ; then
- if test "x${CCNAM}" = "xicc" ; then
+if test "x$WARN" = "xyes" -o "x$WARN" = "xfull" ; then
+ case x${CCNAM} in
+ xicc)
WARN_CFLAGS="${WARN_CFLAGS} -Wcheck"
# DEBUG_CFLAGS="-fast"
- else
- if test "x${CCNAM}" = "xgcc" ; then
+ ;;
+ xeko)
+ WARN_CFLAGS="${WARN_CFLAGS} -Wno-unused-parameter"
+ ;;
+ xgcc|xclang)
WARN_CFLAGS="${WARN_CFLAGS} -Wextra -Wno-unused-parameter"
- else
+ if test "x${WARN}" = "xfull" ; then
+ WARN_CFLAGS="${WARN_CFLAGS} -Wuninitialized -Wconversion -Wcast-qual -ansi -pedantic -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wno-long-long"
+ fi
+ ;;
+ *)
echo
echo "*******************************************************"
echo "unsupported compiler ($CCNAM). Please file a bug."
echo "*******************************************************"
echo
WARN_CFLAGS="${WARN_CFLAGS}"
- fi
- fi
+ esac
fi
@@ -95,6 +126,7 @@ LT_PREREQ([2.2])
LT_INIT
+echo "-----------------------------------------------"
# Machine characteristics
@@ -120,95 +152,104 @@ AC_C_BIGENDIAN(
# Create some useful data types of fixed, known lengths
# We hereby assume that a character is always one byte
-LINBOX_INT8="char";
-
-case $ac_cv_sizeof_char in
- 1)
- TWO_BYTES=2;
- FOUR_BYTES=4;
- EIGHT_BYTES=8;
- ;;
- 8)
- TWO_BYTES=16;
- FOUR_BYTES=32;
- EIGHT_BYTES=64;
-esac
-
-case $TWO_BYTES in
- $ac_cv_sizeof_short)
- LINBOX_INT16="short";
- ;;
- $ac_cv_sizeof_int)
- LINBOX_INT16="int";
- ;;
-esac
-
-case $FOUR_BYTES in
- $ac_cv_sizeof_short)
- LINBOX_INT32="short";
- ;;
- $ac_cv_sizeof_int)
- LINBOX_INT32="int";
- ;;
- $ac_cv_sizeof_long)
- LINBOX_INT32="long";
- ;;
-esac
-
-case $EIGHT_BYTES in
- $ac_cv_sizeof_short)
- LINBOX_INT64="short";
- ;;
- $ac_cv_sizeof_int)
- LINBOX_INT64="int";
- ;;
- $ac_cv_sizeof_long)
- LINBOX_INT64="long";
- ;;
- $ac_cv_sizeof_long_long)
- LINBOX_INT64="long long";
- ;;
- $ac_cv_sizeof___int64)
- LINBOX_INT64="__int64";
- ;;
-esac
-
-AC_DEFINE_UNQUOTED(INT8, $LINBOX_INT8, Canonical 8-bit data type)
-AC_DEFINE_UNQUOTED(INT16, $LINBOX_INT16, Canonical 16-bit data type)
-AC_DEFINE_UNQUOTED(INT32, $LINBOX_INT32, Canonical 32-bit data type)
-AC_DEFINE_UNQUOTED(INT64, $LINBOX_INT64, Canonical 64-bit data type)
-
+# LINBOX_INT8="char";
+
+# case $ac_cv_sizeof_char in
+ # 1)
+ # TWO_BYTES=2;
+ # FOUR_BYTES=4;
+ # EIGHT_BYTES=8;
+ # ;;
+ # 8)
+ # TWO_BYTES=16;
+ # FOUR_BYTES=32;
+ # EIGHT_BYTES=64;
+# esac
+
+# case $TWO_BYTES in
+ # $ac_cv_sizeof_short)
+ # LINBOX_INT16="short";
+ # ;;
+ # $ac_cv_sizeof_int)
+ # LINBOX_INT16="int";
+ # ;;
+# esac
+
+# case $FOUR_BYTES in
+ # $ac_cv_sizeof_short)
+ # LINBOX_INT32="short";
+ # ;;
+ # $ac_cv_sizeof_int)
+ # LINBOX_INT32="int";
+ # ;;
+ # $ac_cv_sizeof_long)
+ # LINBOX_INT32="long";
+ # ;;
+# esac
+
+# case $EIGHT_BYTES in
+ # $ac_cv_sizeof_short)
+ # LINBOX_INT64="short";
+ # ;;
+ # $ac_cv_sizeof_int)
+ # LINBOX_INT64="int";
+ # ;;
+ # $ac_cv_sizeof_long)
+ # LINBOX_INT64="long";
+ # ;;
+ # $ac_cv_sizeof_long_long)
+ # LINBOX_INT64="long long";
+ # ;;
+ # $ac_cv_sizeof___int64)
+ # LINBOX_INT64="__int64";
+ # ;;
+# esac
+
+# AC_DEFINE_UNQUOTED(INT8, $LINBOX_INT8, Canonical 8-bit data type)
+# AC_DEFINE_UNQUOTED(INT16, $LINBOX_INT16, Canonical 16-bit data type)
+# AC_DEFINE_UNQUOTED(INT32, $LINBOX_INT32, Canonical 32-bit data type)
+# AC_DEFINE_UNQUOTED(INT64, $LINBOX_INT64, Canonical 64-bit data type)
+
+echo "-----------------------------------------------"
# Feature checks
LB_MISC
LB_DRIVER
AC_LANG_CPLUSPLUS
+echo "-----------------------------------------------"
LB_CHECK_GMP(,,[
echo '*******************************************************************************'
echo ' ERROR: GMP not found!'
echo
-echo ' GMP version 3.1.1 or greater with --enable-cxx is required for this library to compile. Please'
-echo ' make sure GMP is installed and specify its location with the option'
+echo ' GMP library compiled with --enable-cxx is required for this library to compile.'
+echo ' Please make sure GMP is installed and specify its location with the option'
echo ' --with-gmp=<prefix> when running configure.'
echo '*******************************************************************************'
exit 1
])
LB_CHECK_IML
+LB_CHECK_M4RI
+LB_CHECK_M4RIE
+LB_CHECK_MPFR
+# we nedd mpfr next :
+LB_CHECK_FPLLL
LB_CHECK_NTL
LB_CHECK_GIVARO(,,[
echo '*******************************************************************************'
echo ' ERROR: GIVARO not found!'
echo
-echo ' GIVARO version 3.4.0 or greater (<3.5) is required for this library to compile.'
+echo ' GIVARO library is required for this library to compile.'
echo ' Please make sure GIVARO is installed and specify its location with the'
echo ' option --with-givaro=<prefix> when running configure.'
echo '*******************************************************************************'
exit 1
])
+
+
LB_CHECK_SACLIB
LB_CHECK_LIDIA
LB_CHECK_MAPLE
@@ -228,18 +269,19 @@ LB_CHECK_SAGE
# ])
-LB_CHECK_FFLAFLAS(,,[
+LB_CHECK_FFLAS_FFPACK(,,[
echo ''
echo '*******************************************************************************'
echo ' ERROR: Fflas-Ffpack not found!'
echo
-echo ' Fflas-Ffpack routines are required for this library to compile. Please'
+echo ' Fflas-Ffpack routines are required for this library to compile. Please'
echo ' make sure they are installed and specify its location with the option'
echo ' --with-fflas-ffpack=<lib> when running configure.'
echo '*******************************************************************************'
exit 1
])
+LB_CHECK_LAPACK
# AC_MSG_RESULT($BLAS_LIBS)
# AC_MSG_RESULT($BLAS_CFLAGS)
@@ -247,9 +289,14 @@ exit 1
LB_CHECK_EXPAT
+LB_BENCH
LB_OPT
LB_DOC
+if test ! -d ./benchmarks/data ; then
+ echo "Creating data dir in benchmark" ;
+ mkdir ./benchmarks/data ;
+fi
# this is bogus so far as I can tell. -bds
#CXXFLAGS="${GMP_CFLAGS} ${NTL_CFLAGS} ${GIVARO_CFLAGS} ${SACLIB_CFLAGS} ${CXXFLAGS}"
@@ -258,6 +305,7 @@ LB_DOC
CXXFLAGS="${GMP_CFLAGS} ${CXXFLAGS}"
AC_SUBST(CXXFLAGS)
+echo "-----------------------------------------------"
AC_CONFIG_FILES([
Makefile
@@ -268,9 +316,14 @@ examples/Readme-make
doc/Makefile
linbox/Makefile
linbox/algorithms/Makefile
+linbox/algorithms/gauss/Makefile
+linbox/algorithms/matrix-blas3/Makefile
linbox/blackbox/Makefile
linbox/element/Makefile
linbox/field/Makefile
+linbox/field/NTL/Makefile
+linbox/field/Givaro/Makefile
+linbox/field/Modular/Makefile
linbox/matrix/Makefile
linbox/randiter/Makefile
linbox/ring/Makefile
@@ -288,5 +341,6 @@ interfaces/maple/Makefile
interfaces/kaapi/Makefile
interfaces/sage/Makefile
macros/Makefile
+benchmarks/Makefile
])
AC_OUTPUT
diff --git a/doc/Doxyfile b/doc/Doxyfile
deleted file mode 100644
index 6013315..0000000
--- a/doc/Doxyfile
+++ /dev/null
@@ -1,1707 +0,0 @@
-# Doxyfile 1.7.3
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME = linbox
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER =
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF =
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
-
-PROJECT_LOGO =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY = .
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF = "The $name class" \
- "The $name widget" \
- "The $name file" \
- is \
- provides \
- specifies \
- contains \
- represents \
- a \
- an \
- the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful if your file system
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF = YES
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 4
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES = "bib=\xrefitem bib \"Bibliography\" \"Bibliography\""
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this
-# tag. The format is ext=language, where ext is a file extension, and language
-# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
-# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
-# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-
-EXTENSION_MAPPING =
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also makes the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT = YES
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = YES
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penalty.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will roughly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespaces are hidden.
-
-EXTRACT_ANON_NSPACES = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS = YES
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES = YES
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES = YES
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES = YES
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
-
-FORCE_LOCAL_INCLUDES = NO
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper type resolution of all parameters of a function it will reject a
-# match between the prototype and the implementation of a member function even if there is only one candidate or it is obvious which candidate to choose by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-# will still accept a match between prototype and implementation in such cases.
-
-STRICT_PROTO_MATCHING = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or macro consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and macros in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES = YES
-
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. The create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
-
-LAYOUT_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR = YES
-
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE = doxy.debug
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT = ../linbox \
- ../doc \
- ../examples \
- ../tests \
- ../benchmarks
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
-INPUT_ENCODING = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-# *.f90 *.f *.for *.vhd *.vhdl
-
-FILE_PATTERNS = *.cc \
- *.cpp \
- *.C \
- *.h \
- *.inl \
- *.doxy
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE = *_src.inl \
- Attic
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS = *_src.inl \
- */Attic/*
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH = ..
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS = *.C \
- *.inl \
- *INSTALL \
- *COPYING \
- *HACKING \
- *AUTHORS \
- *.html
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE = YES
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty or if
-# non of the patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-# and it is also possible to disable source filtering for a specific pattern
-# using *.ext= (so without naming a filter). This option only has effect when
-# FILTER_SOURCE_FILES is enabled.
-
-FILTER_SOURCE_PATTERNS =
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT = linbox-html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the stylesheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
-
-HTML_COLORSTYLE_HUE = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
-
-HTML_COLORSTYLE_SAT = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
-
-HTML_COLORSTYLE_GAMMA = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
-
-HTML_TIMESTAMP = YES
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS = YES
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-
-GENERATE_DOCSET = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
-DOCSET_FEEDNAME = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID = org.doxygen.Project
-
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-
-DOCSET_PUBLISHER_ID = org.doxygen.Publisher
-
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
-
-DOCSET_PUBLISHER_NAME = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
-CHM_INDEX_ENCODING =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
-
-GENERATE_QHP = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME =
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS =
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
-
-QHG_LOCATION =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-# will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
-
-GENERATE_ECLIPSEHELP = NO
-
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
-
-ECLIPSE_DOC_ID = org.doxygen.Project
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX = NO
-
-# This tag can be used to set the number of enum values (range [0,1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-# Note that a value of 0 will completely suppress the enum values from appearing in the overview section.
-
-ENUM_VALUES_PER_LINE = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW = NO
-
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-
-USE_INLINE_TREES = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
-
-EXT_LINKS_IN_WINDOW = NO
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
-
-FORMULA_TRANSPARENT = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
-
-USE_MATHJAX = NO
-
-# When MathJax is enabled you need to specify the location relative to the
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the mathjax.org site, so you can quickly see the result without installing
-# MathJax, but it is strongly recommended to install a local copy of MathJax
-# before deployment.
-
-MATHJAX_RELPATH = http://www.mathjax.org/mathjax
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-
-SEARCHENGINE = NO
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvantages are that it is more difficult to setup
-# and does not have live searching capabilities.
-
-SERVER_BASED_SEARCH = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
-
-LATEX_CMD_NAME = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES = stmaryrd \
- amsmath
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition that overrules the definition found in the source code.
-
-EXPAND_AS_DEFINED =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all references to function-like macros
-# that are alone on a line, have an all uppercase name, and do not end with a
-# semicolon, because these will confuse the parser if not removed.
-
-SKIP_FUNCTION_MACROS = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option also works with HAVE_DOT disabled, but it is recommended to
-# install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
-
-DOT_NUM_THREADS = 0
-
-# By default doxygen will write a font called Helvetica to the output
-# directory and reference it in all dot files that doxygen generates.
-# When you want a differently looking font you can specify the font name
-# using DOT_FONTNAME. You need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
-
-DOT_FONTNAME = FreeSans.ttf
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
-
-DOT_FONTSIZE = 10
-
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
-
-DOT_FONTPATH =
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will generate a graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, svg, gif or svg.
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the
-# \mscfile command).
-
-MSCFILE_DIRS =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH = 1000
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP = YES
diff --git a/doc/Doxyfile.mod b/doc/Doxyfile.mod
new file mode 100644
index 0000000..2923085
--- /dev/null
+++ b/doc/Doxyfile.mod
@@ -0,0 +1,1828 @@
+# Doxyfile 1.8.0
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
+
+PROJECT_NAME = linbox
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY = .
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF = "The $name class" \
+ "The $name widget" \
+ "The $name file" \
+ is \
+ provides \
+ specifies \
+ contains \
+ represents \
+ a \
+ an \
+ the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 4
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES = "bib=\xrefitem bib \"Bibliography\" \"Bibliography\""
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this
+# tag. The format is ext=language, where ext is a file extension, and language
+# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
+# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
+# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also makes the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = YES
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields will be shown inline in the documentation
+# of the scope in which they are defined (i.e. file, namespace, or group
+# documentation), provided this scope is documented. If set to NO (the default),
+# structs, classes, and unions are shown on a separate page (for HTML and Man
+# pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penalty.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will roughly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+SYMBOL_CACHE_SIZE = 0
+
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
+# their name and scope. Since this can be an expensive process and often the
+# same symbol appear multiple times in the code, doxygen keeps a cache of
+# pre-resolved symbols. If the cache is too small doxygen will become slower.
+# If the cache is too large, memory is wasted. The cache size is given by this
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+LOOKUP_CACHE_SIZE = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
+
+EXTRACT_PACKAGE = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespaces are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = YES
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = YES
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or macro consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and macros in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. The create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path.
+
+CITE_BIB_FILES =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE = doxy.debug
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT = ../linbox \
+ ../doc \
+ ../examples \
+ ../tests \
+ ../benchmarks
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
+
+FILE_PATTERNS = *.cc \
+ *.cpp \
+ *.C \
+ *.h \
+ *.inl \
+ *.doxy
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE = *_src.inl \
+ Attic
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS = *_src.inl \
+ */Attic/*
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH = ..
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS = *.C \
+ *.inl \
+ *INSTALL \
+ *COPYING \
+ *HACKING \
+ *AUTHORS \
+ *.html
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = YES
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = linbox-html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header. Note that when using a custom header you are responsible
+# for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# style sheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = YES
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS = YES
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+# will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
+
+GENERATE_TREEVIEW = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE = 4
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX = NO
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH = http://www.mathjax.org/mathjax
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a PHP enabled web server instead of at the web client
+# using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server
+# based approach is that it scales better to large projects and allows
+# full text search. The disadvantages are that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES = stmaryrd \
+ amsmath
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE = plain
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load style sheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS = 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
+
+DOT_FONTNAME = FreeSans.ttf
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE = 10
+
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
+
+DOT_FONTPATH =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS = 10
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will generate a graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
+
+DOT_IMAGE_FORMAT = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG = NO
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH = 1000
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP = YES
diff --git a/doc/DoxyfileDev b/doc/DoxyfileDev
deleted file mode 100644
index 19b2282..0000000
--- a/doc/DoxyfileDev
+++ /dev/null
@@ -1,1650 +0,0 @@
-# Doxyfile 1.7.1
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME = linbox
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY = .
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF = "The $name class" \
- "The $name widget" \
- "The $name file" \
- is \
- provides \
- specifies \
- contains \
- represents \
- a \
- an \
- the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF = YES
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 4
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES = "bib=\xrefitem bib \"Bibliography\" \"Bibliography\""
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this
-# tag. The format is ext=language, where ext is a file extension, and language
-# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
-# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
-# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-
-EXTENSION_MAPPING =
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT = YES
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = YES
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS = YES
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES = YES
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS = YES
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES = YES
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES = YES
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
-
-FORCE_LOCAL_INCLUDES = NO
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES = YES
-
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. The create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
-
-LAYOUT_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE = doxydev.debug
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT = ../linbox \
- ../doc \
- ../examples \
- ../tests \
- ../benchmarks
-
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
-INPUT_ENCODING = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS = *.cc \
- *.cpp \
- *.C \
- *.h \
- *.inl \
- *.doxy
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE = *_src.inl Attic
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS = *_src.inl */Attic/*
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS = *__LINBOX_*
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH = ..
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS = *.C *.inl *INSTALL *COPYING *HACKING *AUTHORS *.html
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE = YES
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT = linbox-dev-html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the stylesheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
-
-HTML_COLORSTYLE_HUE = 110
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
-
-HTML_COLORSTYLE_SAT = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
-
-HTML_COLORSTYLE_GAMMA = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
-
-HTML_TIMESTAMP = YES
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS = YES
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-
-GENERATE_DOCSET = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
-DOCSET_FEEDNAME = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID = org.doxygen.Project
-
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-
-DOCSET_PUBLISHER_ID = org.doxygen.Publisher
-
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
-
-DOCSET_PUBLISHER_NAME = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
-CHM_INDEX_ENCODING =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
-
-GENERATE_QHP = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME =
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS =
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
-
-QHG_LOCATION =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-# will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
-
-GENERATE_ECLIPSEHELP = NO
-
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
-
-ECLIPSE_DOC_ID = org.doxygen.Project
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW = NO
-
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-
-USE_INLINE_TREES = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
-
-EXT_LINKS_IN_WINDOW = NO
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
-
-FORMULA_TRANSPARENT = YES
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-
-SEARCHENGINE = NO
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvances is that it is more difficult to setup
-# and does not have live searching capabilities.
-
-SERVER_BASED_SEARCH = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
-
-LATEX_CMD_NAME = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES = stmaryrd amsmath
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
-
-CLASS_DIAGRAMS = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
-
-DOT_NUM_THREADS = 0
-
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
-
-DOT_FONTNAME = FreeSans.ttf
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
-
-DOT_FONTSIZE = 10
-
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
-
-DOT_FONTPATH =
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH = 1000
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP = YES
diff --git a/doc/DoxyfileDev.mod b/doc/DoxyfileDev.mod
new file mode 100644
index 0000000..a8d1824
--- /dev/null
+++ b/doc/DoxyfileDev.mod
@@ -0,0 +1,1828 @@
+# Doxyfile 1.8.0
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
+
+PROJECT_NAME = linbox
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY = .
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF = "The $name class" \
+ "The $name widget" \
+ "The $name file" \
+ is \
+ provides \
+ specifies \
+ contains \
+ represents \
+ a \
+ an \
+ the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 4
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES = "bib=\xrefitem bib \"Bibliography\" \"Bibliography\""
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this
+# tag. The format is ext=language, where ext is a file extension, and language
+# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
+# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
+# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also makes the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = YES
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields will be shown inline in the documentation
+# of the scope in which they are defined (i.e. file, namespace, or group
+# documentation), provided this scope is documented. If set to NO (the default),
+# structs, classes, and unions are shown on a separate page (for HTML and Man
+# pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penalty.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will roughly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+SYMBOL_CACHE_SIZE = 0
+
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
+# their name and scope. Since this can be an expensive process and often the
+# same symbol appear multiple times in the code, doxygen keeps a cache of
+# pre-resolved symbols. If the cache is too small doxygen will become slower.
+# If the cache is too large, memory is wasted. The cache size is given by this
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+LOOKUP_CACHE_SIZE = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
+
+EXTRACT_PACKAGE = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespaces are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = YES
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = YES
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = YES
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or macro consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and macros in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. The create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path.
+
+CITE_BIB_FILES =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE = doxydev.debug
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT = ../linbox \
+ ../doc \
+ ../examples \
+ ../tests \
+ ../benchmarks
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
+
+FILE_PATTERNS = *.cc \
+ *.cpp \
+ *.C \
+ *.h \
+ *.inl \
+ *.doxy
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE = *_src.inl \
+ Attic
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS = *_src.inl \
+ */Attic/*
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS = *__LINBOX_*
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH = ..
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS = *.C \
+ *.inl \
+ *INSTALL \
+ *COPYING \
+ *HACKING \
+ *AUTHORS \
+ *.html
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = YES
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = linbox-dev-html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header. Note that when using a custom header you are responsible
+# for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# style sheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE = 110
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = YES
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS = YES
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+# will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
+
+GENERATE_TREEVIEW = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE = 4
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX = NO
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a PHP enabled web server instead of at the web client
+# using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server
+# based approach is that it scales better to large projects and allows
+# full text search. The disadvantages are that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES = stmaryrd \
+ amsmath
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE = plain
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load style sheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS = 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
+
+DOT_FONTNAME = FreeSans.ttf
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE = 10
+
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
+
+DOT_FONTPATH =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS = 10
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will generate a graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
+
+DOT_IMAGE_FORMAT = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG = NO
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH = 1000
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP = YES
diff --git a/doc/Makefile.am b/doc/Makefile.am
index cda3548..d56ce1d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,27 @@
+# Copyright (c) 2010 the LinBox group
+#
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
+
+
+
+
if LINBOX_BUILD_DOC
USE_TARGETS = docs
INSTALL_TARGETS = install-doc
@@ -36,10 +60,10 @@ docs_dev :
install-doc :
- mkdir $(docdir)
- cp -r linbox-html $(docdir)/linbox-html
- cp -r linbox-dev-html $(docdir)/linbox-dev-html
- cp linbox.html $(docdir)/linbox.html
+ mkdir -p $(DESTDIR)/$(docdir)
+ cp -rp linbox-html $(DESTDIR)/$(docdir)/linbox-html
+ cp -rp linbox-dev-html $(DESTDIR)/$(docdir)/linbox-dev-html
+ cp -p linbox.html $(DESTDIR)/$(docdir)/linbox.html
EXTRA_DIST= \
linbox.html \
@@ -47,8 +71,8 @@ EXTRA_DIST= \
install-dev.html \
index-dev.html \
install-dist.html \
- Doxyfile \
- DoxyfileDev \
+ Doxyfile.mod \
+ DoxyfileDev.mod \
doc.doxy \
mainpage.doxy \
tutorial.doxy \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6ec8a3a..90d5449 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,10 +14,49 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+# Copyright (c) 2010 the LinBox group
+#
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -39,12 +78,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -52,7 +94,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -61,10 +106,43 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
man1dir = $(mandir)/man1
am__installdirs = "$(DESTDIR)$(man1dir)"
NROFF = nroff
@@ -77,6 +155,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -100,10 +179,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -124,10 +205,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -136,6 +222,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -152,6 +240,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -223,8 +312,8 @@ EXTRA_DIST = \
install-dev.html \
index-dev.html \
install-dist.html \
- Doxyfile \
- DoxyfileDev \
+ Doxyfile.mod \
+ DoxyfileDev.mod \
doc.doxy \
mainpage.doxy \
tutorial.doxy \
@@ -242,9 +331,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps doc/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps doc/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps doc/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -262,57 +351,54 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man1_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
- case "$$i" in \
- *.1*) list="$$list $$i" ;; \
- esac; \
+ @list1='$(man1_MANS)'; \
+ list2=''; \
+ test -n "$(man1dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.1[a-z]*$$/p'; \
+ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+ done | \
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+ sed 'N;N;s,\n, ,g' | { \
+ list=; while read file base inst; do \
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+ fi; \
done; \
- for i in $$list; do \
- if test -f $$i; then file=$$i; \
- else file=$(srcdir)/$$i; fi; \
- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 1*) ;; \
- *) ext='1' ;; \
- esac; \
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- done
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+ done; }
+
uninstall-man1:
@$(NORMAL_UNINSTALL)
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
- case "$$i" in \
- *.1*) list="$$list $$i" ;; \
- esac; \
- done; \
- for i in $$list; do \
- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 1*) ;; \
- *) ext='1' ;; \
- esac; \
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- done
+ @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -349,13 +435,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -376,16 +466,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -501,14 +597,15 @@ docs_dev :
doxygen DoxyfileDev
install-doc :
- mkdir $(docdir)
- cp -r linbox-html $(docdir)/linbox-html
- cp -r linbox-dev-html $(docdir)/linbox-dev-html
- cp linbox.html $(docdir)/linbox.html
+ mkdir -p $(DESTDIR)/$(docdir)
+ cp -rp linbox-html $(DESTDIR)/$(docdir)/linbox-html
+ cp -rp linbox-dev-html $(DESTDIR)/$(docdir)/linbox-dev-html
+ cp -p linbox.html $(DESTDIR)/$(docdir)/linbox.html
clean-local :
rm -rf linbox-html
rm -rf linbox-dev-html
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/doc/doc.doxy b/doc/doc.doxy
index 54b5303..cd20623 100644
--- a/doc/doc.doxy
+++ b/doc/doc.doxy
@@ -1,4 +1,25 @@
// Copyright (C) 2005 David Saunders, part of LinBox, GNU LGPL, see COPYING
+/*
+ * Coypright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
/** \ingroup linbox
\defgroup doc doc
diff --git a/doc/index-dev.html b/doc/index-dev.html
index 9195f1d..5009296 100644
--- a/doc/index-dev.html
+++ b/doc/index-dev.html
@@ -1,6 +1,29 @@
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<!-- Copyright (C) 2010 LinBox, Brice Boyer, GNU LGPL, see COPYING for licence information.
-->
+<!--
+/*
+ * Coypright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
+ -->
<html>
<head>
<title> LinBox documentation for Developers</title>
diff --git a/doc/install-dev.html b/doc/install-dev.html
index 1492e2c..78445e8 100644
--- a/doc/install-dev.html
+++ b/doc/install-dev.html
@@ -1,6 +1,29 @@
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<!-- Copyright (C) 2005 LinBox team, part of LinBox, GNU LGPL, see COPYING
-->
+<!--
+/*
+ * Coypright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
+ -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -11,128 +34,21 @@
<body text="#000000" bgcolor="#FFFFFF" link="#0000EE" vlink="#551A8B" alink="#FF0000">
<center>
-<p><b><font size=+2>How to install LinBox (for developers using cvs)</font></b></center>
-
+ <p><b><font size=+2>How to install LinBox (for developers using svn)</font></b></center></p>
+
+<p>
+When you have retrieved your local svn snapshot, you can configure LinBox with the <b>autogen.sh</b> script.
+You can use it exactly the same way <tt>./configure</tt> works (<small>execpt for the --help part... :(</small>) See <a href="install-dist.html">here</a> for additional information on configure script.
+</p>
+<p>
+If you are not sure, run <tt>autogen.sh</tt> with the minimal options so LinBox can be well configured and then you will get more information
+with <tt>configure --help</tt>.
+</p>
<p><br>
-<blockquote>See also <a href="HACKING">HACKING</a>. Once the LinBox
-module has been checked out using cvs,
-<p><b>1. </b>Make sure the bin of <tt>autoconf</tt>, <tt>automake</tt>
-and <tt>libtool </tt>are in your path.<b> </b>Depending on your system
-installation (see <a href="HACKING">HACKING</a>), you may also need
-to set the environment variable <tt>ACLOCAL_FLAGS</tt> to <tt>"-I <automake,
-libtool prefix>/share/aclocal"</tt>.</blockquote>
-
-<blockquote>
-<b>2.</b> Go to the newly-created linbox directory and
-run the script
-<b>autogen.sh,</b> optionally you may specify the LinBox
-installation directory or an optional package directory using prefixes:
-<blockquote><tt>> cd linbox</tt>
-<br><tt>> ./autogen.sh [--prefix=<inst. dir.> --with-package=<location> --enable-feature]</tt></blockquote>
-<a href="http://swox.com/gmp">Gmp</a> is required and its location
-must be specified <gmp location> is not a standard location such as
-<tt>/usr</tt> or <tt>/usr/loca</tt>l:
-<blockquote><tt>> ./autogen.sh --with-gmp= <gmp location>
-[...]</tt></blockquote>
-<a href="http://math-atlas.sourceforge.net/">Atlas</a>, or other source of BLAS, is also required and its location
-must be specified if not standard.
-<blockquote><tt>> ./autogen.sh --with-atlas= <atlas location>
-[...]</tt></blockquote>
-This sets up the library and runs .<tt>/configure</tt>
-
-<p> <b>3.</b> Optional configurations
-
-<blockquote>
-<b> 3.1.</b> Where to put the <tt>include/</tt> and <tt>lib/</tt> directories:
-<blockquote><tt>--prefix= <chosen installation directory></tt>
-<br>Ex: <tt>--prefix= `pwd` </tt>will put the files within the current
-directory</blockquote>
-
-<p><b> 3.2.</b> The use of an optional package is switched on by specifying the directory
-where it can be found:
-<blockquote>
---with-package=<package_directory>
-<br>
-<br>
-<package_directory> can be left blank if the package is installed in a standard directory (<tt>/usr</tt> or <tt>/usr/local</tt>)
-<br>
-Ex: <tt> --with-givaro</tt> will enable the use of Givaro library and assume it is installed in a standard directory
-<br>
-<br>
-<b>Available packages are the following:</b>
-<br>
-<br>
- <table border="3" style="text-align: left; margin-left: 30pt;" cellpadding="5" cellspacing="5">
- <tr>
- <td> <a href="http://ljk.imag.fr/CASYS/LOGICIELS/givaro"> Givaro </a> </td>
- <td> <tt> --with-givaro= <givaro_directory></tt> </td>
- <td> used for finite field arithmetic.</td>
- </tr>
- <tr>
- <td> <a href="http://www.informatik.tu-darmstadt.de/TI/LiDIA/"> Lidia </a></td>
- <td> <tt> --with-lidia= <lidia_directory></tt> </td>
- <td> used for finite field arithmetic.</td>
- </tr>
- <tr>
- <td> <a href="http://shoup.net/ntl/">NTL</a></td>
- <td> <tt> --with-ntl= <ntl_directory></tt></td>
- <td> used for finite field, polynomial arithmetic.</td>
- </tr>
- <tr>
- <td> <a href="ftp://ftp.risc.uni-linz.ac.at/pub/saclib/"> Saclib </a></td>
- <td> <tt> --with-saclib= <saclib_directory></td>
- <td> not yet used </td>
- </tr>
- <tr>
- <td> <a href="http://www.maplesoft.com/"> Maple </a></td>
- <td> <tt> --with-maple= <maple-directory> </tt></td>
- <td> used to create an interface with Maple.</td>
- </tr>
- <tr>
- <td> <a href="http://www.doxygen.org/"> Doxygen </a></td>
- <td> <tt> --with-doxygen= <doxygen-path> </tt></td>
- <td>used to create the html reference manual.</td>
- </tr>
- </table>
-
- <br>
- Note:
- <blockquote>
- <p> the use of <tt> --with-default= <default_directory></tt> can add a special directory to the default location of library
- <p> the use of <tt> --with-all</tt> specifies that all packages will be used
- </blockquote>
- </blockquote>
-
-<p><b> 3.3.</b> The use of special feature is switched on by calling the enable parameter:
-<blockquote>
-<tt> --enable-feature</tt>
-<br>
-Ex: <tt> --enable-shared</tt> will turn on the build of shared library
-<br>
-<br>
-<b>Available extra features are the following:</b>
-<br>
-<br>
- <table border="3" style="text-align: left; margin-left: 30pt;" cellpadding="5" cellspacing="5">
- <tr>
- <td> <tt> --enable-optimization</tt> </td>
- <td> turn on runtime optimization during the configuration </td>
- </tr>
- <tr>
- <td> <tt> --enable-doc</tt> </td>
- <td> turn on the build of documentation via Doxygen.</td>
- </tr>
- </table>
-
-
-</blockquote>
-</blockquote>
-<b>4. </b>Install the library:
-<blockquote><tt>> make install</tt></blockquote>
-</blockquote>
-
+See also <a href="HACKING">HACKING</a>.
+</p>
<hr WIDTH="100%">
-<div align=right><font size=-1>Copyright 1999-2005 The Linbox Group.</font></div>
+<div align=right><font size=-1>Copyright 1999-2011 The Linbox Group.</font></div>
</body>
</html>
diff --git a/doc/install-dist.html b/doc/install-dist.html
index aac8cf8..726b1dc 100644
--- a/doc/install-dist.html
+++ b/doc/install-dist.html
@@ -1,6 +1,29 @@
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<!-- Copyright (C) 2005 LinBox team, part of LinBox, GNU LGPL, see COPYING
-->
+<!--
+/*
+ * Coypright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
+ -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -12,72 +35,91 @@
<center>
<p><b><font size=+2>How to install LinBox (from a distribution)</font></b></center>
-
+
<p><br>
<blockquote>
See also <a href="INSTALL">INSTALL</a>. Once the LinBox
- distribution has been downloaded from the <a href="http://www.linalg.org/download.html"> LinBox download section</a> ,
+ distribution has been downloaded from the <a href="http://www.linalg.org/download.html"> LinBox download section</a>,
</blockquote>
-
+
<blockquote>
<p><b>1.</b>
- Unpack the distribution using <tt>tar</tt> command:
- <blockquote>
- <tt>
+ <b>Unpack</b> the distribution using <tt>tar</tt> command:
+ <blockquote>
+ <tt>
tar -xvzf linbox-X.X.X.tar.gz
</tt>
</blockquote>
</blockquote>
-
+
<blockquote>
<b>2.</b> Go to the newly-created linbox directory and
run the script
- <b>configure,</b> optionally you may specify the LinBox
- installation directory or an optional package directory using prefixes:
- <blockquote><tt>> cd linbox</tt>
- <br><tt>> ./configure [--prefix=<inst. dir.> --with-package=<location> --enable-feature]</tt></blockquote>
- <a href="http://swox.com/gmp">Gmp</a> is required (preferably compiled with the "--enable-cxx" option) and its location
- must be specified <gmp location> if not at a standard location such as
- <tt>/usr</tt> or <tt>/usr/local</tt>:
- <blockquote><tt>> ./configure --with-gmp= <gmp location>
- [...]</tt></blockquote>
- A source of BLAS (e.g. Fortran <a href="http://www.tacc.utexas.edu/resources/software">Goto</a> or C <a href="http://math-atlas.sourceforge.net/">Atlas</a>)
-is also required and its location
- must be specified if not standard.
- <blockquote><tt>> ./configure --with-blas=-L<gotoblas location> -lgoto -lpthread
- [...]</tt></blockquote>
- <blockquote><tt>> ./configure --with-blas= <atlas location>
- [...]</tt></blockquote>
- This sets up the library and runs .<tt>/configure</tt>
-
- <p> <b>3.</b> Optional configurations
-
- <blockquote>
- <b> 3.1.</b> Where to put the <tt>include/</tt> and <tt>lib/</tt> directories:
- <blockquote><tt>--prefix= <chosen installation directory></tt>
- <br>Ex: <tt> ./configure --prefix= `pwd` </tt>will put the files within the current
- directory</blockquote>
-
- <p><b> 3.2.</b> The use of an optional package is switched on by specifying the directory
- where it can be found:
- <blockquote>
- --with-package=<package_directory>
- <br>
- <br>
- <package_directory> can be left blank if the package is installed in a standard directory (<tt>/usr</tt> or <tt>/usr/local</tt>)
- <br>
- Ex: <tt> ./configure --with-givaro</tt> will enable the use of Givaro library and assume it is installed in a standard directory
- <br>
- <br>
- <b>Available packages are the following:</b>
+ <b>configure</b>.
+
+ <blockquote><tt>> cd linbox</tt></blockquote>
+ There are many options for configuring LinBox.
+ If you are not sure, just run
+ <blockquote><tt>> ./configure --help </tt></blockquote>
+ You will find a very comprehensible list of all possible features you may enable/disable.
+
+ <br><br><b>Required packages are the following:</b>
<br>
<br>
<table border="3" style="text-align: left; margin-left: 30pt;" cellpadding="5" cellspacing="5">
<tr>
- <td> <a href="http://ljk.imag.fr/CASYS/LOGICIELS/givaro/givaro-3.2.tar.gz"> Givaro (v3.2.6)</a> </td>
- <td> <tt> --with-givaro= <givaro_directory></tt> </td>
- <td> used for finite field arithmetic.</td>
+ <td> <a href="https://forge.imag.fr/projects/givaro">Givaro</a></td>
+ <td> <tt> --with-givaro= <givaro_directory></tt></td>
+ <td> used for finite fields, integer, rational and polynomial arithmetic.</td>
+ </tr>
+ <tr>
+ <td> <a href="http://linalg.org/projects/fflas-ffpack">Fflas-Ffpack</a></td>
+ <td> <tt> --with-fflas-ffpack= <fflasffpack_directory></tt></td>
+ <td> used for small field dense linear algebra.</td>
+ </tr>
+ </table>
+
+
+ Basically, minimal LinBox only requires a working <a
+ href="https://forge.imag.fr/projects/givaro/">Givaro</a> and <a
+ href="http://linalg.org/projects/fflas-ffpack">Fflas-Ffpack</a>
+ installation. If they are not under the standard <tt>/usr</tt> or
+ <tt>/usr/local</tt> paths, you may enable them with
+ <tt>--with-givaro=<path/to/givaro></tt> and
+ <tt>--with-fflas-ffpack=<path/to/fflas-ffpack></tt> options.
+ <p>
+ <b> NOTE </b> : other requirements
+ <br><a href="https://forge.imag.fr/projects/givaro/">Givaro</a> requires GMP for big integer operations, see <a href="https://forge.imag.fr/projects/givaro/">Givaro page</a> for more information.
+ <br><a href="http://linalg.org/projects/fflas-ffpack">Fflas-Ffpack</a> requires some BLAS for floating point dense matrix multiplication, see <a href="http://linalg.org/projects/fflas-ffpack">Fflas-Ffpack page</a> for more information.
+ </p>
+ <table border="3" style="text-align: left; margin-left: 30pt;" cellpadding="5" cellspacing="5">
+ <tr>
+ <td> For Givaro install</td>
+ <td> <a href="http://gmplib.org">GMP</a></td>
+ </tr>
+ <tr>
+ <td> For Fflas-Ffpack install</td>
+ <td> <a href="http://cms.tacc.utexas.edu/tacc-projects/gotoblas2">Goto BLAS 2</a></td>
+ <td> <a href="http://math-atlas.sourceforge.net">ATLAS</a></td>
+ <td> or ... </td>
</tr>
+ </table>
+
+
+ <p>
+ <b> NOTE </b> :
+ There is a script in alpha version that tries to automate the installation of required packages:
+ <blockquote><tt>> sh auto-install.sh </tt></blockquote>
+ this will download the appropriate dependencies, compile and install them.
+ Use <tt>--help</tt> for help on how to use this script.
+ </p>
+
+ <p> <b>3.</b> Optional configurations
+
+ <br><b>Available packages are the following:</b>
+ <br>
+ <br>
+ <table border="3" style="text-align: left; margin-left: 30pt;" cellpadding="5" cellspacing="5">
<tr>
<td> <a href="http://shoup.net/ntl/">NTL</a></td>
<td> <tt> --with-ntl= <ntl_directory></tt></td>
@@ -100,51 +142,62 @@ is also required and its location
</tr>
<tr>
<td> <a href="http://www.doxygen.org/"> Doxygen </a></td>
- <td> <tt> --with-doxygen= <doxygen-path> </tt></td>
- <td>used to create the html reference manual.</td>
+ <td> <tt> --enable-doc </tt></td>
+ <td>used to create the html reference manual (nothing will be created otherwise).</td>
+ </tr>
+ <tr>
+ <td> <a href="http://www.cs.uwaterloo.ca/~astorjoh/iml.html"> IML </a></td>
+ <td> <tt> --with-iml= <IML-path> </tt></td>
+ <td>used for fast integer/rational linear algebra.</td>
</tr>
+ <tr>
+ <td> <a href="http://www.gnuplot.info/">gnuplot</a></td>
+ <td> <tt> -enable-benchmark </tt></td>
+ <td>used for creating plots in benchmarks.</td>
+ </tr>
+
</table>
-
+
<br>
- Note:
+ Note:
<blockquote>
<p> the use of <tt> --with-default= <default_directory></tt> can add a special directory to the default location of library
<p> the use of <tt> --with-all</tt> specifies that all packages will be used
</blockquote>
- </blockquote>
- <p><b> 3.3.</b> The use of special feature is switched on by calling the enable parameter:
- <blockquote>
- <tt> --enable-feature</tt>
- <br>
- Ex: <tt> ./configure --enable-shared</tt> will turn on the build of a shared library
- <br>
- <br>
- <b>Available extra features are the following:</b>
+ <!-- <p><b> 3.4.</b> Here is a full example: -->
+ <!-- <blockquote> -->
+ <!-- <tt>./configure --prefix=/usr/local/soft/linbox-1.1 --with-givaro=/usr/local/soft/givaro-3.2.6 --with-ntl=/usr/local/soft/ntl-5.4 --with-gmp=/usr/local/soft/gmp-4.2.1 --with-blas="-L/usr/local/soft/GotoBLAS -lgoto -lpthread" --with-maple=/usr/local/soft/maple --enable-optimization --enable-shared --disable-static</tt> -->
+ <!-- </blockquote> -->
+ <!-- </blockquote> -->
+
+
+ <b>4. </b><b>Install</b> the library:
+ <blockquote><tt>> make </tt></blockquote>
+ <blockquote><tt>> make install</tt></blockquote>
+
+ <b>5. </b>Optional make targets:
+
+ <blockquote><tt>> make examples</tt></blockquote>
+ will compile the examples.
+
+ <blockquote><tt>> make check</tt></blockquote>
+ will check LinBox is up and running.
+
+ <blockquote><tt>> make fullcheck</tt></blockquote>
+ will perform additionnal checks to ensure LinBox is completely sane.
+
+ <blockquote><tt>> make benchmarks</tt></blockquote>
+ will benchmarks some LinBox functionnalities.
<br>
<br>
- <table border="3" style="text-align: left; margin-left: 30pt;" cellpadding="5" cellspacing="5">
- <tr>
- <td> <tt> --enable-optimization</tt> </td>
- <td> turn on runtime optimization during the configuration </td>
- </tr>
- <tr>
- <td> <tt> --enable-doc</tt> </td>
- <td> turn on the build of documentation via Doxygen.</td>
- </tr>
- </table>
- </blockquote>
- <p><b> 3.4.</b> Here is a full example:
- <blockquote>
- <tt>./configure --prefix=/usr/local/soft/linbox-1.1 --with-givaro=/usr/local/soft/givaro-3.2.6 --with-ntl=/usr/local/soft/ntl-5.4 --with-gmp=/usr/local/soft/gmp-4.2.1 --with-blas="-L/usr/local/soft/GotoBLAS -lgoto -lpthread" --with-maple=/usr/local/soft/maple --enable-optimization --enable-shared --disable-static</tt>
- </blockquote>
- </blockquote>
-
- <b>4. </b>Install the library:
- <blockquote><tt>> make install</tt></blockquote>
+
+ <b>6. Enjoy !</b> <small>(and report bugs, supply patches, ask for more functionnalities,... on the linbox mailing lists)</small>
+
+ </blockquote>
<hr WIDTH="100%">
- <div align=right><font size=-1>Copyright 1999-2007 The Linbox Group.</font></div>
-
+ <div align=right><font size=-1>Copyright 1999-2011 The Linbox Group.</font></div>
+
</body>
</html>
diff --git a/doc/linbox.html b/doc/linbox.html
index 86d35ad..93c9025 100644
--- a/doc/linbox.html
+++ b/doc/linbox.html
@@ -1,6 +1,29 @@
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<!-- Copyright (C) 2005 David Saunders, part of LinBox, GNU LGPL, see COPYING
-->
+<!--
+/*
+ * Coypright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
+ -->
<html><head>
<title> Starter to LinBox documentation</title>
<!-- the following causes my LinBox to load after 5 seconds
@@ -10,7 +33,7 @@
</head><body>
<!-- the following shows during the initial 5 seconds-->
LinBox documentation main page: <a href="linbox-html/index.html"> linbox-html/index.html</a>
- (going there in 5 seconds).
+ (going there in 5 seconds).
If it is a dead link, you have to build the documentation first
with <tt>make docs</tt>.
diff --git a/doc/mainpage.doxy b/doc/mainpage.doxy
index 1f768b9..964277d 100644
--- a/doc/mainpage.doxy
+++ b/doc/mainpage.doxy
@@ -1,5 +1,26 @@
// Copyright (C) 2005 David Saunders, 2010 LinBox. This file is part of LinBox,
// GNU LGPL, see COPYING for lincene information.
+/*
+ * Coypright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
/** \mainpage LinBox Symbolic Linear Algebra Software Library.
*
* \section intro Introduction
@@ -85,7 +106,7 @@
* \section contrib Contributing to LinBox, getting assistance.
* We warmly welcome contributors ! Contributing can rhyme with providing
* documentation, pointing out bugs, requesting more features, giving
- * test-cases, making comments about the code,...\br
+ * test-cases, making comments about the code,...<br>
* You can contact the LinBox team at \f$\mathtt{linbox}\!-\!\mathtt{use}
* \mathtt{@} \mathtt{googlegroups}\!\cdot\!\mathtt{com}\f$ (user oriented
* discussions) or \f$\mathtt{linbox}\!-\!\mathtt{use} \mathtt{@}
@@ -96,7 +117,7 @@
* prolific documenters have been first William J Turner, then Bradford
* Hovinen, and David Saunders.
*
- * \version 1.1.7
+ * \version 1.3.0
*
* \par Support.
* The project is supported by the National Science Foundation
@@ -111,8 +132,8 @@
/*! \page inst Installing LinBox
* To install from a distribution, the usual <em> configure, make</em> sequence
* applies. See \subpage dist "configuring and installing" for more details.
- * To install a development version from the SVN repository see the \subpage
- * dev "developer info". The generic Free Software Foundation \subpage INSTALL
+ * To install a development version from the SVN repository see the \subpage dev
+ * "developer info". The generic Free Software Foundation \subpage INSTALL
* "INSTALL" may also be of use.
*/
diff --git a/doc/tutorial.doxy b/doc/tutorial.doxy
index c1eaf7b..8871876 100644
--- a/doc/tutorial.doxy
+++ b/doc/tutorial.doxy
@@ -1,5 +1,26 @@
// Copyright (C) 2005 David Saunders, 2010 LinBox.
// This file is part of LinBox, see COPYING for licence information.
+/*
+ * Coypright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
/*! \page tuto LinBox tutorial
The person requiring some exact linear algebra computation may exploit LinBox
diff --git a/doc/tutorial.html b/doc/tutorial.html
index 1e8f697..054fafd 100644
--- a/doc/tutorial.html
+++ b/doc/tutorial.html
@@ -1,52 +1,75 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
<!-- Copyright (C) 2005 David Saunders, part of LinBox, GNU LGPL, see COPYING -->
+<!--
+/*
+ * Coypright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
+ -->
<title>linbox: LinBox Tutorial</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
<h1><a class="el" href="namespace_lin_box.html">LinBox</a> Tutorial</h1>
-The person requiring some exact linear algebra computation may exploit linbox at
-any of four general levels.
+The person requiring some exact linear algebra computation may exploit linbox at
+any of four general levels.
In order from least involved with the details to most involved, they are:
<ol>
<li>
-Access using a linbox web server.
+Access using a linbox web server.
<p>
-The user at this level must attend to preparation of a matrix in
-a suitable file format and invoking the webservice. The server itself should provide adequate
-documentation for this.
+The user at this level must attend to preparation of a matrix in
+a suitable file format and invoking the webservice. The server itself should provide adequate
+documentation for this.
Servers are generally available at <a href="linalg.org">linalg.org</a>.
<li>
Access using compiled codes. Full programs exist in the examples directory and
-can be used through an interface to linbox
-in a general purposes system such as Maple or SAGE.
+can be used through an interface to linbox
+in a general purposes system such as Maple or SAGE.
<p>
The user at this level must see to installation, and then attend to preparation of her
matrix in a suitable file format and to the form of the program or procedure invocation.
-A number of programs are available in the examples directory distributed with LinBox
-providing for rank, determinant, linear system solution, etc. The documentation of the
+A number of programs are available in the examples directory distributed with LinBox
+providing for rank, determinant, linear system solution, etc. The documentation of the
examples module should serve for this level of access.
<!-- what about interfaces maple and gap - can they be documented now? -->
<li>
-Use of LinBox as a programmers library for exact linear algebra functions.
+Use of LinBox as a programmers library for exact linear algebra functions.
<p>
At this level a user must do at least the following:
<ol type="a">
<li>
Choose a field or ring representation and construct a specific field or ring object R.
<li>
-Choose a blackbox or matrix representation suitable to your data and construct
+Choose a blackbox or matrix representation suitable to your data and construct
specific matrix A over R.
<li>
-Call needed algorithm. The solutions directory is designed to support this by
-providing functions with simple problem oriented interfaces (<tt>rank(), det(), solve()</tt>), yet
-allowing some user control of algorithm details. The programmer may be providing some of the
-parts such as an application specific blackbox matrix class.
+Call needed algorithm. The solutions directory is designed to support this by
+providing functions with simple problem oriented interfaces (<tt>rank(), det(), solve()</tt>), yet
+allowing some user control of algorithm details. The programmer may be providing some of the
+parts such as an application specific blackbox matrix class.
</ol>
<p>
@@ -55,32 +78,32 @@ Power development.
<p>
Again, this is use of LinBox as a library, but with hands fully on the details.
The programmer
-at this level apparently needs the best opportunities for high performance and is
-willing to use the more complicated internal interfaces to get it. Direct calls to functions
-in the algorithms directory and perhaps to related packages such as
+at this level apparently needs the best opportunities for high performance and is
+willing to use the more complicated internal interfaces to get it. Direct calls to functions
+in the algorithms directory and perhaps to related packages such as
fflas, ffpac, or other components are being used.
-The programmer working at this level of intimacy with LinBox is likely to develop some
+The programmer working at this level of intimacy with LinBox is likely to develop some
components that ought to be included in future releases of LinBox. Such contributions
are warmly welcomed.
-The online documentation system is intended primarily for the programmer at level 3.
-Thus documentation is not generated to the last internal detail.
-It is supposed that the the level 4 (and 3) programmer, when studying internal details,
-will be best served by reading the code.
-It is possible, if you wish, to set doxygen parameters so as to
-have a documentation listing for every class and function.
+The online documentation system is intended primarily for the programmer at level 3.
+Thus documentation is not generated to the last internal detail.
+It is supposed that the the level 4 (and 3) programmer, when studying internal details,
+will be best served by reading the code.
+It is possible, if you wish, to set doxygen parameters so as to
+have a documentation listing for every class and function.
Good luck separating wheat from chaff in that case.
</ul>
<p>
In this tutorial we will discuss a simple application at level 3, the design of a
program to compute the determinant of a sparse matrix over GF(101). The programmer
-has 3 major issues: field, matrix, algorithm.
+has 3 major issues: field, matrix, algorithm.
-The basic algorithm choice is between blackbox and elimination algorithms.
+The basic algorithm choice is between blackbox and elimination algorithms.
If our matrix is A, then the algorithm call may look like
<pre>
determinant(det, A, Method::Blackbox());
-//or
+//or
determinant(det, A, Method::Elimination());
</pre>
To have access to this determinant function, <tt>#include <linbox/solutions/determinant.h></tt>.
@@ -92,10 +115,10 @@ The last argument to the solutions functions is a method object which specifies
the algorithm to be used. In each case there is a default, so this argument is optional.
Also, some method objects may be constructed so as to convey more detail about the algorithm to use.
For example it may help to promise that the matrix is nonsingular or symmetric or to request
-a particular algorithm variant. The blackbox algorithm based fundamentally on
+a particular algorithm variant. The blackbox algorithm based fundamentally on
Wiedemann's approach is specified by <tt>Method::Wiedemann</tt>, see <tt>linbox/solutions/methods.h</tt> for more details. Specification
-of a blocked blackbox algorithm may be advantageous (in the future).
-Elimination is likely fastest if the matrix is not extremely sparse or not large or
+of a blocked blackbox algorithm may be advantageous (in the future).
+Elimination is likely fastest if the matrix is not extremely sparse or not large or
not subject to rapid fill-in.
<p>
Of course, first we must construct the matrix and field.
@@ -107,18 +130,18 @@ instantiate your specific field.
typedef Modular<short> Field;
Field F(101);
-</pre>
+</pre>
It is a good idea to use a typedef, making it easy to change representations later.
The <em>Modular</em> field representations are LinBox's own and contain some useful
optimizations. Another possibility is use of NTL's zz_p class. The linbox wrapper of
-that, called NTL_zz_p is found in <tt>linbox/field/NTL-zz_p.h</tt>. Or use
+that, called NTL_zz_p is found in <tt>linbox/field/NTL-zz_p.h</tt>. Or use
a Givaro table based representation, <tt>GivaroGFq</tt> in <tt>linbox/field/givaro-gfq.h</tt>.
...and there are many other options. The program <tt>tests/test-fields.C</tt> will provide some
timing data on the basic functions of each representation.
-In linbox, a Field class and the class representing the field entries are distinct types. The
+In linbox, a Field class and the class representing the field entries are distinct types. The
field object owns the arithmetic operations, whereas the entry objects may be of a primitive
type such as short, int, double. Each field class Fld has the embedded class Fld::Element for
-it's elements.
+it's elements.
<pre>
Field::Element a, b, c;
F.init(a, 2); F.init(b, 3);
@@ -131,22 +154,22 @@ F.write(cout, c);
You have seen that the field representations are in subdirectory <tt>linbox/field</tt>. Similarly
the matrix representations are in <tt>linbox/blackbox</tt>.
All of these are are suitable for blackbox algorithms. Only those deriving from
-representations in <tt>linbox/matrix</tt> are suitable for elimination.
+representations in <tt>linbox/matrix</tt> are suitable for elimination.
For a sparse matrix, <tt>TriplesBB</tt> is a good representation choice if a blackbox algorithm
is to be used. For a {0,1}-incidence matrix, the class <tt>ZeroOne</tt> will be more economical
of space and time. On the other hand, if elimination is to be used, those will not serve at
all,
-but <tt>SparseMatrix</tt>, which allows internal modification, will do the trick.
-The ordinary matrix representation is <tt>DenseMatrix</tt>.
+but <tt>SparseMatrix</tt>, which allows internal modification, will do the trick.
+The ordinary matrix representation is <tt>DenseMatrix</tt>.
If your matrix structure allows you to compute matrix-vector products in a way faster than
-these classes provide, you can gain by defining your own matrix class adhering to the
-blackbox interface. The main components of the blackbox interface are member functions <tt>apply()</tt> and <tt>applyTranspose()</tt>
+these classes provide, you can gain by defining your own matrix class adhering to the
+blackbox interface. The main components of the blackbox interface are member functions <tt>apply()</tt> and <tt>applyTranspose()</tt>
functions. <tt>A.apply(y, x)</tt> performs y leftarrow Ax.
Then there is the question of initializing matrix
entries. Two basic approaches are illustrated here.
<pre>
-TriplesBB A;
+TriplesBB A;
A.read("triples-file"); // initialize A from data in file (including shape).
</pre>
Or a program can add entries to a sparse or dense matrix one by one using the <tt>setEntry</tt>
@@ -156,7 +179,7 @@ SparseMatrix B(100, 200); // 100 by 200 zero matrix (so far).
for ( ... )
{
Field::Element v;
- F.init(v, ...);
+ F.init(v, ...);
B.setEntry(i, j, v); // put nonzerp v in i,j position.
}
</pre>
@@ -179,6 +202,6 @@ F.write(cout << "the determinant is ", det) << endl;
}
</pre>
-This tutorial should continue with a discussion of compilation issues, but it
+This tutorial should continue with a discussion of compilation issues, but it
doesn't. Something useful may be learned from examining the Makefile.am in the examples directory.
</body></html>
diff --git a/examples/Makefile.am b/examples/Makefile.am
index caabb87..ef35f50 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,23 @@
# Copyright (c) 2010 the LinBox group
# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
#INCLUDES=-I$(top_srcdir)
AM_CPPFLAGS=-I$(top_srcdir) -I$(top_srcdir)/linbox
@@ -17,11 +34,13 @@ AM_CPPFLAGS=-I$(top_srcdir) -I$(top_srcdir)/linbox
# SAFER_FLAGS=-g -Wall -Wextra -Wno-unused-parameter
# AM_CXXFLAGS = $(SAFER_FLAGS) -DLinBoxSrcOnly -DDEBUG -O0
-AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DLinBoxSrcOnly
-AM_CPPFLAGS += $(GMP_CFLAGS) $(NTL_CFLAGS) $(FFLAFLAS_CFLAGS) $(GIVARO_CFLAGS) $(LIDIA_CFLAGS)
+AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DLinBoxSrcOnly -DDISABLE_COMMENTATOR
+AM_CPPFLAGS += $(GMP_CFLAGS) $(NTL_CFLAGS) $(FFLAS_FFPACK_CFLAGS) $(GIVARO_CFLAGS) $(LIDIA_CFLAGS) $(IML_CFLAGS)
#LDADD = $(NTL_LIBS) $(GIVARO_LIBS) $(LIDIA_LIBS) $(BLAS_LIBS) $(GMP_LIBS) "-Wl,-enable-auto-import"
-LDADD = $(NTL_LIBS) $(GIVARO_LIBS) $(LIDIA_LIBS) $(BLAS_LIBS) $(GMP_LIBS)
+LDADD = $(NTL_LIBS) $(GIVARO_LIBS) $(LIDIA_LIBS) $(BLAS_LIBS) $(GMP_LIBS) $(MPFR_LIBS) $(FPLLL_LIBS) $(LDFLAGS) $(IML_LIBS)
# AM_LDFLAGS=-static
+AM_LDFLAGS = $(top_srcdir)/linbox/.libs/liblinbox.a
+
#EX_LDADD = $(NTL_LIBS) $(GMP_LIBS) $(GIVARO_LIBS) $(LIDIA_LIBS) $(BLAS_LIBS)
#LDADD = $(LINBOX_LIBS) $(EX_LDADD)
@@ -42,7 +61,7 @@ EXTRA_PROGRAMS= $(EXAMPLES) $(USE_GIVARONTL_EXAMPLES)
CLEANFILES=$(EXTRA_PROGRAMS)
-EXTRA_DIST = examples.doxy
+EXTRA_DIST = examples.doxy smithvalence.h
examples: ${EXTRA_PROGRAMS}
@@ -72,7 +91,7 @@ LINBOX_BIN=@bindir@
# for compilation of new examples
%:%.C
- $(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.C -o $@ $(LDFLAGS) $(LDADD) $(LOADLIBES) $(top_srcdir)/linbox/.libs/liblinbox.a
+ $(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.C -o $@ $(AM_LDFLAGS) $(LDADD)
%:%.cpp
- $(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.cpp -o $@ $(LDFLAGS) $(LDADD) $(LOADLIBES) $(top_srcdir)/linbox/.libs/liblinbox.a
+ $(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.cpp -o $@ $(AM_LDFLAGS) $(LDADD)
diff --git a/examples/Makefile.in b/examples/Makefile.in
index f2ae58d..9ef7fc0 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -17,11 +17,46 @@
# Copyright (c) 2010 the LinBox group
# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -45,12 +80,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -58,7 +96,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -67,6 +108,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = Readme-make
+CONFIG_CLEAN_VPATH_FILES =
am__EXEEXT_1 = rank$(EXEEXT) det$(EXEEXT) minpoly$(EXEEXT) \
valence$(EXEEXT) solve$(EXEEXT) dot-product$(EXEEXT) \
echelon$(EXEEXT) sparseelimdet$(EXEEXT) \
@@ -81,90 +123,120 @@ charpoly_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
charpoly_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_checksolve_OBJECTS = checksolve.$(OBJEXT)
checksolve_OBJECTS = $(am_checksolve_OBJECTS)
checksolve_LDADD = $(LDADD)
checksolve_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_det_OBJECTS = det.$(OBJEXT)
det_OBJECTS = $(am_det_OBJECTS)
det_LDADD = $(LDADD)
det_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_dot_product_OBJECTS = dot-product.$(OBJEXT)
dot_product_OBJECTS = $(am_dot_product_OBJECTS)
dot_product_LDADD = $(LDADD)
dot_product_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_doubledet_OBJECTS = doubledet.$(OBJEXT)
doubledet_OBJECTS = $(am_doubledet_OBJECTS)
doubledet_LDADD = $(LDADD)
doubledet_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_echelon_OBJECTS = echelon.$(OBJEXT)
echelon_OBJECTS = $(am_echelon_OBJECTS)
echelon_LDADD = $(LDADD)
echelon_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_graph_charpoly_OBJECTS = graph-charpoly.$(OBJEXT)
graph_charpoly_OBJECTS = $(am_graph_charpoly_OBJECTS)
graph_charpoly_LDADD = $(LDADD)
graph_charpoly_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_minpoly_OBJECTS = minpoly.$(OBJEXT)
minpoly_OBJECTS = $(am_minpoly_OBJECTS)
minpoly_LDADD = $(LDADD)
minpoly_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_rank_OBJECTS = rank.$(OBJEXT)
rank_OBJECTS = $(am_rank_OBJECTS)
rank_LDADD = $(LDADD)
rank_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_smith_OBJECTS = smith.$(OBJEXT)
smith_OBJECTS = $(am_smith_OBJECTS)
smith_LDADD = $(LDADD)
smith_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_smithvalence_OBJECTS = smithvalence.$(OBJEXT)
smithvalence_OBJECTS = $(am_smithvalence_OBJECTS)
smithvalence_LDADD = $(LDADD)
smithvalence_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_solve_OBJECTS = solve.$(OBJEXT)
solve_OBJECTS = $(am_solve_OBJECTS)
solve_LDADD = $(LDADD)
solve_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_sparseelimdet_OBJECTS = sparseelimdet.$(OBJEXT)
sparseelimdet_OBJECTS = $(am_sparseelimdet_OBJECTS)
sparseelimdet_LDADD = $(LDADD)
sparseelimdet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_sparseelimrank_OBJECTS = sparseelimrank.$(OBJEXT)
sparseelimrank_OBJECTS = $(am_sparseelimrank_OBJECTS)
sparseelimrank_LDADD = $(LDADD)
sparseelimrank_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_valence_OBJECTS = valence.$(OBJEXT)
valence_OBJECTS = $(am_valence_OBJECTS)
valence_LDADD = $(LDADD)
valence_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp =
@@ -198,12 +270,45 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -211,6 +316,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -234,10 +340,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -258,10 +366,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -270,6 +383,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -286,6 +401,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -351,8 +467,8 @@ top_srcdir = @top_srcdir@
#INCLUDES=-I$(top_srcdir)
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/linbox $(GMP_CFLAGS) \
- $(NTL_CFLAGS) $(FFLAFLAS_CFLAGS) $(GIVARO_CFLAGS) \
- $(LIDIA_CFLAGS)
+ $(NTL_CFLAGS) $(FFLAS_FFPACK_CFLAGS) $(GIVARO_CFLAGS) \
+ $(LIDIA_CFLAGS) $(IML_CFLAGS)
#if LinBoxSrcOnly
#AM_CPPFLAGS=-g -DLinBoxSrcOnly $(GMP_CFLAGS) $(NTL_CFLAGS) $(GIVARO_CFLAGS) $(LIDIA_CFLAGS)
@@ -366,10 +482,11 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/linbox $(GMP_CFLAGS) \
# SAFER_FLAGS=-g -Wall -Wextra -Wno-unused-parameter
# AM_CXXFLAGS = $(SAFER_FLAGS) -DLinBoxSrcOnly -DDEBUG -O0
-AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DLinBoxSrcOnly
+AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DLinBoxSrcOnly -DDISABLE_COMMENTATOR
#LDADD = $(NTL_LIBS) $(GIVARO_LIBS) $(LIDIA_LIBS) $(BLAS_LIBS) $(GMP_LIBS) "-Wl,-enable-auto-import"
-LDADD = $(NTL_LIBS) $(GIVARO_LIBS) $(LIDIA_LIBS) $(BLAS_LIBS) $(GMP_LIBS)
+LDADD = $(NTL_LIBS) $(GIVARO_LIBS) $(LIDIA_LIBS) $(BLAS_LIBS) $(GMP_LIBS) $(MPFR_LIBS) $(FPLLL_LIBS) $(LDFLAGS) $(IML_LIBS)
# AM_LDFLAGS=-static
+AM_LDFLAGS = $(top_srcdir)/linbox/.libs/liblinbox.a
#EX_LDADD = $(NTL_LIBS) $(GMP_LIBS) $(GIVARO_LIBS) $(LIDIA_LIBS) $(BLAS_LIBS)
#LDADD = $(LINBOX_LIBS) $(EX_LDADD)
@@ -379,7 +496,7 @@ EXAMPLES = rank det minpoly valence solve dot-product echelon sparseelimdet spar
GIVARONTL_EXAMPLES = smith charpoly graph-charpoly
@LINBOX_HAVE_GIVARO_TRUE@@LINBOX_HAVE_NTL_TRUE at USE_GIVARONTL_EXAMPLES = $(GIVARONTL_EXAMPLES)
CLEANFILES = $(EXTRA_PROGRAMS)
-EXTRA_DIST = examples.doxy
+EXTRA_DIST = examples.doxy smithvalence.h
dot_product_SOURCES = dot-product.C
doubledet_SOURCES = doubledet.C
#linbox_program_SOURCES = \
@@ -415,9 +532,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps examples/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps examples/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps examples/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps examples/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -435,51 +552,52 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
Readme-make: $(top_builddir)/config.status $(srcdir)/Readme-make.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-charpoly$(EXEEXT): $(charpoly_OBJECTS) $(charpoly_DEPENDENCIES)
+charpoly$(EXEEXT): $(charpoly_OBJECTS) $(charpoly_DEPENDENCIES) $(EXTRA_charpoly_DEPENDENCIES)
@rm -f charpoly$(EXEEXT)
$(CXXLINK) $(charpoly_OBJECTS) $(charpoly_LDADD) $(LIBS)
-checksolve$(EXEEXT): $(checksolve_OBJECTS) $(checksolve_DEPENDENCIES)
+checksolve$(EXEEXT): $(checksolve_OBJECTS) $(checksolve_DEPENDENCIES) $(EXTRA_checksolve_DEPENDENCIES)
@rm -f checksolve$(EXEEXT)
$(CXXLINK) $(checksolve_OBJECTS) $(checksolve_LDADD) $(LIBS)
-det$(EXEEXT): $(det_OBJECTS) $(det_DEPENDENCIES)
+det$(EXEEXT): $(det_OBJECTS) $(det_DEPENDENCIES) $(EXTRA_det_DEPENDENCIES)
@rm -f det$(EXEEXT)
$(CXXLINK) $(det_OBJECTS) $(det_LDADD) $(LIBS)
-dot-product$(EXEEXT): $(dot_product_OBJECTS) $(dot_product_DEPENDENCIES)
+dot-product$(EXEEXT): $(dot_product_OBJECTS) $(dot_product_DEPENDENCIES) $(EXTRA_dot_product_DEPENDENCIES)
@rm -f dot-product$(EXEEXT)
$(CXXLINK) $(dot_product_OBJECTS) $(dot_product_LDADD) $(LIBS)
-doubledet$(EXEEXT): $(doubledet_OBJECTS) $(doubledet_DEPENDENCIES)
+doubledet$(EXEEXT): $(doubledet_OBJECTS) $(doubledet_DEPENDENCIES) $(EXTRA_doubledet_DEPENDENCIES)
@rm -f doubledet$(EXEEXT)
$(CXXLINK) $(doubledet_OBJECTS) $(doubledet_LDADD) $(LIBS)
-echelon$(EXEEXT): $(echelon_OBJECTS) $(echelon_DEPENDENCIES)
+echelon$(EXEEXT): $(echelon_OBJECTS) $(echelon_DEPENDENCIES) $(EXTRA_echelon_DEPENDENCIES)
@rm -f echelon$(EXEEXT)
$(CXXLINK) $(echelon_OBJECTS) $(echelon_LDADD) $(LIBS)
-graph-charpoly$(EXEEXT): $(graph_charpoly_OBJECTS) $(graph_charpoly_DEPENDENCIES)
+graph-charpoly$(EXEEXT): $(graph_charpoly_OBJECTS) $(graph_charpoly_DEPENDENCIES) $(EXTRA_graph_charpoly_DEPENDENCIES)
@rm -f graph-charpoly$(EXEEXT)
$(CXXLINK) $(graph_charpoly_OBJECTS) $(graph_charpoly_LDADD) $(LIBS)
-minpoly$(EXEEXT): $(minpoly_OBJECTS) $(minpoly_DEPENDENCIES)
+minpoly$(EXEEXT): $(minpoly_OBJECTS) $(minpoly_DEPENDENCIES) $(EXTRA_minpoly_DEPENDENCIES)
@rm -f minpoly$(EXEEXT)
$(CXXLINK) $(minpoly_OBJECTS) $(minpoly_LDADD) $(LIBS)
-rank$(EXEEXT): $(rank_OBJECTS) $(rank_DEPENDENCIES)
+rank$(EXEEXT): $(rank_OBJECTS) $(rank_DEPENDENCIES) $(EXTRA_rank_DEPENDENCIES)
@rm -f rank$(EXEEXT)
$(CXXLINK) $(rank_OBJECTS) $(rank_LDADD) $(LIBS)
-smith$(EXEEXT): $(smith_OBJECTS) $(smith_DEPENDENCIES)
+smith$(EXEEXT): $(smith_OBJECTS) $(smith_DEPENDENCIES) $(EXTRA_smith_DEPENDENCIES)
@rm -f smith$(EXEEXT)
$(CXXLINK) $(smith_OBJECTS) $(smith_LDADD) $(LIBS)
-smithvalence$(EXEEXT): $(smithvalence_OBJECTS) $(smithvalence_DEPENDENCIES)
+smithvalence$(EXEEXT): $(smithvalence_OBJECTS) $(smithvalence_DEPENDENCIES) $(EXTRA_smithvalence_DEPENDENCIES)
@rm -f smithvalence$(EXEEXT)
$(CXXLINK) $(smithvalence_OBJECTS) $(smithvalence_LDADD) $(LIBS)
-solve$(EXEEXT): $(solve_OBJECTS) $(solve_DEPENDENCIES)
+solve$(EXEEXT): $(solve_OBJECTS) $(solve_DEPENDENCIES) $(EXTRA_solve_DEPENDENCIES)
@rm -f solve$(EXEEXT)
$(CXXLINK) $(solve_OBJECTS) $(solve_LDADD) $(LIBS)
-sparseelimdet$(EXEEXT): $(sparseelimdet_OBJECTS) $(sparseelimdet_DEPENDENCIES)
+sparseelimdet$(EXEEXT): $(sparseelimdet_OBJECTS) $(sparseelimdet_DEPENDENCIES) $(EXTRA_sparseelimdet_DEPENDENCIES)
@rm -f sparseelimdet$(EXEEXT)
$(CXXLINK) $(sparseelimdet_OBJECTS) $(sparseelimdet_LDADD) $(LIBS)
-sparseelimrank$(EXEEXT): $(sparseelimrank_OBJECTS) $(sparseelimrank_DEPENDENCIES)
+sparseelimrank$(EXEEXT): $(sparseelimrank_OBJECTS) $(sparseelimrank_DEPENDENCIES) $(EXTRA_sparseelimrank_DEPENDENCIES)
@rm -f sparseelimrank$(EXEEXT)
$(CXXLINK) $(sparseelimrank_OBJECTS) $(sparseelimrank_LDADD) $(LIBS)
-valence$(EXEEXT): $(valence_OBJECTS) $(valence_DEPENDENCIES)
+valence$(EXEEXT): $(valence_OBJECTS) $(valence_DEPENDENCIES) $(EXTRA_valence_DEPENDENCIES)
@rm -f valence$(EXEEXT)
$(CXXLINK) $(valence_OBJECTS) $(valence_LDADD) $(LIBS)
@@ -528,7 +646,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -562,16 +680,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -586,7 +704,7 @@ tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -598,7 +716,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -607,29 +725,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -650,29 +773,41 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -692,10 +827,15 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -703,6 +843,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -775,8 +916,8 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -797,10 +938,11 @@ examples: ${EXTRA_PROGRAMS}
# for compilation of new examples
%:%.C
- $(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.C -o $@ $(LDFLAGS) $(LDADD) $(LOADLIBES) $(top_srcdir)/linbox/.libs/liblinbox.a
+ $(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.C -o $@ $(AM_LDFLAGS) $(LDADD)
%:%.cpp
- $(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.cpp -o $@ $(LDFLAGS) $(LDADD) $(LOADLIBES) $(top_srcdir)/linbox/.libs/liblinbox.a
+ $(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.cpp -o $@ $(AM_LDFLAGS) $(LDADD)
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/examples/charpoly.C b/examples/charpoly.C
index e6d088f..fd73e79 100644
--- a/examples/charpoly.C
+++ b/examples/charpoly.C
@@ -1,25 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/charpoly.C
*
* Copyright (C) 2005, 2010 D. Saunders, C. Pernet, J-G. Dumas
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/** \file examples/charpoly.C
@@ -31,10 +30,9 @@
#include <iomanip>
#include "linbox/util/timer.h"
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
#include "linbox/field/unparametric.h"
#include "linbox/blackbox/sparse.h"
-#include "linbox/blackbox/blas-blackbox.h"
using namespace std;
#include "linbox/solutions/charpoly.h"
@@ -63,7 +61,7 @@ std::ostream& prettyprintIntegerPolynomial (std::ostream& out, const Field &F, c
if (v[n] != 1) F.write(out, v[n]) << '*';
out << 'X';
if (n > 1) out << '^' << n;
- for (int i = n - 1; i > 0; i--) {
+ for (int i = (int)n - 1; i > 0; i--) {
if (v[i] != 0) {
if (v[i] >0) out << " + ";
if (v[i] != 1) F.write (out, v[i]) << '*';
@@ -94,9 +92,9 @@ std::ostream& printFactorization (std::ostream& out, const Field &F, const Facto
int main (int argc, char **argv)
{
- commentator.setMaxDetailLevel (2);
- commentator.setMaxDepth (2);
- commentator.setReportStream (std::cerr);
+ commentator().setMaxDetailLevel (2);
+ commentator().setMaxDepth (2);
+ commentator().setReportStream (std::cerr);
cout<<setprecision(8);
cerr<<setprecision(8);
@@ -111,9 +109,9 @@ int main (int argc, char **argv)
if (argc == 2) {
PID_integer ZZ;
- DenseMatrix<PID_integer > A (ZZ);
+ BlasMatrix<PID_integer > A (ZZ);
A.read (input);
- typedef GivPolynomialRing<PID_integer,::Givaro::Dense> IntPolRing;
+ typedef GivPolynomialRing<PID_integer, Givaro::Dense> IntPolRing;
IntPolRing::Element c_A;
Timer tim; tim.clear();tim.start();
@@ -129,14 +127,14 @@ int main (int argc, char **argv)
char tmp;
cin >> tmp;
if (tmp == 'y' || tmp == 'Y') {
- commentator.start("Integer Polynomial factorization by NTL", "NTLfac");
+ commentator().start("Integer Polynomial factorization by NTL", "NTLfac");
vector<IntPolRing::Element*> intFactors;
vector<unsigned long> exp;
IntPolRing IPD(ZZ);
tim.start();
IPD.factor (intFactors, exp, c_A);
tim.stop();
- commentator.stop("done", NULL, "NTLfac");
+ commentator().stop("done", NULL, "NTLfac");
printFactorization(cout << intFactors.size() << " integer polynomial factors:" << endl, ZZ, intFactors, exp) << endl;
vector<IntPolRing::Element*>::const_iterator itf = intFactors.begin();
for ( ; itf != intFactors.end(); ++itf)
@@ -152,10 +150,10 @@ int main (int argc, char **argv)
typedef Modular<double> Field;
double q = atof(argv[2]);
Field F(q);
- DenseMatrix<Field> B (F);
+ BlasMatrix<Field> B (F);
B.read (input);
cout << "B is " << B.rowdim() << " by " << B.coldim() << endl;
- GivPolynomialRing<Field,::Givaro::Dense>::Element c_B;
+ GivPolynomialRing<Field, Givaro::Dense>::Element c_B;
Timer tim; tim.clear();tim.start();
charpoly (c_B, B);
tim.stop();
@@ -167,3 +165,12 @@ int main (int argc, char **argv)
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/checksolve.C b/examples/checksolve.C
index a683ccf..f414193 100644
--- a/examples/checksolve.C
+++ b/examples/checksolve.C
@@ -1,25 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/checksolve.C
*
* Copyright (C) 2007 C. Pernet
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/**\file examples/checksolve.C
* @example examples/checksolve.C
@@ -29,43 +28,42 @@
//#include "linbox-config.h"
#include <iostream>
-#include "linbox/field/modular-double.h"
-#include "linbox/blackbox/blas-blackbox.h"
+#include "linbox/field/modular.h"
#include "linbox/solutions/solve.h"
#include "linbox/util/matrix-stream.h"
#include "linbox/solutions/methods.h"
using namespace LinBox;
-using namespace std;
+// using namespace std;
int main (int argc, char **argv)
{
- // commentator.setMaxDetailLevel (-1);
- // commentator.setMaxDepth (-1);
- // commentator.setReportStream (std::cerr);
+ // commentator().setMaxDetailLevel (-1);
+ // commentator().setMaxDepth (-1);
+ // commentator().setReportStream (std::cerr);
if (argc < 2 || argc > 4) {
- cerr << "Usage: checksolve <matrix-file-in-supported-format> <dense-vector-file> <p>" << endl;
+ std::cerr << "Usage: checksolve <matrix-file-in-supported-format> <dense-vector-file> <p>" << std::endl;
return 0;
}
std::ifstream input (argv[1]);
- if (!input) { cerr << "Error opening matrix file " << argv[1] << endl; return -1; }
+ if (!input) { std::cerr << "Error opening matrix file " << argv[1] << std::endl; return -1; }
std::ifstream invect(argv[2]);
- if (!input) { cerr << "Error opening vector file " << argv[2] << endl; return -1; }
+ if (!input) { std::cerr << "Error opening vector file " << argv[2] << std::endl; return -1; }
typedef Modular<double> Field;
double q = atof(argv[3]);
Field F(q);
MatrixStream< Field > ms ( F, input );
- BlasBlackbox<Field> A (ms); // A.write(std::cout);
- cout << "A is " << A.rowdim() << " by " << A.coldim() << endl;
+ BlasMatrix<Field> A (ms); // A.write(std::cout);
+ std::cout << "A is " << A.rowdim() << " by " << A.coldim() << std::endl;
std::vector<Field::Element> X( A.coldim()),B(A.rowdim());
@@ -80,16 +78,25 @@ int main (int argc, char **argv)
std::cout << "(BlasElimination) Solution is [ "<<X<< "]" << std::endl;
std::vector<Field::Element> r(A.rowdim());
BlasMatrixDomain<Field> BMD(F);
- BMD.mul(r, static_cast<BlasMatrix<Field::Element>& >(A), X);
+ BMD.mul(r, static_cast<BlasMatrix<Field>& >(A), X);
//A.apply (r,X);
VectorDomain<Field> VD(F);
if (VD.areEqual (r,B))
- std::cout<<"CHECK"<<endl;
+ std::cout<<"CHECK"<<std::endl;
else{
- std::cout<<"FAIL"<<endl;
- cout<<"r = "<<r<<endl;
- cout<<"B = "<<B<<endl;
+ std::cout<<"FAIL"<<std::endl;
+ std::cout<<"r = "<<r<<std::endl;
+ std::cout<<"B = "<<B<<std::endl;
}
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/det.C b/examples/det.C
index b94efac..afa2334 100644
--- a/examples/det.C
+++ b/examples/det.C
@@ -1,25 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/det.C
*
* Copyright (C) 2005, 2010 D. Saunders, J-G. Dumas
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/**\file examples/det.C examples/det.C
@@ -31,9 +30,8 @@
//#include "linbox-config.h"
#include <iostream>
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
#include "linbox/blackbox/sparse.h"
-#include "linbox/blackbox/blas-blackbox.h"
#include "linbox/solutions/det.h"
#include "linbox/util/matrix-stream.h"
@@ -42,9 +40,9 @@ using namespace std;
int main (int argc, char **argv)
{
- commentator.setMaxDetailLevel (-1);
- commentator.setMaxDepth (-1);
- commentator.setReportStream (std::cerr);
+ commentator().setMaxDetailLevel (-1);
+ commentator().setMaxDepth (-1);
+ commentator().setReportStream (std::cerr);
if (argc <= 1 || argc > 3) {
cerr << "Usage: det <matrix-file-in-supported-format> [<p>]" << endl;
@@ -65,7 +63,7 @@ int main (int argc, char **argv)
return -1;
}
MatrixStream< Integers> ms ( ZZ, input );
- BlasBlackbox<Integers> A(ms);
+ BlasMatrix<Integers> A(ms);
cout << "Matrix is " << A.rowdim() << " by " << A.coldim() << endl;
Integers::Element det_A;
@@ -98,3 +96,12 @@ int main (int argc, char **argv)
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/dot-product.C b/examples/dot-product.C
index faf1866..601a862 100644
--- a/examples/dot-product.C
+++ b/examples/dot-product.C
@@ -1,26 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* -*- mode: C++; style: linux -*- */
/*
* examples/dot-product.C
*
* Copyright (C) 2002, 2010 Bradford Hovinen <hovinen at cis.udel.edu>
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/** \file examples/dot-product.C
@@ -50,16 +48,17 @@ using namespace LinBox;
typedef Modular<uint32_t> Field;
-// Constants: we are working with an n x n matrix over GF(q)
-const int n = 10000000;
-const double p = .001;
-const int q = 32749;
-
/// no command line args
int main (int argc, char **argv)
{
- commentator.setMaxDepth (1);
- commentator.setReportStream (std::cout);
+ // Constants: we are working with an n x n matrix over GF(q)
+ const int n = 10000000;
+ const double p = .001;
+ const int q = 32749;
+
+
+ commentator().setMaxDepth (1);
+ commentator().setReportStream (std::cout);
Field F (q);
@@ -78,20 +77,29 @@ int main (int argc, char **argv)
VectorDomain<Field> VD (F);
Field::Element res;
- commentator.start ("dense/dense dot product (1)");
+ commentator().start ("dense/dense dot product (1)");
for (int i = 0; i < 1; i++)
VD.dot (res, v1, v2);
- commentator.stop ("done");
+ commentator().stop ("done");
- commentator.start ("dense/sparse sequence dot product (1000)");
+ commentator().start ("dense/sparse sequence dot product (1000)");
for (int i = 0; i < 1000; i++)
VD.dot (res, v1, v3);
- commentator.stop ("done");
+ commentator().stop ("done");
- commentator.start ("dense/sparse parallel dot product (1000)");
+ commentator().start ("dense/sparse parallel dot product (1000)");
for (int i = 0; i < 1000; i++)
VD.dot (res, v1, v4);
- commentator.stop ("done");
+ commentator().stop ("done");
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/doubledet.C b/examples/doubledet.C
index 6e65a37..aaf8fa3 100644
--- a/examples/doubledet.C
+++ b/examples/doubledet.C
@@ -1,26 +1,25 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/doubledet.C
*
* Copyright (C) 2008, 2010 C. Pernet
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file examples/doubledet.C
@@ -35,7 +34,6 @@
#include "linbox/field/PID-integer.h"
#include "linbox/util/matrix-stream.h"
#include "linbox/solutions/det.h"
-#include "linbox/blackbox/blas-blackbox.h"
#include "linbox/algorithms/double-det.h"
@@ -44,9 +42,9 @@ using namespace std;
int main (int argc, char **argv)
{
- // commentator.setMaxDetailLevel (-1);
- // commentator.setMaxDepth (-1);
- // commentator.setReportStream (std::cerr);
+ // commentator().setMaxDetailLevel (-1);
+ // commentator().setMaxDepth (-1);
+ // commentator().setReportStream (std::cerr);
PID_integer ZZ;
@@ -56,7 +54,7 @@ int main (int argc, char **argv)
return -1;
}
MatrixStream <PID_integer> ms (ZZ, input);
- BlasBlackbox <PID_integer> A (ms);
+ BlasMatrix <PID_integer> A (ms);
cout << "Matrix is " << A.rowdim() << " by " << A.coldim() << endl;
if (A.rowdim() != A.coldim() + 1){
@@ -77,7 +75,7 @@ int main (int argc, char **argv)
// Check solution
size_t n = A.coldim();
- BlasBlackbox<PID_integer> B (ZZ, n, n);
+ BlasMatrix<PID_integer> B (ZZ, n, n);
for (size_t i=0; i<n-1; ++i)
for (size_t j=0; j<n; ++j)
B.setEntry (i,j,A.getEntry(i,j));
@@ -105,3 +103,12 @@ int main (int argc, char **argv)
return 0 ;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/echelon.C b/examples/echelon.C
index 645091d..c4e6ed6 100644
--- a/examples/echelon.C
+++ b/examples/echelon.C
@@ -1,26 +1,25 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/echelon.C
*
* Copyright (C) 2007, 2010 C. Pernet
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/** \file examples/echelon.C
@@ -31,7 +30,7 @@
#include <iostream>
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
#include "linbox/util/matrix-stream.h"
#include "linbox/algorithms/echelon-form.h"
@@ -52,8 +51,8 @@ int main (int argc, char **argv)
Field F(q);
MatrixStream<Field> ms(F,input);
- BlasMatrix<Field::Element> A(ms);
- BlasMatrix<Field::Element> E(A.rowdim(),A.coldim());
+ BlasMatrix<Field> A(ms);
+ BlasMatrix<Field> E(F,A.rowdim(),A.coldim());
cout << "A is " << A.rowdim() << " by " << A.coldim() << endl;
EchelonFormDomain<Modular<double> > EFD (F);
@@ -61,7 +60,16 @@ int main (int argc, char **argv)
EFD.rowReducedEchelon(E,A);
if (E.coldim() <20)
- E.write(cerr<<"Echelon = "<<endl,F)<<endl;
+ E.write(cerr<<"Echelon = "<<endl)<<endl;
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/examples.doxy b/examples/examples.doxy
index 619009d..5e7ebe0 100644
--- a/examples/examples.doxy
+++ b/examples/examples.doxy
@@ -1,4 +1,23 @@
//Copyright (C) 2005 David Saunders, part of LinBox. GNU LGPL, see COPYING.
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** \ingroup linbox
\defgroup examples examples
diff --git a/examples/fields/Makefile.am b/examples/fields/Makefile.am
index 4da83e7..2a9c752 100644
--- a/examples/fields/Makefile.am
+++ b/examples/fields/Makefile.am
@@ -1,6 +1,24 @@
# Copyright (c) 2010 the LinBox group
# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
+
AM_CPPFLAGS=-I$(top_srcdir)
EXTRA_PROGRAMS = \
@@ -13,7 +31,7 @@ EXTRA_PROGRAMS = \
AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DLinBoxSrcOnly
AM_CPPFLAGS+= -DLinBoxSrcOnly $(GMP_CFLAGS) $(NTL_CFLAGS) \
-DEXAMPLE_DATADIR=\"$(srcdir)/data\"
-LDADD = $(GMP_LIBS) $(NTL_LIBS) -lgivaro -lclapack -lcblas -latlas
+LDADD = $(GMP_LIBS) $(NTL_LIBS) -lgivaro -lclapack -lcblas -latlas $(LDFLAGS)
ex_fields_SOURCES = ex-fields.C
ex_fields_archetype_SOURCES = ex-fields-archetype.C
diff --git a/examples/fields/Makefile.in b/examples/fields/Makefile.in
index 23f6e32..87f9b3e 100644
--- a/examples/fields/Makefile.in
+++ b/examples/fields/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,10 +14,49 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+# Copyright (c) 2010 the LinBox group
+# This file is part of LinBox
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -41,12 +80,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -54,7 +96,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -63,20 +108,23 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
am_ex_fields_OBJECTS = ex-fields.$(OBJEXT)
ex_fields_OBJECTS = $(am_ex_fields_OBJECTS)
ex_fields_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
-ex_fields_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ex_fields_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_ex_fields_archetype_OBJECTS = ex-fields-archetype.$(OBJEXT)
ex_fields_archetype_OBJECTS = $(am_ex_fields_archetype_OBJECTS)
ex_fields_archetype_LDADD = $(LDADD)
ex_fields_archetype_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_modular_int_OBJECTS = modular-int.$(OBJEXT)
modular_int_OBJECTS = $(am_modular_int_OBJECTS)
modular_int_LDADD = $(LDADD)
-modular_int_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+modular_int_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -93,6 +141,11 @@ SOURCES = $(ex_fields_SOURCES) $(ex_fields_archetype_SOURCES) \
$(modular_int_SOURCES)
DIST_SOURCES = $(ex_fields_SOURCES) $(ex_fields_archetype_SOURCES) \
$(modular_int_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -103,6 +156,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -126,10 +180,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -150,10 +206,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -162,6 +223,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -178,6 +241,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -240,17 +304,13 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
AM_CPPFLAGS = -I$(top_srcdir) -DLinBoxSrcOnly $(GMP_CFLAGS) \
$(NTL_CFLAGS) -DEXAMPLE_DATADIR=\"$(srcdir)/data\"
#AM_CPPFLAGS=$(GMP_CFLAGS) $(NTL_CFLAGS) -DEXAMPLE_DATADIR=\"$(srcdir)/data\"
#LDADD = $(top_builddir)/linbox/liblinbox.a $(GMP_LIBS) $(NTL_LIBS)
AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DLinBoxSrcOnly
-LDADD = $(GMP_LIBS) $(NTL_LIBS) -lgivaro -lclapack -lcblas -latlas
+LDADD = $(GMP_LIBS) $(NTL_LIBS) -lgivaro -lclapack -lcblas -latlas $(LDFLAGS)
ex_fields_SOURCES = ex-fields.C
ex_fields_archetype_SOURCES = ex-fields-archetype.C
modular_int_SOURCES = modular-int.C
@@ -267,9 +327,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps examples/fields/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps examples/fields/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps examples/fields/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps examples/fields/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -287,13 +347,14 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-ex-fields$(EXEEXT): $(ex_fields_OBJECTS) $(ex_fields_DEPENDENCIES)
+$(am__aclocal_m4_deps):
+ex-fields$(EXEEXT): $(ex_fields_OBJECTS) $(ex_fields_DEPENDENCIES) $(EXTRA_ex_fields_DEPENDENCIES)
@rm -f ex-fields$(EXEEXT)
$(CXXLINK) $(ex_fields_OBJECTS) $(ex_fields_LDADD) $(LIBS)
-ex-fields-archetype$(EXEEXT): $(ex_fields_archetype_OBJECTS) $(ex_fields_archetype_DEPENDENCIES)
+ex-fields-archetype$(EXEEXT): $(ex_fields_archetype_OBJECTS) $(ex_fields_archetype_DEPENDENCIES) $(EXTRA_ex_fields_archetype_DEPENDENCIES)
@rm -f ex-fields-archetype$(EXEEXT)
$(CXXLINK) $(ex_fields_archetype_OBJECTS) $(ex_fields_archetype_LDADD) $(LIBS)
-modular-int$(EXEEXT): $(modular_int_OBJECTS) $(modular_int_DEPENDENCIES)
+modular-int$(EXEEXT): $(modular_int_OBJECTS) $(modular_int_DEPENDENCIES) $(EXTRA_modular_int_DEPENDENCIES)
@rm -f modular-int$(EXEEXT)
$(CXXLINK) $(modular_int_OBJECTS) $(modular_int_LDADD) $(LIBS)
@@ -330,7 +391,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -338,29 +399,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -381,13 +447,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -405,16 +475,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -502,6 +578,7 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/examples/fields/ex-fields-archetype.C b/examples/fields/ex-fields-archetype.C
index da904c8..febb2d0 100644
--- a/examples/fields/ex-fields-archetype.C
+++ b/examples/fields/ex-fields-archetype.C
@@ -1,25 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/fields/ex-fields-archetype.C
*
* Copyright (C) 2002, 2010 G. Villard
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/** \file examples/fields/ex-fields-archetype.C
@@ -73,12 +72,14 @@ int main() {
/* The field objects "K_o" and "Q_o" are constructed as in previous examples
*/
- UnparametricField<NTL::RR> Q_o;
+ // UnparametricField<NTL::RR> Q_o;
+ NTL_RR Q_o ;
NTL::RR::SetPrecision(400);
NTL::RR::SetOutputPrecision(50);
- UnparametricField<NTL::zz_p> K_o;
+ // UnparametricField<NTL::zz_p> K_o;
NTL::zz_p::init(553);
+ NTL_zz_p K_o ;
/* These field objects "K_o" and "Q_o" of different types can be converted to
* objects Q and K of a unique type "Field_archetype" for instance using
@@ -97,3 +98,12 @@ int main() {
return 0;
};
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/fields/ex-fields.C b/examples/fields/ex-fields.C
index 03eec7c..c0d2b17 100644
--- a/examples/fields/ex-fields.C
+++ b/examples/fields/ex-fields.C
@@ -1,25 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/fields/ex-fields.C
*
* Copyright (C) 2001, 2002, 2010 G. Villard
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/** \file examples/fields/ex-fields.C
@@ -79,7 +78,8 @@ int main()
// NTL arbitrary precision real field
// (Could be parameterized by the precision)
- UnparametricField<NTL::RR> K2;
+ // UnparametricField<NTL::RR> K2;
+ NTL_RR K2 ;
NTL::RR::SetPrecision(500);
NTL::RR::SetOutputPrecision(50);
@@ -93,3 +93,12 @@ int main()
return 0;
};
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/fields/modular-int.C b/examples/fields/modular-int.C
index 6941e10..9395470 100644
--- a/examples/fields/modular-int.C
+++ b/examples/fields/modular-int.C
@@ -1,26 +1,25 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/modular-int.C
*
* Copyright (C) 2005, 2010 D. Saunders, Z. Wang
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/** \file examples/fields/modular-int.C
@@ -149,3 +148,12 @@ int main (int argc, char **argv)
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/graph-charpoly.C b/examples/graph-charpoly.C
index 85bd51f..306fb18 100644
--- a/examples/graph-charpoly.C
+++ b/examples/graph-charpoly.C
@@ -1,26 +1,25 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/graph-charpoly.C
*
* Copyright (C) 2005, 2007, 2010 C. Pernet
+ ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file examples/graph-charpoly.C
@@ -44,7 +43,7 @@ using namespace LinBox;
template <class Field, class Polynomial>
void printPolynomial(const Field& F, const Polynomial& P)
{
- int n= P.size()-1;
+ int n= (int) P.size()-1;
for (int i=0;i<n;++i)
cout<<P[i]<<" ";
cout<<endl;
@@ -67,12 +66,12 @@ void printPolynomial(const Field& F, const Polynomial& P)
typedef ZeroOne<PID_integer> Matrix;
-typedef GivPolynomialRing<PID_integer,::Givaro::Dense> IntPolRing;
+typedef GivPolynomialRing<PID_integer, Givaro::Dense> IntPolRing;
int main (int argc, char **argv)
{
- commentator.getMessageClass (BRIEF_REPORT).setMaxDepth (2);
- commentator.getMessageClass (BRIEF_REPORT).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (BRIEF_REPORT).setMaxDepth (2);
+ commentator().getMessageClass (BRIEF_REPORT).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (argc != 2) {
@@ -90,7 +89,7 @@ int main (int argc, char **argv)
PID_integer ZZ;
Matrix A(ZZ);
A.read (input);
- commentator.report(1, BRIEF_REPORT)<< "A is " << A.rowdim() << " by " << A.coldim() << endl;
+ commentator().report(1, BRIEF_REPORT)<< "A is " << A.rowdim() << " by " << A.coldim() << endl;
IntPolRing::Element c_A;
@@ -101,3 +100,12 @@ int main (int argc, char **argv)
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/minpoly.C b/examples/minpoly.C
index 49b57e4..8505948 100644
--- a/examples/minpoly.C
+++ b/examples/minpoly.C
@@ -1,26 +1,25 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/minpoly.C
*
* Copyright (C) 2005, 2010 D Saunders, J-G Dumas
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/** \file examples/minpoly.C
@@ -32,7 +31,7 @@
template <class Field, class Polynomial>
void printPolynomial (const Field &F, const Polynomial &v)
{
- for (int i = v.size () - 1; i >= 0; i--) {
+ for (int i = (int)v.size () ; i-- ; ) {
F.write (std::cout, v[i]);
if (i > 0)
std::cout << " x^" << i << " + ";
@@ -40,7 +39,7 @@ void printPolynomial (const Field &F, const Polynomial &v)
std::cout << std::endl;
}
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
#include "linbox/blackbox/sparse.h"
#include "linbox/solutions/minpoly.h"
@@ -50,9 +49,9 @@ using namespace std;
int main (int argc, char **argv)
{
- commentator.setMaxDetailLevel (-1);
- commentator.setMaxDepth (-1);
- commentator.setReportStream (std::cerr);
+ commentator().setMaxDetailLevel (-1);
+ commentator().setMaxDepth (-1);
+ commentator().setReportStream (std::cerr);
int a = argc;
while(a--){
@@ -121,3 +120,12 @@ int main (int argc, char **argv)
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/rank.C b/examples/rank.C
index a5ed0fb..4ea16e2 100644
--- a/examples/rank.C
+++ b/examples/rank.C
@@ -1,25 +1,25 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/rank.C
*
* Copyright (C) 2005, 2010 D. Saunders, J-G Dumas
*
- * This file is part of LinBox.
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/**\file examples/rank.C
@@ -31,46 +31,50 @@
#include <iostream>
#include <sstream>
-//#include "linbox/field/modular.h"
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
#include "linbox/field/gf2.h"
#include "linbox/blackbox/sparse.h"
#include "linbox/blackbox/zero-one.h"
#include "linbox/solutions/rank.h"
#include "linbox/util/matrix-stream.h"
-#include "linbox/field/givaro-rational.h"
+#include "linbox/field/givaro.h"
using namespace LinBox;
-using namespace std;
/// rank or rank mod p
int main (int argc, char **argv)
{
- commentator.setMaxDetailLevel (-1);
- commentator.setMaxDepth (-1);
- commentator.setReportStream (std::cerr);
+ commentator().setMaxDetailLevel (-1);
+ commentator().setMaxDepth (-1);
+ commentator().setReportStream (std::cerr);
- if (argc < 2 || argc > 3)
- { cerr << "Usage: rank <matrix-file-in-supported-format> [<p>]" << endl; return -1; }
+ if (argc < 2 || argc > 3) {
+ std::cerr << "Usage: rank <matrix-file-in-supported-format> [<p>]" << std::endl;
+ return -1;
+ }
- ifstream input (argv[1]);
- if (!input) { cerr << "Error opening matrix file: " << argv[1] << endl; return -1; }
+ std::ifstream input (argv[1]);
+ if (!input) {
+ std::cerr << "Error opening matrix file: " << argv[1] << std::endl;
+ return -1;
+ }
long unsigned int r;
if (argc == 2) { // rank over the rational numbers.
- /* We could pick a random prime and work mod that prime, But the point here
- is that the rank function in solutions/ handles that issue. Our matrix here
- is an integer or rational matrix and our concept is that we are getting the rank of that
- matrix by some blackbox magic inside linbox.
- */
+ /* We could pick a random prime and work mod that prime, But
+ * the point here is that the rank function in solutions/
+ * handles that issue. Our matrix here is an integer or
+ * rational matrix and our concept is that we are getting the
+ * rank of that matrix by some blackbox magic inside linbox.
+ */
LinBox::GivaroRational ZZ;
MatrixStream<GivaroRational> ms( ZZ, input );
SparseMatrix<GivaroRational> A ( ms );
- cout << "A is " << A.rowdim() << " by " << A.coldim() << endl;
+ std::cout << "A is " << A.rowdim() << " by " << A.coldim() << std::endl;
- rank (r, A);
+ LinBox::rank (r, A);
}
if (argc == 3) { // rank mod a prime
/*
@@ -92,31 +96,40 @@ int main (int argc, char **argv)
Field F(q);
MatrixStream<Field> ms( F, input );
SparseMatrix<Field, Vector<Field>::SparseSeq > B (ms);
- cout << "B is " << B.rowdim() << " by " << B.coldim() << endl;
- if (B.rowdim() <= 20 && B.coldim() <= 20) B.write(cout) << endl;
+ std::cout << "B is " << B.rowdim() << " by " << B.coldim() << std::endl;
+ if (B.rowdim() <= 20 && B.coldim() <= 20) B.write(std::cout) << std::endl;
// Using the adaptive LinBox Solution
- rank(r,B);
+ LinBox::rank(r,B);
// using BlackBoxes
- /*
+#if 0 /* too bad */
Method::Blackbox MBB;
MBB.certificate(true);
- rank(r, B, MBB);
- */
+ Linbox::rank(r, B, MBB);
+#endif
// using in place Sparse Elimination with linear pivoting
- /*
+#if 0 /* too bad */
Method::SparseElimination SE;
SE.strategy(Specifier::PIVOT_LINEAR);
rankin (r, B, SE);
- if (B.rowdim() <= 20 && B.coldim() <= 20) B.write(cout) << endl;
- */
+ if (B.rowdim() <= 20 && B.coldim() <= 20) B.write(std::cout) << std::endl;
+#endif
}
- cout << "Rank is " << r << endl;
+ std::cout << "Rank is " << r << std::endl;
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/smith.C b/examples/smith.C
index 1a1e8d6..fb852af 100644
--- a/examples/smith.C
+++ b/examples/smith.C
@@ -1,25 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/smith.C
*
* Copyright (C) 2005, 2010 D. Saunders, Z. Wang, J-G Dumas
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/** \file examples/smith.C
@@ -56,7 +55,7 @@
using namespace std;
-#include "linbox/field/modular-int32.h"
+#include "linbox/field/modular.h"
#include "linbox/blackbox/sparse.h"
#include "linbox/algorithms/smith-form-sparseelim-local.h"
@@ -66,10 +65,8 @@ using namespace std;
#include "linbox/field/local2_32.h"
#include "linbox/field/PIR-modular-int32.h"
#include "linbox/algorithms/smith-form-local.h"
-#include "linbox/algorithms/smith-form-local2.h"
-#include <linbox/algorithms/smith-form-iliopoulos.h>
+#include "linbox/algorithms/smith-form-iliopoulos.h"
#include "linbox/algorithms/smith-form-adaptive.h"
-#include "linbox/blackbox/dense.h"
using namespace LinBox;
@@ -77,7 +74,7 @@ using namespace LinBox;
template<class PIR>
-void Mat(DenseMatrix<PIR>& M, PIR& R, int n,
+void Mat(BlasMatrix<PIR>& M, PIR& R, int n,
string src, string file, string format);
template<class I1, class Lp> void distinct (I1 a, I1 b, Lp& c);
@@ -119,7 +116,7 @@ int main(int argc, char* argv[])
{
typedef PID_integer Ints;
Ints Z;
- DenseMatrix<Ints> M(Z);
+ BlasMatrix<Ints> M(Z);
Mat(M, Z, n, src, file, format);
vector<integer> v(n);
T.start();
@@ -142,7 +139,7 @@ int main(int argc, char* argv[])
PIR R(m);
- DenseMatrix<PIR> M(R);
+ BlasMatrix<PIR> M(R);
Mat(M, R, n, src, file, format);
@@ -156,7 +153,8 @@ int main(int argc, char* argv[])
List L;
- for (size_t i = 0; i < M.rowdim(); ++i) L.push_back(M[i][i]);
+ for (size_t i = 0; i < M.rowdim(); ++i)
+ L.push_back(M[(int)i][i]);
list<pair<PIR::Element, size_t> > p;
@@ -188,8 +186,8 @@ int main(int argc, char* argv[])
Integer p(m), im(m);
// Should better ask user to give the prime !!!
- for(unsigned int k = 2; ( ( ! ::Givaro::probab_prime(p) ) && (p > 1) ); ++k)
- ::Givaro::root( p, im, k );
+ for(unsigned int k = 2; ( ( ! Givaro::probab_prime(p) ) && (p > 1) ); ++k)
+ Givaro::root( p, im, k );
// using Sparse Elimination
LinBox::PowerGaussDomain< Field > PGD( F );
@@ -200,11 +198,13 @@ int main(int argc, char* argv[])
typedef list< Field::Element > List;
List L;
for ( std::vector<std::pair<size_t,size_t> >::iterator
- p = local.begin(); p != local.end(); ++p) {
- for(size_t i = 0; i < p->first; ++i) L.push_back(p->second);
+ p_it = local.begin(); p_it != local.end(); ++p_it) {
+ for(size_t i = 0; i < (size_t) p_it->first; ++i)
+ L.push_back((Field::Element)p_it->second);
}
- size_t m = (B.rowdim() > B.coldim() ? B.coldim() : B.rowdim());
- for (size_t i = L.size(); i < m; ++i) L.push_back(0);
+ size_t M = (B.rowdim() > B.coldim() ? B.coldim() : B.rowdim());
+ for (size_t i = L.size(); i < M; ++i)
+ L.push_back(0);
list<pair<Field::Element, size_t> > pl;
@@ -214,14 +214,14 @@ int main(int argc, char* argv[])
//display(local.begin(), local.end());
display(pl.begin(), pl.end());
- cout << "# local, PowerGaussDomain<int32_t>(" << m << "), n = " << n << endl;
+ cout << "# local, PowerGaussDomain<int32_t>(" << M << "), n = " << n << endl;
}
else {
PIR R(m);
- DenseMatrix<PIR> M(R);
+ BlasMatrix<PIR> M(R);
Mat(M, R, n, src, file, format);
@@ -255,7 +255,7 @@ int main(int argc, char* argv[])
Local2_32 R;
- DenseMatrix<Local2_32> M(R);
+ BlasMatrix<Local2_32> M(R);
Mat(M, R, n, src, file, format);
@@ -297,112 +297,80 @@ int main(int argc, char* argv[])
return 0 ;
}
-/** Output matrix is determined by src which may be:
- "random-rough"
- This mat will have s, near sqrt(n), distinct invariant factors,
- each repeated twice), involving the s primes 101, 103, ...
- "random"
- This mat will have the same nontrivial invariant factors as
- diag(1,2,3,5,8, ... 999, 0, 1, 2, ...).
- "fib"
- This mat will have the same nontrivial invariant factors as
- diag(1,2,3,5,8, ... fib(k)), where k is about sqrt(n).
- The basic matrix is block diagonal with i-th block of order i and
- being a tridiagonal {-1,0,1} matrix whose snf = diag(i-1 1's, fib(i)),
- where fib(1) = 1, fib(2) = 2. But note that, depending on n,
- the last block may be truncated, thus repeating an earlier fibonacci number.
- "file" (or any other string)
- mat read from named file with format "sparse" or "dense".
- Also "tref" and file with format "kdense"
- */
-template <class PIR>
-void Mat(DenseMatrix<PIR>& M, PIR& R, int n,
- string src, string file, string format) {
-
- typename PIR::Element zero; R.init(zero, 0);
- if (src == "random-rough") RandomRoughMat(M, R, n);
-
- else if (src == "random") RandomFromDiagMat(M, R, n);
+template < class Ring >
+void scramble(BlasMatrix<Ring>& M)
+{
- else if (src == "fib") RandomFibMat(M, R, n);
+ Ring R = M.field();
- else if (src == "tref") TrefMat(M, R, n);
+ int N,n = (int)M.rowdim(); // number of random basic row and col ops.
+ N = n;
- else // from file
- {
+ for (int k = 0; k < N; ++k) {
- int rdim, cdim;
+ int i = rand()%(int)M.rowdim();
- std::ifstream in (file.c_str(), std::ios::in);
- if (! in) { cerr << "error: unable to open file" << endl; exit(-1); }
+ int j = rand()%(int)M.coldim();
- in >> rdim >> cdim;
+ if (i == j) continue;
- M. resize (rdim, cdim);
+ // M*i += alpha M*j and Mi* += beta Mj
- integer val;
+ //int a = rand()%2;
+ int a = 0;
- if (format == "dense" ) {
+ for (size_t l = 0; l < M.rowdim(); ++l) {
- for (int i = 0; i < rdim; ++ i)
+ if (a)
- for ( int j = 0; j < cdim; ++ j) {
+ R.subin(M[(int)l][i], M[(int)l][j]);
- in >> val;
+ else
- R. init (M[i][j], val);
+ R.addin(M[(int)l][i], M[(int)l][j]);
- }
+ //K.axpy(c, M.getEntry(l, i), x, M.getEntry(l, j));
+ //M.setEntry(l, i, c);
}
- else if (format == "sparse") {
+ //a = rand()%2;
- int i, j;
+ for (size_t l = 0; l < M.coldim(); ++l) {
- char mark;
+ if (a)
- in >> mark;
+ R.subin(M[i][l], M[j][l]);
+ else
- LinBox::integer val;
+ R.addin(M[i][l], M[j][l]);
+ }
+ }
- do {
+ std::ofstream out("matrix", std::ios::out);
- in >> i >> j;
- in. ignore (1);
- in >> val;
+ out << n << " " << n << "\n";
- if ( i == 0) break;
+ for (int i = 0; i < n; ++ i) {
- R. init (M[i-1][j-1], val);
+ for ( int j = 0; j < n; ++ j) {
- } while (true);
+ R. write(out, M[i][j]);
+ out << " ";
}
- //Krattenthaler's q^e matrices, given by exponent
- else if (format == "kdense") KratMat(M, R, n, in);
- else {
-
- cout << "Format: " << format << " Unknown\n";
-
- exit (-1);
+ out << "\n";
- }
}
- /*show some entries
- for (int k = 0; k < 10; ++k)
- cout << M.getEntry(0,k) << " " << M.getEntry(M.rowdim()-1, M.coldim()-1 - k) << endl;
- cout << endl << M.rowdim() << " " << M.coldim() << endl;
- */
+ //}
+}
- /* some row ops and some col ops */
-} // Mat
// This mat will have s, near sqrt(n), distinct invariant factors,
// each repeated twice), involving the s primes 101, 103, ...
template <class PIR>
-void RandomRoughMat(DenseMatrix<PIR>& M, PIR& R, int n) {
+void RandomRoughMat(BlasMatrix<PIR>& M, PIR& R, int n) {
typename PIR::Element zero; R.init(zero, 0);
M.resize(n, n, zero);
if (n > 10000) {cerr << "n too big" << endl; exit(-1);}
@@ -431,7 +399,7 @@ void RandomRoughMat(DenseMatrix<PIR>& M, PIR& R, int n) {
// This mat will have the same nontrivial invariant factors as
// diag(1,2,3,5,8, ... 999, 0, 1, 2, ...).
template <class PIR>
-void RandomFromDiagMat(DenseMatrix<PIR>& M, PIR& R, int n) {
+void RandomFromDiagMat(BlasMatrix<PIR>& M, PIR& R, int n) {
typename PIR::Element zero; R.init(zero, 0);
M.resize(n, n, zero);
@@ -449,7 +417,7 @@ void RandomFromDiagMat(DenseMatrix<PIR>& M, PIR& R, int n) {
// where fib(1) = 1, fib(2) = 2. But note that, depending on n,
// the last block may be truncated, thus repeating an earlier fibonacci number.
template <class PIR>
-void RandomFibMat(DenseMatrix<PIR>& M, PIR& R, int n) {
+void RandomFibMat(BlasMatrix<PIR>& M, PIR& R, int n) {
typename PIR::Element zero; R.init(zero, 0);
M.resize(n, n, zero);
@@ -479,81 +447,13 @@ void RandomFibMat(DenseMatrix<PIR>& M, PIR& R, int n) {
scramble(M);
}
-template < class Ring >
-void scramble(DenseMatrix<Ring>& M)
-{
-
- Ring R = M.field();
-
- int N,n = M.rowdim(); // number of random basic row and col ops.
- N = n;
-
- for (int k = 0; k < N; ++k) {
-
- int i = rand()%M.rowdim();
-
- int j = rand()%M.coldim();
-
- if (i == j) continue;
-
- // M*i += alpha M*j and Mi* += beta Mj
-
- //int a = rand()%2;
- int a = 0;
-
- for (size_t l = 0; l < M.rowdim(); ++l) {
-
- if (a)
-
- R.subin(M[l][i], M[l][j]);
-
- else
-
- R.addin(M[l][i], M[l][j]);
-
- //K.axpy(c, M.getEntry(l, i), x, M.getEntry(l, j));
- //M.setEntry(l, i, c);
- }
-
- //a = rand()%2;
-
- for (size_t l = 0; l < M.coldim(); ++l) {
-
- if (a)
-
- R.subin(M[i][l], M[j][l]);
- else
-
- R.addin(M[i][l], M[j][l]);
- }
- }
-
- std::ofstream out("matrix", std::ios::out);
-
- out << n << " " << n << "\n";
-
- for (int i = 0; i < n; ++ i) {
-
- for ( int j = 0; j < n; ++ j) {
-
- R. write(out, M[i][j]);
-
- out << " ";
- }
-
- out << "\n";
-
- }
-
- //}
-}
//////////////////////////////////
// special mats tref and krat
// Trefethen's challenge #7 mat (primes on diag, 1's on 2^e bands).
template <class PIR>
-void TrefMat(DenseMatrix<PIR>& M, PIR& R, int n) {
+void TrefMat(BlasMatrix<PIR>& M, PIR& R, int n) {
typename PIR::Element zero; R.init(zero, 0);
M.resize(n, n, zero);
@@ -596,7 +496,7 @@ struct pwrlist
}
integer operator[](int e)
{
- for (int i = m.size(); i <= e; ++i) m.push_back(m[1]*m[i-1]);
+ for (int i = (int)m.size(); i <= e; ++i) m.push_back(m[1]*m[i-1]);
return m[e];
}
};
@@ -604,31 +504,31 @@ struct pwrlist
// Read "1" or "q" or "q^e", for some (small) exponent e.
// Return value of the power of q at q = _q.
template <class num>
-num& qread(num& val, pwrlist& M, istream& in)
+num& qread(num& Val, pwrlist& M, istream& in)
{
char c;
in >> c; // next nonwhitespace
- if (c == '0') return val = 0;
- if (c == '1') return val = 1;
+ if (c == '0') return Val = 0;
+ if (c == '1') return Val = 1;
if (c != 'p' && c != 'q') { cout << "exiting due to unknown char " << c << endl; exit(-1);}
in.get(c);
- if (c !='^') {in.putback(c); return val = M[1];}
+ if (c !='^') {in.putback(c); return Val = M[1];}
else
{ int expt; in >> expt;
- return val = M[expt];
+ return Val = M[expt];
};
}
template <class PIR>
-void KratMat(DenseMatrix<PIR>& M, PIR& R, int q, istream& in)
+void KratMat(BlasMatrix<PIR>& M, PIR& R, int q, istream& in)
{
pwrlist pwrs(q);
for (unsigned int i = 0; i < M.rowdim(); ++ i)
for ( unsigned int j = 0; j < M.coldim(); ++ j) {
- int val;
- qread(val, pwrs, in);
- R. init (M[i][j], val);
+ int Val;
+ qread(Val, pwrs, in);
+ R. init (M[i][j], Val);
}
}
@@ -657,4 +557,116 @@ void display(I b, I e)
for (I p = b; p != e; ++p) cout << p->first << " " << p->second << ", ";
cout << ")" << endl;
}
+
+/** Output matrix is determined by src which may be:
+ "random-rough"
+ This mat will have s, near sqrt(n), distinct invariant factors,
+ each repeated twice), involving the s primes 101, 103, ...
+ "random"
+ This mat will have the same nontrivial invariant factors as
+ diag(1,2,3,5,8, ... 999, 0, 1, 2, ...).
+ "fib"
+ This mat will have the same nontrivial invariant factors as
+ diag(1,2,3,5,8, ... fib(k)), where k is about sqrt(n).
+ The basic matrix is block diagonal with i-th block of order i and
+ being a tridiagonal {-1,0,1} matrix whose snf = diag(i-1 1's, fib(i)),
+ where fib(1) = 1, fib(2) = 2. But note that, depending on n,
+ the last block may be truncated, thus repeating an earlier fibonacci number.
+ "file" (or any other string)
+ mat read from named file with format "sparse" or "dense".
+ Also "tref" and file with format "kdense"
+ */
+template <class PIR>
+void Mat(BlasMatrix<PIR>& M, PIR& R, int n,
+ string src, string file, string format) {
+
+ typename PIR::Element zero; R.init(zero, 0);
+ if (src == "random-rough") RandomRoughMat(M, R, n);
+
+ else if (src == "random") RandomFromDiagMat(M, R, n);
+
+ else if (src == "fib") RandomFibMat(M, R, n);
+
+ else if (src == "tref") TrefMat(M, R, n);
+
+ else // from file
+ {
+
+ int rdim, cdim;
+
+ std::ifstream in (file.c_str(), std::ios::in);
+ if (! in) { cerr << "error: unable to open file" << endl; exit(-1); }
+
+ in >> rdim >> cdim;
+
+ M. resize (rdim, cdim);
+
+ integer Val;
+
+ if (format == "dense" ) {
+
+ for (int i = 0; i < rdim; ++ i)
+
+ for ( int j = 0; j < cdim; ++ j) {
+
+ in >> Val;
+
+ R. init (M[i][j], Val);
+
+ }
+ }
+
+ else if (format == "sparse") {
+
+ int i, j;
+
+ char mark;
+
+ in >> mark;
+
+ LinBox::integer val;
+
+ do {
+
+ in >> i >> j;
+ in. ignore (1);
+ in >> val;
+
+ if ( i == 0) break;
+
+ R. init (M[i-1][j-1], val);
+
+ } while (true);
+
+ }
+ //Krattenthaler's q^e matrices, given by exponent
+ else if (format == "kdense") KratMat(M, R, n, in);
+
+ else {
+
+ cout << "Format: " << format << " Unknown\n";
+
+ exit (-1);
+
+ }
+ }
+
+ /*show some entries
+ for (int k = 0; k < 10; ++k)
+ cout << M.getEntry(0,k) << " " << M.getEntry(M.rowdim()-1, M.coldim()-1 - k) << endl;
+ cout << endl << M.rowdim() << " " << M.coldim() << endl;
+ */
+
+ /* some row ops and some col ops */
+} // Mat
+
//@}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/smithvalence.C b/examples/smithvalence.C
index 908e97c..110d3d9 100644
--- a/examples/smithvalence.C
+++ b/examples/smithvalence.C
@@ -1,25 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/smithvalence.C
*
* Copyright (C) 2010 J-G Dumas
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/**\file examples/smithvalence.C
@@ -30,139 +29,15 @@
//#include "linbox-config.h"
#include <iostream>
-#include "linbox/field/gf2.h"
-#include "linbox/field/modular-double.h"
-#include "linbox/field/givaro-zpz.h"
-#include "linbox/field/field-traits.h"
-#include "linbox/blackbox/transpose.h"
-#include "linbox/blackbox/compose.h"
-#include "linbox/blackbox/sparse.h"
-#include "linbox/solutions/rank.h"
-#include "linbox/solutions/valence.h"
-#include "linbox/algorithms/smith-form-sparseelim-local.h"
-#include "linbox/util/matrix-stream.h"
-#include "linbox/integer.h"
-
-#include <givaro/givintnumtheo.h>
-
-using LinBox::integer;
-
-template<class Field>
-unsigned long& TempLRank(unsigned long& r, char * filename, const Field& F)
-{
- std::ifstream input(filename);
- LinBox::MatrixStream< Field > msf( F, input );
- LinBox::SparseMatrix<Field,typename LinBox::Vector<Field>::SparseSeq> FA(msf);
- input.close();
- ::Givaro::Timer tim; tim.start();
- LinBox::rankin(r, FA);
- tim.stop();
- F.write(std::cout << "Rank over ") << " is " << r << ' ' << tim << std::endl;
- return r;
-}
-
-unsigned long& TempLRank(unsigned long& r, char * filename, const LinBox::GF2& F2)
-{
- std::ifstream input(filename);
- LinBox::ZeroOne<LinBox::GF2> A;
- A.read(input);
- input.close();
- ::Givaro::Timer tim; tim.start();
- LinBox::rankin(r, A, LinBox::Method::SparseElimination() );
- tim.stop();
- F2.write(std::cout << "Rank over ") << " is " << r << ' ' << tim << std::endl;
- return r;
-}
-
-
-
-unsigned long& LRank(unsigned long& r, char * filename, integer p)
-{
-
- integer maxmod16; LinBox::FieldTraits<LinBox::GivaroZpz< ::Givaro::Std16> >::maxModulus(maxmod16);
- integer maxmod32; LinBox::FieldTraits<LinBox::GivaroZpz< ::Givaro::Std32> >::maxModulus(maxmod32);
- integer maxmod53; LinBox::FieldTraits<LinBox::Modular<double> >::maxModulus(maxmod53);
- integer maxmod64; LinBox::FieldTraits<LinBox::GivaroZpz< ::Givaro::Std64> >::maxModulus(maxmod64);
- if (p == 2) {
- LinBox::GF2 F2;
- return TempLRank(r, filename, F2);
- }
- else if (p <= maxmod16) {
- typedef LinBox::GivaroZpz< ::Givaro::Std16> Field;
- Field F(p);
- return TempLRank(r, filename, F);
- }
- else if (p <= maxmod32) {
- typedef LinBox::GivaroZpz< ::Givaro::Std32> Field;
- Field F(p);
- return TempLRank(r, filename, F);
- }
- else if (p <= maxmod53) {
- typedef LinBox::Modular<double> Field;
- Field F(p);
- return TempLRank(r, filename, F);
- }
- else if (p <= maxmod64) {
- typedef LinBox::GivaroZpz< ::Givaro::Std64> Field;
- Field F(p);
- return TempLRank(r, filename, F);
- }
- else {
- typedef LinBox::GivaroZpz<integer> Field;
- Field F(p);
- return TempLRank(r, filename, F);
- }
- return r;
-}
-
-std::vector<size_t>& PRank(std::vector<size_t>& ranks, char * filename, integer p, size_t e, size_t intr)
-{
- integer maxmod;
- LinBox::FieldTraits<LinBox::GivaroZpz< ::Givaro::Std64> >::maxModulus(maxmod);
- if (p <= maxmod) {
- typedef LinBox::GivaroZpz< ::Givaro::Std64> Ring;
- int64_t lp(p);
- integer q = pow(p,e); int64_t lq(q);
- if (q > integer(lq)) {
- std::cerr << "Sorry power rank mod large composite not yet implemented" << std::endl;
- q = p;
- do {
- q *= p; lq = (int64_t)q;
- } while (q == integer(lq));
- q/=p; lq = (int64_t)q;
- std::cerr << "Trying: " << lq << std::endl;
- }
- Ring F(lq);
- std::ifstream input(filename);
- LinBox::MatrixStream<Ring> ms( F, input );
- LinBox::SparseMatrix<Ring, LinBox::Vector<Ring>::SparseSeq > A (ms);
- input.close();
- LinBox::PowerGaussDomain< Ring > PGD( F );
-
- PGD.prime_power_rankin( lq, lp, ranks, A, A.rowdim(), A.coldim(), std::vector<size_t>());
- F.write(std::cout << "Ranks over ") << " are " ;
- for(std::vector<size_t>::const_iterator rit=ranks.begin(); rit != ranks.end(); ++rit)
- std::cout << *rit << ' ';
- std::cout << std::endl;
- }
- else {
- std::cerr << "Sorry power rank mod large composite not yet implemented" << std::endl;
- std::cerr << "Assuming integer rank" << std::endl;
- ranks.resize(0); ranks.push_back(intr);
- }
- return ranks;
-}
-
-
-
+#include "smithvalence.h"
using namespace LinBox;
int main (int argc, char **argv)
{
- // commentator.setMaxDetailLevel (-1);
- // commentator.setMaxDepth (-1);
- // commentator.setReportStream (std::cerr);
+ // commentator().setMaxDetailLevel (-1);
+ // commentator().setMaxDepth (-1);
+ // commentator().setReportStream (std::cerr);
if (argc < 2 || argc > 4) {
@@ -183,7 +58,7 @@ int main (int argc, char **argv)
PID_integer::Element val_A;
- ::Givaro::Timer chrono; chrono.start();
+ Givaro::Timer chrono; chrono.start();
if (argc >= 3) {
Transpose<Blackbox> T(&A);
if (strcmp(argv[2],"-ata") == 0) {
@@ -214,7 +89,7 @@ int main (int argc, char **argv)
std::vector<integer> Moduli;
std::vector<size_t> exponents;
- ::Givaro::IntFactorDom<> FTD;
+ Givaro::IntFactorDom<> FTD;
typedef std::pair<integer,unsigned long> PairIntRk;
std::vector< PairIntRk > smith;
@@ -265,27 +140,38 @@ int main (int argc, char **argv)
if (sit->second != coprimeR) {
std::vector<size_t> ranks;
ranks.push_back(sit->second);
+ size_t effexp;
if (*eit > 1) {
- PRank(ranks, argv[1], sit->first, *eit, coprimeR);
+ PRank(ranks, effexp, argv[1], sit->first, *eit, coprimeR);
}
else {
- PRank(ranks, argv[1], sit->first, 2, coprimeR);
+ PRank(ranks, effexp, argv[1], sit->first, 2, coprimeR);
}
if (ranks.size() == 1) ranks.push_back(coprimeR);
- for(size_t expo = (*eit)<<1; ranks.back() < coprimeR; expo<<=1) {
- PRank(ranks, argv[1], sit->first, expo, coprimeR);
- if (ranks.size() < expo) {
- std::cerr << "Larger prime power not yet implemented" << std::endl;
- break;
- }
- }
+
+ if (effexp < *eit) {
+ for(size_t expo = effexp<<1; ranks.back() < coprimeR; expo<<=1) {
+ PRankInteger(ranks, argv[1], sit->first, expo, coprimeR);
+ }
+ } else {
+
+ for(size_t expo = (*eit)<<1; ranks.back() < coprimeR; expo<<=1) {
+ PRank(ranks, effexp, argv[1], sit->first, expo, coprimeR);
+ if (ranks.size() < expo) {
+ std::cerr << "It seems we need a larger prime power, it will take longer ..." << std::endl;
+ // break;
+ PRankInteger(ranks, argv[1], sit->first, expo, coprimeR);
+ }
+ }
+ }
+
std::vector<size_t>::const_iterator rit=ranks.begin();
- unsigned long modrank = *rit;
+ // unsigned long modrank = *rit;
for(++rit; rit!= ranks.end(); ++rit) {
if ((*rit)>= coprimeR) break;
for(size_t i=(*rit); i < coprimeR; ++i)
SmithDiagonal[i] *= sit->first;
- modrank = *rit;
+ // modrank = *rit;
}
}
}
@@ -308,3 +194,12 @@ int main (int argc, char **argv)
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/smithvalence.h b/examples/smithvalence.h
new file mode 100644
index 0000000..4305d89
--- /dev/null
+++ b/examples/smithvalence.h
@@ -0,0 +1,222 @@
+/*
+ * examples/smithvalence.h
+ * Copyright (c) Linbox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/**\file examples/smithvalence.h
+ * @example examples/smithvalence.h
+ \brief Valence of sparse matrix over Z or Zp.
+ \ingroup examples
+ */
+
+#include <givaro/givintnumtheo.h>
+#include "linbox/field/gf2.h"
+#include "linbox/field/modular.h"
+#include "linbox/field/givaro.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/blackbox/transpose.h"
+#include "linbox/blackbox/compose.h"
+#include "linbox/blackbox/sparse.h"
+#include "linbox/solutions/rank.h"
+#include "linbox/solutions/valence.h"
+#include "linbox/algorithms/smith-form-sparseelim-local.h"
+#include "linbox/util/matrix-stream.h"
+#include "linbox/util/timer.h"
+
+
+template<class Field>
+unsigned long& TempLRank(unsigned long& r, char * filename, const Field& F)
+{
+ std::ifstream input(filename);
+ LinBox::MatrixStream< Field > msf( F, input );
+ LinBox::SparseMatrix<Field,typename LinBox::Vector<Field>::SparseSeq> FA(msf);
+ input.close();
+ LinBox::Timer tim; tim.start();
+ LinBox::rankin(r, FA);
+ tim.stop();
+ F.write(std::cerr << "Rank over ") << " is " << r << ' ' << tim << std::endl;
+ return r;
+}
+
+unsigned long& TempLRank(unsigned long& r, char * filename, const LinBox::GF2& F2)
+{
+ std::ifstream input(filename);
+ LinBox::ZeroOne<LinBox::GF2> A;
+ A.read(input);
+ input.close();
+ LinBox::Timer tim; tim.start();
+ LinBox::rankin(r, A, LinBox::Method::SparseElimination() );
+ tim.stop();
+ F2.write(std::cerr << "Rank over ") << " is " << r << ' ' << tim << std::endl;
+ return r;
+}
+
+unsigned long& LRank(unsigned long& r, char * filename,Givaro::Integer p)
+{
+
+Givaro::Integer maxmod16; LinBox::FieldTraits<LinBox::GivaroZpz<Givaro::Std16> >::maxModulus(maxmod16);
+Givaro::Integer maxmod32; LinBox::FieldTraits<LinBox::GivaroZpz<Givaro::Std32> >::maxModulus(maxmod32);
+Givaro::Integer maxmod53; LinBox::FieldTraits<LinBox::Modular<double> >::maxModulus(maxmod53);
+Givaro::Integer maxmod64; LinBox::FieldTraits<LinBox::GivaroZpz<Givaro::Std64> >::maxModulus(maxmod64);
+ if (p == 2) {
+ LinBox::GF2 F2;
+ return TempLRank(r, filename, F2);
+ }
+ else if (p <= maxmod16) {
+ typedef LinBox::GivaroZpz<Givaro::Std16> Field;
+ Field F(p);
+ return TempLRank(r, filename, F);
+ }
+ else if (p <= maxmod32) {
+ typedef LinBox::GivaroZpz<Givaro::Std32> Field;
+ Field F(p);
+ return TempLRank(r, filename, F);
+ }
+ else if (p <= maxmod53) {
+ typedef LinBox::Modular<double> Field;
+ Field F(p);
+ return TempLRank(r, filename, F);
+ }
+ else if (p <= maxmod64) {
+ typedef LinBox::GivaroZpz<Givaro::Std64> Field;
+ Field F(p);
+ return TempLRank(r, filename, F);
+ }
+ else {
+ typedef LinBox::GivaroZpz<Givaro::Integer> Field;
+ Field F(p);
+ return TempLRank(r, filename, F);
+ }
+ return r;
+}
+
+std::vector<size_t>& PRank(std::vector<size_t>& ranks, size_t& effective_exponent, char * filename,Givaro::Integer p, size_t e, size_t intr)
+{
+ effective_exponent = e;
+ Givaro::Integer maxmod;
+ LinBox::FieldTraits<LinBox::GivaroZpz<Givaro::Std64> >::maxModulus(maxmod);
+ if (p <= maxmod) {
+ typedef LinBox::GivaroZpz<Givaro::Std64> Ring;
+ int64_t lp(p);
+ Givaro::Integer q = pow(p,e); int64_t lq(q);
+ if (q >Givaro::Integer(lq)) {
+ std::cerr << "Power rank might need extra large composite (" << p << '^' << e << ")." << std::endl;
+ // << "Such a large composite is not yet implemented ..." << std::endl;
+ q = p; lq = (int64_t)q;
+ for(effective_exponent=1; q == Givaro::Integer(lq); ++effective_exponent) {
+ q *= p; lq = (int64_t)q;
+ }
+ q/=p; --effective_exponent; lq = (int64_t)q;
+ std::cerr << "First trying: " << lq << " (=" << p << '^' << effective_exponent << ", without further warning this will be sufficient)." << std::endl;
+ }
+ Ring F(lq);
+ std::ifstream input(filename);
+ LinBox::MatrixStream<Ring> ms( F, input );
+ LinBox::SparseMatrix<Ring, LinBox::Vector<Ring>::SparseSeq > A (ms);
+ input.close();
+ LinBox::PowerGaussDomain< Ring > PGD( F );
+
+ LinBox::Timer tim; tim.clear(); tim.start();
+ PGD.prime_power_rankin( lq, lp, ranks, A, A.rowdim(), A.coldim(), std::vector<size_t>());
+ tim.stop();
+ F.write(std::cerr << "Ranks over ") << " are " ;
+ for(std::vector<size_t>::const_iterator rit=ranks.begin(); rit != ranks.end(); ++rit)
+ std::cerr << *rit << ' ';
+ std::cerr << ' ' << tim << std::endl;
+ }
+ else {
+ std::cerr << "*** WARNING *** Sorry power rank mod large composite not yet implemented" << std::endl;
+ std::cerr << "*** WARNING *** Assuming integer rank, extra factors in the Smith form could be missing" << std::endl;
+ ranks.resize(0); ranks.push_back(intr);
+ }
+ return ranks;
+}
+
+#include "linbox/algorithms/smith-form-sparseelim-poweroftwo.h"
+
+
+std::vector<size_t>& PRankPowerOfTwo(std::vector<size_t>& ranks, size_t& effective_exponent, char * filename, size_t e, size_t intr)
+{
+ effective_exponent = e;
+ typedef uint64_t RingElements;
+ if (e > 63) {
+ std::cerr << "Power rank power of two might need extra large composite (2^" << e << ")." << std::endl;
+ std::cerr << "First trying: 63, without further warning this will be sufficient)." << std::endl;
+ effective_exponent = 63;
+ }
+
+ std::ifstream input(filename);
+ typedef LinBox::UnparametricField<int64_t> Ring;
+ Ring F;
+ LinBox::MatrixStream<Ring> ms( F, input );
+ LinBox::SparseMatrix<Ring, LinBox::Vector<Ring>::SparseSeq > A (ms);
+ input.close();
+ LinBox::PowerGaussDomainPowerOfTwo< uint64_t > PGD;
+
+ LinBox::Timer tim; tim.clear(); tim.start();
+ PGD.prime_power_rankin( effective_exponent, ranks, A, A.rowdim(), A.coldim(), std::vector<size_t>());
+ tim.stop();
+ std::cerr << "Ranks over 2^" << effective_exponent << " are " ;
+ for(std::vector<size_t>::const_iterator rit=ranks.begin(); rit != ranks.end(); ++rit)
+ std::cerr << *rit << ' ';
+ std::cerr << ' ' << tim << std::endl;
+ return ranks;
+}
+
+std::vector<size_t>& PRankInteger(std::vector<size_t>& ranks, char * filename,Givaro::Integer p, size_t e, size_t intr)
+{
+ typedef LinBox::GivaroZpz<Givaro::Integer> Ring;
+ Givaro::Integer q = pow(p,e);
+ Ring F(q);
+ std::ifstream input(filename);
+ LinBox::MatrixStream<Ring> ms( F, input );
+ LinBox::SparseMatrix<Ring, LinBox::Vector<Ring>::SparseSeq > A (ms);
+ input.close();
+ LinBox::PowerGaussDomain< Ring > PGD( F );
+
+ LinBox::Timer tim; tim.clear(); tim.start();
+ PGD.prime_power_rankin( q, p, ranks, A, A.rowdim(), A.coldim(), std::vector<size_t>());
+ tim.stop();
+ F.write(std::cerr << "Ranks over ") << " are " ;
+ for(std::vector<size_t>::const_iterator rit=ranks.begin(); rit != ranks.end(); ++rit)
+ std::cerr << *rit << ' ';
+ std::cerr << ' ' << tim << std::endl;
+ return ranks;
+}
+
+std::vector<size_t>& PRankIntegerPowerOfTwo(std::vector<size_t>& ranks, char * filename, size_t e, size_t intr)
+{
+ typedef LinBox::PID_integer Ring;
+ Ring ZZ;
+ std::ifstream input(filename);
+ LinBox::MatrixStream<Ring> ms( ZZ, input );
+ LinBox::SparseMatrix<Ring, LinBox::Vector<Ring>::SparseSeq > A (ms);
+ input.close();
+ LinBox::PowerGaussDomainPowerOfTwo< Givaro::Integer > PGD;
+
+ LinBox::Timer tim; tim.clear(); tim.start();
+ PGD.prime_power_rankin( e, ranks, A, A.rowdim(), A.coldim(), std::vector<size_t>());
+ tim.stop();
+ std::cerr << "Ranks over 2^" << e << " are " ;
+ for(std::vector<size_t>::const_iterator rit=ranks.begin(); rit != ranks.end(); ++rit)
+ std::cerr << *rit << ' ';
+ std::cerr << ' ' << tim << std::endl;
+ return ranks;
+}
diff --git a/examples/solve.C b/examples/solve.C
index 6ceb476..87fe6e4 100644
--- a/examples/solve.C
+++ b/examples/solve.C
@@ -1,25 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/solve.C
*
* Copyright (C) 2005, 2010 J-G Dumas, D. Saunders, P. Giorgi
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/** @file examples/solve.C
@@ -31,7 +30,7 @@
#include <iostream>
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
#include "linbox/blackbox/sparse.h"
#include "linbox/solutions/solve.h"
#include "linbox/util/matrix-stream.h"
@@ -43,9 +42,9 @@ using namespace std;
int main (int argc, char **argv)
{
- commentator.setMaxDetailLevel (-1);
- commentator.setMaxDepth (-1);
- commentator.setReportStream (std::cerr);
+ commentator().setMaxDetailLevel (-1);
+ commentator().setMaxDepth (-1);
+ commentator().setReportStream (std::cerr);
if (argc < 2 || argc > 4) {
@@ -125,6 +124,7 @@ int main (int argc, char **argv)
Timer chrono;
// Sparse Elimination
+ std::cout << "Sparse Elimination" << std::endl;
chrono.clear();
chrono.start();
solve (X, A, B, Method::SparseElimination());
@@ -137,6 +137,7 @@ int main (int argc, char **argv)
std::cout << "CPU time (seconds): " << chrono.usertime() << std::endl<<std::endl;;
// BlasElimination
+ std::cout << "BlasElimination" << std::endl;
chrono.start();
solve (X, A, B, Method::BlasElimination());
chrono.stop();
@@ -148,6 +149,7 @@ int main (int argc, char **argv)
std::cout << "CPU time (seconds): " << chrono.usertime() << std::endl<< std::endl;
// Wiedemann
+ std::cout << "Blackbox" << std::endl;
chrono.clear();
chrono.start();
solve (X, A, B, Method::Blackbox());
@@ -160,6 +162,7 @@ int main (int argc, char **argv)
std::cout << "CPU time (seconds): " << chrono.usertime() << std::endl<<std::endl;;
#if 0
// Lanczos
+ std::cout << "Lanczos" << std::endl;
chrono.clear();
chrono.start();
solve (X, A, B, Method::Lanczos());
@@ -173,6 +176,7 @@ int main (int argc, char **argv)
// Block Lanczos
+ std::cout << "Block Lanczos" << std::endl;
Method::BlockLanczos MBL;
MBL.preconditioner(Specifier::FULL_DIAGONAL);
chrono.clear();
@@ -224,6 +228,7 @@ int main (int argc, char **argv)
Timer chrono;
// Wiedemann
+ std::cout << "Wiedemann" << std::endl;
chrono.start();
solve (X, d, A, B, Method::Wiedemann());
chrono.stop();
@@ -236,6 +241,7 @@ int main (int argc, char **argv)
std::cout << "CPU time (seconds): " << chrono.usertime() << std::endl;
// BlasElimination
+ std::cout << "BlasElimination" << std::endl;
chrono.start();
solve (X, d, A, B, Method::BlasElimination());
chrono.stop();
@@ -248,6 +254,7 @@ int main (int argc, char **argv)
std::cout << "CPU time (seconds): " << chrono.usertime() << std::endl;
// Sparse Elimination
+ std::cout << "Sparse Elimination" << std::endl;
chrono.start();
solve (X, d, A, B, Method::SparseElimination());
chrono.stop();
@@ -261,6 +268,7 @@ int main (int argc, char **argv)
#if 0
// Lanczos
+ std::cout << "Lanczos" << std::endl;
chrono.start();
solve (X, d, A, B, Method::Lanczos());
chrono.stop();
@@ -274,6 +282,7 @@ int main (int argc, char **argv)
// Block Lanczos
+ std::cout << "Block Lanczos" << std::endl;
chrono.clear();
chrono.start();
solve (X, d, A, B, Method::BlockLanczos());
@@ -290,3 +299,12 @@ int main (int argc, char **argv)
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/sparseelimdet.C b/examples/sparseelimdet.C
index 40cfd63..c990188 100644
--- a/examples/sparseelimdet.C
+++ b/examples/sparseelimdet.C
@@ -1,25 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/sparseelimdet.C
*
* Copyright (C) 2006, 2010 J-G Dumas
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/** \file examples/sparseelimdet.C
@@ -33,7 +32,7 @@
#include <vector>
#include <utility>
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
#include "linbox/field/gf2.h"
#include "linbox/blackbox/sparse.h"
#include "linbox/blackbox/zero-one.h"
@@ -46,9 +45,9 @@ using namespace std;
int main (int argc, char **argv)
{
- commentator.setMaxDetailLevel (-1);
- commentator.setMaxDepth (-1);
- commentator.setReportStream (std::cerr);
+ commentator().setMaxDetailLevel (-1);
+ commentator().setMaxDepth (-1);
+ commentator().setReportStream (std::cerr);
if (argc < 2 || argc > 3)
{ cerr << "Usage: sparseelimdet <matrix-file-in-supported-format> [<p>]" << endl; return -1; }
@@ -99,3 +98,12 @@ int main (int argc, char **argv)
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/sparseelimrank.C b/examples/sparseelimrank.C
index 4a5f3ff..5d3f49b 100644
--- a/examples/sparseelimrank.C
+++ b/examples/sparseelimrank.C
@@ -1,25 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/sparseelimrank.C
*
* Copyright (C) 2006, 2010 J-G Dumas
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/** \file examples/sparseelimrank.C
@@ -33,22 +32,22 @@
#include <vector>
#include <utility>
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
#include "linbox/field/gf2.h"
#include "linbox/blackbox/sparse.h"
#include "linbox/blackbox/zero-one.h"
#include "linbox/solutions/rank.h"
#include "linbox/util/matrix-stream.h"
-#include "linbox/field/givaro-rational.h"
+#include "linbox/field/givaro.h"
using namespace LinBox;
using namespace std;
int main (int argc, char **argv)
{
- commentator.setMaxDetailLevel (-1);
- commentator.setMaxDepth (-1);
- commentator.setReportStream (std::cerr);
+ commentator().setMaxDetailLevel (-1);
+ commentator().setMaxDepth (-1);
+ commentator().setReportStream (std::cerr);
if (argc < 2 || argc > 3)
{ cerr << "Usage: rank <matrix-file-in-supported-format> [<p>]" << endl; return -1; }
@@ -70,7 +69,7 @@ int main (int argc, char **argv)
SparseMatrix<GivaroRational> A ( ms );
cout << "A is " << A.rowdim() << " by " << A.coldim() << endl;
- rank (r, A, Method::SparseElimination() );
+ LinBox::rank (r, A, Method::SparseElimination() );
cout << "Rank is " << r << endl;
}
@@ -87,13 +86,13 @@ int main (int argc, char **argv)
Method::SparseElimination SE;
SE.strategy(Specifier::PIVOT_NONE);
// using Sparse Elimination
- rank (r, B, SE);
+ LinBox::rank (r, B, SE);
if (B.rowdim() <= 20 && B.coldim() <= 20) B.write(cout) << endl;
cout << "Rank is " << r << endl;
SE.strategy(Specifier::PIVOT_LINEAR);
// using Sparse Elimination
- rank (r, B, SE);
+ LinBox::rank (r, B, SE);
if (B.rowdim() <= 20 && B.coldim() <= 20) B.write(cout) << endl;
cout << "Rank is " << r << endl;
@@ -102,3 +101,12 @@ int main (int argc, char **argv)
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/examples/valence.C b/examples/valence.C
index 3a53eda..400ef88 100644
--- a/examples/valence.C
+++ b/examples/valence.C
@@ -1,25 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* examples/valence.C
*
* Copyright (C) 2005, 2010 J-G Dumas
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * LinBox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2 of
- * the License, or (at your option) any later version.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * LinBox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with LinBox. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/**\file examples/valence.C
@@ -30,7 +29,7 @@
//#include "linbox-config.h"
#include <iostream>
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
#include "linbox/blackbox/transpose.h"
#include "linbox/blackbox/compose.h"
#include "linbox/blackbox/sparse.h"
@@ -41,9 +40,9 @@ using namespace LinBox;
int main (int argc, char **argv)
{
- commentator.setMaxDetailLevel (-1);
- commentator.setMaxDepth (-1);
- commentator.setReportStream (std::cerr);
+ commentator().setMaxDetailLevel (-1);
+ commentator().setMaxDepth (-1);
+ commentator().setReportStream (std::cerr);
if (argc < 2 || argc > 3) {
@@ -90,3 +89,12 @@ int main (int argc, char **argv)
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index d16a9cc..73f5f5b 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -1,6 +1,24 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
SUBDIRS=driver kaapi maple sage
diff --git a/interfaces/Makefile.in b/interfaces/Makefile.in
index 08fd668..7e2d2ff 100644
--- a/interfaces/Makefile.in
+++ b/interfaces/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,10 +14,47 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -39,12 +76,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -52,7 +92,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -61,6 +104,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
@@ -72,12 +116,45 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -85,6 +162,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -108,10 +186,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -132,10 +212,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -144,6 +229,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -160,6 +247,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -222,10 +310,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
SUBDIRS = driver kaapi maple sage
all: all-recursive
@@ -239,9 +323,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps interfaces/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps interfaces/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps interfaces/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps interfaces/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -259,6 +343,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -290,7 +375,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -324,16 +409,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -348,7 +433,7 @@ tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -360,7 +445,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -369,29 +454,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -412,29 +502,41 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -454,16 +556,22 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -534,8 +642,8 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -551,6 +659,7 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/interfaces/driver/Makefile.am b/interfaces/driver/Makefile.am
index 7bf29fd..8779c20 100644
--- a/interfaces/driver/Makefile.am
+++ b/interfaces/driver/Makefile.am
@@ -1,12 +1,28 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+#========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
if LINBOX_COMPILE_DRIVERS
pkgincludesubdir=$(includedir)/interfaces/driver
AM_CPPFLAGS=-I$(top_srcdir) -I. -I../../linbox
-AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(GMP_CFLAGS) $(FFLAFLAS_CFLAGS) $(BLAS_CFLAGS) $(GIVARO_CFLAGS)
+AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(GMP_CFLAGS) $(FFLAS_FFPACK_CFLAGS) $(BLAS_CFLAGS) $(GIVARO_CFLAGS)
#ifdef HAVE_NTL
AM_CXXFLAGS +=$(NTL_CFLAGS)
@@ -19,17 +35,20 @@ lib_LTLIBRARIES=liblbdriver.la
liblbdriver_la_SOURCES= lb-element.C \
lb-domain.C \
- lb-blackbox.C \
lb-vector.C \
lb-polynomial.C \
- lb-garbage.C \
lb-det.C \
lb-rank.C \
+ lb-garbage.C \
lb-minpoly.C \
- lb-charpoly.C \
- lb-solve.C
+ lb-blackbox.C \
+ lb-charpoly.C
+# \
+ # lb-solve.C
+
+liblbdriver_la_LDFLAGS=$(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(LDFLAGS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs
+
-liblbdriver_la_LDFLAGS=$(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs
pkginclude_HEADERS=\
lb-driver.h \
@@ -59,7 +78,6 @@ pkginclude_HEADERS=\
lb-vector.h \
lb-blackbox-functor.h \
lb-domain-collection.h \
- lb-driver.h \
lb-interface.h \
lb-vector-abstract.h \
lb-vector-type.h \
diff --git a/interfaces/driver/Makefile.in b/interfaces/driver/Makefile.in
index 3585f95..8580dd8 100644
--- a/interfaces/driver/Makefile.in
+++ b/interfaces/driver/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,48 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+#========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -42,12 +79,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -55,7 +95,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -64,26 +107,46 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
liblbdriver_la_LIBADD =
-am__liblbdriver_la_SOURCES_DIST = lb-element.C lb-domain.C \
- lb-blackbox.C lb-vector.C lb-polynomial.C lb-garbage.C \
- lb-det.C lb-rank.C lb-minpoly.C lb-charpoly.C lb-solve.C
+am__liblbdriver_la_SOURCES_DIST = lb-element.C lb-domain.C lb-vector.C \
+ lb-polynomial.C lb-det.C lb-rank.C lb-garbage.C lb-minpoly.C \
+ lb-blackbox.C lb-charpoly.C
@LINBOX_COMPILE_DRIVERS_TRUE at am_liblbdriver_la_OBJECTS = \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-element.lo lb-domain.lo \
- at LINBOX_COMPILE_DRIVERS_TRUE@ lb-blackbox.lo lb-vector.lo \
- at LINBOX_COMPILE_DRIVERS_TRUE@ lb-polynomial.lo lb-garbage.lo \
+ at LINBOX_COMPILE_DRIVERS_TRUE@ lb-vector.lo lb-polynomial.lo \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-det.lo lb-rank.lo \
- at LINBOX_COMPILE_DRIVERS_TRUE@ lb-minpoly.lo lb-charpoly.lo \
- at LINBOX_COMPILE_DRIVERS_TRUE@ lb-solve.lo
+ at LINBOX_COMPILE_DRIVERS_TRUE@ lb-garbage.lo lb-minpoly.lo \
+ at LINBOX_COMPILE_DRIVERS_TRUE@ lb-blackbox.lo lb-charpoly.lo
liblbdriver_la_OBJECTS = $(am_liblbdriver_la_OBJECTS)
liblbdriver_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -104,6 +167,11 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(liblbdriver_la_SOURCES)
DIST_SOURCES = $(am__liblbdriver_la_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__pkginclude_HEADERS_DIST = lb-driver.h lb-blackbox-abstract.h \
lb-blackbox-type.h lb-domain-function.h \
lb-element-collection.h lb-polynomial.h lb-vector-data.h \
@@ -116,7 +184,6 @@ am__pkginclude_HEADERS_DIST = lb-driver.h lb-blackbox-abstract.h \
lb-domain-collection.h lb-interface.h lb-vector-abstract.h \
lb-vector-type.h lb-blackbox.h lb-domain-data.h \
lb-element-abstract.h lb-minpoly.h lb-vector-collection.h
-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkginclude_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -128,6 +195,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -151,10 +219,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -175,10 +245,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -187,6 +262,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -203,6 +280,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -265,17 +343,14 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
@LINBOX_COMPILE_DRIVERS_TRUE at pkgincludesubdir = $(includedir)/interfaces/driver
@LINBOX_COMPILE_DRIVERS_TRUE at AM_CPPFLAGS = -I$(top_srcdir) -I. -I../../linbox
#ifdef HAVE_NTL
@LINBOX_COMPILE_DRIVERS_TRUE at AM_CXXFLAGS = @DEFAULT_CFLAGS@ \
@LINBOX_COMPILE_DRIVERS_TRUE@ -DDISABLE_COMMENTATOR \
- at LINBOX_COMPILE_DRIVERS_TRUE@ $(GMP_CFLAGS) $(FFLAFLAS_CFLAGS) \
+ at LINBOX_COMPILE_DRIVERS_TRUE@ $(GMP_CFLAGS) \
+ at LINBOX_COMPILE_DRIVERS_TRUE@ $(FFLAS_FFPACK_CFLAGS) \
@LINBOX_COMPILE_DRIVERS_TRUE@ $(BLAS_CFLAGS) $(GIVARO_CFLAGS) \
@LINBOX_COMPILE_DRIVERS_TRUE@ $(NTL_CFLAGS)
#endif
@@ -284,17 +359,18 @@ top_srcdir = @top_srcdir@
@LINBOX_COMPILE_DRIVERS_TRUE at lib_LTLIBRARIES = liblbdriver.la
@LINBOX_COMPILE_DRIVERS_TRUE at liblbdriver_la_SOURCES = lb-element.C \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-domain.C \
- at LINBOX_COMPILE_DRIVERS_TRUE@ lb-blackbox.C \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-vector.C \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-polynomial.C \
- at LINBOX_COMPILE_DRIVERS_TRUE@ lb-garbage.C \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-det.C \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-rank.C \
+ at LINBOX_COMPILE_DRIVERS_TRUE@ lb-garbage.C \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-minpoly.C \
- at LINBOX_COMPILE_DRIVERS_TRUE@ lb-charpoly.C \
- at LINBOX_COMPILE_DRIVERS_TRUE@ lb-solve.C
+ at LINBOX_COMPILE_DRIVERS_TRUE@ lb-blackbox.C \
+ at LINBOX_COMPILE_DRIVERS_TRUE@ lb-charpoly.C
- at LINBOX_COMPILE_DRIVERS_TRUE@liblbdriver_la_LDFLAGS = $(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs
+# \
+# # lb-solve.C
+ at LINBOX_COMPILE_DRIVERS_TRUE@liblbdriver_la_LDFLAGS = $(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(LDFLAGS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs
@LINBOX_COMPILE_DRIVERS_TRUE at pkginclude_HEADERS = \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-driver.h \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-blackbox-abstract.h \
@@ -323,7 +399,6 @@ top_srcdir = @top_srcdir@
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-vector.h \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-blackbox-functor.h \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-domain-collection.h \
- at LINBOX_COMPILE_DRIVERS_TRUE@ lb-driver.h \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-interface.h \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-vector-abstract.h \
@LINBOX_COMPILE_DRIVERS_TRUE@ lb-vector-type.h \
@@ -346,9 +421,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps interfaces/driver/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps interfaces/driver/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps interfaces/driver/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps interfaces/driver/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -366,23 +441,29 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ list2="$$list2 $$p"; \
else :; fi; \
- done
+ done; \
+ test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+ }
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
done
clean-libLTLIBRARIES:
@@ -393,7 +474,7 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-liblbdriver.la: $(liblbdriver_la_OBJECTS) $(liblbdriver_la_DEPENDENCIES)
+liblbdriver.la: $(liblbdriver_la_OBJECTS) $(liblbdriver_la_DEPENDENCIES) $(EXTRA_liblbdriver_la_DEPENDENCIES)
$(liblbdriver_la_LINK) $(am_liblbdriver_la_rpath) $(liblbdriver_la_OBJECTS) $(liblbdriver_la_LIBADD) $(LIBS)
mostlyclean-compile:
@@ -418,21 +499,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludeHEADERS: $(pkginclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
- @list='$(pkginclude_HEADERS)'; for p in $$list; do \
+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
done
uninstall-pkgincludeHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkginclude_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
- done
+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -446,7 +531,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -454,29 +539,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -497,13 +587,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -524,16 +618,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -624,6 +724,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/interfaces/driver/lb-blackbox-abstract.h b/interfaces/driver/lb-blackbox-abstract.h
index 0027bf4..c866624 100644
--- a/interfaces/driver/lb-blackbox-abstract.h
+++ b/interfaces/driver/lb-blackbox-abstract.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-blackbox-abstract.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
du -h tes *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_blackbox_abstract_H
@@ -46,3 +47,12 @@ public:
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-blackbox-collection.h b/interfaces/driver/lb-blackbox-collection.h
index 098dbdb..3fc5a5a 100644
--- a/interfaces/driver/lb-blackbox-collection.h
+++ b/interfaces/driver/lb-blackbox-collection.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-blackbox-collection.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
du -h tes *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_blackbox_collection_H
@@ -47,3 +48,12 @@ typedef std::map<BlackboxKey, BlackboxAbstract*, BlackboxKeyLessThan> Blackbox
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-blackbox-data.h b/interfaces/driver/lb-blackbox-data.h
index b418503..8ccefe9 100644
--- a/interfaces/driver/lb-blackbox-data.h
+++ b/interfaces/driver/lb-blackbox-data.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-blackbox-data.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
du -h tes *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,17 +17,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_blackbox_data_H
#define __LINBOX_lb_blackbox_data_H
-#include <linbox/blackbox/sparse.h>
-#include <linbox/blackbox/blas-blackbox.h>
-#include <linbox/util/matrix-stream.h>
+#include "linbox/blackbox/sparse.h"
+#include "linbox/util/matrix-stream.h"
#include <map>
#include <utility>
@@ -53,7 +53,8 @@ public:
BlackboxSpecFunctor(const Functor &f, void *p) : fct(f), ptr(p) {}
template<class Domain, class Result>
- void operator()(Result &res, Domain *d) const{
+ void operator()(Result &res, Domain *d) const
+ {
Blackbox<Domain> * b= static_cast<Blackbox<Domain>*> (ptr);
fct(res, b);
}
@@ -117,7 +118,8 @@ private:
class CopyBlackboxFunctor {
public:
template<class Blackbox>
- void operator()(void *&res, Blackbox *B) const {
+ void operator()(void *&res, Blackbox *B) const
+ {
res= new Blackbox(static_cast<const Blackbox&>(*B));
}
};
@@ -134,16 +136,18 @@ public:
RebindBlackboxFunctor(void *&p) : ptr(p) {}
template<class Domain>
- void operator()(const DomainKey &key, Domain *D) const {
+ void operator()(const DomainKey &key, Domain *D) const
+ {
RebindBlackboxFunctor fct(ptr);
DomainFunction::call(*D, key, fct);
}
template<class DomainSource, class DomainTarget>
- void operator()(DomainSource &res, DomainTarget *D) const {
+ void operator()(DomainSource &res, DomainTarget *D) const
+ {
Blackbox<DomainSource> *B_source= static_cast<Blackbox<DomainSource> * > (ptr);
- Blackbox<DomainTarget> *B_target;
+ Blackbox<DomainTarget> *B_target = NULL; /* was not init't */
typename Blackbox<DomainSource>::template rebind<DomainTarget>()(*B_target, *B_source, *D);
delete B_source;
ptr = B_target;
@@ -162,30 +166,39 @@ protected:
const char* _info;
public:
- BlackboxEnvelope(void *p, const DomainKey &k, const char *info) : ptr(p), key(k, true), _info(info) {}
+ BlackboxEnvelope(void *p, const DomainKey &k, const char *Info) :
+ ptr(p), key(k, true), _info(Info)
+ {}
~BlackboxEnvelope(){}
- BlackboxAbstract* clone() const {
+ BlackboxAbstract* clone() const
+ {
CopyBlackboxFunctor Fct;
void *b;
launch(b, Fct);
return new BlackboxEnvelope<Blackbox>(b, key, _info);
}
- void * getPtr() const { return ptr;}
+ void * getPtr() const
+ { return ptr;}
- virtual const DomainKey& getDomainKey() const {return key;}
+ virtual const DomainKey& getDomainKey() const
+ {
+ return key;
+ }
LINBOX_VISITABLE();
template<class Functor, class Result>
- void launch (Result &res, const Functor &fct) const {
+ void launch (Result &res, const Functor &fct) const
+ {
BlackboxSpecFunctor<Blackbox, Functor> bbs(fct, ptr);
DomainFunction::call(res, key, bbs);
}
- const char* info() const {
+ const char* info() const
+ {
std::string msg= "[ LinBox Blackbox (storage = ";
msg+= std::string(_info);
msg+= std::string(", domain = [LinBox Domain (type = ");
@@ -196,7 +209,8 @@ public:
return msg.c_str();
}
- void rebind(const DomainKey &k) {
+ void rebind(const DomainKey &k)
+ {
RebindBlackboxFunctor<Blackbox> Fct(ptr);
DomainFunction::call(k, key, Fct);
key = k;
@@ -219,7 +233,8 @@ public:
CreateBlackboxFunctor(size_t &m, size_t &n) : _row(m), _col(n) {}
template<class Domain>
- void operator()(void *&res, Domain *D) const {
+ void operator()(void *&res, Domain *D) const
+ {
res = new Blackbox<Domain>(*D, _row, _col);
}
};
@@ -231,7 +246,8 @@ public:
CreateBlackboxFromStreamFunctor(std::istream &i) : in(i) {}
template<class Domain>
- void operator()(void *&res, Domain *D) const {
+ void operator()(void *&res, Domain *D) const
+ {
LinBox::MatrixStream<Domain> ms(*D, in);
res = new Blackbox<Domain>(ms);
}
@@ -283,3 +299,12 @@ const BlackboxKey& addBlackbox(BlackboxAbstract * v){
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-blackbox-function.h b/interfaces/driver/lb-blackbox-function.h
index 7c2b18a..73708a0 100644
--- a/interfaces/driver/lb-blackbox-function.h
+++ b/interfaces/driver/lb-blackbox-function.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-blackbox-function.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_blackbox_function_H
@@ -69,3 +70,12 @@ public:
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-blackbox-functor.h b/interfaces/driver/lb-blackbox-functor.h
index e968b7e..16c55b6 100644
--- a/interfaces/driver/lb-blackbox-functor.h
+++ b/interfaces/driver/lb-blackbox-functor.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-blackbox-functor.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
du -h tes *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_blackbox_functor_H
@@ -93,3 +94,12 @@ public: ApplyBlackboxFunctor(Result &r, const Functor &f) {
};
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-blackbox-type.h b/interfaces/driver/lb-blackbox-type.h
index c63a34e..9e95062 100644
--- a/interfaces/driver/lb-blackbox-type.h
+++ b/interfaces/driver/lb-blackbox-type.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-blackbox-type.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,21 +17,22 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_blackbox_type_H
#define __LINBOX_lb_blackbox_type_H
+#include <linbox/matrix/blas-matrix.h>
/****************************************
* Define the list of all Blackbox Type *
****************************************/
// (NEED TO USE ENVELOPE TO DEFINE A CONCRETE TYPE)
-typedef LinBoxTypelist < BlackboxEnvelope< LinBox::BlasBlackbox > , LinBoxDumbType> BL1;
+typedef LinBoxTypelist < BlackboxEnvelope< LinBox::BlasMatrix > , LinBoxDumbType> BL1;
//typedef LinBoxTypelist < BlackboxEnvelope< LinBox::SparseMatrix > , BL1> BL2;
// define the blackbox typelist
@@ -48,8 +50,8 @@ void UpdateBlackbox() {
// Blackbox_Factory::CallBackMap::value_type::second_type(
// constructBlackbox_from_size<LinBox::SparseMatrix>, constructBlackbox_from_stream<LinBox::SparseMatrix> ));
linbox_blackbox.add("linbox_dense",
- Blackbox_Factory::CallBackMap::value_type::second_type( constructBlackbox_from_size<LinBox::BlasBlackbox>,
- constructBlackbox_from_stream<LinBox::BlasBlackbox> ));
+ Blackbox_Factory::CallBackMap::value_type::second_type( constructBlackbox_from_size<LinBox::BlasMatrix >,
+ constructBlackbox_from_stream<LinBox::BlasMatrix > ));
}
@@ -61,3 +63,12 @@ void UpdateBlackbox() {
#define default_blackbox "linbox_dense"
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-blackbox.C b/interfaces/driver/lb-blackbox.C
index fe41917..bb1cdf5 100644
--- a/interfaces/driver/lb-blackbox.C
+++ b/interfaces/driver/lb-blackbox.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-blackbox.C
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,22 +17,22 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_blackbox_C
#define __LINBOX_lb_blackbox_C
-#include <linbox-config.h>
+#include "linbox-config.h"
#include <lb-blackbox.h>
#include <lb-blackbox-function.h>
#include <lb-domain-collection.h>
-//#include <linbox/matrix/matrix-category.h>
+//#include "linbox/matrix/matrix-category.h"
/********************************
* Allocate the global variable *
@@ -228,3 +229,12 @@ void writeBlackboxInfo(const BlackboxKey &k, std::ostream& os){
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-blackbox.h b/interfaces/driver/lb-blackbox.h
index 19bb528..e0b3e65 100644
--- a/interfaces/driver/lb-blackbox.h
+++ b/interfaces/driver/lb-blackbox.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-blackbox.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_blackbox_H
@@ -88,3 +89,12 @@ void setBlackbox(const char* t);
void writeBlackboxInfo(const BlackboxKey &k, std::ostream& os);
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-charpoly.C b/interfaces/driver/lb-charpoly.C
index 5f70437..5406907 100644
--- a/interfaces/driver/lb-charpoly.C
+++ b/interfaces/driver/lb-charpoly.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-charpoly.C
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,16 +17,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_charpoly_C
#define __LINBOX_lb_charpoly_C
-#include <linbox/solutions/charpoly.h>
+#include "linbox/solutions/charpoly.h"
#ifdef __LINBOX_HAVE_GIVARO
#include "linbox/ring/givaro-polynomial.h"
#endif
@@ -56,7 +57,7 @@ public:
typedef typename Field::Element Element;
#ifdef __LINBOX_HAVE_GIVARO
// use givpolynomial du to non genericity of charpoly over integer
- typename LinBox::GivPolynomialRing<Field, ::Givaro::Dense>::Element pol;
+ typename LinBox::GivPolynomialRing<Field, Givaro::Dense>::Element pol;
LinBox::charpoly(pol, *B, meth);
// convert back the result to std::vector
@@ -104,3 +105,12 @@ const VectorKey& lb_charpoly(const BlackboxKey& key) {
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-charpoly.h b/interfaces/driver/lb-charpoly.h
index 23b30c3..2ff190c 100644
--- a/interfaces/driver/lb-charpoly.h
+++ b/interfaces/driver/lb-charpoly.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-charpoly.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_charpoly_H
@@ -43,3 +44,12 @@ const VectorKey& lb_charpoly(const BlackboxKey& key);
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-det.C b/interfaces/driver/lb-det.C
index 0240983..552c68d 100644
--- a/interfaces/driver/lb-det.C
+++ b/interfaces/driver/lb-det.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-det.C
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,16 +17,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_det_C
#define __LINBOX_lb_det_C
-#include <linbox-config.h>
-#include <linbox/solutions/det.h>
+#include "linbox-config.h"
+#include "linbox/solutions/det.h"
#include <lb-det.h>
#include <lb-blackbox-function.h>
@@ -98,3 +99,12 @@ const EltKey& lb_determinant(const BlackboxKey& key, const char *method) {
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-det.h b/interfaces/driver/lb-det.h
index c6983c9..b4d1bf5 100644
--- a/interfaces/driver/lb-det.h
+++ b/interfaces/driver/lb-det.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-det.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_det_H
@@ -50,3 +51,12 @@ const char* lb_determinant_methods();
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-domain-abstract.h b/interfaces/driver/lb-domain-abstract.h
index 15d6b6b..345f05b 100644
--- a/interfaces/driver/lb-domain-abstract.h
+++ b/interfaces/driver/lb-domain-abstract.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-domain-abstract.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
du -h tes *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_domain_abstract_H
@@ -41,3 +42,12 @@ public:
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-domain-collection.h b/interfaces/driver/lb-domain-collection.h
index c574786..2674565 100644
--- a/interfaces/driver/lb-domain-collection.h
+++ b/interfaces/driver/lb-domain-collection.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-domain-collection.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
du -h tes *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,15 +17,15 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_domain_collection_H
#define __LINBOX_lb_domain_collection_H
-#include <linbox/integer.h>
+#include "linbox/integer.h"
#include <map>
#include <lb-domain-abstract.h>
@@ -121,3 +122,12 @@ typedef std::map<DomainKey, DomainAbstract*, DomainKeyLessThan> DomainTable;
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-domain-data.h b/interfaces/driver/lb-domain-data.h
index 3ec2bd1..058cf34 100644
--- a/interfaces/driver/lb-domain-data.h
+++ b/interfaces/driver/lb-domain-data.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-domain-data.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,18 +17,18 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_domain_data_H
#define __LINBOX_lb_domain_data_H
-#include <linbox-config.h>
-#include <linbox/integer.h>
-#include <linbox/field/field-traits.h>
+#include "linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/field/field-traits.h"
#include <map>
#include <utility>
@@ -159,3 +160,12 @@ DomainAbstract* constructDomain(const LinBox::integer &p) {
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-domain-function.h b/interfaces/driver/lb-domain-function.h
index 7b995cb..11f51e0 100644
--- a/interfaces/driver/lb-domain-function.h
+++ b/interfaces/driver/lb-domain-function.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-domain-function.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_domain_function_H
@@ -72,3 +73,12 @@ public:
};
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-domain-functor.h b/interfaces/driver/lb-domain-functor.h
index 4b5a4bb..2cca757 100644
--- a/interfaces/driver/lb-domain-functor.h
+++ b/interfaces/driver/lb-domain-functor.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-domain-functor.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
du -h tes *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_domain_functor_H
@@ -93,3 +94,12 @@ public:
};
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-domain-type.h b/interfaces/driver/lb-domain-type.h
index 75bee77..0386e45 100644
--- a/interfaces/driver/lb-domain-type.h
+++ b/interfaces/driver/lb-domain-type.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-domain-type.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,27 +17,24 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_domain_type_H
#define __LINBOX_lb_domain_type_H
-#include <linbox/field/modular.h>
-#include <linbox/field/PID-integer.h>
-#include <linbox/field/gmp-rational.h>
+#include "linbox/field/modular.h"
+#include "linbox/field/PID-integer.h"
+#include "linbox/field/gmp-rational.h"
#ifdef __LINBOX_HAVE_NTL
-#include <linbox/field/ntl-lzz_p.h>
-#include <linbox/field/ntl-ZZ_p.h>
-#include <linbox/field/ntl-ZZ.h>
+#include "linbox/field/ntl.h"
#endif
#ifdef __LINBOX_HAVE_GIVARO
-#include <linbox/field/givaro-zpz.h>
-#include <linbox/field/givaro-gfq.h>
+#include "linbox/field/givaro.h"
#endif
/**************************************
@@ -75,7 +73,7 @@ typedef LinBoxDumbType ntl_domain_list;
#ifdef __LINBOX_HAVE_GIVARO
typedef LinBoxTypelist < LinBox::GivaroGfq, LinBoxDumbType> DG1;
-typedef LinBoxTypelist < LinBox::GivaroZpz< ::Givaro::Std32>, DG1> DG2;
+typedef LinBoxTypelist < LinBox::GivaroZpz< Givaro::Std32>, DG1> DG2;
#ifdef __LINBOX_MINIMIZE_DOMAIN
typedef DG1 givaro_domain_list;
#else
@@ -120,7 +118,7 @@ void UpdateDomain(){
#ifdef __LINBOX_HAVE_GIVARO
linbox_domain.add("givaro_field_gfq" , constructDomain<LinBox::GivaroGfq>);
#ifndef __LINBOX_MINIMIZE_DOMAIN
- linbox_domain.add("givaro_field_32" , constructDomain<LinBox::GivaroZpz< ::Givaro::Std32> >);
+ linbox_domain.add("givaro_field_32" , constructDomain<LinBox::GivaroZpz< Givaro::Std32> >);
#endif
#endif
}
@@ -142,3 +140,12 @@ void UpdateDomain(){
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-domain.C b/interfaces/driver/lb-domain.C
index 0312ca9..17dcdf9 100644
--- a/interfaces/driver/lb-domain.C
+++ b/interfaces/driver/lb-domain.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-domain.C
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_domain_C
@@ -127,3 +128,12 @@ void writeDomainInfo(const DomainKey &key, std::ostream& os){
#endif // end of file
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-domain.h b/interfaces/driver/lb-domain.h
index 57faeb4..3f2da54 100644
--- a/interfaces/driver/lb-domain.h
+++ b/interfaces/driver/lb-domain.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-domain.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,16 +17,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_domain_H
#define __LINBOX_lb_domain_H
#include <lb-domain-collection.h>
-#include <linbox/integer.h>
+#include "linbox/integer.h"
/*************************
* Initializer of Domain *
@@ -65,3 +66,12 @@ void writeDomainInfo(const DomainKey &k, std::ostream& os);
#endif // end of file
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-driver.h b/interfaces/driver/lb-driver.h
index f824327..5ea1f4c 100644
--- a/interfaces/driver/lb-driver.h
+++ b/interfaces/driver/lb-driver.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-driver.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_driver_H
@@ -87,3 +88,12 @@ void LinBoxDataInfo(std::ostringstream &out){
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-element-abstract.h b/interfaces/driver/lb-element-abstract.h
index 79c30c0..95235a6 100644
--- a/interfaces/driver/lb-element-abstract.h
+++ b/interfaces/driver/lb-element-abstract.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-element-abstract.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
du -h tes *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_element_abstract_H
@@ -42,3 +43,12 @@ public:
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-element-collection.h b/interfaces/driver/lb-element-collection.h
index 58835ef..007e2d4 100644
--- a/interfaces/driver/lb-element-collection.h
+++ b/interfaces/driver/lb-element-collection.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-element-collection.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
du -h tes *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_collection_H
@@ -51,3 +52,12 @@ struct SerialElement {
};
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-element-data.h b/interfaces/driver/lb-element-data.h
index a249a07..a5d14b1 100644
--- a/interfaces/driver/lb-element-data.h
+++ b/interfaces/driver/lb-element-data.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-element.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -81,3 +82,12 @@ EltAbstract* constructElt(const DomainKey &key){
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-element.C b/interfaces/driver/lb-element.C
index 23deaff..0cfb3ba 100644
--- a/interfaces/driver/lb-element.C
+++ b/interfaces/driver/lb-element.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-element.C
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -127,3 +128,12 @@ void SerializeElement (SerialElement &s, const EltKey &key) {
}
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-element.h b/interfaces/driver/lb-element.h
index 729a293..92f626f 100644
--- a/interfaces/driver/lb-element.h
+++ b/interfaces/driver/lb-element.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-element.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -48,3 +49,12 @@ void SerializeElement (SerialElement &s, const EltKey &key);
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-garbage.C b/interfaces/driver/lb-garbage.C
index d11d735..4b387ec 100644
--- a/interfaces/driver/lb-garbage.C
+++ b/interfaces/driver/lb-garbage.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-garbage.C
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_garbage_C
@@ -234,3 +235,12 @@ void LinBoxCollect(){
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-garbage.h b/interfaces/driver/lb-garbage.h
index c51a252..b0ec592 100644
--- a/interfaces/driver/lb-garbage.h
+++ b/interfaces/driver/lb-garbage.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-garbage.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_garbage_H
@@ -77,3 +78,12 @@ void LinBoxCollect();
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-interface.h b/interfaces/driver/lb-interface.h
index 2e7ebd1..f6ff8a9 100644
--- a/interfaces/driver/lb-interface.h
+++ b/interfaces/driver/lb-interface.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-interface.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -60,3 +61,12 @@ void LinBoxInit(){
void LinBoxEnd(){
LinBoxCollect();
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-minpoly.C b/interfaces/driver/lb-minpoly.C
index 6be6a82..5bd0379 100644
--- a/interfaces/driver/lb-minpoly.C
+++ b/interfaces/driver/lb-minpoly.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-minpoly.C
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,16 +17,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_minpoly_C
#define __LINBOX_lb_minpoly_C
-#include <linbox/solutions/minpoly.h>
+#include "linbox/solutions/minpoly.h"
#include <lb-minpoly.h>
#include <lb-blackbox-function.h>
@@ -88,3 +89,12 @@ const VectorKey& lb_minpoly(const BlackboxKey& key) {
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-minpoly.h b/interfaces/driver/lb-minpoly.h
index 88ee819..511fc1d 100644
--- a/interfaces/driver/lb-minpoly.h
+++ b/interfaces/driver/lb-minpoly.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-minpoly.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_minpoly_H
@@ -42,3 +43,12 @@ const VectorKey& lb_minpoly(const BlackboxKey& key);
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-polynomial.C b/interfaces/driver/lb-polynomial.C
index 530f4b9..3c7b26e 100644
--- a/interfaces/driver/lb-polynomial.C
+++ b/interfaces/driver/lb-polynomial.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-polynomial.C
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_polynomial_C
@@ -177,3 +178,12 @@ void SerializePolynomial (SerialPolynomial &s, const PolynomialKey &key) {
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-polynomial.h b/interfaces/driver/lb-polynomial.h
index 5c61109..c5d7b99 100644
--- a/interfaces/driver/lb-polynomial.h
+++ b/interfaces/driver/lb-polynomial.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-polynomial.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_polynomial_H
@@ -54,3 +55,12 @@ void SerializePolynomial (SerialPolynomial &s, const PolynomialKey &key);
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-rank.C b/interfaces/driver/lb-rank.C
index f51dc81..99e0abe 100644
--- a/interfaces/driver/lb-rank.C
+++ b/interfaces/driver/lb-rank.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-rank.C
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,16 +17,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_rank_C
#define __LINBOX_lb_rank_C
-#include <linbox/solutions/rank.h>
+#include "linbox/solutions/rank.h"
#include <lb-rank.h>
#include <lb-blackbox-function.h>
@@ -72,3 +73,12 @@ unsigned long lb_rank(const BlackboxKey& key){
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-rank.h b/interfaces/driver/lb-rank.h
index bfe8e05..079f530 100644
--- a/interfaces/driver/lb-rank.h
+++ b/interfaces/driver/lb-rank.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-rank.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_rank_H
@@ -50,3 +51,12 @@ const char* lb_rank_methods();
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-solve.C b/interfaces/driver/lb-solve.C
deleted file mode 100644
index 00c93ab..0000000
--- a/interfaces/driver/lb-solve.C
+++ /dev/null
@@ -1,224 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* lb-solve.C
- * Copyright (C) 2005 Pascal Giorgi
- *
- * Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __LINBOX_lb_solve_C
-#define __LINBOX_lb_solve_C
-
-#include <linbox/solutions/solve.h>
-
-#include <lb-solve.h>
-#include <lb-blackbox-function.h>
-#include <lb-vector-function.h>
-#include <lb-blackbox.h>
-#include <lb-vector.h>
-#include <lb-domain.h>
-#include <lb-garbage.h>
-
-
-extern BlackboxTable blackbox_hashtable;
-extern VectorTable vector_hashtable;
-extern const char* current_rational_field;
-
-/****************************************************************
- * Functor interface to launch LinBox solving *
- * deal with different API and avoid different type compilation *
- ****************************************************************/
-
-// generic version to handle different type compilation
-template<class ResultElement, class BlackboxElement, class VectorElement, class DomainCategory>
-class LaunchSolveFunctor {
-public:
- template<class Result, class Blackbox, class Vector, class Method>
- inline void operator()(Result &s, Blackbox *B, Vector *v, const Method &m) const {
- throw lb_runtime_error("LinBox ERROR: incompatible domain in solving");// throw an exception for incompatible data type
- }
-};
-
-// specialization to launch LinBox solving using standard API
-template<class Element, class DomainCategory>
-class LaunchSolveFunctor<Element, Element, Element, DomainCategory>{
-public:
- template<class Result, class Blackbox, class Vector, class Method>
- inline void operator()(Result &s, Blackbox *B, Vector *v, const Method &m) const {
- LinBox::solve(s, *B, *v, m);
- }
-};
-
-
-// specialization to launch LinBox solving using integer solving API (output is a GMPRational)
-template<class Element>
-class LaunchSolveFunctor<Element, Element, Element, LinBox::RingCategories::IntegerTag >{
-public:
- template<class Result, class Blackbox, class Vector, class Method>
- inline void operator()(Result &s, Blackbox *B, Vector *v, const Method &m) const {
- //LinBox::solve(s, *B, *v, m);
- //not yet handled
- throw lb_runtime_error("LinBox ERROR: integer system solving with same vector type is not yet handled");
- }
-};
-
-
-// specialization to launch LinBox solving using integer solving API (output is a GMPRational)
-template<class Element>
-class LaunchSolveFunctor<LinBox::GMPRationalElement, Element, Element, LinBox::RingCategories::IntegerTag >{
-public:
- template<class Result, class Blackbox, class Vector, class Method>
- inline void operator()(Result &s, Blackbox *B, Vector *v, const Method &m) const {
- LinBox::solve(s, *B, *v, m);
- }
-};
-
-
-/**********************************************************************
- * Partial Solving linear system Functor according to a blackbox type *
- **********************************************************************/
-
-template<class Blackbox, class Method>
-class SolvePartialFunctor{
-protected:
- Blackbox *_BB;
- const Method &meth;
-public:
-
- SolvePartialFunctor (Blackbox *B, const Method &m) : _BB(B), meth(m) {}
-
- template<class Vector>
- void operator()(const VectorKey& Vkey, Vector *res) const {
- VectorTable::iterator it = vector_hashtable.find(Vkey);
- if (it == vector_hashtable.end())
- throw lb_runtime_error("LinBox ERROR: right hand side vector does not exist (solving impossible)\n");
-
- SolvePartialFunctor<Blackbox, Method> fct(_BB, meth);
- VectorFunction::call(*res, Vkey, fct);
- }
-
- template<class Vector, class Result>
- void operator() (Result &res, Vector *v) const {
- typedef typename Blackbox::Field::Element BElement;
- typedef typename Vector::value_type VElement;
- typedef typename Result::value_type RElement;
- typedef typename LinBox::FieldTraits<typename Blackbox::Field>::categoryTag categoryTag;
- LaunchSolveFunctor<RElement, BElement, VElement, categoryTag>()(res, _BB, v, meth);
- }
-};
-
-
-
-/**********************************************************
- * Modify the vector Result if it is integer computation *
- * and vector result is not define over a rational domain *
- **********************************************************/
-template<class Category>
-class MutateVector{
-public:
- void operator()(VectorAbstract *v){}
-};
-
-template<>
-class MutateVector<LinBox::RingCategories::IntegerTag>{
-public:
- void operator()(VectorAbstract *v){
- const DomainKey *k= &createDomain(0, current_rational_field);
- v->rebind(*k);
- deleteDomain(*k);
- }
-};
-
-
-class MutateVectorFunctor{
-public:
- template<class Domain>
- void operator()(VectorAbstract *&v, Domain *D) const {
- MutateVector<typename LinBox::FieldTraits<Domain>::categoryTag>()(v);
- }
-};
-
-
-void modifyResultVector(const VectorKey &key){
- VectorTable::iterator it = vector_hashtable.find(key);
- if (it == vector_hashtable.end())
- throw lb_runtime_error("LinBox ERROR: result vector does not exist (solving impossible)\n");
-
- const DomainKey *Dkey = &(it->second->getDomainKey());
- MutateVectorFunctor Fct;
- DomainFunction::call(it->second, *Dkey, Fct);
-}
-
-
-/*****************************************
- * Generic Solving linear system Functor *
- *****************************************/
-
-template<typename Method = LinBox::Method::Hybrid >
-class SolveFunctor{
-protected:
- const VectorKey &_Vkey;
- Method meth;
-public:
- SolveFunctor(const VectorKey &Vkey, Method m =Method()) : _Vkey(Vkey), meth(m) {}
-
- template<class Blackbox, class Result>
- inline void operator()(Result &res, Blackbox *B) const {
- SolvePartialFunctor<Blackbox, Method> fct(B, meth);
- VectorFunction::call(res, _Vkey, fct);
- }
-};
-
-
-/***********************************************************
- * API for solving linear systems *
- * vector solution is returned through a given vector key *
- ***********************************************************/
-
-void lb_solve(const VectorKey &res, const BlackboxKey &Bkey, const VectorKey &Vkey) {
- SolveFunctor<> fct(res);
- modifyResultVector(res);
- BlackboxFunction::call(Vkey, Bkey, fct);
-}
-
-/*****************************************************
- * API for solving linear systems *
- * vector solution is returned through a vector key *
- *****************************************************/
-
-const VectorKey& lb_solve(const BlackboxKey &Bkey, const VectorKey &Vkey) {
-
- BlackboxTable::iterator it = blackbox_hashtable.find(Bkey);
- if (it == blackbox_hashtable.end())
- throw lb_runtime_error("LinBox ERROR: blackbox does not exist (solving impossible)\n");
- const DomainKey *Dkey = &it->second->getDomainKey();
-
- std::pair<size_t,size_t> dim;
- dim = getBlackboxDimension(Bkey);
- size_t coldim = dim.second;
-
- //const VectorKey *res = ©Vector(Vkey);
- const VectorKey *res = &createVector(*Dkey, coldim);
-
- lb_solve(*res, Bkey, Vkey);
- return *res;
-}
-
-
-
-#endif
diff --git a/interfaces/driver/lb-solve.h b/interfaces/driver/lb-solve.h
index 00678e2..202fdb5 100644
--- a/interfaces/driver/lb-solve.h
+++ b/interfaces/driver/lb-solve.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-solve.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_solve_H
@@ -44,3 +45,12 @@ const VectorKey& lb_solve(const BlackboxKey &Bkey, const VectorKey &Vkey);
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-utilities.h b/interfaces/driver/lb-utilities.h
index b0caab9..2759d3e 100644
--- a/interfaces/driver/lb-utilities.h
+++ b/interfaces/driver/lb-utilities.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-utilities.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,17 +17,17 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_utilities_H
#define __LINBOX_lb_utilities_H
-#include <linbox/util/error.h>
-#include <linbox/util/debug.h>
+#include "linbox/util/error.h"
+#include "linbox/util/debug.h"
#include <iostream>
#include <sstream>
@@ -129,3 +130,12 @@ namespace LinBoxTL{
}
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-vector-abstract.h b/interfaces/driver/lb-vector-abstract.h
index 37c9052..08233b8 100644
--- a/interfaces/driver/lb-vector-abstract.h
+++ b/interfaces/driver/lb-vector-abstract.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-vector-abstract.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
du -h tes *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_vector_abstract_H
@@ -44,3 +45,12 @@ public:
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-vector-collection.h b/interfaces/driver/lb-vector-collection.h
index 702784f..c694bdb 100644
--- a/interfaces/driver/lb-vector-collection.h
+++ b/interfaces/driver/lb-vector-collection.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-vector-collection.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
du -h tes *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_vector_collection_H
@@ -50,3 +51,12 @@ struct SerialVector {
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-vector-data.h b/interfaces/driver/lb-vector-data.h
index 5c3aac3..49f77ee 100644
--- a/interfaces/driver/lb-vector-data.h
+++ b/interfaces/driver/lb-vector-data.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-vector-data.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,16 +17,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_vector_data_H
#define __LINBOX_lb_vector_data_H
#include <vector>
-#include <linbox/field/hom.h>
+#include "linbox/field/hom.h"
#include <map>
#include <utility>
@@ -48,7 +49,8 @@ public:
VectorSpecFunctor(const Functor &f, void *p) : fct(f), ptr(p) {}
template<class Domain, class Result>
- void operator() (Result& res, Domain *d) const {
+ void operator() (Result& res, Domain *d) const
+ {
fct(res, static_cast<Vector<typename Domain::Element, Alloc<typename Domain::Element> >*> (ptr));
}
};
@@ -111,7 +113,8 @@ private:
class CopyVectorFunctor {
public:
template<class Vector>
- void operator()(void *&res, Vector *V) const {
+ void operator()(void *&res, Vector *V) const
+ {
res= new Vector(*V);
}
};
@@ -128,16 +131,18 @@ public:
RebindVectorFunctor(void *&p) : ptr(p) {}
template<class Domain>
- void operator()(const DomainKey &key, Domain *D) const {
+ void operator()(const DomainKey &key, Domain *D) const
+ {
RebindVectorFunctor fct(ptr);
DomainFunction::call(*D, key, fct);
}
template<class DomainSource, class DomainTarget>
- void operator()(DomainSource &res, DomainTarget *D) const {
+ void operator()(DomainSource &res, DomainTarget *D) const
+ {
Vector<typename DomainSource::Element,Alloc<typename DomainSource::Element> > *v_source= static_cast<Vector<typename DomainSource::Element,Alloc<typename DomainSource::Element> > * > (ptr);
- Vector<typename DomainTarget::Element,Alloc<typename DomainTarget::Element> > *v_target= new Vector<typename DomainTarget::Element,Alloc<typename DomainTarget::Element> >(v_source->size());
+ Vector<typename DomainTarget::Element,Alloc<typename DomainTarget::Element> > *v_target= new Vector<typename DomainTarget::Element,Alloc<typename DomainTarget::Element> >(v_source->size());
LinBox::Hom<DomainSource, DomainTarget> hom(res, *D);
for (size_t i=0;i<v_source->size();++i)
@@ -159,30 +164,37 @@ protected:
DomainKey key;
const char* _info;
public:
- VectorEnvelope(void* p, const DomainKey &k, const char* info) : ptr(p), key(k, true), _info(info) {}
+ VectorEnvelope(void* p, const DomainKey &k, const char* Info) :
+ ptr(p), key(k, true), _info(Info)
+ {}
~VectorEnvelope() {}
LINBOX_VISITABLE();
template<class Functor, class Result>
- void launch (Result &res, const Functor &fct) const {
+ void launch (Result &res, const Functor &fct) const
+ {
VectorSpecFunctor<Vector, Functor> vs(fct, ptr);
DomainFunction::call(res, key, vs);
}
- VectorAbstract* clone() const {
+ VectorAbstract* clone() const
+ {
CopyVectorFunctor Fct;
void *v;
launch(v, Fct);
return new VectorEnvelope<Vector>(v, key, _info);
}
- void * getPtr() const { return ptr;}
+ void * getPtr() const
+ { return ptr;}
- const DomainKey& getDomainKey() const {return key;}
+ const DomainKey& getDomainKey() const
+ {return key;}
- const char* info() const {
+ const char* info() const
+ {
std::string msg= "[ LinBox Vector (storage = ";
msg+= std::string(_info);
msg+= std::string(", domain = [LinBox Domain (type = ");
@@ -193,7 +205,8 @@ public:
return msg.c_str();
}
- void rebind(const DomainKey &k) {
+ void rebind(const DomainKey &k)
+ {
RebindVectorFunctor<Vector> Fct(ptr);
DomainFunction::call(k, key, Fct);
key = k;
@@ -214,7 +227,8 @@ public:
CreateVectorFunctor( size_t &n) : _dim(n) {}
template<class Domain>
- void operator()(void *&res, Domain *D) const {
+ void operator()(void *&res, Domain *D) const
+ {
typename Domain::Element zero;
D->init(zero, 0UL);
res = new Vector<typename Domain::Element, Alloc<typename Domain::Element> >(_dim, zero);
@@ -228,7 +242,8 @@ public:
CreateVectorFromStreamFunctor(std::istream &i) : in(i) {}
template<class Domain>
- void operator()(void *&res, Domain *D) const {
+ void operator()(void *&res, Domain *D) const
+ {
size_t n;
LinBox::integer tmp;
in>>n;
@@ -266,3 +281,12 @@ VectorAbstract* constructVector_from_stream (const DomainKey &k, std::istream &i
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-vector-function.h b/interfaces/driver/lb-vector-function.h
index 854ab14..1e026f5 100644
--- a/interfaces/driver/lb-vector-function.h
+++ b/interfaces/driver/lb-vector-function.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-vector-function.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_vector_function_H
@@ -68,3 +69,12 @@ public:
};
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-vector-functor.h b/interfaces/driver/lb-vector-functor.h
index bb9eb7f..8fdf872 100644
--- a/interfaces/driver/lb-vector-functor.h
+++ b/interfaces/driver/lb-vector-functor.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-vector-functor.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
du -h tes *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_vector_functor_H
@@ -95,3 +96,12 @@ public:
};
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-vector-type.h b/interfaces/driver/lb-vector-type.h
index 5c393e4..356641f 100644
--- a/interfaces/driver/lb-vector-type.h
+++ b/interfaces/driver/lb-vector-type.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-vector-type.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_vector_type_H
@@ -59,3 +60,12 @@ void UpdateVector() {
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-vector.C b/interfaces/driver/lb-vector.C
index 9735ad9..c79a5cf 100644
--- a/interfaces/driver/lb-vector.C
+++ b/interfaces/driver/lb-vector.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-vector.C
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,15 +17,15 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_vector_C
#define __LINBOX_lb_vector_C
-#include <linbox-config.h>
+#include "linbox-config.h"
#include <lb-vector.h>
#include <lb-vector-function.h>
@@ -367,3 +368,12 @@ void SerializeVector (SerialVector &s, const VectorKey &key) {
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/driver/lb-vector.h b/interfaces/driver/lb-vector.h
index 5c80346..a915e38 100644
--- a/interfaces/driver/lb-vector.h
+++ b/interfaces/driver/lb-vector.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-vector.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_vector_H
@@ -93,3 +94,12 @@ void writeVectorInfo(const VectorKey &k, std::ostream& os);
void SerializeVector (SerialVector &s, const VectorKey &key);
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/kaapi/Makefile.am b/interfaces/kaapi/Makefile.am
index de8ecee..41cb7b4 100644
--- a/interfaces/kaapi/Makefile.am
+++ b/interfaces/kaapi/Makefile.am
@@ -1,6 +1,23 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
pkgincludesubdir=$(pkgincludedir)/kaapi
pkgincludesub_HEADERS = \
diff --git a/interfaces/kaapi/Makefile.in b/interfaces/kaapi/Makefile.in
index e4ef772..0b6d84b 100644
--- a/interfaces/kaapi/Makefile.in
+++ b/interfaces/kaapi/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,10 +15,47 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -41,12 +78,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -54,7 +94,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -63,18 +106,44 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
-pkgincludesubHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkgincludesub_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -86,6 +155,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -109,10 +179,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -133,10 +205,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -145,6 +222,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -161,6 +240,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -223,10 +303,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
pkgincludesubdir = $(pkgincludedir)/kaapi
pkgincludesub_HEADERS = \
communicate.h
@@ -243,9 +319,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps interfaces/kaapi/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps interfaces/kaapi/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps interfaces/kaapi/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps interfaces/kaapi/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -263,6 +339,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -271,21 +348,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludesubdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)"
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludesubHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- $(pkgincludesubHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
done
uninstall-pkgincludesubHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
- done
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -299,7 +380,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -307,29 +388,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -350,13 +436,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -377,16 +467,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -472,6 +568,7 @@ uninstall-am: uninstall-pkgincludesubHEADERS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/interfaces/kaapi/communicate.h b/interfaces/kaapi/communicate.h
index 87b748e..543e8a9 100644
--- a/interfaces/kaapi/communicate.h
+++ b/interfaces/kaapi/communicate.h
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -87,3 +88,12 @@ a1::IStream& operator>>( a1::IStream& in, LinBox::Modular<double>& m)
}
#endif //__LINBOX_kaapi_communicate_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/maple/Makefile.am b/interfaces/maple/Makefile.am
index 72b1deb..d23032c 100644
--- a/interfaces/maple/Makefile.am
+++ b/interfaces/maple/Makefile.am
@@ -1,18 +1,36 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
if LINBOX_HAVE_MAPLE
pkgincludesubdir=$(includedir)/interfaces/maple/new
AM_CPPFLAGS =-I$(top_srcdir) -I. -I../../linbox
-AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I../driver $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(FFLAFLAS_CFLAGS) $(MAPLE_CFLAGS) $(GIVARO_CFLAGS)
+AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I../driver $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(FFLAS_FFPACK_CFLAGS) $(MAPLE_CFLAGS) $(GIVARO_CFLAGS)
lib_LTLIBRARIES=liblbmaple.la
liblbmaple_la_SOURCES= lb-maple.C
-liblbmaple_la_LDFLAGS=$(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(MAPLE_LIBS) $(top_srcdir)/interfaces/driver/liblbdriver.la -Wl,-zmuldefs
+liblbmaple_la_LDFLAGS=$(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(MAPLE_LIBS) $(top_srcdir)/interfaces/driver/liblbdriver.la -Wl,-zmuldefs $(LDFLAGS)
pkginclude_HEADERS =lb-maple.h lb-maple-utilities.h
diff --git a/interfaces/maple/Makefile.in b/interfaces/maple/Makefile.in
index bbf904b..eea2fcb 100644
--- a/interfaces/maple/Makefile.in
+++ b/interfaces/maple/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,48 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -42,12 +79,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -55,7 +95,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -64,14 +107,35 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
liblbmaple_la_LIBADD =
am__liblbmaple_la_SOURCES_DIST = lb-maple.C
@@ -95,8 +159,12 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(liblbmaple_la_SOURCES)
DIST_SOURCES = $(am__liblbmaple_la_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__pkginclude_HEADERS_DIST = lb-maple.h lb-maple-utilities.h
-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkginclude_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -108,6 +176,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -131,10 +200,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -155,10 +226,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -167,6 +243,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -183,6 +261,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -245,16 +324,12 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
@LINBOX_HAVE_MAPLE_TRUE at pkgincludesubdir = $(includedir)/interfaces/maple/new
@LINBOX_HAVE_MAPLE_TRUE at AM_CPPFLAGS = -I$(top_srcdir) -I. -I../../linbox
- at LINBOX_HAVE_MAPLE_TRUE@AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I../driver $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(FFLAFLAS_CFLAGS) $(MAPLE_CFLAGS) $(GIVARO_CFLAGS)
+ at LINBOX_HAVE_MAPLE_TRUE@AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I../driver $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(FFLAS_FFPACK_CFLAGS) $(MAPLE_CFLAGS) $(GIVARO_CFLAGS)
@LINBOX_HAVE_MAPLE_TRUE at lib_LTLIBRARIES = liblbmaple.la
@LINBOX_HAVE_MAPLE_TRUE at liblbmaple_la_SOURCES = lb-maple.C
- at LINBOX_HAVE_MAPLE_TRUE@liblbmaple_la_LDFLAGS = $(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(MAPLE_LIBS) $(top_srcdir)/interfaces/driver/liblbdriver.la -Wl,-zmuldefs
+ at LINBOX_HAVE_MAPLE_TRUE@liblbmaple_la_LDFLAGS = $(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(MAPLE_LIBS) $(top_srcdir)/interfaces/driver/liblbdriver.la -Wl,-zmuldefs $(LDFLAGS)
@LINBOX_HAVE_MAPLE_TRUE at pkginclude_HEADERS = lb-maple.h lb-maple-utilities.h
all: all-am
@@ -269,9 +344,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps interfaces/maple/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps interfaces/maple/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps interfaces/maple/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps interfaces/maple/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -289,23 +364,29 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ list2="$$list2 $$p"; \
else :; fi; \
- done
+ done; \
+ test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+ }
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
done
clean-libLTLIBRARIES:
@@ -316,7 +397,7 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-liblbmaple.la: $(liblbmaple_la_OBJECTS) $(liblbmaple_la_DEPENDENCIES)
+liblbmaple.la: $(liblbmaple_la_OBJECTS) $(liblbmaple_la_DEPENDENCIES) $(EXTRA_liblbmaple_la_DEPENDENCIES)
$(liblbmaple_la_LINK) $(am_liblbmaple_la_rpath) $(liblbmaple_la_OBJECTS) $(liblbmaple_la_LIBADD) $(LIBS)
mostlyclean-compile:
@@ -341,21 +422,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludeHEADERS: $(pkginclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
- @list='$(pkginclude_HEADERS)'; for p in $$list; do \
+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
done
uninstall-pkgincludeHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkginclude_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
- done
+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -369,7 +454,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -377,29 +462,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -420,13 +510,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -447,16 +541,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -488,7 +588,6 @@ info-am:
install-data-am: install-data-local install-pkgincludeHEADERS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-
install-dvi: install-dvi-am
install-dvi-am:
@@ -560,6 +659,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
@LINBOX_HAVE_MAPLE_TRUE at install-data-hook:
@LINBOX_HAVE_MAPLE_TRUE@ cd $(libdir) && \
@LINBOX_HAVE_MAPLE_TRUE@ $(MAPLE_HOME)/bin/maple lb-maple.mpl 2>&1 > /dev/null
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/interfaces/maple/lb-maple-utilities.h b/interfaces/maple/lb-maple-utilities.h
index c49d3d8..e85cba1 100644
--- a/interfaces/maple/lb-maple-utilities.h
+++ b/interfaces/maple/lb-maple-utilities.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-maple-utilities.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,16 +17,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lb_maple_utilities_H
#define __LINBOX_lb_maple_utilities_H
-#include <linbox-config.h>
+#include "linbox-config.h"
#include <lb-driver.h>
extern "C" {
#include <gmp.h>
@@ -660,3 +661,12 @@ extern "C" {
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/maple/lb-maple.C b/interfaces/maple/lb-maple.C
index d200fb1..e2b8fa0 100644
--- a/interfaces/maple/lb-maple.C
+++ b/interfaces/maple/lb-maple.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-maple.C
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -29,7 +30,7 @@
#include <iostream>
#include <lb-driver.h>
#include <lb-maple-utilities.h>
-#include <linbox/util/timer.h>
+#include "linbox/util/timer.h"
extern "C"{
#include <maplec.h>
@@ -1037,3 +1038,12 @@ extern "C" {
} // end of extern "C"
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/maple/lb-maple.h b/interfaces/maple/lb-maple.h
index 3371cd9..188a5c3 100644
--- a/interfaces/maple/lb-maple.h
+++ b/interfaces/maple/lb-maple.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* lb-maple.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -98,3 +99,12 @@ extern "C" {
} // end of extern "C"
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/sage/Makefile.am b/interfaces/sage/Makefile.am
index a247163..f7c690c 100644
--- a/interfaces/sage/Makefile.am
+++ b/interfaces/sage/Makefile.am
@@ -1,11 +1,29 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
if LINBOX_HAVE_SAGE
AM_CPPFLAGS=-I$(top_srcdir) -I. -I../../linbox
-AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(FFLAFLAS_CFLAGS) $(GIVARO_CFLAGS)
+AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(FFLAS_FFPACK_CFLAGS) $(GIVARO_CFLAGS)
lib_LTLIBRARIES = liblinboxsage.la
@@ -14,6 +32,8 @@ liblinboxsage_la_SOURCES = linbox-sage.C
pkginclude_HEADERS = linbox-sage.h
#liblinboxsage_la_LIBADD = -llinbox $(BLAS_LIBS)
+#gentoo's linbox-1.1.6-fix-undefined-symbols.patch
+liblinboxsage_la_LIBADD = $(top_builddir)/linbox/liblinbox.la
-liblinboxsage_la_LDFLAGS = $(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(MAPLE_LIBS) -version-info 0:0:0 #-Wl,-zmuldefs
+liblinboxsage_la_LDFLAGS = $(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(MAPLE_LIBS) $(LDFLAGS) -version-info 0:0:0 #-Wl,-zmuldefs
endif
diff --git a/interfaces/sage/Makefile.in b/interfaces/sage/Makefile.in
index c9375ad..924dc48 100644
--- a/interfaces/sage/Makefile.in
+++ b/interfaces/sage/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,48 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -42,12 +79,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -55,7 +95,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -64,16 +107,38 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
-liblinboxsage_la_LIBADD =
+ at LINBOX_HAVE_SAGE_TRUE@liblinboxsage_la_DEPENDENCIES = \
+ at LINBOX_HAVE_SAGE_TRUE@ $(top_builddir)/linbox/liblinbox.la
am__liblinboxsage_la_SOURCES_DIST = linbox-sage.C
@LINBOX_HAVE_SAGE_TRUE at am_liblinboxsage_la_OBJECTS = linbox-sage.lo
liblinboxsage_la_OBJECTS = $(am_liblinboxsage_la_OBJECTS)
@@ -95,8 +160,12 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(liblinboxsage_la_SOURCES)
DIST_SOURCES = $(am__liblinboxsage_la_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__pkginclude_HEADERS_DIST = linbox-sage.h
-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkginclude_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -108,6 +177,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -131,10 +201,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -155,10 +227,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -167,6 +244,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -183,6 +262,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -245,18 +325,16 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
@LINBOX_HAVE_SAGE_TRUE at AM_CPPFLAGS = -I$(top_srcdir) -I. -I../../linbox
- at LINBOX_HAVE_SAGE_TRUE@AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(FFLAFLAS_CFLAGS) $(GIVARO_CFLAGS)
+ at LINBOX_HAVE_SAGE_TRUE@AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(FFLAS_FFPACK_CFLAGS) $(GIVARO_CFLAGS)
@LINBOX_HAVE_SAGE_TRUE at lib_LTLIBRARIES = liblinboxsage.la
@LINBOX_HAVE_SAGE_TRUE at liblinboxsage_la_SOURCES = linbox-sage.C
@LINBOX_HAVE_SAGE_TRUE at pkginclude_HEADERS = linbox-sage.h
#liblinboxsage_la_LIBADD = -llinbox $(BLAS_LIBS)
- at LINBOX_HAVE_SAGE_TRUE@liblinboxsage_la_LDFLAGS = $(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(MAPLE_LIBS) -version-info 0:0:0 #-Wl,-zmuldefs
+#gentoo's linbox-1.1.6-fix-undefined-symbols.patch
+ at LINBOX_HAVE_SAGE_TRUE@liblinboxsage_la_LIBADD = $(top_builddir)/linbox/liblinbox.la
+ at LINBOX_HAVE_SAGE_TRUE@liblinboxsage_la_LDFLAGS = $(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(MAPLE_LIBS) $(LDFLAGS) -version-info 0:0:0 #-Wl,-zmuldefs
all: all-am
.SUFFIXES:
@@ -270,9 +348,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps interfaces/sage/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps interfaces/sage/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps interfaces/sage/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps interfaces/sage/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -290,23 +368,29 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ list2="$$list2 $$p"; \
else :; fi; \
- done
+ done; \
+ test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+ }
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
done
clean-libLTLIBRARIES:
@@ -317,7 +401,7 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-liblinboxsage.la: $(liblinboxsage_la_OBJECTS) $(liblinboxsage_la_DEPENDENCIES)
+liblinboxsage.la: $(liblinboxsage_la_OBJECTS) $(liblinboxsage_la_DEPENDENCIES) $(EXTRA_liblinboxsage_la_DEPENDENCIES)
$(liblinboxsage_la_LINK) $(am_liblinboxsage_la_rpath) $(liblinboxsage_la_OBJECTS) $(liblinboxsage_la_LIBADD) $(LIBS)
mostlyclean-compile:
@@ -342,21 +426,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludeHEADERS: $(pkginclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
- @list='$(pkginclude_HEADERS)'; for p in $$list; do \
+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
done
uninstall-pkgincludeHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkginclude_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
- done
+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -370,7 +458,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -378,29 +466,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -421,13 +514,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -448,16 +545,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -548,6 +651,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/interfaces/sage/linbox-sage.C b/interfaces/sage/linbox-sage.C
index d42f99f..fd2197b 100644
--- a/interfaces/sage/linbox-sage.C
+++ b/interfaces/sage/linbox-sage.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox-sage.C
* Copyright (C) 2007 Martin Albrecht
* 2008 Clement Pernet
@@ -7,10 +5,13 @@
* Written by Martin Albrecht
* Clement Pernet <clement.pernet at gmail.com>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#include <iostream>
@@ -32,32 +33,32 @@
#include "linbox-sage.h"
-#include <linbox/util/commentator.h>
+#include "linbox/util/commentator.h"
-#include <linbox/blackbox/sparse.h>
+#include "linbox/blackbox/sparse.h"
//#include "linbox/element/givaro-polynomial.h"
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/matrix/sparse.h>
-#include <linbox/vector/sparse.h>
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/matrix/sparse.h"
+#include "linbox/vector/sparse.h"
-#include <linbox/algorithms/blas-domain.h>
-#include <linbox/algorithms/echelon-form.h>
+#include "linbox/algorithms/blas-domain.h"
+#include "linbox/algorithms/echelon-form.h"
#include "linbox/algorithms/gauss.h"
#include "linbox/algorithms/smith-form-adaptive.h"
-#include "fflas-ffpack/ffpack/ffpack.h"
-#include <linbox/solutions/rank.h>
-#include <linbox/solutions/det.h>
-#include <linbox/solutions/solve.h>
+#include <fflas-ffpack/ffpack/ffpack.h>
+#include "linbox/solutions/rank.h"
+#include "linbox/solutions/det.h"
+#include "linbox/solutions/solve.h"
#include "linbox/solutions/methods.h"
-#include <linbox/solutions/minpoly.h>
-#include <linbox/solutions/charpoly.h>
+#include "linbox/solutions/minpoly.h"
+#include "linbox/solutions/charpoly.h"
#include "linbox/algorithms/double-det.h"
-#include <linbox/integer.h>
-#include <linbox/field/gmp-rational.h>
-#include <linbox/ring/givaro-polynomial.h>
-#include <linbox/field/modular.h>
+#include "linbox/integer.h"
+#include "linbox/field/gmp-rational.h"
+#include "linbox/ring/givaro-polynomial.h"
+#include "linbox/field/modular.h"
using namespace LinBox;
@@ -71,7 +72,9 @@ using namespace LinBox;
most don't build. This combination below does though.
*/
-void linbox_modn_dense_delete_array_double(double * f) {delete[] f;
+void linbox_modn_dense_delete_array_double(double * f)
+{
+ delete[] f;
}
void linbox_modn_dense_delete_array_float(float * f) {delete[] f;
}
@@ -93,7 +96,8 @@ unsigned long int linbox_modn_dense_echelonize (Element modulus, Element* matrix
if (i<r)
*(matrix + i*(ncols+1)) = 1;
}
- FFPACK::applyP (F, FFLAS::FflasRight, FFLAS::FflasNoTrans, nrows, 0,r, matrix, ncols, Q);
+ FFPACK::applyP (F, FFLAS::FflasRight, FFLAS::FflasNoTrans,
+ nrows, 0,(int)r, matrix, ncols, Q);
delete[] P;
delete[] Q;
return r;
@@ -101,12 +105,12 @@ unsigned long int linbox_modn_dense_echelonize (Element modulus, Element* matrix
EXTERN unsigned long int linbox_modn_dense_echelonize_double (double modulus, double*matrix, size_t nrows, size_t ncols)
{
- return linbox_modn_dense_echelonize<double>(modulus, matrix, nrows, ncols);
+ return (unsigned long) linbox_modn_dense_echelonize<double>(modulus, matrix, nrows, ncols);
}
EXTERN unsigned long int linbox_modn_dense_echelonize_float (float modulus, float * matrix, size_t nrows, size_t ncols)
{
- return linbox_modn_dense_echelonize<float>(modulus,matrix,nrows,ncols);
+ return (unsigned long) linbox_modn_dense_echelonize<float>(modulus,matrix,nrows,ncols);
}
template<class Element>
@@ -196,10 +200,10 @@ Polynomial & mulpoly(const Field& F, Polynomial &res, const Polynomial & P1, con
size_t i,j;
// Warning: assumes that res is allocated to the size of the product
//res.resize(P1.size()+P2.size()-1);
- for (i=0;i<res.size();i++)
+ for (i=0;i<res.size();++i)
F.assign(res[i], 0.0);
- for ( i=0;i<P1.size();i++)
- for ( j=0;j<P2.size();j++)
+ for ( i=0;i<P1.size();++i)
+ for ( j=0;j<P2.size();++j)
F.axpyin(res[i+j],P1[i],P2[j]);
return res;
@@ -348,7 +352,7 @@ EXTERN float* linbox_modn_dense_matrix_matrix_general_multiply_float (float modu
dense over ZZ
*************************************************************************/
-typedef PID_integer Integers;
+typedef PID_integer IntegerRing;
template <class Field, class Polynomial>
void printPolynomial (const Field &F, const Polynomial &v)
@@ -361,18 +365,18 @@ void printPolynomial (const Field &F, const Polynomial &v)
std::cout << std::endl;
}
-Integers ZZ;
+IntegerRing staticZZ;
SpyInteger spy;
-typedef GivPolynomialRing<Integers,::Givaro::Dense> IntPolRing;
+typedef GivPolynomialRing<IntegerRing, Givaro::Dense> IntPolRing;
-DenseMatrix<Integers> new_matrix(mpz_t** matrix, size_t nrows, size_t ncols)
+BlasMatrix<IntegerRing> new_matrix(mpz_t** matrix, size_t nrows, size_t ncols)
{
- DenseMatrix<Integers> A ( ZZ, nrows, ncols);
+ BlasMatrix<IntegerRing> A ( staticZZ, nrows, ncols);
size_t i, j;
- for (i=0; i < nrows; i++) {
- for (j=0; j < ncols; j++) {
- Integers::Element t;
+ for (i=0; i < nrows; ++i) {
+ for (j=0; j < ncols; ++j) {
+ IntegerRing::Element t;
mpz_set(spy.get_mpz(t), matrix[i][j]);
A.setEntry(i, j, t);
}
@@ -380,15 +384,15 @@ DenseMatrix<Integers> new_matrix(mpz_t** matrix, size_t nrows, size_t ncols)
return A;
}
-DenseMatrix<Integers> new_matrix_integers(mpz_t** matrix, size_t nrows, size_t ncols)
+BlasMatrix<IntegerRing> new_matrix_integers(mpz_t** matrix, size_t nrows, size_t ncols)
{
- Integers ZZ;
- DenseMatrix<Integers> A ( ZZ,nrows, ncols);
+ IntegerRing Z;
+ BlasMatrix<IntegerRing> A ( Z,nrows, ncols);
size_t i, j;
- for (i=0; i < nrows; i++) {
- for (j=0; j < ncols; j++) {
- Integers::Element t;
+ for (i=0; i < nrows; ++i) {
+ for (j=0; j < ncols; ++j) {
+ IntegerRing::Element t;
mpz_set(spy.get_mpz(t), matrix[i][j]);
A.setEntry(i, j, t);
}
@@ -396,12 +400,12 @@ DenseMatrix<Integers> new_matrix_integers(mpz_t** matrix, size_t nrows, size_t n
return A;
}
-template<class Element>
-void set_matrix(mpz_t** matrix, BlasMatrix<Element>& A, size_t nrows, size_t ncols)
+template<class Field>
+void set_matrix(mpz_t** matrix, BlasMatrix<Field>& A, size_t nrows, size_t ncols)
{
size_t i, j;
- for (i=0; i < nrows; i++) {
- for (j=0; j < ncols; j++) {
+ for (i=0; i < nrows; ++i) {
+ for (j=0; j < ncols; ++j) {
mpz_set(matrix[i][j], spy.get_mpz(A.getEntry(i,j)));
}
}
@@ -420,18 +424,18 @@ void linbox_integer_dense_minpoly_hacked(mpz_t* *mp, size_t* degree, size_t n, m
m = n;
}
- DenseMatrix<Integers> A( ZZ, m, m);
+ BlasMatrix<IntegerRing> A( staticZZ, m, m);
size_t i, j;
- Integers::Element t;
- for (i=0; i < n; i++) {
- for (j=0; j < n; j++) {
+ IntegerRing::Element t;
+ for (i=0; i < n; ++i) {
+ for (j=0; j < n; ++j) {
mpz_set(spy.get_mpz(t), matrix[i][j]);
A.setEntry(i, j, t);
}
}
- // vector<Integers::Element> m_A;
+ // vector<IntegerRing::Element> m_A;
IntPolRing::Element m_A;
if (do_minpoly)
@@ -456,9 +460,9 @@ void linbox_integer_dense_minpoly_hacked(mpz_t* *mp, size_t* degree, size_t n, m
/* x was not a factor of the charpoly after all. */
(*mp) = new mpz_t[m_A.size()-1];
*degree = m_A.size() - 2;
- for (size_t i=0; i <= *degree; i++) {
- mpz_init((*mp)[i]);
- mpz_set((*mp)[i], spy.get_mpz(m_A[i+1]));
+ for (size_t k=0; k <= *degree; ++k) {
+ mpz_init((*mp)[k]);
+ mpz_set((*mp)[k], spy.get_mpz(m_A[k+1]));
}
return;
}
@@ -466,9 +470,9 @@ void linbox_integer_dense_minpoly_hacked(mpz_t* *mp, size_t* degree, size_t n, m
(*mp) = new mpz_t[m_A.size()];
*degree = m_A.size() - 1;
- for (size_t i=0; i <= *degree; i++) {
- mpz_init((*mp)[i]);
- mpz_set((*mp)[i], spy.get_mpz(m_A[i]));
+ for (size_t k=0; k <= *degree; ++k) {
+ mpz_init((*mp)[k]);
+ mpz_set((*mp)[k], spy.get_mpz(m_A[k]));
}
}
@@ -478,13 +482,13 @@ void linbox_integer_dense_charpoly(mpz_t* *mp, size_t* degree, size_t n, mpz_t**
/* THIS IS Broken when n % 4 == 0!!!! Use above function instead. */
/* linbox_integer_dense_minpoly(mp, degree, n, matrix, 0); */
- DenseMatrix<Integers> A(new_matrix(matrix, n, n));
+ BlasMatrix<IntegerRing> A(new_matrix(matrix, n, n));
IntPolRing::Element m_A;
charpoly(m_A, A);
(*mp) = new mpz_t[m_A.size()];
*degree = m_A.size() - 1;
- for (size_t i=0; i <= *degree; i++) {
+ for (size_t i=0; i <= *degree; ++i) {
mpz_init((*mp)[i]);
mpz_set((*mp)[i], spy.get_mpz(m_A[i]));
}
@@ -496,13 +500,13 @@ void linbox_integer_dense_minpoly(mpz_t* *mp, size_t* degree, size_t n, mpz_t**
/* THIS IS Broken when n % 4 == 0!!!! Use above function instead. */
/* linbox_integer_dense_minpoly(mp, degree, n, matrix, 0); */
- DenseMatrix<Integers> A(new_matrix(matrix, n, n));
+ BlasMatrix<IntegerRing> A(new_matrix(matrix, n, n));
IntPolRing::Element m_A;
minpoly(m_A, A);
(*mp) = new mpz_t[m_A.size()];
*degree = m_A.size() - 1;
- for (size_t i=0; i <= *degree; i++) {
+ for (size_t i=0; i <= *degree; ++i) {
mpz_init((*mp)[i]);
mpz_set((*mp)[i], spy.get_mpz(m_A[i]));
}
@@ -517,16 +521,16 @@ void linbox_integer_dense_delete_array(mpz_t* f)
int linbox_integer_dense_matrix_matrix_multiply(mpz_t** ans, mpz_t **A, mpz_t **B,
size_t A_nr, size_t A_nc, size_t B_nr, size_t B_nc)
{
- typedef PID_integer Integers;
- Integers ZZ;
+ typedef PID_integer Integerz;
+ Integerz Z;
- BlasMatrix<Integers::Element> AA(new_matrix_integers(A, A_nr, A_nc));
- BlasMatrix<Integers::Element> BB(new_matrix_integers(B, B_nr, B_nc));
+ BlasMatrix<Integerz> AA(new_matrix_integers(A, A_nr, A_nc));
+ BlasMatrix<Integerz> BB(new_matrix_integers(B, B_nr, B_nc));
if (A_nc != B_nr)
return -1; // error
- BlasMatrix<Integers::Element> CC( A_nr, B_nc);
+ BlasMatrix<Integerz> CC(Z, A_nr, B_nc);
- MatrixDomain<Integers> MD(ZZ);
+ MatrixDomain<Integerz> MD(Z);
MD.mul(CC, AA, BB);
@@ -538,7 +542,7 @@ int linbox_integer_dense_matrix_matrix_multiply(mpz_t** ans, mpz_t **A, mpz_t **
unsigned long linbox_integer_dense_rank(mpz_t** matrix, size_t nrows,
size_t ncols)
{
- DenseMatrix<Integers> A(new_matrix(matrix, nrows, ncols));
+ BlasMatrix<IntegerRing> A(new_matrix(matrix, nrows, ncols));
unsigned long r;
rank(r, A);
return r;
@@ -547,27 +551,27 @@ unsigned long linbox_integer_dense_rank(mpz_t** matrix, size_t nrows,
void linbox_integer_dense_det(mpz_t ans, mpz_t** matrix, size_t nrows,
size_t ncols)
{
- commentator.setMaxDetailLevel(0);
- commentator.setMaxDepth (0);
+ commentator().setMaxDetailLevel(0);
+ commentator().setMaxDepth (0);
- DenseMatrix<Integers> A(new_matrix_integers(matrix, nrows, ncols));
- Integers::Element d;
+ BlasMatrix<IntegerRing> A(new_matrix_integers(matrix, nrows, ncols));
+ IntegerRing::Element d;
det(d, A);
mpz_set(ans, spy.get_mpz(d));
}
#ifdef __LINBOX_HAVE_NTL
-DenseMatrix<NTL_ZZ> new_matrix_integer_dense_ntl(mpz_t** matrix, size_t nrows, size_t ncols)
+BlasMatrix<NTL_ZZ> new_matrix_integer_dense_ntl(mpz_t** matrix, size_t nrows, size_t ncols)
{
- NTL_ZZ ZZ;
- DenseMatrix<NTL_ZZ> A (ZZ,nrows, ncols);
+ NTL_ZZ Z;
+ BlasMatrix<NTL_ZZ> A (Z,nrows, ncols);
size_t i, j;
- for (i=0; i < nrows; i++) {
- for (j=0; j < ncols; j++) {
+ for (i=0; i < nrows; ++i) {
+ for (j=0; j < ncols; ++j) {
NTL_ZZ::Element t;
PID_integer::Element s;
mpz_set(spy.get_mpz(s), matrix[i][j]);
- ZZ.init(t, s);
+ Z.init(t, s);
A.setEntry(i, j, t);
}
}
@@ -579,17 +583,17 @@ void linbox_integer_dense_double_det (mpz_t ans1, mpz_t ans2, mpz_t **a, mpz_t
size_t n, int proof)
{
- PID_integer ZZ;
- BlasBlackbox <PID_integer> A (ZZ, n+1, n);
+ PID_integer Z;
+ BlasMatrix <PID_integer> A (Z, n+1, n);
size_t i, j;
- for (i=0; i < n-1; i++) {
- for (j=0; j < n; j++) {
+ for (i=0; i < n-1; ++i) {
+ for (j=0; j < n; ++j) {
PID_integer::Element t;
mpz_set(spy.get_mpz(t), a[i][j]);
A.setEntry(i, j, t);
}
}
- for (j=0; j < n; j++) {
+ for (j=0; j < n; ++j) {
PID_integer::Element t;
mpz_set(spy.get_mpz(t), b[0][j]);
A.setEntry (n-1, j, t);
@@ -610,12 +614,12 @@ void linbox_integer_dense_smithform(mpz_t **v,
{
typedef NTL_ZZ Ints;
Ints Z;
- DenseMatrix<Ints> M(new_matrix_integer_dense_ntl(matrix, nrows, ncols));
+ BlasMatrix<Ints> M(new_matrix_integer_dense_ntl(matrix, nrows, ncols));
std::vector<integer> w(ncols);
SmithFormAdaptive::smithForm(w, M);
(*v) = new mpz_t[ncols];
- for (size_t i=0; i < ncols; i++) {
+ for (size_t i=0; i < ncols; ++i) {
mpz_init((*v)[i]);
mpz_set((*v)[i], spy.get_mpz(w[i]));
}
@@ -638,8 +642,8 @@ struct c_vector_modint_linbox {
typedef unsigned int mod_int;
typedef Modular<unsigned int> GFp;
-typedef GFp::Element Element;
-typedef std::vector <std::pair <size_t, Element> > SparseSeqVectorGFp;
+typedef GFp::Element GFpElement;
+typedef std::vector <std::pair <size_t, GFpElement> > SparseSeqVectorGFp;
typedef SparseMatrix<GFp, SparseSeqVectorGFp> SparseMatrixGFp;
static SparseMatrixGFp linbox_new_modn_sparse_matrix(mod_int modulus, size_t numrows, size_t numcols, void *rows)
@@ -649,26 +653,26 @@ static SparseMatrixGFp linbox_new_modn_sparse_matrix(mod_int modulus, size_t num
struct c_vector_modint_linbox *A = static_cast<struct c_vector_modint_linbox *>(rows);
- for(size_t i = 0; i < numrows; i++) {
- for(size_t j = 0; j < A[i].num_nonzero; j++) {
+ for(size_t i = 0; i < numrows; ++i) {
+ for(size_t j = 0; j < A[i].num_nonzero; ++j) {
M.setEntry(i, A[i].positions[j], A[i].entries[j]);
}
}
return M;
}
-static std::vector<Element> linbox_new_modn_sparse_vector(mod_int modulus, size_t len, void *_vec)
+static std::vector<GFpElement> linbox_new_modn_sparse_vector(mod_int modulus, size_t len, void *_vec)
{
GFp F(modulus);
- std::vector<GFp::Element> A(len);
+ std::vector<GFpElement> A(len);
if (_vec==NULL) {
return A;
}
struct c_vector_modint_linbox *vec = static_cast<struct c_vector_modint_linbox*>(_vec);
- for(size_t i = 0; i < vec->num_nonzero; i++) {
+ for(size_t i = 0; i < vec->num_nonzero; ++i) {
A[vec->positions[i]] = vec->entries[i];
}
return A;
@@ -680,7 +684,7 @@ unsigned long linbox_modn_sparse_matrix_rank(mod_int modulus,
{
GFp F(modulus);
unsigned long M_rank;
- Element M_det;
+ GFpElement M_det;
GaussDomain<GFp> dom(F);
SparseMatrixGFp M( linbox_new_modn_sparse_matrix(modulus, numrows, numcols, rows) );
@@ -695,7 +699,7 @@ unsigned long linbox_modn_sparse_matrix_rank(mod_int modulus,
//*pivots = (int*)calloc(sizeof(int), dom.pivots.size());
// int j=0;
- // for(std::vector<int>::const_iterator i= dom.pivots.begin(); i!= dom.pivots.end(); i++, j++){
+ // for(std::vector<int>::const_iterator i= dom.pivots.begin(); i!= dom.pivots.end(); ++i, ++j){
// (*pivots)[j] = *i;
// }
@@ -731,3 +735,12 @@ std::vector<mod_int> linbox_modn_sparse_matrix_solve(mod_int p, size_t numrows,
}
return X;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/interfaces/sage/linbox-sage.h b/interfaces/sage/linbox-sage.h
index 04eef53..e249228 100644
--- a/interfaces/sage/linbox-sage.h
+++ b/interfaces/sage/linbox-sage.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox-sage.h
* Copyright (C) 2007 Martin Albrecht
* 2008 Clement Pernet
@@ -7,10 +5,13 @@
* Written by Martin Albrecht
* Clement Pernet <clement.pernet at gmail.com>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_sage_H
@@ -105,20 +106,20 @@ EXTERN unsigned long linbox_modn_dense_col_rankprofile_submatrix_indices_float (
/* linbox_minpoly allocates space for minpoly, so you have to call linbox_delete_array
to free it up afterwards. */
-void linbox_integer_dense_minpoly (mpz_t*& minpoly, size_t& degree, size_t n, mpz_t* matrix);
+void linbox_integer_dense_minpoly (mpz_t*& minpoly, size_t& degree, size_t n, mpz_t** matrix);
-void linbox_integer_dense_charpoly (mpz_t*& minpoly, size_t& degree, size_t n, mpz_t* matrix);
+void linbox_integer_dense_charpoly (mpz_t*& minpoly, size_t& degree, size_t n, mpz_t** matrix);
void linbox_integer_dense_delete_array (mpz_t* f);
/* ans must be a pre-allocated and pre-initialized array of GMP ints. */
-int linbox_integer_dense_matrix_matrix_multiply (mpz_t* ans, mpz_t *A, mpz_t *B, size_t m, size_t n, size_t k);
+int linbox_integer_dense_matrix_matrix_multiply (mpz_t** ans, mpz_t **A, mpz_t **B, size_t m, size_t n, size_t k);
-unsigned long linbox_integer_dense_rank(mpz_t* matrix, size_t nrows, size_t ncols);
+unsigned long linbox_integer_dense_rank(mpz_t** matrix, size_t nrows, size_t ncols);
-void linbox_integer_dense_det(mpz_t ans, mpz_t* matrix, size_t nrows, size_t ncols);
+void linbox_integer_dense_det(mpz_t ans, mpz_t** matrix, size_t nrows, size_t ncols);
-void linbox_integer_dense_smithform(mpz_t *&v, mpz_t *matrix, size_t nrows, size_t ncols);
+void linbox_integer_dense_smithform(mpz_t *&v, mpz_t **matrix, size_t nrows, size_t ncols);
void linbox_integer_dense_double_det (mpz_t ans1, mpz_t ans2, mpz_t **a, mpz_t ** b, mpz_t **c, size_t n, int proof);
@@ -140,3 +141,12 @@ std::vector<unsigned int> linbox_modn_sparse_matrix_solve (unsigned int modulus,
int method);
#endif // __LINBOX_SAGE_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox-config.in b/linbox-config.in
index e962137..b27dbd9 100644
--- a/linbox-config.in
+++ b/linbox-config.in
@@ -9,6 +9,18 @@ exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
+major=`echo @VERSION@ | cut -d'.' -f1`
+minor=`echo @VERSION@ | cut -d'.' -f2`
+micro=`echo @VERSION@ | cut -d'.' -f3`
+decvr=$((((($major*100)+$minor)*100)+$micro))
+
+
+cflags=false
+libs=false
+
+
+
+
usage()
{
cat <<EOF
@@ -20,7 +32,8 @@ Known values for OPTION are:
--libs print library linking information
--cflags print pre-processor and compiler flags
--help display this help and exit
- --version output version information
+ --version output version information string (eg @VERSION@)
+ --decimal-version output version information number (eg $decvr)
EOF
@@ -31,9 +44,6 @@ if test $# -eq 0; then
usage 1
fi
-cflags=false
-libs=false
-
while test $# -gt 0; do
case "$1" in
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
@@ -54,6 +64,11 @@ while test $# -gt 0; do
exit 0
;;
+ --decimal-version)
+ echo $decvr
+ exit 0
+ ;;
+
--help)
usage 0
;;
diff --git a/linbox/Makefile.am b/linbox/Makefile.am
index aeed4e5..405658c 100644
--- a/linbox/Makefile.am
+++ b/linbox/Makefile.am
@@ -1,6 +1,24 @@
# Copyright (c) 2010 the LinBox group
# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
+
AM_CPPFLAGS=-I$(top_srcdir)
SUBDIRS=util element field randiter vector matrix blackbox switch algorithms solutions ring
diff --git a/linbox/Makefile.in b/linbox/Makefile.in
index 23eff1d..eca8f1d 100644
--- a/linbox/Makefile.in
+++ b/linbox/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,50 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# This file is part of LinBox
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -42,12 +81,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -55,7 +97,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -64,14 +109,35 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
liblinbox_la_DEPENDENCIES = util/libutil.la randiter/libranditer.la \
algorithms/libalgorithms.la
@@ -98,14 +164,46 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
HEADERS = $(pkginclude_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -113,6 +211,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -136,10 +235,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -160,10 +261,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -172,6 +278,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -188,6 +296,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -250,10 +359,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
AM_CPPFLAGS = -I$(top_srcdir)
SUBDIRS = util element field randiter vector matrix blackbox switch algorithms solutions ring
BASIC_HDRS = \
@@ -299,9 +404,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps linbox/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -319,23 +424,29 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ list2="$$list2 $$p"; \
else :; fi; \
- done
+ done; \
+ test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+ }
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
done
clean-libLTLIBRARIES:
@@ -346,7 +457,7 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-liblinbox.la: $(liblinbox_la_OBJECTS) $(liblinbox_la_DEPENDENCIES)
+liblinbox.la: $(liblinbox_la_OBJECTS) $(liblinbox_la_DEPENDENCIES) $(EXTRA_liblinbox_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(liblinbox_la_OBJECTS) $(liblinbox_la_LIBADD) $(LIBS)
mostlyclean-compile:
@@ -371,21 +482,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludeHEADERS: $(pkginclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
- @list='$(pkginclude_HEADERS)'; for p in $$list; do \
+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
done
uninstall-pkgincludeHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkginclude_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
- done
+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -411,7 +526,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -445,16 +560,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -469,7 +584,7 @@ tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -481,7 +596,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -490,29 +605,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -533,29 +653,41 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -578,16 +710,22 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -661,8 +799,8 @@ ps-am:
uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic \
@@ -681,6 +819,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
tags tags-recursive uninstall uninstall-am \
uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/linbox/algorithms/Makefile.am b/linbox/algorithms/Makefile.am
index 310472e..b011792 100644
--- a/linbox/algorithms/Makefile.am
+++ b/linbox/algorithms/Makefile.am
@@ -1,15 +1,35 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
pkgincludesubdir=$(pkgincludedir)/algorithms
+SUBDIRS=gauss matrix-blas3
+
noinst_LTLIBRARIES=libalgorithms.la
libalgorithms_la_SOURCES= diophantine-solver.C
# AM_CPPFLAGS= $(CBLAS_FLAG) $(GMP_CFLAGS) $(NTL_CFLAGS) $(GIVARO_CFLAGS) $(LIDIA_CFLAGS)
-AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(CBLAS_FLAG) $(FFLAFLAS_CFLAGS) $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(GIVARO_CFLAGS) $(LIDIA_CFLAGS)
+AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(CBLAS_FLAG) $(FFLAS_FFPACK_CFLAGS) $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(GIVARO_CFLAGS) $(LIDIA_CFLAGS) $(FPLLL_CFLAGS)
pkgincludesub_HEADERS = \
blackbox-container.h \
@@ -27,20 +47,8 @@ pkgincludesub_HEADERS = \
la-block-lanczos.h la-block-lanczos.inl \
eliminator.h eliminator.inl \
gauss.h \
- gauss.inl \
- gauss-det.inl \
- gauss-rank.inl \
- gauss-solve.inl \
- gauss-nullspace.inl \
- gauss-elim.inl \
- gauss-pivot.inl \
triangular-solve.h \
gauss-gf2.h \
- gauss-gf2.inl \
- gauss-elim-gf2.inl \
- gauss-rank-gf2.inl \
- gauss-pivot-gf2.inl \
- gauss-solve-gf2.inl \
triangular-solve-gf2.h \
dense-container.h \
cra-mpi.h \
@@ -61,6 +69,7 @@ pkgincludesub_HEADERS = \
rational-cra-full-multip.h \
blas-domain.h \
blas-domain.inl \
+ blas-domain-multimod.h \
bitonic-sort.h \
blackbox-block-container-base.h \
blackbox-block-container.h \
@@ -74,18 +83,18 @@ pkgincludesub_HEADERS = \
hybrid-det.h \
lifting-container.h \
smith-form-local.h \
- smith-form-local2.h \
+ smith-form-local2.inl \
matrix-inverse.h \
matrix-hom.h \
matrix-rank.h \
- numeric-solver-lapack.h \
- rational-solver-sn.h \
- rational-solver-sn.inl \
- dyadic-to-rational.h \
+ numeric-solver-lapack.h \
+ rational-solver-sn.h \
+ rational-solver-sn.inl \
+ dyadic-to-rational.h \
rational-reconstruction.h \
rational-reconstruction-base.h \
classic-rational-reconstruction.h \
- fast-rational-reconstruction.h \
+ fast-rational-reconstruction.h \
rational-solver.h \
rational-solver2.h \
rational-solver.inl \
@@ -95,6 +104,7 @@ pkgincludesub_HEADERS = \
smith-form-adaptive.h \
smith-form-adaptive.inl \
smith-form-sparseelim-local.h \
+ smith-form-sparseelim-poweroftwo.h \
rational-reconstruction2.h \
rational-solver-adaptive.h \
varprec-cra-early-single.h \
@@ -102,6 +112,7 @@ pkgincludesub_HEADERS = \
vector-fraction.h \
whisart_trace.h \
cia.h \
+ lattice.h lattice.inl \
bbcharpoly.h \
charpoly-rational.h \
minpoly-integer.h \
@@ -111,8 +122,10 @@ pkgincludesub_HEADERS = \
echelon-form.h \
toeplitz-det.h \
dense-nullspace.h dense-nullspace.inl \
- linbox-tags.h \
- rns.h rns.inl
+ linbox-tags.h \
+ bm-seq.h \
+ short-vector.h \
+ rns.h rns.inl
EXTRA_DIST = \
algorithms.doxy \
@@ -121,6 +134,8 @@ EXTRA_DIST = \
lanczos.doxy \
sigmabasis.doxy \
elimination.doxy \
- diophantine.doxy
+ lattice.doxy \
+ diophantine.doxy \
+ gauss.doxy
diff --git a/linbox/algorithms/Makefile.in b/linbox/algorithms/Makefile.in
index b608bea..f79170b 100644
--- a/linbox/algorithms/Makefile.in
+++ b/linbox/algorithms/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,48 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -42,12 +79,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -55,7 +95,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -64,6 +107,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libalgorithms_la_LIBADD =
am_libalgorithms_la_OBJECTS = diophantine-solver.lo
@@ -82,18 +126,81 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libalgorithms_la_SOURCES)
DIST_SOURCES = $(libalgorithms_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
-pkgincludesubHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkgincludesub_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
ETAGS = etags
CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -101,6 +208,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -124,10 +232,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -148,10 +258,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -160,6 +275,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -176,6 +293,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -238,16 +356,13 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
pkgincludesubdir = $(pkgincludedir)/algorithms
+SUBDIRS = gauss matrix-blas3
noinst_LTLIBRARIES = libalgorithms.la
libalgorithms_la_SOURCES = diophantine-solver.C
# AM_CPPFLAGS= $(CBLAS_FLAG) $(GMP_CFLAGS) $(NTL_CFLAGS) $(GIVARO_CFLAGS) $(LIDIA_CFLAGS)
-AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(CBLAS_FLAG) $(FFLAFLAS_CFLAGS) $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(GIVARO_CFLAGS) $(LIDIA_CFLAGS)
+AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(CBLAS_FLAG) $(FFLAS_FFPACK_CFLAGS) $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(GIVARO_CFLAGS) $(LIDIA_CFLAGS) $(FPLLL_CFLAGS)
pkgincludesub_HEADERS = \
blackbox-container.h \
blackbox-container-symmetric.h \
@@ -264,20 +379,8 @@ pkgincludesub_HEADERS = \
la-block-lanczos.h la-block-lanczos.inl \
eliminator.h eliminator.inl \
gauss.h \
- gauss.inl \
- gauss-det.inl \
- gauss-rank.inl \
- gauss-solve.inl \
- gauss-nullspace.inl \
- gauss-elim.inl \
- gauss-pivot.inl \
triangular-solve.h \
gauss-gf2.h \
- gauss-gf2.inl \
- gauss-elim-gf2.inl \
- gauss-rank-gf2.inl \
- gauss-pivot-gf2.inl \
- gauss-solve-gf2.inl \
triangular-solve-gf2.h \
dense-container.h \
cra-mpi.h \
@@ -298,6 +401,7 @@ pkgincludesub_HEADERS = \
rational-cra-full-multip.h \
blas-domain.h \
blas-domain.inl \
+ blas-domain-multimod.h \
bitonic-sort.h \
blackbox-block-container-base.h \
blackbox-block-container.h \
@@ -311,18 +415,18 @@ pkgincludesub_HEADERS = \
hybrid-det.h \
lifting-container.h \
smith-form-local.h \
- smith-form-local2.h \
+ smith-form-local2.inl \
matrix-inverse.h \
matrix-hom.h \
matrix-rank.h \
- numeric-solver-lapack.h \
- rational-solver-sn.h \
- rational-solver-sn.inl \
- dyadic-to-rational.h \
+ numeric-solver-lapack.h \
+ rational-solver-sn.h \
+ rational-solver-sn.inl \
+ dyadic-to-rational.h \
rational-reconstruction.h \
rational-reconstruction-base.h \
classic-rational-reconstruction.h \
- fast-rational-reconstruction.h \
+ fast-rational-reconstruction.h \
rational-solver.h \
rational-solver2.h \
rational-solver.inl \
@@ -332,6 +436,7 @@ pkgincludesub_HEADERS = \
smith-form-adaptive.h \
smith-form-adaptive.inl \
smith-form-sparseelim-local.h \
+ smith-form-sparseelim-poweroftwo.h \
rational-reconstruction2.h \
rational-solver-adaptive.h \
varprec-cra-early-single.h \
@@ -339,6 +444,7 @@ pkgincludesub_HEADERS = \
vector-fraction.h \
whisart_trace.h \
cia.h \
+ lattice.h lattice.inl \
bbcharpoly.h \
charpoly-rational.h \
minpoly-integer.h \
@@ -348,8 +454,10 @@ pkgincludesub_HEADERS = \
echelon-form.h \
toeplitz-det.h \
dense-nullspace.h dense-nullspace.inl \
- linbox-tags.h \
- rns.h rns.inl
+ linbox-tags.h \
+ bm-seq.h \
+ short-vector.h \
+ rns.h rns.inl
EXTRA_DIST = \
algorithms.doxy \
@@ -358,9 +466,11 @@ EXTRA_DIST = \
lanczos.doxy \
sigmabasis.doxy \
elimination.doxy \
- diophantine.doxy
+ lattice.doxy \
+ diophantine.doxy \
+ gauss.doxy
-all: all-am
+all: all-recursive
.SUFFIXES:
.SUFFIXES: .C .lo .o .obj
@@ -373,9 +483,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/algorithms/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps linbox/algorithms/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/algorithms/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/algorithms/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -393,6 +503,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -402,7 +513,7 @@ clean-noinstLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libalgorithms.la: $(libalgorithms_la_OBJECTS) $(libalgorithms_la_DEPENDENCIES)
+libalgorithms.la: $(libalgorithms_la_OBJECTS) $(libalgorithms_la_DEPENDENCIES) $(EXTRA_libalgorithms_la_DEPENDENCIES)
$(CXXLINK) $(libalgorithms_la_OBJECTS) $(libalgorithms_la_LIBADD) $(LIBS)
mostlyclean-compile:
@@ -427,20 +538,94 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludesubdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)"
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludesubHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- $(pkgincludesubHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
done
uninstall-pkgincludesubHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -453,39 +638,57 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -506,120 +709,158 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
check-am: all-am
-check: check-am
+check: check-recursive
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
+installdirs: installdirs-recursive
+installdirs-am:
for dir in "$(DESTDIR)$(pkgincludesubdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
html-am:
-info: info-am
+info: info-recursive
info-am:
install-data-am: install-pkgincludesubHEADERS
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
install-dvi-am:
install-exec-am:
-install-html: install-html-am
+install-html: install-html-recursive
install-html-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-info-am:
install-man:
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
install-pdf-am:
-install-ps: install-ps-am
+install-ps: install-ps-recursive
install-ps-am:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
uninstall-am: uninstall-pkgincludesubHEADERS
-.MAKE: install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ clean-noinstLTLIBRARIES ctags ctags-recursive distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
@@ -627,10 +868,12 @@ uninstall-am: uninstall-pkgincludesubHEADERS
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-pkgincludesubHEADERS \
install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+ tags tags-recursive uninstall uninstall-am \
+ uninstall-pkgincludesubHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/linbox/algorithms/algorithms.doxy b/linbox/algorithms/algorithms.doxy
index 8e8a17a..2121624 100644
--- a/linbox/algorithms/algorithms.doxy
+++ b/linbox/algorithms/algorithms.doxy
@@ -1,23 +1,46 @@
-/** \ingroup linbox
- \defgroup algorithms algorithms
-
-\brief The core linear algebra algorithms of LinBox.
+/*
+ * Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
-The codes here implement algorithms for linear algebra problems. The names often
-reflect the authorship of the central algorithm (Lanczos, Wiedemann, ...).
-In contrast, the "drivers" in the
-\ref solutions directory are named for the problem solved (rank, det, ...).
-Those are generally wrappers of
-algorithms from this directory. Their purpose is to give a simple and direct user interface
-and sometimes to provide a solution strategy which is a hybrid of algorithms from this directory.
-%Algorithm classes and functions generally have the field class as a template parameter.
-Blackbox algorithms may have a BlackboxMatrix parameter or allow a Blackbox class as
-template parameter.
-Elimination codes work over DenseMatrix or SparseMatrix types with varying degrees of
-substitution among the types possible.
-
-*/
+/** \ingroup linbox
+ * \defgroup algorithms algorithms
+ *
+ * \brief The core linear algebra algorithms of LinBox.
+ *
+ * The codes here implement algorithms for linear algebra problems. The names
+ * often reflect the authorship of the central algorithm (Lanczos, Wiedemann,
+ * ...). In contrast, the "drivers" in the \ref solutions directory are named
+ * for the problem solved (rank, det, ...). Those are generally wrappers of
+ * algorithms from this directory. Their purpose is to give a simple and
+ * direct user interface and sometimes to provide a solution strategy which is
+ * a hybrid of algorithms from this directory.
+ *
+ * %Algorithm classes and functions generally have the field class as a
+ * template parameter. Blackbox algorithms may have a BlackboxMatrix parameter
+ * or allow a Blackbox class as template parameter. Elimination codes work
+ * over DenseMatrix or SparseMatrix types with varying degrees of substitution
+ * among the types possible.
+ *
+ */
//@{
diff --git a/linbox/algorithms/bbcharpoly.h b/linbox/algorithms/bbcharpoly.h
index a7b829e..866ac1a 100644
--- a/linbox/algorithms/bbcharpoly.h
+++ b/linbox/algorithms/bbcharpoly.h
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/bbchapoly.h
* Copyright(C) LinBox
* Written
* by Clement Pernet <clement.pernet at imag.fr>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file algorithms/bbcharpoly.h
@@ -35,6 +51,13 @@
namespace LinBox
{
+
+ /*! @internal
+ * @ingroup charpoly
+ * @brief BlackBox Characteristic Polynomial
+ * @details NO DOC
+ * @warning rebind comes from Givaro !
+ */
class BBcharpoly {
template<class FieldPoly, class IntPoly=FieldPoly>
class FactorMult ;
@@ -60,24 +83,24 @@ namespace LinBox
if (dep->dep != NULL){
FactorMult<FieldPoly,IntPoly>*curr = dep;
int k = dep->update (n,goal)+1;
- int d = (dep->fieldP->size()-1)/k;
- int tmp = (n-dep->multiplicity) / d;
+ int d = ((int)dep->fieldP->size()-1)/k;
+ int tmp = (int)(n-dep->multiplicity) / d;
int i = k-1;
while (curr->dep!=NULL){
curr = curr->dep;
- tmp-=i*curr->multiplicity;
+ tmp-=i*(int)curr->multiplicity;
--i;
}
- tmp = tmp/k + (multiplicity - dep->multiplicity) / d;
+ tmp = tmp/k + (int)(multiplicity - dep->multiplicity) / d;
dep->multiplicity = tmp ;
//std::cerr<<"Updating "<<*dep->fieldP<<" --> mul = "<<tmp<<std::endl;
- *goal -= tmp * (dep->fieldP->size()-1);
+ *goal -= tmp * ((int)dep->fieldP->size()-1);
return k;
}
else{
- int tmp = (n - 2 * dep->multiplicity + multiplicity) / (dep->fieldP->size()-1);
- *goal -= tmp * (dep->fieldP->size()-1);
+ int tmp = (int)((n - 2 * dep->multiplicity + multiplicity) / (dep->fieldP->size()-1));
+ *goal -= tmp * ((int)dep->fieldP->size()-1);
//std::cerr<<"Updating (leaf)"<<*dep->fieldP<<" --> mul = "<<tmp<<std::endl;
dep->multiplicity = tmp;
return 1;
@@ -107,29 +130,29 @@ namespace LinBox
* of a blackbox.
* @warning not implemented in general cases.
*/
- template < class Blackbox, class Polynomial, class Categorytag >
+ template < class BlackBox, class Polynomial, class Categorytag >
static Polynomial&
blackboxcharpoly (Polynomial & P,
- const Blackbox & A,
+ const BlackBox & A,
const Categorytag & tag,
const Method::Blackbox & M);
/** Algorithm computing the integer characteristic polynomial
* of a blackbox.
*/
- template < class Blackbox >
- static typename GivPolynomialRing<typename Blackbox::Field>::Element&
- blackboxcharpoly (typename GivPolynomialRing<typename Blackbox::Field>::Element & P,
- const Blackbox & A,
+ template < class BlackBox >
+ static typename GivPolynomialRing<typename BlackBox::Field>::Element&
+ blackboxcharpoly (typename GivPolynomialRing<typename BlackBox::Field>::Element & P,
+ const BlackBox & A,
const RingCategories::IntegerTag & tag,
const Method::Blackbox & M)
{
- commentator.start ("Integer Blackbox Charpoly ", "IbbCharpoly");
+ commentator().start ("Integer BlackBox Charpoly ", "IbbCharpoly");
- typename Blackbox::Field intRing = A.field();
+ typename BlackBox::Field intRing = A.field();
typedef Modular<uint32_t> Field;
- typedef typename Blackbox::template rebind<Field>::other FieldBlackbox;
- typedef GivPolynomialRing<typename Blackbox::Field, ::Givaro::Dense> IntPolyDom;
+ typedef typename BlackBox::template rebind<Field>::other FieldBlackBox;
+ typedef GivPolynomialRing<typename BlackBox::Field, Givaro::Dense> IntPolyDom;
typedef typename IntPolyDom::Element IntPoly;
typedef GivPolynomialRing<Field>::Element FieldPoly;
// Set of factors-multiplicities sorted by degree
@@ -147,7 +170,7 @@ namespace LinBox
IntPoly intMinPoly;
minpoly (intMinPoly, A, M);
if (intMinPoly.size() == n+1){
- commentator.stop ("done", NULL, "IbbCharpoly");
+ commentator().stop ("done", NULL, "IbbCharpoly");
return P = intMinPoly;
}
/* Factorization over the integers */
@@ -162,7 +185,7 @@ namespace LinBox
Field F(*primeg);
/* Building the structure of factors */
- int goal = n;
+ int goal =(int) n;
for (size_t i = 0; i < intFactors.size(); ++i) {
unsigned long deg = (intFactors[i]->size()-1);
@@ -186,7 +209,7 @@ namespace LinBox
delete tmp;
--factnum;
FFM->multiplicity = 1; // The last factor is present in minpoly
- goal -= deg-intFactors[i]->size()+1;
+ goal -= (int)deg-(int)intFactors[i]->size()+1;
leadingBlocks.insert (std::pair<FM*,bool>(FFM,false));
}
else {
@@ -195,11 +218,11 @@ namespace LinBox
FFM = new FM (fp,intFactors[i],1,NULL);
factCharPoly.insert (std::pair<size_t, FM* > (intFactors[i]->size()-1, FFM));
leadingBlocks.insert (std::pair<FM*,bool>(FFM,false));
- goal -= deg;
+ goal -= (int)deg;
}
}
- FieldBlackbox Ap(A, F);
+ FieldBlackBox Ap(A, F);
findMultiplicities (Ap, factCharPoly, leadingBlocks, goal, M);
@@ -214,7 +237,7 @@ namespace LinBox
delete it_f->second->fieldP;
delete it_f->second;
}
- commentator.stop ("done", NULL, "IbbCharpoly");
+ commentator().stop ("done", NULL, "IbbCharpoly");
return P = intCharPoly;
}
@@ -222,16 +245,16 @@ namespace LinBox
/** Algorithm computing the characteristic polynomial
* of a blackbox over a prime field.
*/
- template < class Blackbox >
- static typename GivPolynomialRing<typename Blackbox::Field>::Element&
- blackboxcharpoly (typename GivPolynomialRing<typename Blackbox::Field>::Element & P,
- const Blackbox & A,
+ template < class BlackBox >
+ static typename GivPolynomialRing<typename BlackBox::Field>::Element&
+ blackboxcharpoly (typename GivPolynomialRing<typename BlackBox::Field>::Element & P,
+ const BlackBox & A,
const RingCategories::ModularTag & tag,
const Method::Blackbox & M)
{
- commentator.start ("Modular Blackbox Charpoly ", "MbbCharpoly");
- typedef typename Blackbox::Field Field;
- typedef GivPolynomialRing<Field, ::Givaro::Dense> PolyDom;
+ commentator().start ("Modular BlackBox Charpoly ", "MbbCharpoly");
+ typedef typename BlackBox::Field Field;
+ typedef GivPolynomialRing<Field, Givaro::Dense> PolyDom;
typedef typename PolyDom::Element Polynomial;
// Set of factors-multiplicities sorted by degree
typedef std::multimap<unsigned long,FactorMult<Polynomial>* > FactPoly;
@@ -249,7 +272,7 @@ namespace LinBox
minpoly (minPoly, A, M);
//std::cerr<<"Minpoly = "<<minPoly;
if (minPoly.size() == n+1){
- commentator.stop ("done", NULL, "MbbCharpoly");
+ commentator().stop ("done", NULL, "MbbCharpoly");
return P = minPoly;
}
@@ -264,7 +287,7 @@ namespace LinBox
size_t factnum = factors.size();
/* Building the structure of factors */
- int goal = n;
+ int goal = (int)n;
for (size_t i = 0; i < factors.size(); ++i) {
unsigned long deg = (factors[i]->size()-1);
@@ -287,7 +310,7 @@ namespace LinBox
delete tmp;
--factnum;
FFM->multiplicity = 1; // The last factor is present in minpoly
- goal -= deg-factors[i]->size()+1;
+ goal -= (int)(deg-factors[i]->size())+1;
leadingBlocks.insert (std::pair<FactorMult<Polynomial>*,bool>(FFM,false));
delete factors[i] ;
}
@@ -296,7 +319,7 @@ namespace LinBox
//std::cerr<<"Inserting new factor : "<<*factors[i]<<std::endl;
factCharPoly.insert (std::pair<size_t, FactorMult<Polynomial>* > (factors[i]->size()-1, FFM));
leadingBlocks.insert (std::pair<FactorMult<Polynomial>*,bool>(FFM,false));
- goal -= deg;
+ goal -= (int)deg;
}
}
findMultiplicities ( A, factCharPoly, leadingBlocks, goal, M);
@@ -313,7 +336,7 @@ namespace LinBox
}
}
- commentator.stop ("done", NULL, "MbbCharpoly");
+ commentator().stop ("done", NULL, "MbbCharpoly");
return P = charPoly;
}
@@ -331,22 +354,22 @@ namespace LinBox
else if ( goal > 0 ){
for (size_t i=i0; i<ufv.size(); ++i){
ufv[i].multiplicity++;
- trials( sols, goal - ufv[i].fieldP->size()+1, ufv, i );
+ trials( sols, goal - (int)ufv[i].fieldP->size()+1, ufv, (int)i );
ufv[i].multiplicity--;
}
}
}
- template <class Blackbox, class FieldPoly, class IntPoly>
- static void findMultiplicities( const Blackbox& A,
+ template <class BlackBox, class FieldPoly, class IntPoly>
+ static void findMultiplicities( const BlackBox& A,
std::multimap<unsigned long, FactorMult<FieldPoly,IntPoly>* >& factCharPoly,
std::multimap<FactorMult<FieldPoly,IntPoly>*,bool>& leadingBlocks,
int goal,
const Method::Blackbox &M)
{
typedef std::multimap<unsigned long, FactorMult<FieldPoly,IntPoly>* > FactPoly;
- typedef typename Blackbox::Field Field;
- typedef GivPolynomialRing<Field, ::Givaro::Dense> PolyDom;
+ typedef typename BlackBox::Field Field;
+ typedef GivPolynomialRing<Field, Givaro::Dense> PolyDom;
typename FactPoly::iterator itf = factCharPoly.begin();
typename std::multimap<FactorMult<FieldPoly,IntPoly>*,bool>::iterator lead_it;
Field F = A.field();
@@ -367,7 +390,7 @@ namespace LinBox
rank (r, A, M) ;
}
else {
- PolynomialBB<Blackbox, FieldPoly > PA (A, *itf->second->fieldP);
+ PolynomialBB<BlackBox, FieldPoly > PA (A, *itf->second->fieldP);
rank (r, PA, M) ;
}
itf->second->multiplicity = r;
@@ -384,7 +407,7 @@ namespace LinBox
if ( lead_it != leadingBlocks.end())
lead_it->second = true;
- PolynomialBB<Blackbox, FieldPoly > PA (A, *itf->second->fieldP);
+ PolynomialBB<BlackBox, FieldPoly > PA (A, *itf->second->fieldP);
long unsigned int r;
rank (r, PA, M);
@@ -412,12 +435,12 @@ namespace LinBox
if (currFFM->dep != NULL){
// Need one more computation:
- PolynomialBB<Blackbox, FieldPoly > PA (A, *currFFM->fieldP);
+ PolynomialBB<BlackBox, FieldPoly > PA (A, *currFFM->fieldP);
long unsigned int r;
rank (r, PA, M) ;
//std::cerr<<"extra factor : "<<*currFFM->fieldP<<" --> "<<r<<std::endl;
- int tmp = currFFM->multiplicity;
+ int tmp = (int)currFFM->multiplicity;
currFFM->multiplicity = r;
currFFM->update (n,&goal);
currFFM->multiplicity = tmp;
@@ -428,20 +451,20 @@ namespace LinBox
if (currFFM->dep != NULL){
int k = currFFM->update (n,&goal)+1;
- int d = (lead_it->first->fieldP->size()-1) / k;
+ int d = (int)(lead_it->first->fieldP->size()-1) / k;
- lbm = (n-lead_it->first->multiplicity) / d;
+ lbm = (int)(n-lead_it->first->multiplicity) / d;
currFFM = currFFM->dep;
do{
- lbm -= currFFM->multiplicity * (currFFM->fieldP->size()-1);
+ lbm -= (int)(currFFM->multiplicity * (currFFM->fieldP->size()-1));
currFFM = currFFM->dep;
} while (currFFM!=NULL);
lbm /= k;
- goal -= (lbm-1)*(lead_it->first->fieldP->size()-1);
+ goal -= (lbm-1)*((int)lead_it->first->fieldP->size()-1);
}
else {
- lbm = (n-lead_it->first->multiplicity) / (lead_it->first->fieldP->size()-1);
- goal -= (lbm-1)*(lead_it->first->fieldP->size()-1);
+ lbm = (int)((n-lead_it->first->multiplicity) / ((int)lead_it->first->fieldP->size()-1));
+ goal -= (lbm-1)*((int)lead_it->first->fieldP->size()-1);
}
lead_it->first->multiplicity = lbm;
}
@@ -470,7 +493,7 @@ namespace LinBox
//Building the matrix A + gamma.Id mod p
F.neg( mgamma, gamma );
ScalarMatrix<Field> gammaId( F, n, gamma );
- Sum<Blackbox,ScalarMatrix<Field> > Agamma(A, gammaId);
+ Sum<BlackBox,ScalarMatrix<Field> > Agamma(A, gammaId);
// Compute det (A+gamma.Id)
det (d, Agamma, M);
@@ -481,16 +504,16 @@ namespace LinBox
typename Field::Element tmp, e;
F.init (d2,1);
typename FactPoly::iterator it_f=factCharPoly.begin();
- PolyDom PD (F);
+ PolyDom PD_f (F);
for (size_t i = 0; i < factCharPoly.size()-factnum; ++i, ++it_f){
- PD.eval (tmp, *it_f->second->fieldP, mgamma);
+ PD_f.eval (tmp, *it_f->second->fieldP, mgamma);
for (size_t j=0; j < it_f->second->multiplicity; ++j)
F.mulin (d2, tmp);
}
while ( uf_it != sols.end() ){
F.init (e,1);
for (size_t i = 0; i < uf_it->size(); ++i){
- PD.eval( tmp, *(*uf_it)[i].fieldP, mgamma );
+ PD_f.eval( tmp, *(*uf_it)[i].fieldP, mgamma );
for (size_t j=0; j < (*uf_it)[i].multiplicity; ++j)
F.mulin( e, tmp );
}
@@ -516,3 +539,12 @@ namespace LinBox
#undef _LB_MAXITER
#endif // __BBCHARPOLY_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/bbsolve.h b/linbox/algorithms/bbsolve.h
index 176964f..a50ddc0 100644
--- a/linbox/algorithms/bbsolve.h
+++ b/linbox/algorithms/bbsolve.h
@@ -1,12 +1,28 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (c) LinBox
* linbox/algorithms/bbsolve.h
* (was linbox/solutions/solve.h)
* written
* by Bradford Hovinen <hovinen at cis.udel.edu>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_bbsolve_H
@@ -19,7 +35,6 @@
#include "linbox/algorithms/wiedemann.h"
#include "linbox/algorithms/lanczos.h"
#include "linbox/algorithms/mg-block-lanczos.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/util/debug.h"
#include "linbox/vector/vector-domain.h"
#include "linbox/solutions/methods.h"
@@ -281,3 +296,12 @@ namespace LinBox
#endif // __LINBOX_bbsolve_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/bitonic-sort.h b/linbox/algorithms/bitonic-sort.h
index 982ca71..289f13c 100644
--- a/linbox/algorithms/bitonic-sort.h
+++ b/linbox/algorithms/bitonic-sort.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
* Written by Zhendong Wan
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_bitonic_sort_H
@@ -92,3 +93,12 @@ namespace LinBox
}
#endif //__LINBOX_bitonic_sort_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/blackbox-block-container-base.h b/linbox/algorithms/blackbox-block-container-base.h
index 73bfedb..5f0fa25 100644
--- a/linbox/algorithms/blackbox-block-container-base.h
+++ b/linbox/algorithms/blackbox-block-container-base.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/blackbox-block-container-base.h
* Copyright (C) 2002 Pascal Giorgi
*
* Written by Pascal Giorgi pascal.giorgi at ens-lyon.fr
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/blackbox-block-container-base.h
@@ -34,15 +35,12 @@
#include <time.h> // for seeding
-#include <linbox/blackbox/archetype.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/vector/vector-domain.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/algorithms/blas-domain.h>
-#include <linbox/util/debug.h>
-#undef _U
-#undef _V
-#undef _F
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+#include "linbox/blackbox/archetype.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/algorithms/blas-domain.h"
namespace LinBox
{
@@ -68,16 +66,18 @@ namespace LinBox
typedef _Field Field;
typedef typename Field::Element Element;
typedef _Blackbox Blackbox;
- typedef BlasMatrix<Element> Block;
- typedef BlasMatrix<Element> Value;
+ typedef BlasMatrix<Field> Block;
+ typedef BlasMatrix<Field> Value;
// Default constructors
BlackboxBlockContainerBase () {}
// Sequence constructor from a blackbox and a field
// cs set the size of the sequence
- BlackboxBlockContainerBase (const Blackbox *BD, const Field &F, size_t m, size_t n, size_t seed=time(NULL)) :
- _F(F) , _BB(BD), _size(BD->rowdim()/m + BD->coldim()/n +2) , _row(BD->rowdim()), _col(BD->coldim()), _m(m), _n(n), _value(m,n), _seed(seed)
+ BlackboxBlockContainerBase (const Blackbox *BD, const Field &F, size_t m, size_t n, size_t seed=(size_t)time(NULL)) :
+ _field(F) , _BB(BD), _size(BD->rowdim()/m + BD->coldim()/n +2)
+ , _nn(BD->rowdim()), _m(m), _n(n),
+ _blockU(F,_m,_nn),_blockV(F,_nn,_n),_value(_field,m,n), _seed(seed)
{}
@@ -111,7 +111,7 @@ namespace LinBox
size_t size() const { return _size; }
// field of the sequence
- const Field &getField () const { return _F; }
+ const Field &getField () const { return _field; }
// blackbox of the sequence
const Blackbox *getBB () const { return _BB; }
@@ -122,13 +122,6 @@ namespace LinBox
// column dimension of the sequence element
size_t coldim() const { return _n; }
- // row dimension of the matrix
- size_t getrow() const { return _BB->rowdim();}
-
- // col dimension of the matrix
- size_t getcol() const { return _BB->rowcol();}
-
-
protected:
friend class const_iterator;
@@ -147,18 +140,17 @@ namespace LinBox
/// Members
//--------------
- Field _F;
+ Field _field;
const Blackbox *_BB;
- size_t _size;
- size_t _row;
- size_t _col;
- size_t _m;
- size_t _n;
+ size_t _size; // length of sequence
+ size_t _nn; // _BB order (square mat)
+ size_t _m; // block rows
+ size_t _n; // block cols
// BDS 22.03.03
long casenumber;
- Block _U;
- Block _V;
+ Block _blockU;
+ Block _blockV;
Value _value;
size_t _seed;
@@ -189,14 +181,16 @@ namespace LinBox
void init (const Block& U, const Block& V)
{
- linbox_check ( U.coldim() == _row);
- linbox_check ( V.rowdim() == _col);
+ linbox_check ( U.rowdim() == _m);
+ linbox_check ( U.coldim() == _nn);
+ linbox_check ( V.rowdim() == _nn);
+ linbox_check ( V.coldim() == _n);
casenumber = 1;
- _U = U;
- _V = V;
- _value = Value(_m,_n);
- BlasMatrixDomain<Field> BMD(_F);
- BMD.mul(_value, _U, _V);
+ _blockU = U;
+ _blockV = V;
+ _value = Value(_field,_m,_n);
+ BlasMatrixDomain<Field> BMD(_field);
+ BMD.mul(_value, _blockU, _blockV);
}
// Random Left Matrix and Right Matrix
@@ -204,23 +198,23 @@ namespace LinBox
{
casenumber = 1;
- typename Field::RandIter G(_F,0,_seed);
+ typename Field::RandIter G(_field,0,_seed);
Block U (m, _BB->rowdim());
- _U =U;
+ _blockU =U;
Block V(_BB->coldim(), n);
- _V =V;
+ _blockV =V;
- typename Block::RawIterator iter_U = _U.rawBegin();
- for (; iter_U != _U.rawEnd();++iter_U)
+ typename Block::Iterator iter_U = _blockU.Begin();
+ for (; iter_U != _blockU.End();++iter_U)
G.random(*iter_U);
- typename Block::RawIterator iter_V = _V.rawBegin();
- for (; iter_V != _V.rawEnd();++iter_V)
+ typename Block::Iterator iter_V = _blockV.Begin();
+ for (; iter_V != _blockV.End();++iter_V)
G.random(*iter_V);
- _value = Value(m,n);
- BlasMatrixDomain<Field> BMD(_F);
- BMD.mul(_value, _U, _V);
+ _value = Value(_field,m,n);
+ BlasMatrixDomain<Field> BMD(_field);
+ BMD.mul(_value, _blockU, _blockV);
}
};
@@ -228,3 +222,12 @@ namespace LinBox
#endif // __LINBOX_blackbox_block_container_base_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/blackbox-block-container.h b/linbox/algorithms/blackbox-block-container.h
index 4334dfd..6a785ce 100644
--- a/linbox/algorithms/blackbox-block-container.h
+++ b/linbox/algorithms/blackbox-block-container.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/blackbox-block-container.h
* Copyright (C) 2002 Pascal Giorgi
*
* Written by Pascal Giorgi pascal.giorgi at ens-lyon.fr
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/blackbox-block-container.h
@@ -29,16 +30,18 @@
#ifndef __LINBOX_blackbox_block_container_H
#define __LINBOX_blackbox_block_container_H
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
-#include <linbox/algorithms/blackbox-block-container-base.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/algorithms/blas-domain.h>
+#include "linbox/algorithms/blackbox-block-container-base.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/algorithms/blas-domain.h"
#define _BBC_TIMING
#ifdef _BBC_TIMING
#include <time.h>
-#include <linbox/util/timer.h>
+#include "linbox/util/timer.h"
#endif
namespace LinBox
@@ -49,18 +52,18 @@ namespace LinBox
template<class _Field, class _Blackbox>
class BlackboxBlockContainer : public BlackboxBlockContainerBase<_Field,_Blackbox> {
public:
- typedef _Field Field;
+ typedef _Field Field;
typedef typename Field::Element Element;
- typedef typename Field::RandIter RandIter;
- typedef BlasMatrix<Element> Block;
- typedef BlasMatrix<Element> Value;
+ typedef typename Field::RandIter RandIter;
+ typedef BlasMatrix<Field> Block;
+ typedef BlasMatrix<Field> Value;
// Default constructor
BlackboxBlockContainer () {}
// constructor of the sequence from a blackbox, a field and one block projection
BlackboxBlockContainer(const _Blackbox *D, const Field &F, const Block &U0) :
- BlackboxBlockContainerBase<Field,_Blackbox> (D, F, U0.rowdim(), U0.coldim()) , _W(D->rowdim(), U0.coldim()), _BMD(F)
+ BlackboxBlockContainerBase<Field,_Blackbox> (D, F, U0.rowdim(), U0.coldim()) , _blockW(D->rowdim(), U0.coldim()), _BMD(F)
{
#ifdef _BBC_TIMING
clearTimer();
@@ -76,14 +79,15 @@ namespace LinBox
// constructor of the sequence from a blackbox, a field and two blocks projection
BlackboxBlockContainer(const _Blackbox *D, const Field &F, const Block &U0, const Block& V0) :
- BlackboxBlockContainerBase<Field,_Blackbox> (D, F,U0.rowdim(), V0.coldim()) , _W(D->rowdim(), V0.coldim()), _BMD(F)
+ BlackboxBlockContainerBase<Field,_Blackbox> (D, F,U0.rowdim(), V0.coldim())
+ , _blockW(F,D->rowdim(), V0.coldim()), _BMD(F)
{
#ifdef _BBC_TIMING
clearTimer();
tSequence.clear();
tSequence.start();
#endif
- this->init (U0, U0);
+ this->init (U0, V0);
#ifdef _BBC_TIMING
tSequence.stop();
ttSequence += tSequence;
@@ -91,8 +95,9 @@ namespace LinBox
}
// constructor of the sequence from a blackbox, a field and two blocks random projection
- BlackboxBlockContainer(const _Blackbox *D, const Field &F, size_t m, size_t n, size_t seed= time(NULL)) :
- BlackboxBlockContainerBase<Field, _Blackbox> (D, F, m, n,seed) , _W(D->rowdim(), n), _BMD(F)
+ BlackboxBlockContainer(const _Blackbox *D, const Field &F, size_t m, size_t n, size_t seed= (size_t)time(NULL)) :
+ BlackboxBlockContainerBase<Field, _Blackbox> (D, F, m, n,seed)
+ , _blockW(F,D->rowdim(), n), _BMD(F)
{
#ifdef _BBC_TIMING
clearTimer();
@@ -119,7 +124,7 @@ namespace LinBox
protected:
- Block _W;
+ Block _blockW;
BlasMatrixDomain<Field> _BMD;
#ifdef _BBC_TIMING
@@ -134,13 +139,13 @@ namespace LinBox
tSequence.start();
#endif
if (this->casenumber) {
- Mul(_W,*this->_BB,this->_V);
- _BMD.mul(this->_value, this->_U, _W);
+ this->Mul(_blockW,*this->_BB,this->_blockV);
+ _BMD.mul(this->_value, this->_blockU, _blockW);
this->casenumber = 0;
}
else {
- Mul(this->_V,*this->_BB,_W);
- _BMD.mul(this->_value, this->_U, this->_V);
+ this->Mul(this->_blockV,*this->_BB,_blockW);
+ _BMD.mul(this->_value, this->_blockU, this->_blockV);
this->casenumber = 1;
}
#ifdef _BBC_TIMING
@@ -159,10 +164,10 @@ namespace LinBox
public:
typedef _Field Field;
- typedef typename Field::Element Element;
+ typedef typename Field::Element Element;
typedef typename Field::RandIter RandIter;
- typedef BlasMatrix<Element> Block;
- typedef BlasMatrix<Element> Value;
+ typedef BlasMatrix<Field> Block;
+ typedef BlasMatrix<Field> Value;
enum Launcher {RowUpdate=0, ColUpdate=1, Nothing=2};
@@ -171,12 +176,12 @@ namespace LinBox
// constructor of the sequence from a blackbox, a field and one block projection
BlackboxBlockContainerRecord(const _Blackbox *D, const Field &F, const Block &U0) :
- BlackboxBlockContainerBase<Field,_Blackbox> (D, F, U0.rowdim(), U0.coldim()),
- _W(D->rowdim(), U0.coldim()), _BMD(F), _launcher(Nothing), _iter(1)
+ BlackboxBlockContainerBase<Field,_Blackbox> (D, F, U0.rowdim(), U0.coldim())
+ , _blockW(F, D->rowdim(), U0.coldim()), _BMD(F), _launcher(Nothing), _iter(1)
{
this->init (U0, U0);
- _rep = std::vector<Value> (this->_size);
- _Vcopy = this->_V;
+ _rep = std::vector<Value> (this->_size, Value(F));
+ _Vcopy = this->_blockV;
for (size_t i=0;i< this->_size;++i){
_rep[i] = this->_value;
_launch_record();
@@ -186,8 +191,8 @@ namespace LinBox
// constructor of the sequence from a blackbox, a field and two blocks projection
BlackboxBlockContainerRecord(const _Blackbox *D, const Field &F, const Block &U0, const Block& V0, bool denseblock= true) :
- BlackboxBlockContainerBase<Field,_Blackbox> (D, F,U0.rowdim(), V0.coldim()),
- _W(D->rowdim(), V0.coldim()), _BMD(F), _launcher(Nothing), _iter(1)
+ BlackboxBlockContainerBase<Field,_Blackbox> (D, F,U0.rowdim(), V0.coldim())
+ , _blockW(F,D->rowdim(), V0.coldim()), _BMD(F), _launcher(Nothing), _iter(1)
{
#ifdef _BBC_TIMING
clearTimer();
@@ -197,8 +202,8 @@ namespace LinBox
this->init (U0, V0);
- _rep = std::vector<Value> (this->_size);
- _Vcopy = this->_V;
+ _rep = std::vector<Value> (this->_size, Value(F));
+ _Vcopy = this->_blockV;
if (denseblock) {
for (size_t i=0;i< this->_size;++i){
_rep[i] = this->_value;
@@ -208,12 +213,12 @@ namespace LinBox
else {
_rep.resize(_rep.size()-3);
size_t block= U0.rowdim();
- size_t N = U0.coldim()/block;
- _Special_U.resize(block, std::vector<typename Field::Element>(N));
+ size_t Nn = U0.coldim()/block;
+ _Special_U.resize(block, std::vector<typename Field::Element>(Nn));
for (size_t i=0;i<block;++i)
- for (size_t j=0;j<N;++j)
- F.assign(_Special_U[i][j], U0.getEntry(0, i*N+j));
+ for (size_t j=0;j<Nn;++j)
+ F.assign(_Special_U[i][j], U0.getEntry(0, i*Nn+j));
for (size_t i=0;i< this->_size-3;++i){
_launch_record_notdense();
@@ -230,9 +235,9 @@ namespace LinBox
}
// constructor of the sequence from a blackbox, a field and two blocks random projection
- BlackboxBlockContainerRecord(const _Blackbox *D, const Field &F, size_t m, size_t n, size_t seed= time(NULL)) :
+ BlackboxBlockContainerRecord(const _Blackbox *D, const Field &F, size_t m, size_t n, size_t seed= (size_t)time(NULL)) :
BlackboxBlockContainerBase<Field, _Blackbox> (D, F, m, n,seed),
- _W(D->rowdim(), n), _BMD(F), _launcher(Nothing), _iter(1)
+ _blockW(D->rowdim(), n), _BMD(F), _launcher(Nothing), _iter(1)
{
#ifdef _BBC_TIMING
clearTimer();
@@ -241,7 +246,7 @@ namespace LinBox
#endif
this->init (m,n);
_rep = std::vector<Value> (this->_size);
- _Vcopy = this->_V;
+ _Vcopy = this->_blockV;
for (size_t i=0;i< this->_size;++i){
_rep[i] = this->_value;
_launch_record();
@@ -293,7 +298,7 @@ namespace LinBox
tSequence.start();
#endif
std::vector<Element> _col_value(this->_m);
- _BMD.mul(_col_value, this->_U, b);
+ _BMD.mul(_col_value, this->_blockU, b);
this->_value = _rep[0];
for (size_t j=0; j< this->_m; ++j)
this->_value.setEntry(j, _upd_idx, _col_value[j]);
@@ -369,7 +374,7 @@ namespace LinBox
protected:
- Block _W;
+ Block _blockW;
Block _Vcopy;
BlasMatrixDomain<Field> _BMD;
std::vector<Value> _rep;
@@ -388,13 +393,13 @@ namespace LinBox
void _launch_record ()
{
if (this->casenumber) {
- Mul(_W,*this->_BB,this->_V);
- _BMD.mul(this->_value, this->_U, _W);
+ Mul(_blockW,*this->_BB,this->_blockV);
+ _BMD.mul(this->_value, this->_blockU, _blockW);
this->casenumber = 0;
}
else {
- Mul(this->_V,*this->_BB,_W);
- _BMD.mul(this->_value, this->_U, this->_V);
+ Mul(this->_blockV,*this->_BB,_blockW);
+ _BMD.mul(this->_value, this->_blockU, this->_blockV);
this->casenumber = 1;
}
}
@@ -403,31 +408,31 @@ namespace LinBox
// launcher of computation of sequence element
void _launch_record_notdense ()
{
- size_t block= this->_V.coldim();
+ size_t block= this->_blockV.coldim();
size_t numblock=_Special_U[0].size();
if (this->casenumber) {
- Mul(_W,*this->_BB,this->_V);
+ Mul(_blockW,*this->_BB,this->_blockV);
std::vector<Element> tmp(block);
for (size_t i=0; i<block; ++i){
- BlasMatrix<Element> T(_W, i*numblock, 0, numblock, block);
+ BlasMatrix<Field> T(_blockW, i*numblock, 0, numblock, block);
_BMD.mul(tmp, _Special_U[i], T);
for (size_t j=0;j<block;++j){
- this->_F.assign(this->_value.refEntry(i,j), tmp[j]);
+ this->_field.assign(this->_value.refEntry(i,j), tmp[j]);
}
}
this->casenumber = 0;
}
else {
- Mul(this->_V,*this->_BB,_W);
+ Mul(this->_blockV,*this->_BB,_blockW);
std::vector<Element> tmp(block);
for (size_t i=0; i< block; ++i){
- BlasMatrix<Element> T(this->_V, i*numblock, 0, numblock, block);
+ BlasMatrix<Field> T(this->_blockV, i*numblock, 0, numblock, block);
_BMD.mul(tmp, _Special_U[i], T);
for (size_t j=0;j<block;++j)
- this->_F.assign(this->_value.refEntry(i,j), tmp[j]);
+ this->_field.assign(this->_value.refEntry(i,j), tmp[j]);
}
this->casenumber = 1;
@@ -471,7 +476,7 @@ namespace LinBox
if ( _case == 1) {
this->_BB->apply(_w,_u);
std::vector<Element> _col_value(this->_m);
- _BMD.mul(_col_value, this->_U, _w);
+ _BMD.mul(_col_value, this->_blockU, _w);
this->_value = _rep[_iter];
for (size_t j=0; j< this->_m; ++j)
this->_value.setEntry(j, _upd_idx, _col_value[j]);
@@ -481,7 +486,7 @@ namespace LinBox
else {
this->_BB->apply(_u,_w);
std::vector<Element> _col_value(this->_m);
- _BMD.mul(_col_value, this->_U, _u);
+ _BMD.mul(_col_value, this->_blockU, _u);
this->_value = _rep[_iter];
for (size_t j=0; j< this->_m; ++j)
this->_value.setEntry(j, _upd_idx, _col_value[j]);
@@ -520,3 +525,12 @@ namespace LinBox
#undef _BBC_TIMING
#endif // __LINBOX_blackbox_block_container_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/blackbox-container-base.h b/linbox/algorithms/blackbox-container-base.h
index fc33908..4ce344a 100644
--- a/linbox/algorithms/blackbox-container-base.h
+++ b/linbox/algorithms/blackbox-container-base.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/blackbox-container.h
* Copyright (C) 1999, 2001 Jean-Guillaume Dumas
*
* Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_blackbox_container_base_H
@@ -61,12 +62,14 @@ namespace LinBox
BlackboxContainerBase () {}
BlackboxContainerBase (const Blackbox *BB, const Field &F) :
- _F (F), _VD (F), _BB (BB), _size (MIN (BB->rowdim (), BB->coldim ()))
- { _size <<= 1; }
+ _field (F), _VD (F), _BB (BB), _size ((long)MIN (BB->rowdim (), BB->coldim ()))
+ {
+ _size <<= 1;
+ }
// Pascal Giorgi 16.02.2004
- BlackboxContainerBase (const Blackbox *BB, const Field &F, unsigned long size) :
- _F (F), _VD (F), _BB (BB), _size (size)
+ BlackboxContainerBase (const Blackbox *BB, const Field &F, unsigned long Size) :
+ _field (F), _VD (F), _BB (BB), _size ((long)Size)
{}
virtual ~BlackboxContainerBase ()
@@ -89,7 +92,7 @@ namespace LinBox
const_iterator end () { return const_iterator (); }
long size () const { return _size; }
- const Field &getField () const { return _F; }
+ const Field &getField () const { return _field; }
Blackbox *getBB () const { return _BB; }
protected:
@@ -110,7 +113,7 @@ namespace LinBox
/// Members
//--------------
- Field _F;
+ Field _field;
VectorDomain<Field> _VD;
const Blackbox *_BB;
@@ -169,3 +172,12 @@ namespace LinBox
#endif // __LINBOX_blackbox_container_base_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/blackbox-container-symmetric.h b/linbox/algorithms/blackbox-container-symmetric.h
index f17a3b5..3d503f6 100644
--- a/linbox/algorithms/blackbox-container-symmetric.h
+++ b/linbox/algorithms/blackbox-container-symmetric.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/blackbox-container.h
* Copyright (C) 1999, 2001 Jean-Guillaume Dumas, Bradford Hovinen
*
@@ -11,7 +9,25 @@
* Modifications to incorporate into linbox-new tree
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
// ================================================================
@@ -46,7 +62,7 @@ namespace LinBox
{ init (u0, u0); }
BlackboxContainerSymmetric (const Blackbox *D, const Field &F, RandIter &g) :
BlackboxContainerBase<Field, _Blackbox> (D, F)
- { init (g); }
+ { this->init (g); }
protected:
@@ -82,3 +98,12 @@ namespace LinBox
}
#endif // __LINBOX_blackbox_container_symmetric_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/blackbox-container-symmetrize.h b/linbox/algorithms/blackbox-container-symmetrize.h
index 8898668..60d5f17 100644
--- a/linbox/algorithms/blackbox-container-symmetrize.h
+++ b/linbox/algorithms/blackbox-container-symmetrize.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/blackbox-container-symmetrize.h
* Copyright (C) 1999, 2001 Jean-Guillaume Dumas
*
@@ -12,7 +10,25 @@
* VectorDomain
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @internal
@@ -24,7 +40,7 @@
#ifndef __LINBOX_blackbox_container_symmetrize_H
#define __LINBOX_blackbox_container_symmetrize_H
-#include <linbox/algorithms/blackbox-container-base.h>
+#include "linbox/algorithms/blackbox-container-base.h"
namespace LinBox
{
@@ -60,7 +76,7 @@ namespace LinBox
init (u0);
}
- //BlackboxContainerSymmetrize (const Blackbox *D, const Field &F, RandIter &g = typename Field::RandIter(_F) )
+ //BlackboxContainerSymmetrize (const Blackbox *D, const Field &F, RandIter &g = typename Field::RandIter(_field) )
BlackboxContainerSymmetrize (const Blackbox *D, const Field &F, RandIter &g = typename Field::RandIter() ) :
BlackboxContainerBase<Field, Blackbox> (D, F)
{
@@ -88,3 +104,12 @@ namespace LinBox
}
#endif // __LINBOX_blackbox_container_symmetrize_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/blackbox-container.h b/linbox/algorithms/blackbox-container.h
index 8432399..948b788 100644
--- a/linbox/algorithms/blackbox-container.h
+++ b/linbox/algorithms/blackbox-container.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/blackbox-container.h
* Copyright (C) 1999, 2001 Jean-Guillaume Dumas, Bradford Hovinen
*
@@ -8,15 +6,33 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_blackbox_container_H
#define __LINBOX_blackbox_container_H
-#include <linbox/randiter/archetype.h>
-#include <linbox/algorithms/blackbox-container-base.h>
-#include <linbox/util/timer.h>
+#include "linbox/randiter/archetype.h"
+#include "linbox/algorithms/blackbox-container-base.h"
+#include "linbox/util/timer.h"
namespace LinBox
{
@@ -144,3 +160,12 @@ namespace LinBox
#endif // __LINBOX_blackbox_container_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/blas-domain-multimod.h b/linbox/algorithms/blas-domain-multimod.h
new file mode 100644
index 0000000..182d368
--- /dev/null
+++ b/linbox/algorithms/blas-domain-multimod.h
@@ -0,0 +1,93 @@
+/* linbox/algorithms/blas-domain.inl
+ * Copyright (C) 2004 Pascal Giorgi, Clément Pernet
+ *
+ * Written by :
+ * Pascal Giorgi pascal.giorgi at ens-lyon.fr
+ * Clément Pernet clement.pernet at imag.fr
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+
+
+#ifndef __LINBOX_blas_matrix_domain_multimod_H
+#define __LINBOX_blas_matrix_domain_multimod_H
+
+#include "linbox/matrix/blas-matrix-multimod.h"
+#include "linbox/algorithms/blas-domain.h"
+
+THIS_CODE_MAY_NOT_COMPILE_AND_IS_NOT_TESTED
+
+namespace LinBox
+{
+
+
+ /*! specialisation for MultiModDouble.
+ */
+// #ifndef __INTEL_COMPILER
+ // template <>
+// #endif
+ class BlasMatrixDomainInv<MultiModDouble,BlasMatrix<MultiModDouble> > {
+ public:
+ int operator() (const MultiModDouble &F,
+ BlasMatrix<MultiModDouble> &Ainv,
+ const BlasMatrix<MultiModDouble> &A) const
+ {
+
+ linbox_check( A.rowdim() == A.coldim());
+ linbox_check( A.rowdim() == Ainv.rowdim());
+ linbox_check( A.coldim() == Ainv.coldim());
+ BlasMatrix<MultiModDouble> tmp(A);
+ return (*this)(F,Ainv,tmp);
+ }
+
+ int operator() (const MultiModDouble &F,
+ BlasMatrix<MultiModDouble> &Ainv,
+ BlasMatrix<MultiModDouble> &A) const
+ {
+
+ linbox_check( A.rowdim() == A.coldim());
+ linbox_check( A.rowdim() == Ainv.rowdim());
+ linbox_check( A.coldim() == Ainv.coldim());
+ int nullity, defrank=0;
+
+ for (size_t i=0;i<F.size();++i){
+ FFPACK::Invert(F.getBase(i),A.rowdim(), A.getMatrix(i)->getPointer(),A.getMatrix(i)->getStride(),
+ Ainv.getMatrix(i)->getPointer(),Ainv.getMatrix(i)->getStride(),nullity);
+ defrank+=nullity;
+ }
+ return defrank;
+ }
+
+ };
+
+}
+
+
+#endif // __LINBOX_blas_matrix_domain_multimod_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/blas-domain.h b/linbox/algorithms/blas-domain.h
index 2716ca8..93e7b19 100644
--- a/linbox/algorithms/blas-domain.h
+++ b/linbox/algorithms/blas-domain.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/blas-domain.h
* Copyright (C) 2004 Pascal Giorgi, Clément Pernet
*
@@ -7,10 +5,13 @@
* Pascal Giorgi pascal.giorgi at ens-lyon.fr
* Clément Pernet clement.pernet at imag.fr
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/blas-domain.h
@@ -37,12 +38,14 @@
#include <iostream>
#include <vector>
+
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+
#include <fflas-ffpack/ffpack/ffpack.h>
#include <fflas-ffpack/fflas/fflas.h>
-//#include <linbox/blackbox/permutation.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/matrix/matrix-permutation.h>
-#include <linbox/util/debug.h>
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/matrix/permutation-matrix.h"
namespace LinBox
@@ -315,7 +318,7 @@ namespace LinBox
protected:
- const Field & _F;
+ const Field & _field;
Element _One;
Element _Zero;
Element _MOne;
@@ -325,23 +328,37 @@ namespace LinBox
//! Constructor of BlasDomain.
BlasMatrixDomain (const Field& F ) :
- _F(F)
+ _field(F)
{
F.init(_One,1UL);
F.init(_Zero,0UL);
F.init(_MOne,-1);
+#ifndef NDEBUG
+ if (!Givaro::probab_prime(F.characteristic())) {
+ std::cout << " *** WARNING *** " << std::endl;
+ std::cout << " You are using a BLAS Domain where your field is not prime " << std::endl;
+ }
+#endif
}
//! Copy constructor
BlasMatrixDomain (const BlasMatrixDomain<Field> & BMD) :
- _F(BMD._F), _One(BMD._One), _Zero(BMD._Zero), _MOne(BMD._MOne)
- {}
+ _field(BMD._field), _One(BMD._One), _Zero(BMD._Zero), _MOne(BMD._MOne)
+ {
+#ifndef NDEBUG
+ if (!Givaro::probab_prime(_field.characteristic())) {
+ std::cout << " *** WARNING *** " << std::endl;
+ std::cout << " You are using a BLAS Domain where your field is not prime " << std::endl;
+ }
+#endif
+
+ }
//! Field accessor
const Field& field() const
{
- return _F;
+ return _field;
}
@@ -354,7 +371,7 @@ namespace LinBox
template <class Operand1, class Operand2, class Operand3>
Operand1& mul(Operand1& C, const Operand2& A, const Operand3& B) const
{
- return BlasMatrixDomainMul<Field,Operand1,Operand2,Operand3>()(_F,C,A,B);
+ return BlasMatrixDomainMul<Field,Operand1,Operand2,Operand3>()(_field,C,A,B);
}
//! addition.
@@ -362,7 +379,7 @@ namespace LinBox
template <class Operand1, class Operand2, class Operand3>
Operand1& add(Operand1& C, const Operand2& A, const Operand3& B) const
{
- return BlasMatrixDomainAdd<Field,Operand1,Operand2,Operand3>()(_F,C,A,B);
+ return BlasMatrixDomainAdd<Field,Operand1,Operand2,Operand3>()(_field,C,A,B);
}
//! copy.
@@ -370,7 +387,7 @@ namespace LinBox
template <class Operand1, class Operand2>
Operand1& copy(Operand1& B, const Operand2& A) const
{
- return BlasMatrixDomainCopy<Field,Operand1,Operand2>()(_F,B,A);
+ return BlasMatrixDomainCopy<Field,Operand1,Operand2>()(_field,B,A);
}
//! substraction
@@ -378,7 +395,7 @@ namespace LinBox
template <class Operand1, class Operand2, class Operand3>
Operand1& sub(Operand1& C, const Operand2& A, const Operand3& B) const
{
- return BlasMatrixDomainSub<Field,Operand1,Operand2,Operand3>()(_F,C,A,B);
+ return BlasMatrixDomainSub<Field,Operand1,Operand2,Operand3>()(_field,C,A,B);
}
//! substraction (in place)
@@ -386,7 +403,7 @@ namespace LinBox
template <class Operand1, class Operand3>
Operand1& subin(Operand1& C, const Operand3& B) const
{
- return BlasMatrixDomainSubin<Field,Operand1,Operand3>()(_F,C,B);
+ return BlasMatrixDomainSubin<Field,Operand1,Operand3>()(_field,C,B);
}
//! addition (in place)
@@ -394,7 +411,7 @@ namespace LinBox
template <class Operand1, class Operand3>
Operand1& addin(Operand1& C, const Operand3& B) const
{
- return BlasMatrixDomainAddin<Field,Operand1,Operand3>()(_F,C,B);
+ return BlasMatrixDomainAddin<Field,Operand1,Operand3>()(_field,C,B);
}
@@ -412,7 +429,7 @@ namespace LinBox
template <class Operand1, class Operand2>
Operand1& mulin_left(Operand1& A, const Operand2& B ) const
{
- return BlasMatrixDomainMulin<Field,Operand1,Operand2>()(_F,A,B);
+ return BlasMatrixDomainMulin<Field,Operand1,Operand2>()(_field,A,B);
}
//! In place multiplication.
@@ -420,7 +437,7 @@ namespace LinBox
template <class Operand1, class Operand2>
Operand2& mulin_right(const Operand1& A, Operand2& B ) const
{
- return BlasMatrixDomainMulin<Field,Operand2,Operand1>()(_F,A,B);
+ return BlasMatrixDomainMulin<Field,Operand2,Operand1>()(_field,A,B);
}
//! axpy.
@@ -477,7 +494,7 @@ namespace LinBox
Operand1& muladd(Operand1& D, const Element& beta, const Operand1& C,
const Element& alpha, const Operand2& A, const Operand3& B) const
{
- return BlasMatrixDomainMulAdd<Field,Operand1,Operand2,Operand3>()(_F,D,beta,C,alpha,A,B);
+ return BlasMatrixDomainMulAdd<Field,Operand1,Operand2,Operand3>()(_field,D,beta,C,alpha,A,B);
}
//! muladdin.
@@ -486,7 +503,7 @@ namespace LinBox
Operand1& muladdin(const Element& beta, Operand1& C,
const Element& alpha, const Operand2& A, const Operand3& B) const
{
- return BlasMatrixDomainMulAdd<Field,Operand1,Operand2,Operand3>()(_F,beta,C,alpha,A,B);
+ return BlasMatrixDomainMulAdd<Field,Operand1,Operand2,Operand3>()(_field,beta,C,alpha,A,B);
}
@@ -499,7 +516,7 @@ namespace LinBox
template <class Matrix>
Matrix& inv( Matrix &Ainv, const Matrix &A) const
{
- BlasMatrixDomainInv<Field,Matrix>()(_F,Ainv,A);
+ BlasMatrixDomainInv<Field,Matrix>()(_field,Ainv,A);
return Ainv;
}
@@ -507,7 +524,7 @@ namespace LinBox
template <class Matrix>
Matrix& invin( Matrix &Ainv, Matrix &A) const
{
- BlasMatrixDomainInv<Field,Matrix>()(_F,Ainv,A);
+ BlasMatrixDomainInv<Field,Matrix>()(_field,Ainv,A);
return Ainv;
}
@@ -517,7 +534,7 @@ namespace LinBox
{
Matrix tmp(A.rowdim(), A.coldim());
tmp = A;
- BlasMatrixDomainInv<Field,Matrix>()(_F,A,tmp);
+ BlasMatrixDomainInv<Field,Matrix>()(_field,A,tmp);
return A;
}
@@ -536,7 +553,7 @@ namespace LinBox
template <class Matrix>
Matrix& inv( Matrix &Ainv, const Matrix &A, int& nullity) const
{
- nullity = BlasMatrixDomainInv<Field,Matrix>()(_F,Ainv,A);
+ nullity = BlasMatrixDomainInv<Field,Matrix>()(_field,Ainv,A);
return Ainv;
}
@@ -544,7 +561,7 @@ namespace LinBox
template <class Matrix>
Matrix& invin( Matrix &Ainv, Matrix &A, int& nullity) const
{
- nullity = BlasMatrixDomainInv<Field,Matrix>()(_F,Ainv,A);
+ nullity = BlasMatrixDomainInv<Field,Matrix>()(_field,Ainv,A);
return Ainv;
}
@@ -552,28 +569,28 @@ namespace LinBox
template <class Matrix>
unsigned int rank(const Matrix &A) const
{
- return BlasMatrixDomainRank<Field,Matrix>()(_F,A);
+ return BlasMatrixDomainRank<Field,Matrix>()(_field,A);
}
//! in-place Rank (the matrix is modified)
template <class Matrix>
unsigned int rankin(Matrix &A) const
{
- return BlasMatrixDomainRank<Field, Matrix>()(_F,A);
+ return BlasMatrixDomainRank<Field, Matrix>()(_field,A);
}
//! determinant
template <class Matrix>
Element det(const Matrix &A) const
{
- return BlasMatrixDomainDet<Field, Matrix>()(_F,A);
+ return BlasMatrixDomainDet<Field, Matrix>()(_field,A);
}
//! in-place Determinant (the matrix is modified)
template <class Matrix>
Element detin(Matrix &A) const
{
- return BlasMatrixDomainDet<Field, Matrix>()(_F,A);
+ return BlasMatrixDomainDet<Field, Matrix>()(_field,A);
}
//@}
@@ -587,7 +604,7 @@ namespace LinBox
template <class Operand, class Matrix>
Operand& left_solve (Operand& X, const Matrix& A, const Operand& B) const
{
- return BlasMatrixDomainLeftSolve<Field,Operand,Matrix>()(_F,X,A,B);
+ return BlasMatrixDomainLeftSolve<Field,Operand,Matrix>()(_field,X,A,B);
}
//! linear solve with matrix right hand side, the result is stored in-place in B.
@@ -596,7 +613,7 @@ namespace LinBox
template <class Operand,class Matrix>
Operand& left_solve (const Matrix& A, Operand& B) const
{
- return BlasMatrixDomainLeftSolve<Field,Operand,Matrix>()(_F,A,B);
+ return BlasMatrixDomainLeftSolve<Field,Operand,Matrix>()(_field,A,B);
}
//! linear solve with matrix right hand side.
@@ -604,7 +621,7 @@ namespace LinBox
template <class Operand, class Matrix>
Operand& right_solve (Operand& X, const Matrix& A, const Operand& B) const
{
- return BlasMatrixDomainRightSolve<Field,Operand,Matrix>()(_F,X,A,B);
+ return BlasMatrixDomainRightSolve<Field,Operand,Matrix>()(_field,X,A,B);
}
//! linear solve with matrix right hand side, the result is stored in-place in B.
@@ -613,14 +630,14 @@ namespace LinBox
template <class Operand, class Matrix>
Operand& right_solve (const Matrix& A, Operand& B) const
{
- return BlasMatrixDomainRightSolve<Field,Operand,Matrix>()(_F,A,B);
+ return BlasMatrixDomainRightSolve<Field,Operand,Matrix>()(_field,A,B);
}
//! minimal polynomial computation.
template <class Polynomial, class Matrix>
Polynomial& minpoly( Polynomial& P, const Matrix& A ) const
{
- return BlasMatrixDomainMinpoly<Field, Polynomial, Matrix>()(_F,P,A);
+ return BlasMatrixDomainMinpoly<Field, Polynomial, Matrix>()(_field,P,A);
}
//! characteristic polynomial computation.
@@ -628,10 +645,10 @@ namespace LinBox
Polynomial& charpoly( Polynomial& P, const Matrix& A ) const
{
- commentator.start ("Modular Dense Charpoly ", "MDCharpoly");
+ commentator().start ("Modular Dense Charpoly ", "MDCharpoly");
std::list<Polynomial> P_list;
P_list.clear();
- BlasMatrixDomainCharpoly<Field, std::list<Polynomial>, Matrix >()(_F,P_list,A);
+ BlasMatrixDomainCharpoly<Field, std::list<Polynomial>, Matrix >()(_field,P_list,A);
Polynomial tmp(A.rowdim()+1);
@@ -644,7 +661,7 @@ namespace LinBox
// delete &(*it);
++it;
}
- commentator.stop ("done", NULL, "MDCharpoly");
+ commentator().stop ("done", NULL, "MDCharpoly");
return P;
}
@@ -653,7 +670,7 @@ namespace LinBox
template <class Polynomial, class Matrix >
std::list<Polynomial>& charpoly( std::list<Polynomial>& P, const Matrix& A ) const
{
- return BlasMatrixDomainCharpoly<Field, std::list<Polynomial>, Matrix >()(_F,P,A);
+ return BlasMatrixDomainCharpoly<Field, std::list<Polynomial>, Matrix >()(_field,P,A);
}
@@ -666,15 +683,100 @@ namespace LinBox
size_t i,j;
res.resize(P1.size()+P2.size()-1);
for (i=0;i<res.size();i++)
- _F.assign(res[i],_Zero);
+ _field.assign(res[i],_Zero);
for ( i=0;i<P1.size();i++)
for ( j=0;j<P2.size();j++)
- _F.axpyin(res[i+j],P1[i],P2[j]);
+ _field.axpyin(res[i+j],P1[i],P2[j]);
return res;
}
//@}
+ template<class Matrix1, class Matrix2>
+ bool areEqual(const Matrix1 & A, const Matrix2 & B)
+ {
+ if ( (A.rowdim() != B.rowdim()) || (A.coldim() != B.coldim()) )
+ return false ;
+ for (size_t i = 0 ; i < A.rowdim() ; ++i)
+ for (size_t j = 0 ; j < A.coldim() ; ++j)
+ if (!_field.areEqual(A.getEntry(i,j),B.getEntry(i,j))) //!@bug use refs
+ return false ;
+ return true ;
+ }
+
+ template<class Matrix>
+ void setIdentity(Matrix & I)
+ {
+ for (size_t i = 0 ; i< I.rowdim() ; ++i)
+ for (size_t j = 0 ; j < I.coldim() ; ++j) {
+ if (i == j)
+ I.setEntry(i,j,_One);
+ else
+ I.setEntry(i,j,_Zero);
+ }
+
+ }
+
+ template<class Matrix>
+ void setZero(Matrix & I)
+ {
+ // use Iterator
+ for (size_t i = 0 ; i< I.rowdim() ; ++i)
+ for (size_t j = 0 ; j < I.coldim() ; ++j) {
+ I.setEntry(i,j,_Zero);
+ }
+ }
+
+
+ template<class Matrix1>
+ bool isZero(const Matrix1 & A)
+ {
+ for (size_t i = 0 ; i < A.rowdim() ; ++i)
+ for (size_t j = 0 ; j < A.coldim() ; ++j)
+ if (!_field.isZero(A.getEntry(i,j))) //!@bug use refs
+ return false ;
+ return true ;
+ }
+
+ template<class Matrix1>
+ bool isIdentity(const Matrix1 & A)
+ {
+ if (A.rowdim() != A.coldim())
+ return false ;
+ for (size_t i = 0 ; i < A.rowdim() ; ++i)
+ if (!_field.isOne(A.getEntry(i,i)))
+ return false;
+
+ for (size_t i = 0 ; i < A.rowdim() ; ++i)
+ for (size_t j = 0 ; j < i ; ++j)
+ if (!_field.isZero(A.getEntry(i,j))) //!@bug use refs
+ return false ;
+ for (size_t i = 0 ; i < A.rowdim() ; ++i)
+ for (size_t j = i+1 ; j < A.coldim() ; ++j)
+ if (!_field.isZero(A.getEntry(i,j))) //!@bug use refs
+ return false ;
+ return true ;
+ }
+
+ template<class Matrix1>
+ bool isIdentityGeneralized(const Matrix1 & A)
+ {
+ size_t mn = std::min(A.rowdim(),A.coldim());
+ for (size_t i = 0 ; i < mn ; ++i)
+ if (!_field.isOne(A.getEntry(i,i)))
+ return false;
+
+ for (size_t i = 0 ; i < A.rowdim() ; ++i)
+ for (size_t j = 0 ; j < std::min(i,mn) ; ++j)
+ if (!_field.isZero(A.getEntry(i,j))) //!@bug use refs
+ return false ;
+ for (size_t i = 0 ; i < A.rowdim() ; ++i)
+ for (size_t j = i+1 ; j < A.coldim() ; ++j)
+ if (!_field.isZero(A.getEntry(i,j))) //!@bug use refs
+ return false ;
+ return true ;
+ }
+
public:
/** Print matrix.
@@ -685,13 +787,13 @@ namespace LinBox
template <class Matrix>
inline std::ostream &write (std::ostream &os, const Matrix &A) const
{
- return A.write (os, _F);
+ return A.write (os);
}
template <class Matrix>
inline std::ostream &write (std::ostream &os, const Matrix &A, bool maple_format) const
{
- return A.write (os, _F, maple_format);
+ return A.write (os, _field, maple_format);
}
/** Read matrix
@@ -702,7 +804,7 @@ namespace LinBox
template <class Matrix>
inline std::istream &read (std::istream &is, Matrix &A) const
{
- return A.read (is, _F);
+ return A.read (is, _field);
}
}; /* end of class BlasMatrixDomain */
@@ -710,7 +812,16 @@ namespace LinBox
} /* end of namespace LinBox */
-#include <linbox/algorithms/blas-domain.inl>
+#include "linbox/algorithms/blas-domain.inl"
#endif /* __LINBOX_blas_matrix_domain_H */
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/blas-domain.inl b/linbox/algorithms/blas-domain.inl
index 0ae756e..a555797 100644
--- a/linbox/algorithms/blas-domain.inl
+++ b/linbox/algorithms/blas-domain.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/blas-domain.inl
* Copyright (C) 2004 Pascal Giorgi, Clément Pernet
*
@@ -7,10 +5,13 @@
* Pascal Giorgi pascal.giorgi at ens-lyon.fr
* Clément Pernet clement.pernet at imag.fr
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -28,138 +29,102 @@
#ifndef __LINBOX_blas_matrix_domain_INL
#define __LINBOX_blas_matrix_domain_INL
-#include <linbox/blackbox/blas-blackbox.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/matrix/factorized-matrix.h>
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/matrix/factorized-matrix.h"
namespace LinBox
{
/*
* **********************************************
- * *** Specialization for BlasBlackbox<Field> ***
+ * *** Specialization for BlasMatrix<Field> ***
* **********************************************
*/
+#if 0
// Inversion
// dpritcha: now returns nullity. (2004-07-19)
// previously returned Ainv but this is passed back anyway.
template <class Field>
- class BlasMatrixDomainInv<Field,BlasBlackbox<Field> > {
+ class BlasMatrixDomainInv<Field,BlasMatrix<Field> > {
public:
int operator() (const Field &F,
- BlasBlackbox<Field> &Ainv,
- const BlasBlackbox<Field> &A) const
+ BlasMatrix<Field> &Ainv,
+ const BlasMatrix<Field> &A) const
{
linbox_check( A.rowdim() == A.coldim());
linbox_check( A.rowdim() == Ainv.rowdim());
linbox_check( A.coldim() == Ainv.coldim());
- BlasBlackbox<Field> tmp(A);
+ BlasMatrix<Field> tmp(A);
return (*this)(F,Ainv,tmp);
}
int operator() (const Field &F,
- BlasBlackbox<Field> &Ainv,
- BlasBlackbox<Field> &A) const
+ BlasMatrix<Field> &Ainv,
+ BlasMatrix<Field> &A) const
{
linbox_check( A.rowdim() == A.coldim());
linbox_check( A.rowdim() == Ainv.rowdim());
linbox_check( A.coldim() == Ainv.coldim());
int nullity;
- FFPACK::Invert(F,A.rowdim(),A.getPointer(),A.getStride(),
+ FFPACK::Invert((typename Field::Father_t)F,A.rowdim(),A.getPointer(),A.getStride(),
Ainv.getPointer(),Ainv.getStride(),nullity);
return nullity;
}
};
-
-#ifndef __INTEL_COMPILER
- template <>
#endif
- class BlasMatrixDomainInv<MultiModDouble,BlasBlackbox<MultiModDouble> > {
- public:
- int operator() (const MultiModDouble &F,
- BlasBlackbox<MultiModDouble> &Ainv,
- const BlasBlackbox<MultiModDouble> &A) const
- {
-
- linbox_check( A.rowdim() == A.coldim());
- linbox_check( A.rowdim() == Ainv.rowdim());
- linbox_check( A.coldim() == Ainv.coldim());
- BlasBlackbox<MultiModDouble> tmp(A);
- return (*this)(F,Ainv,tmp);
- }
-
- int operator() (const MultiModDouble &F,
- BlasBlackbox<MultiModDouble> &Ainv,
- BlasBlackbox<MultiModDouble> &A) const
- {
-
- linbox_check( A.rowdim() == A.coldim());
- linbox_check( A.rowdim() == Ainv.rowdim());
- linbox_check( A.coldim() == Ainv.coldim());
- int nullity, defrank=0;
-
- for (size_t i=0;i<F.size();++i){
- FFPACK::Invert(F.getBase(i),A.rowdim(), A.getMatrix(i)->getPointer(),A.getMatrix(i)->getStride(),
- Ainv.getMatrix(i)->getPointer(),Ainv.getMatrix(i)->getStride(),nullity);
- defrank+=nullity;
- }
- return defrank;
- }
-
- };
-
+#if 0
// Rank
template <class Field>
- class BlasMatrixDomainRank<Field,BlasBlackbox<Field> > {
+ class BlasMatrixDomainRank<Field,BlasMatrix<Field> > {
public:
inline unsigned int operator() (const Field &F,
- const BlasBlackbox<Field> &A) const
+ const BlasMatrix<Field> &A) const
{
- BlasBlackbox<Field> tmp(A);
+ BlasMatrix<Field> tmp(A);
return (*this)(F,tmp);
}
inline unsigned int operator() (const Field &F,
- BlasBlackbox<Field> &A) const
+ BlasMatrix<Field> &A) const
{
- return FFPACK::Rank(F, A.rowdim(), A.coldim(),A.getPointer(), A.getStride());
+ return FFPACK::Rank((typename Field::Father_t)F, A.rowdim(), A.coldim(),A.getPointer(), A.getStride());
}
};
// determinant
template <class Field>
- class BlasMatrixDomainDet<Field,BlasBlackbox<Field> > {
+ class BlasMatrixDomainDet<Field,BlasMatrix<Field> > {
public:
inline typename Field::Element operator()(const Field &F,
- const BlasBlackbox<Field> &A) const
+ const BlasMatrix<Field> &A) const
{
- BlasBlackbox<Field> tmp(A);
+ BlasMatrix<Field> tmp(A);
return (*this)(F,tmp);
}
inline typename Field::Element operator() (const Field &F,
- BlasBlackbox<Field> &A) const
+ BlasMatrix<Field> &A) const
{
- return FFPACK::Det(F, A.rowdim(), A.coldim(),A.getPointer(), A.getStride());
+ return FFPACK::Det((typename Field::Father_t)F, A.rowdim(), A.coldim(),A.getPointer(), A.getStride());
}
};
-
+#endif
/*
* **********************************************
- * *** Specialization for BlasMatrix<Element> ***
+ * *** Specialization for BlasMatrix<Field> ***
* **********************************************
*/
@@ -168,30 +133,30 @@ namespace LinBox
// dpritcha: now returns nullity. (2004-07-19)
// previously returned Ainv but this is passed back anyway.
template <class Field>
- class BlasMatrixDomainInv<Field,BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainInv<Field,BlasMatrix<Field> > {
public:
int operator() (const Field &F,
- BlasMatrix<typename Field::Element> &Ainv,
- const BlasMatrix<typename Field::Element> &A) const
+ BlasMatrix<Field> &Ainv,
+ const BlasMatrix<Field> &A) const
{
linbox_check( A.rowdim() == A.coldim());
linbox_check( A.rowdim() == Ainv.rowdim());
linbox_check( A.coldim() == Ainv.coldim());
- BlasMatrix<typename Field::Element> tmp(A);
+ BlasMatrix<Field> tmp(A);
return (*this)(F,Ainv,tmp);
}
int operator() (const Field &F,
- BlasMatrix<typename Field::Element> &Ainv,
- BlasMatrix<typename Field::Element> &A) const
+ BlasMatrix<Field> &Ainv,
+ BlasMatrix<Field> &A) const
{
linbox_check( A.rowdim() == A.coldim());
linbox_check( A.rowdim() == Ainv.rowdim());
linbox_check( A.coldim() == Ainv.coldim());
int nullity;
- FFPACK::Invert (F, A.rowdim(), A.getPointer(), A.getStride(),
+ FFPACK::Invert ((typename Field::Father_t)F, A.rowdim(), A.getPointer(), A.getStride(),
Ainv.getPointer(),Ainv.getStride(),nullity);
return nullity;
}
@@ -200,63 +165,64 @@ namespace LinBox
// Rank
template <class Field>
- class BlasMatrixDomainRank<Field,BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainRank<Field,BlasMatrix<Field> > {
public:
inline unsigned int operator() (const Field &F,
- const BlasMatrix<typename Field::Element> &A) const
+ const BlasMatrix<Field> &A) const
{
- BlasMatrix<typename Field::Element> tmp(A);
+ BlasMatrix<Field> tmp(A);
return (*this)(F,tmp);
}
inline unsigned int
operator() (const Field &F,
- BlasMatrix<typename Field::Element> &A) const
+ BlasMatrix<Field> &A) const
{
- return FFPACK::Rank(F, A.rowdim(), A.coldim(),A.getPointer(), A.getStride());
+ return (unsigned int) FFPACK::Rank((typename Field::Father_t)F,
+ A.rowdim(), A.coldim(),A.getPointer(), A.getStride());
}
};
// determinant
template <class Field>
- class BlasMatrixDomainDet<Field,BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainDet<Field,BlasMatrix<Field> > {
public:
inline typename Field::Element operator()(const Field &F,
- const BlasMatrix<typename Field::Element> &A) const
+ const BlasMatrix<Field> &A) const
{
- BlasMatrix<typename Field::Element> tmp(A);
+ BlasMatrix<Field> tmp(A);
return (*this)(F,tmp);
}
inline typename Field::Element operator() (const Field &F,
- BlasMatrix<typename Field::Element> &A) const
+ BlasMatrix<Field> &A) const
{
- return FFPACK::Det(F, A.rowdim(), A.coldim(),A.getPointer(), A.getStride());
+ return FFPACK::Det((typename Field::Father_t)F, A.rowdim(), A.coldim(),A.getPointer(), A.getStride());
}
};
/*
- * specialization for Operand1, Operand2 and Operand3 of type BlasMatrix<Element>
+ * specialization for Operand1, Operand2 and Operand3 of type BlasMatrix<Field>
*/
template<class Field>
- class BlasMatrixDomainAdd<Field,BlasMatrix<typename Field::Element>,BlasMatrix<typename Field::Element>, BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainAdd<Field,BlasMatrix<Field>,BlasMatrix<Field>, BlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator()(const Field& F,
- BlasMatrix<typename Field::Element>& C,
- const BlasMatrix<typename Field::Element>& A,
- const BlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator()(const Field& F,
+ BlasMatrix<Field>& C,
+ const BlasMatrix<Field>& A,
+ const BlasMatrix<Field>& B) const
{
linbox_check( A.rowdim() == B.rowdim());
linbox_check( C.rowdim() == A.rowdim());
linbox_check( A.coldim() == B.coldim());
linbox_check( C.coldim() == A.coldim());
- FFLAS::fadd (F, C.rowdim(), C.coldim(),
+ FFLAS::fadd ((typename Field::Father_t)F, C.rowdim(), C.coldim(),
A.getPointer(), A.getStride(),
B.getPointer(), B.getStride(),
C.getPointer(), C.getStride());
@@ -265,16 +231,16 @@ namespace LinBox
};
template<class Field>
- class BlasMatrixDomainCopy<Field,BlasMatrix<typename Field::Element>, BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainCopy<Field,BlasMatrix<Field>, BlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator()(const Field& F,
- BlasMatrix<typename Field::Element>& B,
- const BlasMatrix<typename Field::Element>& A) const
+ BlasMatrix<Field>& operator()(const Field& F,
+ BlasMatrix<Field>& B,
+ const BlasMatrix<Field>& A) const
{
linbox_check( A.rowdim() == B.rowdim());
linbox_check( A.coldim() == B.coldim());
for (size_t i=0; i<A.rowdim(); i++)
- FFLAS::fcopy (F, A.coldim(),
+ FFLAS::fcopy ((typename Field::Father_t)F, A.coldim(),
B.getPointer() + i*B.getStride(), 1,
A.getPointer() + i*A.getStride(), 1);
return B;
@@ -282,18 +248,18 @@ namespace LinBox
};
template<class Field>
- class BlasMatrixDomainSub<Field,BlasMatrix<typename Field::Element>,BlasMatrix<typename Field::Element>, BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainSub<Field,BlasMatrix<Field>,BlasMatrix<Field>, BlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator()(const Field& F,
- BlasMatrix<typename Field::Element>& C,
- const BlasMatrix<typename Field::Element>& A,
- const BlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator()(const Field& F,
+ BlasMatrix<Field>& C,
+ const BlasMatrix<Field>& A,
+ const BlasMatrix<Field>& B) const
{
linbox_check( A.rowdim() == B.rowdim());
linbox_check( C.rowdim() == A.rowdim());
linbox_check( A.coldim() == B.coldim());
linbox_check( C.coldim() == A.coldim());
- FFLAS::fsub (F, C.rowdim(), C.coldim(),
+ FFLAS::fsub ((typename Field::Father_t)F, C.rowdim(), C.coldim(),
A.getPointer(), A.getStride(),
B.getPointer(), B.getStride(),
C.getPointer(), C.getStride());
@@ -302,15 +268,15 @@ namespace LinBox
};
template<class Field>
- class BlasMatrixDomainSubin<Field,BlasMatrix<typename Field::Element>,BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainSubin<Field,BlasMatrix<Field>,BlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator()(const Field& F,
- BlasMatrix<typename Field::Element>& C,
- const BlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator()(const Field& F,
+ BlasMatrix<Field>& C,
+ const BlasMatrix<Field>& B) const
{
linbox_check( C.rowdim() == B.rowdim());
linbox_check( C.coldim() == B.coldim());
- FFLAS::fsubin (F, C.rowdim(), C.coldim(),
+ FFLAS::fsubin ((typename Field::Father_t)F, C.rowdim(), C.coldim(),
B.getPointer(), B.getStride(),
C.getPointer(), C.getStride());
return C;
@@ -318,15 +284,15 @@ namespace LinBox
};
template<class Field>
- class BlasMatrixDomainAddin<Field,BlasMatrix<typename Field::Element>,BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainAddin<Field,BlasMatrix<Field>,BlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator()(const Field& F,
- BlasMatrix<typename Field::Element>& C,
- const BlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator()(const Field& F,
+ BlasMatrix<Field>& C,
+ const BlasMatrix<Field>& B) const
{
linbox_check( C.rowdim() == B.rowdim());
linbox_check( C.coldim() == B.coldim());
- FFLAS::faddin (F, C.rowdim(), C.coldim(),
+ FFLAS::faddin ((typename Field::Father_t)F, C.rowdim(), C.coldim(),
B.getPointer(), B.getStride(),
C.getPointer(), C.getStride());
return C;
@@ -336,16 +302,16 @@ namespace LinBox
// general matrix-matrix multiplication and addition with scaling
// D= beta.C + alpha.A*B
template<class Field>
- class BlasMatrixDomainMulAdd<Field,BlasMatrix<typename Field::Element>,BlasMatrix<typename Field::Element>, BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainMulAdd<Field,BlasMatrix<Field>,BlasMatrix<Field>, BlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>&
+ BlasMatrix<Field>&
operator()(const Field & F,
- BlasMatrix<typename Field::Element> & D,
+ BlasMatrix<Field> & D,
const typename Field::Element & beta,
- const BlasMatrix<typename Field::Element>& C,
+ const BlasMatrix<Field>& C,
const typename Field::Element & alpha,
- const BlasMatrix<typename Field::Element>& A,
- const BlasMatrix<typename Field::Element>& B) const
+ const BlasMatrix<Field>& A,
+ const BlasMatrix<Field>& B) const
{
linbox_check( A.coldim() == B.rowdim());
linbox_check( C.rowdim() == A.rowdim());
@@ -361,7 +327,7 @@ namespace LinBox
// D.write(std::cout << "Dfgem :=" ) <<','<< std::endl;
// A.write(std::cout << "Afgem :=" ) <<','<< std::endl;
// B.write(std::cout << "Bfgem :=" ) <<','<< std::endl;
- FFLAS::fgemm( F, FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
+ FFLAS::fgemm((typename Field::Father_t) F, FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
C.rowdim(), C.coldim(), A.coldim(),
alpha,
A.getPointer(), A.getStride(),
@@ -376,19 +342,19 @@ namespace LinBox
}
- BlasMatrix<typename Field::Element>&
+ BlasMatrix<Field>&
operator() (const Field & F,
const typename Field::Element & beta,
- BlasMatrix<typename Field::Element> & C,
+ BlasMatrix<Field> & C,
const typename Field::Element & alpha,
- const BlasMatrix<typename Field::Element>& A,
- const BlasMatrix<typename Field::Element>& B) const
+ const BlasMatrix<Field>& A,
+ const BlasMatrix<Field>& B) const
{
linbox_check( A.coldim() == B.rowdim());
linbox_check( C.rowdim() == A.rowdim());
linbox_check( C.coldim() == B.coldim());
- FFLAS::fgemm( F, FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
+ FFLAS::fgemm((typename Field::Father_t) F, FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
C.rowdim(), C.coldim(), A.coldim(),
alpha,
A.getPointer(), A.getStride(),
@@ -402,18 +368,18 @@ namespace LinBox
template<class Field>
class BlasMatrixDomainMulAdd<Field,
- BlasMatrix<typename Field::Element>,
- TransposedBlasMatrix<BlasMatrix<typename Field::Element> >,
- BlasMatrix<typename Field::Element> > {
+ BlasMatrix<Field>,
+ TransposedBlasMatrix<BlasMatrix<Field> >,
+ BlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>&
+ BlasMatrix<Field>&
operator()(const Field & F,
- BlasMatrix<typename Field::Element> & D,
+ BlasMatrix<Field> & D,
const typename Field::Element & beta,
- const BlasMatrix<typename Field::Element>& C,
+ const BlasMatrix<Field>& C,
const typename Field::Element & alpha,
- const TransposedBlasMatrix<BlasMatrix<typename Field::Element> >& A,
- const BlasMatrix<typename Field::Element>& B) const
+ const TransposedBlasMatrix<BlasMatrix<Field> >& A,
+ const BlasMatrix<Field>& B) const
{
linbox_check( A.getMatrix().rowdim() == B.rowdim());
linbox_check( C.rowdim() == A.getMatrix().coldim());
@@ -423,7 +389,7 @@ namespace LinBox
D=C;
- FFLAS::fgemm( F, FFLAS::FflasTrans, FFLAS::FflasNoTrans,
+ FFLAS::fgemm((typename Field::Father_t) F, FFLAS::FflasTrans, FFLAS::FflasNoTrans,
C.rowdim(), C.coldim(), B.rowdim(),
alpha,
A.getMatrix().getPointer(), A.getMatrix().getStride(),
@@ -435,19 +401,19 @@ namespace LinBox
}
- BlasMatrix<typename Field::Element>&
+ BlasMatrix<Field>&
operator() (const Field & F,
const typename Field::Element & beta,
- BlasMatrix<typename Field::Element> & C,
+ BlasMatrix<Field> & C,
const typename Field::Element & alpha,
- const TransposedBlasMatrix<BlasMatrix<typename Field::Element> >& A,
- const BlasMatrix<typename Field::Element>& B) const
+ const TransposedBlasMatrix<BlasMatrix<Field> >& A,
+ const BlasMatrix<Field>& B) const
{
linbox_check( A.getMatrix().rowdim() == B.rowdim());
linbox_check( C.rowdim() == A.getMatrix().coldim());
linbox_check( C.coldim() == B.coldim());
- FFLAS::fgemm( F, FFLAS::FflasTrans, FFLAS::FflasNoTrans,
+ FFLAS::fgemm((typename Field::Father_t) F, FFLAS::FflasTrans, FFLAS::FflasNoTrans,
C.rowdim(), C.coldim(), B.rowdim(),
alpha,
A.getMatrix().getPointer(), A.getMatrix().getStride(),
@@ -460,18 +426,18 @@ namespace LinBox
template<class Field>
class BlasMatrixDomainMulAdd<Field,
- BlasMatrix<typename Field::Element>,
- TransposedBlasMatrix<BlasMatrix<typename Field::Element> >,
- TransposedBlasMatrix<BlasMatrix<typename Field::Element> > > {
+ BlasMatrix<Field>,
+ TransposedBlasMatrix<BlasMatrix<Field> >,
+ TransposedBlasMatrix<BlasMatrix<Field> > > {
public:
- BlasMatrix<typename Field::Element>&
+ BlasMatrix<Field>&
operator()(const Field & F,
- BlasMatrix<typename Field::Element> & D,
+ BlasMatrix<Field> & D,
const typename Field::Element & beta,
- const BlasMatrix<typename Field::Element>& C,
+ const BlasMatrix<Field>& C,
const typename Field::Element & alpha,
- const TransposedBlasMatrix<BlasMatrix<typename Field::Element> >& A,
- const TransposedBlasMatrix<BlasMatrix<typename Field::Element> >& B) const
+ const TransposedBlasMatrix<BlasMatrix<Field> >& A,
+ const TransposedBlasMatrix<BlasMatrix<Field> >& B) const
{
linbox_check( A.getMatrix().rowdim() == B.getMatrix().coldim());
linbox_check( C.rowdim() == A.getMatrix().coldim());
@@ -482,7 +448,7 @@ namespace LinBox
D=C;
// linbox_check(D.getPointer() != C.getPointer());
- FFLAS::fgemm( F, FFLAS::FflasTrans, FFLAS::FflasTrans,
+ FFLAS::fgemm((typename Field::Father_t) F, FFLAS::FflasTrans, FFLAS::FflasTrans,
C.rowdim(), C.coldim(), A.getMatrix().rowdim(),
alpha,
A.getMatrix().getPointer(), A.getMatrix().getStride(),
@@ -493,19 +459,19 @@ namespace LinBox
}
- BlasMatrix<typename Field::Element>&
+ BlasMatrix<Field>&
operator() (const Field & F,
const typename Field::Element & beta,
- BlasMatrix<typename Field::Element> & C,
+ BlasMatrix<Field> & C,
const typename Field::Element & alpha,
- const TransposedBlasMatrix<BlasMatrix<typename Field::Element> >& A,
- const TransposedBlasMatrix<BlasMatrix<typename Field::Element> >& B) const
+ const TransposedBlasMatrix<BlasMatrix<Field> >& A,
+ const TransposedBlasMatrix<BlasMatrix<Field> >& B) const
{
linbox_check( A.getMatrix().rowdim() == B.getMatrix().coldim());
linbox_check( C.rowdim() == A.getMatrix().coldim());
linbox_check( C.coldim() == B.getMatrix().rowdim());
- FFLAS::fgemm( F, FFLAS::FflasTrans, FFLAS::FflasTrans,
+ FFLAS::fgemm((typename Field::Father_t) F, FFLAS::FflasTrans, FFLAS::FflasTrans,
C.rowdim(), C.coldim(), A.getMatrix().rowdim(),
alpha,
A.getMatrix().getPointer(), A.getMatrix().getStride(),
@@ -518,18 +484,18 @@ namespace LinBox
template<class Field>
class BlasMatrixDomainMulAdd<Field,
- BlasMatrix<typename Field::Element>,
- BlasMatrix<typename Field::Element>,
- TransposedBlasMatrix<BlasMatrix<typename Field::Element> > > {
+ BlasMatrix<Field>,
+ BlasMatrix<Field>,
+ TransposedBlasMatrix<BlasMatrix<Field> > > {
public:
- BlasMatrix<typename Field::Element>&
+ BlasMatrix<Field>&
operator()(const Field & F,
- BlasMatrix<typename Field::Element> & D,
+ BlasMatrix<Field> & D,
const typename Field::Element & beta,
- const BlasMatrix<typename Field::Element>& C,
+ const BlasMatrix<Field>& C,
const typename Field::Element & alpha,
- const BlasMatrix<typename Field::Element>& A,
- const TransposedBlasMatrix<BlasMatrix<typename Field::Element> >& B) const
+ const BlasMatrix<Field>& A,
+ const TransposedBlasMatrix<BlasMatrix<Field> >& B) const
{
linbox_check( A.coldim() == B.getMatrix().coldim());
linbox_check( C.rowdim() == A.rowdim());
@@ -538,7 +504,7 @@ namespace LinBox
linbox_check( D.coldim() == C.coldim());
D=C;
- FFLAS::fgemm( F, FFLAS::FflasNoTrans, FFLAS::FflasTrans,
+ FFLAS::fgemm((typename Field::Father_t) F, FFLAS::FflasNoTrans, FFLAS::FflasTrans,
C.rowdim(), C.coldim(), A.coldim(),
alpha,
A.getPointer(), A.getStride(),
@@ -549,19 +515,19 @@ namespace LinBox
}
- BlasMatrix<typename Field::Element>&
+ BlasMatrix<Field>&
operator() (const Field & F,
const typename Field::Element & beta,
- BlasMatrix<typename Field::Element> & C,
+ BlasMatrix<Field> & C,
const typename Field::Element & alpha,
- const BlasMatrix<typename Field::Element>& A,
- const TransposedBlasMatrix<BlasMatrix<typename Field::Element> >& B) const
+ const BlasMatrix<Field>& A,
+ const TransposedBlasMatrix<BlasMatrix<Field> >& B) const
{
linbox_check( A.coldim() == B.getMatrix().coldim());
linbox_check( C.rowdim() == A.rowdim());
linbox_check( C.coldim() == B.getMatrix().rowdim());
- FFLAS::fgemm( F, FFLAS::FflasNoTrans, FFLAS::FflasTrans,
+ FFLAS::fgemm((typename Field::Father_t) F, FFLAS::FflasNoTrans, FFLAS::FflasTrans,
C.rowdim(), C.coldim(), A.coldim(),
alpha,
A.getPointer(), A.getStride(),
@@ -574,20 +540,20 @@ namespace LinBox
/*
* specialization for Operand1 and Operand3 of type std::vector<Element>
- * and Operand2 of type BlasMatrix<Element>
+ * and Operand2 of type BlasMatrix<Field>
*/
// general matrix-vector multiplication and addition with scaling
// d = beta.c + alpha.A*b
template<class Field>
- class BlasMatrixDomainMulAdd<Field,std::vector<typename Field::Element>,BlasMatrix<typename Field::Element>,std::vector<typename Field::Element> > {
+ class BlasMatrixDomainMulAdd<Field,std::vector<typename Field::Element>,BlasMatrix<Field>,std::vector<typename Field::Element> > {
public:
std::vector<typename Field::Element>& operator() (const Field& F,
std::vector<typename Field::Element>& d,
const typename Field::Element& beta,
const std::vector<typename Field::Element>& c,
const typename Field::Element& alpha,
- const BlasMatrix<typename Field::Element>& A,
+ const BlasMatrix<Field>& A,
const std::vector<typename Field::Element>& b) const
{
linbox_check( A.coldim() == b.size());
@@ -595,7 +561,7 @@ namespace LinBox
linbox_check( d.size() == c.size());
d=c;
- FFLAS::fgemv( F, FFLAS::FflasNoTrans,
+ FFLAS::fgemv((typename Field::Father_t) F, FFLAS::FflasNoTrans,
A.rowdim(), A.coldim(),
alpha,
A.getPointer(), A.getStride(),
@@ -610,13 +576,13 @@ namespace LinBox
const typename Field::Element& beta,
std::vector<typename Field::Element>& c,
const typename Field::Element& alpha,
- const BlasMatrix<typename Field::Element>& A,
+ const BlasMatrix<Field>& A,
const std::vector<typename Field::Element>& b) const
{
linbox_check( A.coldim() == b.size());
linbox_check( A.rowdim() == c.size()); //fixed: dpritcha
- FFLAS::fgemv( F, FFLAS::FflasNoTrans,
+ FFLAS::fgemv((typename Field::Father_t) F, FFLAS::FflasNoTrans,
A.rowdim(), A.coldim(),
alpha,
A.getPointer(), A.getStride(),
@@ -630,7 +596,7 @@ namespace LinBox
// general vector-matrix multiplication and addition with scaling
// d = beta.c + alpha.a*B -- note order of coldim, rowdim passed to fgemv is switched
template<class Field>
- class BlasMatrixDomainMulAdd<Field,std::vector<typename Field::Element>,std::vector<typename Field::Element>,BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainMulAdd<Field,std::vector<typename Field::Element>,std::vector<typename Field::Element>,BlasMatrix<Field> > {
public:
std::vector<typename Field::Element>& operator() (const Field& F,
std::vector<typename Field::Element>& d,
@@ -638,14 +604,14 @@ namespace LinBox
const std::vector<typename Field::Element>& c,
const typename Field::Element& alpha,
const std::vector<typename Field::Element>& a,
- const BlasMatrix<typename Field::Element>& B) const
+ const BlasMatrix<Field>& B) const
{
linbox_check( B.rowdim() == a.size());
linbox_check( B.coldim() == c.size());
linbox_check( d.size() == c.size());
d=c;
- FFLAS::fgemv( F, FFLAS::FflasTrans,
+ FFLAS::fgemv((typename Field::Father_t) F, FFLAS::FflasTrans,
B.rowdim(), B.coldim(),
alpha,
B.getPointer(), B.getStride(),
@@ -661,12 +627,12 @@ namespace LinBox
std::vector<typename Field::Element>& c,
const typename Field::Element& alpha,
const std::vector<typename Field::Element>& a,
- const BlasMatrix<typename Field::Element>& B) const
+ const BlasMatrix<Field>& B) const
{
linbox_check( B.rowdim() == a.size());
linbox_check( B.coldim() == c.size());
- FFLAS::fgemv( F, FFLAS::FflasTrans,
+ FFLAS::fgemv((typename Field::Father_t) F, FFLAS::FflasTrans,
B.rowdim(), B.coldim(),
alpha,
B.getPointer(), B.getStride(),
@@ -680,117 +646,123 @@ namespace LinBox
/*
- * Specialization for Operand1, Operand2 of type BlasMatrix<Element>
+ * Specialization for Operand1, Operand2 of type BlasMatrix<Field>
* and Operand3 of type BlasPermutation
*/
// Matrix permutation product C = A*B
template<class Field>
- class BlasMatrixDomainMul<Field,BlasMatrix<typename Field::Element>,BlasMatrix<typename Field::Element>, BlasPermutation<size_t> > {
+ class BlasMatrixDomainMul<Field,BlasMatrix<Field>,BlasMatrix<Field>, BlasPermutation<size_t> > {
public:
- BlasMatrix<typename Field::Element>& operator()(const Field& F,
- BlasMatrix<typename Field::Element>& C,
- const BlasMatrix<typename Field::Element>& A,
+ BlasMatrix<Field>& operator()(const Field& F,
+ BlasMatrix<Field>& C,
+ const BlasMatrix<Field>& A,
const BlasPermutation<size_t>& B) const
{
C = A;
- return BlasMatrixDomainMulin<Field,BlasMatrix<typename Field::Element>,BlasPermutation<size_t> >()( F, C, B);
+ return BlasMatrixDomainMulin<Field,BlasMatrix<Field>,BlasPermutation<size_t> >()( F, C, B);
}
};
template<class Field>
- class BlasMatrixDomainMul<Field,BlasMatrix<typename Field::Element>, BlasPermutation<size_t>,BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainMul<Field,BlasMatrix<Field>, BlasPermutation<size_t>,BlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator()(const Field& F,
- BlasMatrix<typename Field::Element>& C,
+ BlasMatrix<Field>& operator()(const Field& F,
+ BlasMatrix<Field>& C,
const BlasPermutation<size_t>& B,
- const BlasMatrix<typename Field::Element>& A) const
+ const BlasMatrix<Field>& A) const
{
C = A;
- return BlasMatrixDomainMulin<Field,BlasMatrix<typename Field::Element>,BlasPermutation<size_t> >()( F, B, C);
+ return BlasMatrixDomainMulin<Field,BlasMatrix<Field>,BlasPermutation<size_t> >()( F, B, C);
}
};
/*
- * specialization for Operand1, Operand2 of type BlasMatrix<Element> and Operand3 of type TransposedBlasMatrix<BlasPermutation<size_t> >
+ * specialization for Operand1, Operand2 of type BlasMatrix<Field> and Operand3 of type TransposedBlasMatrix<BlasPermutation<size_t> >
*/
// Matrix permutation product C = A*B
template<class Field>
- class BlasMatrixDomainMul<Field,BlasMatrix<typename Field::Element>,BlasMatrix<typename Field::Element>, TransposedBlasMatrix<BlasPermutation<size_t> > > {
+ class BlasMatrixDomainMul<Field,BlasMatrix<Field>,BlasMatrix<Field>, TransposedBlasMatrix<BlasPermutation<size_t> > > {
public:
- BlasMatrix<typename Field::Element>& operator()(const Field& F,
- BlasMatrix<typename Field::Element>& C,
- const BlasMatrix<typename Field::Element>& A,
+ BlasMatrix<Field>& operator()(const Field& F,
+ BlasMatrix<Field>& C,
+ const BlasMatrix<Field>& A,
const TransposedBlasMatrix<BlasPermutation<size_t> >& B) const
{
C = A;
- return BlasMatrixDomainMulin<Field,BlasMatrix<typename Field::Element>,TransposedBlasMatrix<BlasPermutation<size_t> > >()( F, C, B);
+ return BlasMatrixDomainMulin<Field,BlasMatrix<Field>,TransposedBlasMatrix<BlasPermutation<size_t> > >()( F, C, B);
}
};
template<class Field>
- class BlasMatrixDomainMul<Field,BlasMatrix<typename Field::Element>, TransposedBlasMatrix<BlasPermutation<size_t> >,BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainMul<Field,BlasMatrix<Field>, TransposedBlasMatrix<BlasPermutation<size_t> >,BlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator()(const Field& F,
- BlasMatrix<typename Field::Element>& C,
+ BlasMatrix<Field>& operator()(const Field& F,
+ BlasMatrix<Field>& C,
const TransposedBlasMatrix<BlasPermutation<size_t> >& B,
- const BlasMatrix<typename Field::Element>& A) const
+ const BlasMatrix<Field>& A) const
{
C = A;
- return BlasMatrixDomainMulin<Field,BlasMatrix<typename Field::Element>,TransposedBlasMatrix<BlasPermutation<size_t> > >()( F, B, C);
+ return BlasMatrixDomainMulin<Field,BlasMatrix<Field>,TransposedBlasMatrix<BlasPermutation<size_t> > >()( F, B, C);
}
};
/*
- * specialization for Operand1 of type BlasMatrix<Element> and Operand2 of type BlasPermutation
+ * specialization for Operand1 of type BlasMatrix<Field> and Operand2 of type BlasPermutation
*/
// In-place matrix permutation product
template<class Field>
- class BlasMatrixDomainMulin<Field,BlasMatrix<typename Field::Element>, BlasPermutation<size_t> > {
+ class BlasMatrixDomainMulin<Field,BlasMatrix<Field>, BlasPermutation<size_t> > {
public:
- BlasMatrix<typename Field::Element>& operator()( const Field& F,
- BlasMatrix<typename Field::Element>& A,
+ BlasMatrix<Field>& operator()( const Field& F,
+ BlasMatrix<Field>& A,
const BlasPermutation<size_t>& B) const
{
if (B.isIdentity()) return A ;
linbox_check( A.coldim() >= B.getSize() );
- FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasNoTrans, A.rowdim(), 0, B.getOrder(), A.getPointer(), A.getStride(), B.getPointer() );
+ FFPACK::applyP((typename Field::Father_t) F, FFLAS::FflasRight, FFLAS::FflasNoTrans,
+ A.rowdim(), 0,(int) B.getOrder(),
+ A.getPointer(), A.getStride(), B.getPointer() );
return A;
}
- BlasMatrix<typename Field::Element>& operator()( const Field& F,
+ BlasMatrix<Field>& operator()( const Field& F,
const BlasPermutation<size_t>& B,
- BlasMatrix<typename Field::Element>& A) const
+ BlasMatrix<Field>& A) const
{
if (B.isIdentity()) return A ;
linbox_check( A.rowdim() >= B.getSize() );
- FFPACK::applyP( F, FFLAS::FflasLeft, FFLAS::FflasNoTrans, A.coldim(), 0, B.getOrder(), A.getPointer(), A.getStride(), B.getPointer() );
+ FFPACK::applyP((typename Field::Father_t) F, FFLAS::FflasLeft, FFLAS::FflasNoTrans,
+ A.coldim(), 0,(int) B.getOrder(), A.getPointer(), A.getStride(), B.getPointer() );
return A;
}
};
template<class Field>
- class BlasMatrixDomainMulin<Field,BlasMatrix<typename Field::Element>, TransposedBlasMatrix<BlasPermutation<size_t> > > {
+ class BlasMatrixDomainMulin<Field,BlasMatrix<Field>, TransposedBlasMatrix<BlasPermutation<size_t> > > {
public:
- BlasMatrix<typename Field::Element>& operator()( const Field& F,
- BlasMatrix<typename Field::Element>& A,
+ BlasMatrix<Field>& operator()( const Field& F,
+ BlasMatrix<Field>& A,
const TransposedBlasMatrix<BlasPermutation<size_t> >& B) const
{
if (B.getMatrix().isIdentity()) return A ;
linbox_check( A.coldim() >= B.getMatrix().getSize() );
- FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasTrans, A.rowdim(), 0, B.getMatrix().getOrder(), A.getPointer(), A.getStride(), B.getMatrix().getPointer() );
+ FFPACK::applyP((typename Field::Father_t) F, FFLAS::FflasRight, FFLAS::FflasTrans,
+ A.rowdim(), 0,(int) B.getMatrix().getOrder(),
+ A.getPointer(), A.getStride(), B.getMatrix().getPointer() );
return A;
}
- BlasMatrix<typename Field::Element>& operator()( const Field& F,
+ BlasMatrix<Field>& operator()( const Field& F,
const TransposedBlasMatrix<BlasPermutation<size_t> >& B,
- BlasMatrix<typename Field::Element>& A) const
+ BlasMatrix<Field>& A) const
{
if (B.getMatrix().isIdentity()) return A ;
linbox_check( A.rowdim() >= B.getMatrix().getSize() );
- FFPACK::applyP( F, FFLAS::FflasLeft, FFLAS::FflasTrans, A.coldim(), 0, B.getMatrix().getOrder(), A.getPointer(), A.getStride(), B.getMatrix().getPointer() );
+ FFPACK::applyP((typename Field::Father_t) F, FFLAS::FflasLeft, FFLAS::FflasTrans,
+ A.coldim(), 0,(int) B.getMatrix().getOrder(), A.getPointer(), A.getStride(), B.getMatrix().getPointer() );
return A;
}
};
@@ -873,7 +845,8 @@ namespace LinBox
{
if (B.isIdentity()) return A ;
linbox_check( A.size() == B.getSize() );
- FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasNoTrans, 1, 0, B.getOrder(), &A[0], 1, B.getPointer() );
+ FFPACK::applyP((typename Field::Father_t) F, FFLAS::FflasRight, FFLAS::FflasNoTrans,
+ 1, 0,(int) B.getOrder(), &A[0], 1, B.getPointer() );
return A;
}
@@ -883,7 +856,8 @@ namespace LinBox
{
if (B.isIdentity()) return A ;
linbox_check( A.size() >= B.getSize() );
- FFPACK::applyP( F, FFLAS::FflasLeft, FFLAS::FflasNoTrans, 1, 0, B.getOrder(), &A[0], 1, B.getPointer() );
+ FFPACK::applyP((typename Field::Father_t) F, FFLAS::FflasLeft, FFLAS::FflasNoTrans,
+ 1, 0,(int) B.getOrder(), &A[0], 1, B.getPointer() );
return A;
}
@@ -898,7 +872,9 @@ namespace LinBox
{
if (B.getMatrix().isIdentity()) return A ;
linbox_check( A.size() >= B.getMatrix().getSize() );
- FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasTrans, 1, 0, B.getMatrix().getOrder(), &A[0], 1, B.getMatrix().getPointer() );
+ FFPACK::applyP((typename Field::Father_t) F, FFLAS::FflasRight, FFLAS::FflasTrans,
+ 1, 0,(int) B.getMatrix().getOrder(),
+ &A[0], 1, B.getMatrix().getPointer() );
return A;
}
std::vector< typename Field::Element>& operator()( const Field& F,
@@ -907,76 +883,80 @@ namespace LinBox
{
if (B.getMatrix().isIdentity()) return A ;
linbox_check( A.size() >= B.getMatrix().getSize() );
- FFPACK::applyP( F, FFLAS::FflasLeft, FFLAS::FflasTrans, 1, 0, B.getMatrix().getOrder(), &A[0], 1, B.getMatrix().getPointer() );
+ FFPACK::applyP((typename Field::Father_t) F, FFLAS::FflasLeft, FFLAS::FflasTrans,
+ 1, 0,(int) B.getMatrix().getOrder(), &A[0], 1, B.getMatrix().getPointer() );
return A;
}
};
/*
- * specialization for Operand1 of type BlasMatrix<Element> and Operand2
- * of type TriangularBlasMatrix<Element>
+ * specialization for Operand1 of type BlasMatrix<Field> and Operand2
+ * of type TriangularBlasMatrix<Field>
*/
// Matrix/Triangular product C = A*B
template<class Field>
- class BlasMatrixDomainMul<Field,BlasMatrix<typename Field::Element>,BlasMatrix<typename Field::Element>, TriangularBlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainMul<Field,BlasMatrix<Field>,BlasMatrix<Field>, TriangularBlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator()(const Field& F,
- BlasMatrix<typename Field::Element>& C,
- const BlasMatrix<typename Field::Element>& A,
- const TriangularBlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator()(const Field& F,
+ BlasMatrix<Field>& C,
+ const BlasMatrix<Field>& A,
+ const TriangularBlasMatrix<Field>& B) const
{
C = A;
- return BlasMatrixDomainMulin<Field,BlasMatrix<typename Field::Element>,TriangularBlasMatrix<typename Field::Element> >()( F, C, B);
+ return BlasMatrixDomainMulin<Field,BlasMatrix<Field>,TriangularBlasMatrix<Field> >()( F, C, B);
}
};
template<class Field>
- class BlasMatrixDomainMul<Field,BlasMatrix<typename Field::Element>, TriangularBlasMatrix<typename Field::Element>,BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainMul<Field,BlasMatrix<Field>, TriangularBlasMatrix<Field>,BlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator()(const Field& F,
- BlasMatrix<typename Field::Element>& C,
- const TriangularBlasMatrix<typename Field::Element>& B,
- const BlasMatrix<typename Field::Element>& A) const
+ BlasMatrix<Field>& operator()(const Field& F,
+ BlasMatrix<Field>& C,
+ const TriangularBlasMatrix<Field>& B,
+ const BlasMatrix<Field>& A) const
{
C = A;
- return BlasMatrixDomainMulin<Field,BlasMatrix<typename Field::Element>,TriangularBlasMatrix<typename Field::Element> >()( F, B, C);
+ return BlasMatrixDomainMulin<Field,BlasMatrix<Field>,TriangularBlasMatrix<Field> >()( F, B, C);
}
};
/*
- * specialization for Operand1 of type BlasMatrix<Element> and Operand2 of type TriangularBlasMatrix<Element>
+ * specialization for Operand1 of type BlasMatrix<Field> and Operand2 of type TriangularBlasMatrix<Field>
*/
// In-place matrix*triangular matrix product
template<class Field>
- class BlasMatrixDomainMulin<Field,BlasMatrix<typename Field::Element>,
- TriangularBlasMatrix<typename Field::Element> >{
+ class BlasMatrixDomainMulin<Field,BlasMatrix<Field>,
+ TriangularBlasMatrix<Field> >{
public:
- BlasMatrix<typename Field::Element>& operator()( const Field& F,
- BlasMatrix<typename Field::Element>& A,
- const TriangularBlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator()( const Field& F,
+ BlasMatrix<Field>& A,
+ const TriangularBlasMatrix<Field>& B) const
{
typename Field::Element one;
F.init(one, 1UL);
linbox_check( A.coldim() == B.rowdim() );
- FFLAS::ftrmm( F, FFLAS::FflasRight, (B.getUpLo()==BlasTag::up)?FFLAS::FflasUpper:FFLAS::FflasLower,
- FFLAS::FflasNoTrans,(B.getDiag()==BlasTag::unit)?FFLAS::FflasUnit:FFLAS::FflasNonUnit,
- A.rowdim(), A.coldim(), one, B.getPointer(), B.getStride(), A.getPointer(), A.getStride() );
+ FFLAS::ftrmm((typename Field::Father_t) F, FFLAS::FflasRight, (FFLAS::FFLAS_UPLO) (B.getUpLo()),
+ FFLAS::FflasNoTrans,(FFLAS::FFLAS_DIAG) (B.getDiag()),
+ A.rowdim(), A.coldim(), one,
+ B.getPointer(), B.getStride(), A.getPointer(), A.getStride() );
return A;
}
- BlasMatrix<typename Field::Element>& operator()( const Field& F,
- const TriangularBlasMatrix<typename Field::Element>& B,
- BlasMatrix<typename Field::Element>& A) const
+ BlasMatrix<Field>& operator()( const Field& F,
+ const TriangularBlasMatrix<Field>& B,
+ BlasMatrix<Field>& A) const
{
linbox_check( B.coldim() == A.rowdim() );
typename Field::Element one;
F.init(one, 1UL);
- FFLAS::ftrmm( F, FFLAS::FflasLeft, (B.getUpLo()==BlasTag::up)?FFLAS::FflasUpper:FFLAS::FflasLower,
- FFLAS::FflasNoTrans,(B.getDiag()==BlasTag::unit)?FFLAS::FflasUnit:FFLAS::FflasNonUnit,
- A.rowdim(), A.coldim(), one, B.getPointer(), B.getStride(), A.getPointer(), A.getStride() );
+ FFLAS::ftrmm((typename Field::Father_t) F, FFLAS::FflasLeft, (FFLAS::FFLAS_UPLO)(B.getUpLo()),
+ FFLAS::FflasNoTrans, (FFLAS::FFLAS_DIAG) (B.getDiag()),
+ A.rowdim(), A.coldim(), one,
+ B.getPointer(), B.getStride(),
+ A.getPointer(), A.getStride() );
return A;
}
};
@@ -985,21 +965,21 @@ namespace LinBox
/*! @internal In-place matrix*triangular matrix product with transpose.
*/
template<class Field>
- class BlasMatrixDomainMulin<Field,BlasMatrix<typename Field::Element>,
- TransposedBlasMatrix<TriangularBlasMatrix<typename Field::Element> > >{
+ class BlasMatrixDomainMulin<Field,BlasMatrix<Field>,
+ TransposedBlasMatrix<TriangularBlasMatrix<Field> > >{
public:
- BlasMatrix<typename Field::Element>& operator()( const Field& F,
- BlasMatrix<typename Field::Element>& A,
- const TransposedBlasMatrix< TriangularBlasMatrix<typename Field::Element> >& B) const
+ BlasMatrix<Field>& operator()( const Field& F,
+ BlasMatrix<Field>& A,
+ const TransposedBlasMatrix< TriangularBlasMatrix<Field> >& B) const
{
typename Field::Element one;
F.init(one, 1UL);
linbox_check( B.getMatrix().coldim() == A.coldim() );
- FFLAS::ftrmm( F, FFLAS::FflasRight,
- (B.getMatrix().getUpLo()==BlasTag::up)?FFLAS::FflasUpper:FFLAS::FflasLower,
+ FFLAS::ftrmm((typename Field::Father_t) F, FFLAS::FflasRight,
+ (FFLAS::FFLAS_UPLO)(B.getMatrix().getUpLo()),
FFLAS::FflasTrans,
- (B.getMatrix().getDiag()==BlasTag::unit)?FFLAS::FflasUnit:FFLAS::FflasNonUnit,
+ (FFLAS::FFLAS_DIAG) (B.getMatrix().getDiag()),
A.rowdim(), A.coldim(),
one,
B.getMatrix().getPointer(), B.getMatrix().getStride(),
@@ -1007,17 +987,17 @@ namespace LinBox
return A;
}
- BlasMatrix<typename Field::Element>& operator()( const Field& F,
- const TransposedBlasMatrix< TriangularBlasMatrix< typename Field::Element> >& B,
- BlasMatrix<typename Field::Element>& A) const
+ BlasMatrix<Field>& operator()( const Field& F,
+ const TransposedBlasMatrix< TriangularBlasMatrix<Field> >& B,
+ BlasMatrix<Field>& A) const
{
linbox_check( B.getMatrix().coldim() == A.rowdim() );
typename Field::Element one;
F.init(one, 1UL);
- FFLAS::ftrmm( F, FFLAS::FflasLeft,
- (B.getMatrix().getUpLo()==BlasTag::up)?FFLAS::FflasUpper:FFLAS::FflasLower,
+ FFLAS::ftrmm((typename Field::Father_t) F, FFLAS::FflasLeft,
+ (FFLAS::FFLAS_UPLO) (B.getMatrix().getUpLo()),
FFLAS::FflasTrans,
- (B.getMatrix().getDiag()==BlasTag::unit)?FFLAS::FflasUnit:FFLAS::FflasNonUnit,
+ (FFLAS::FFLAS_DIAG) (B.getMatrix().getDiag()),
A.rowdim(), A.coldim(), one,
B.getMatrix().getPointer(), B.getMatrix().getStride(),
A.getPointer(), A.getStride() );
@@ -1028,83 +1008,83 @@ namespace LinBox
/*
- * specialization for Operand1 of type TriangularBlasMatrix<Element> and Operand2 of type BlasPermutation
+ * specialization for Operand1 of type TriangularBlasMatrix<Field> and Operand2 of type BlasPermutation
*/
// Matrix permutation product C = A*B
template<class Field>
- class BlasMatrixDomainMul<Field,BlasMatrix<typename Field::Element>,TriangularBlasMatrix<typename Field::Element>, BlasPermutation<size_t> > {
+ class BlasMatrixDomainMul<Field,BlasMatrix<Field>,TriangularBlasMatrix<Field>, BlasPermutation<size_t> > {
public:
- BlasMatrix<typename Field::Element>& operator()(const Field& F,
- BlasMatrix<typename Field::Element>& C,
- const TriangularBlasMatrix<typename Field::Element>& A,
+ BlasMatrix<Field>& operator()(const Field& F,
+ BlasMatrix<Field>& C,
+ const TriangularBlasMatrix<Field>& A,
const BlasPermutation<size_t>& B) const
{
C = A;
- return BlasMatrixDomainMulin<Field,BlasMatrix<typename Field::Element>,BlasPermutation<size_t> >()( F, C, B);
+ return BlasMatrixDomainMulin<Field,BlasMatrix<Field>,BlasPermutation<size_t> >()( F, C, B);
}
};
template<class Field>
- class BlasMatrixDomainMul<Field,BlasMatrix<typename Field::Element>, BlasPermutation<size_t>,TriangularBlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainMul<Field,BlasMatrix<Field>, BlasPermutation<size_t>,TriangularBlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator()(const Field& F,
- BlasMatrix<typename Field::Element>& C,
+ BlasMatrix<Field>& operator()(const Field& F,
+ BlasMatrix<Field>& C,
const BlasPermutation<size_t>& B,
- const TriangularBlasMatrix<typename Field::Element>& A) const
+ const TriangularBlasMatrix<Field>& A) const
{
C = A;
- return BlasMatrixDomainMulin<Field,BlasMatrix<typename Field::Element>,BlasPermutation<size_t> >()( F, B, C);
+ return BlasMatrixDomainMulin<Field,BlasMatrix<Field>,BlasPermutation<size_t> >()( F, B, C);
}
};
/*
- * Specialization for Operand of type BlasMatrix<Element>
+ * Specialization for Operand of type BlasMatrix<Field>
*/
template <class Field>
- class BlasMatrixDomainLeftSolve<Field,BlasMatrix<typename Field::Element>,BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainLeftSolve<Field,BlasMatrix<Field>,BlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator() (const Field& F,
- BlasMatrix<typename Field::Element>& X,
- const BlasMatrix<typename Field::Element>& A,
- const BlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator() (const Field& F,
+ BlasMatrix<Field>& X,
+ const BlasMatrix<Field>& A,
+ const BlasMatrix<Field>& B) const
{
- LQUPMatrix<Field> LQUP(F,A);
+ LQUPMatrix<Field> LQUP(A);
LQUP.left_solve(X,B);
return X;
}
- BlasMatrix<typename Field::Element>& operator() (const Field& F,
- const BlasMatrix<typename Field::Element>& A,
- BlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator() (const Field& F,
+ const BlasMatrix<Field>& A,
+ BlasMatrix<Field>& B) const
{
- LQUPMatrix<Field> LQUP(F,A);
+ LQUPMatrix<Field> LQUP(A);
LQUP.left_solve(B);
return B;
}
};
template <class Field>
- class BlasMatrixDomainRightSolve<Field,BlasMatrix<typename Field::Element>,BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainRightSolve<Field,BlasMatrix<Field>,BlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator() (const Field& F,
- BlasMatrix<typename Field::Element>& X,
- const BlasMatrix<typename Field::Element>& A,
- const BlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator() (const Field& F,
+ BlasMatrix<Field>& X,
+ const BlasMatrix<Field>& A,
+ const BlasMatrix<Field>& B) const
{
- LQUPMatrix<Field> LQUP(F,A);
+ LQUPMatrix<Field> LQUP(A);
LQUP.right_solve(X,B);
return X;
}
- BlasMatrix<typename Field::Element>& operator() (const Field& F,
- const BlasMatrix<typename Field::Element>& A,
- BlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator() (const Field& F,
+ const BlasMatrix<Field>& A,
+ BlasMatrix<Field>& B) const
{
- LQUPMatrix<Field> LQUP(F,A);
+ LQUPMatrix<Field> LQUP(A);
LQUP.right_solve(B);
return B;
}
@@ -1116,23 +1096,23 @@ namespace LinBox
*/
template <class Field>
- class BlasMatrixDomainLeftSolve<Field, std::vector<typename Field::Element>, BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainLeftSolve<Field, std::vector<typename Field::Element>, BlasMatrix<Field> > {
public:
std::vector<typename Field::Element>& operator() (const Field& F,
std::vector<typename Field::Element>& X,
- const BlasMatrix<typename Field::Element>& A,
+ const BlasMatrix<Field>& A,
const std::vector<typename Field::Element>& B) const
{
- LQUPMatrix<Field> LQUP(F,A);
+ LQUPMatrix<Field> LQUP(A);
LQUP.left_solve(X,B);
return X;
}
std::vector<typename Field::Element>& operator()(const Field& F,
- const BlasMatrix<typename Field::Element>& A,
+ const BlasMatrix<Field>& A,
std::vector<typename Field::Element>& B) const
{
- LQUPMatrix<Field> LQUP(F,A);
+ LQUPMatrix<Field> LQUP(A);
LQUP.left_solve(B);
return B;
}
@@ -1140,23 +1120,23 @@ namespace LinBox
};
template <class Field>
- class BlasMatrixDomainRightSolve<Field, std::vector<typename Field::Element>, BlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainRightSolve<Field, std::vector<typename Field::Element>, BlasMatrix<Field> > {
public:
std::vector<typename Field::Element>& operator() (const Field& F,
std::vector<typename Field::Element>& X,
- const BlasMatrix<typename Field::Element>& A,
+ const BlasMatrix<Field>& A,
const std::vector<typename Field::Element>& B) const
{
- LQUPMatrix<Field> LQUP(F,A);
+ LQUPMatrix<Field> LQUP(A);
LQUP.right_solve(X,B);
return X;
}
std::vector<typename Field::Element>& operator() (const Field& F,
- const BlasMatrix<typename Field::Element>& A,
+ const BlasMatrix<Field>& A,
std::vector<typename Field::Element>& B) const
{
- LQUPMatrix<Field> LQUP(F,A);
+ LQUPMatrix<Field> LQUP(A);
LQUP.right_solve(B);
return B;
}
@@ -1166,121 +1146,81 @@ namespace LinBox
/*
* ********************************************************
- * *** Specialization for TriangularBlasMatrix<Element> ***
+ * *** Specialization for TriangularBlasMatrix<Field> ***
* ********************************************************
*/
/*
- * specialization for Operand of type BlasMatrix<Element>
+ * specialization for Operand of type BlasMatrix<Field>
*/
template <class Field>
- class BlasMatrixDomainLeftSolve<Field, BlasMatrix<typename Field::Element>,TriangularBlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainLeftSolve<Field, BlasMatrix<Field>,TriangularBlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator() (const Field& F,
- BlasMatrix<typename Field::Element>& X,
- const TriangularBlasMatrix<typename Field::Element>& A,
- const BlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator() (const Field& F,
+ BlasMatrix<Field>& X,
+ const TriangularBlasMatrix<Field>& A,
+ const BlasMatrix<Field>& B) const
{
linbox_check( X.rowdim() == B.rowdim());
linbox_check( X.coldim() == B.coldim());
- typename BlasMatrix<typename Field::Element>::ConstRawIterator Biter = B.rawBegin();
- typename BlasMatrix<typename Field::Element>::RawIterator Xiter = X.rawBegin();
+ typename BlasMatrix<Field>::ConstIterator Biter = B.Begin();
+ typename BlasMatrix<Field>::Iterator Xiter = X.Begin();
- for (; Biter != B.rawEnd(); ++Biter,++Xiter)
+ for (; Biter != B.End(); ++Biter,++Xiter)
F.assign(*Xiter,*Biter);
return (*this)(F,A,X);
}
- BlasMatrix<typename Field::Element>& operator() (const Field& F,
- const TriangularBlasMatrix<typename Field::Element>& A,
- BlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator() (const Field& F,
+ const TriangularBlasMatrix<Field>& A,
+ BlasMatrix<Field>& B) const
{
-
linbox_check( A.rowdim() == A.coldim());
linbox_check( A.coldim() == B.rowdim());
typename Field::Element _One;
F.init(_One,1UL);
- switch (A.getUpLo()) {
- case BlasTag::up:
- switch(A.getDiag()) {
- case BlasTag::unit:
- FFLAS::ftrsm( F,
- FFLAS::FflasLeft,FFLAS::FflasUpper,FFLAS::FflasNoTrans,FFLAS::FflasUnit,
- A.rowdim(), B.coldim(),_One,A.getPointer(),A.getStride(),B.getPointer(),B.getStride());
- break;
-
- case BlasTag::nonunit: {
- //TriangularBlasMatrix<typename Field::Element> Acopy(A);
- FFLAS::ftrsm( F,
- FFLAS::FflasLeft,FFLAS::FflasUpper,FFLAS::FflasNoTrans,FFLAS::FflasNonUnit,
- A.rowdim(), B.coldim(),_One,A.getPointer(),A.getStride(),B.getPointer(),B.getStride());
- break; }
-
- default:
- throw LinboxError ("Error in BlasMatrixDomain (triangular matrix not well defined)");
- }
- break;
-
- case BlasTag::low:
- switch(A.getDiag()) {
- case BlasTag::unit:
- FFLAS::ftrsm( F,
- FFLAS::FflasLeft,FFLAS::FflasLower,FFLAS::FflasNoTrans,FFLAS::FflasUnit,
- A.rowdim(), B.coldim(),_One,A.getPointer(),A.getStride(),B.getPointer(),B.getStride());
- break;
-
- case BlasTag::nonunit:
- {//TriangularBlasMatrix<typename Field::Element> Acopy(A);
- FFLAS::ftrsm( F,
- FFLAS::FflasLeft,FFLAS::FflasLower,FFLAS::FflasNoTrans,FFLAS::FflasNonUnit,
- A.rowdim(), B.coldim(),_One,A.getPointer(),A.getStride(),B.getPointer(),B.getStride());
- break;}
-
- default:
- throw LinboxError ("Error in BlasMatrixDomain (triangular matrix not well defined)");
- }
- break;
-
- default:
- throw LinboxError ("Error in BlasMatrixDomain (triangular matrix not well defined)");
-
- }
+ FFLAS::ftrsm((typename Field::Father_t) F,
+ FFLAS::FflasLeft, (FFLAS::FFLAS_UPLO) A.getUpLo(),
+ FFLAS::FflasNoTrans,(FFLAS::FFLAS_DIAG) A.getDiag(),
+ A.rowdim(), B.coldim(),
+ _One,A.getPointer(),A.getStride(),
+ B.getPointer(),B.getStride());
return B;
}
};
template <class Field>
- class BlasMatrixDomainRightSolve<Field,BlasMatrix<typename Field::Element>, TriangularBlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainRightSolve<Field,BlasMatrix<Field>, TriangularBlasMatrix<Field> > {
public:
- BlasMatrix<typename Field::Element>& operator() (const Field& F,
- BlasMatrix<typename Field::Element>& X,
- const TriangularBlasMatrix<typename Field::Element>& A,
- const BlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator() (const Field& F,
+ BlasMatrix<Field>& X,
+ const TriangularBlasMatrix<Field>& A,
+ const BlasMatrix<Field>& B) const
{
linbox_check( X.rowdim() == B.rowdim());
linbox_check( X.coldim() == B.coldim());
- typename BlasMatrix<typename Field::Element>::ConstRawIterator Biter = B.rawBegin();
- typename BlasMatrix<typename Field::Element>::RawIterator Xiter = X.rawBegin();
+ typename BlasMatrix<Field>::ConstIterator Biter = B.Begin();
+ typename BlasMatrix<Field>::Iterator Xiter = X.Begin();
- for (; Biter != B.rawEnd(); ++Biter,++Xiter)
+ for (; Biter != B.End(); ++Biter,++Xiter)
F.assign(*Xiter,*Biter);
return (*this)(F,A,X);
}
- BlasMatrix<typename Field::Element>& operator() (const Field& F,
- const TriangularBlasMatrix<typename Field::Element>& A,
- BlasMatrix<typename Field::Element>& B) const
+ BlasMatrix<Field>& operator() (const Field& F,
+ const TriangularBlasMatrix<Field>& A,
+ BlasMatrix<Field>& B) const
{
linbox_check( A.rowdim() == A.coldim());
@@ -1288,43 +1228,14 @@ namespace LinBox
typename Field::Element _One;
F.init(_One,1UL);
- switch (A.getUpLo()) {
- case BlasTag::up:
- switch(A.getDiag()) {
- case BlasTag::unit:
- FFLAS::ftrsm( F,
- FFLAS::FflasRight,FFLAS::FflasUpper,FFLAS::FflasNoTrans,FFLAS::FflasUnit,
- B.rowdim(), A.coldim(),_One,A.getPointer(),A.getStride(),B.getPointer(),B.getStride());
- break;
- case BlasTag::nonunit:
- FFLAS::ftrsm( F,
- FFLAS::FflasRight,FFLAS::FflasUpper,FFLAS::FflasNoTrans,FFLAS::FflasNonUnit,
- B.rowdim(), A.coldim(),_One,A.getPointer(),A.getStride(),B.getPointer(),B.getStride());
- break;
- default:
- throw LinboxError ("Error in BlasMatrixDomain (triangular matrix not well defined)");
- }
- break;
- case BlasTag::low:
- switch(A.getDiag()) {
- case BlasTag::unit:
- FFLAS::ftrsm( F,
- FFLAS::FflasRight,FFLAS::FflasLower,FFLAS::FflasNoTrans,FFLAS::FflasUnit,
- B.rowdim(), A.coldim(),_One,A.getPointer(),A.getStride(),B.getPointer(),B.getStride());
- break;
- case BlasTag::nonunit:
- FFLAS::ftrsm( F,
- FFLAS::FflasRight,FFLAS::FflasLower,FFLAS::FflasNoTrans,FFLAS::FflasNonUnit,
- B.rowdim(), A.coldim(),_One,A.getPointer(),A.getStride(),B.getPointer(),B.getStride());
- break;
- default:
- throw LinboxError ("Error in BlasMatrixDomain (triangular matrix not well defined)");
- }
- break;
- default:
- throw LinboxError ("Error in BlasMatrixDomain (triangular matrix not well defined)");
+ FFLAS::ftrsm((typename Field::Father_t) F,
+ FFLAS::FflasRight,(FFLAS::FFLAS_UPLO) A.getUpLo(),
+ FFLAS::FflasNoTrans,(FFLAS::FFLAS_DIAG) A.getDiag() ,
+ B.rowdim(), A.coldim(),
+ _One,A.getPointer(),A.getStride(),
+ B.getPointer(),B.getStride());
+
- }
return B;
}
};
@@ -1334,11 +1245,11 @@ namespace LinBox
*/
template <class Field>
- class BlasMatrixDomainLeftSolve<Field, std::vector<typename Field::Element>, TriangularBlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainLeftSolve<Field, std::vector<typename Field::Element>, TriangularBlasMatrix<Field> > {
public:
std::vector<typename Field::Element>& operator() (const Field& F,
std::vector<typename Field::Element>& x,
- const TriangularBlasMatrix<typename Field::Element>& A,
+ const TriangularBlasMatrix<Field>& A,
const std::vector<typename Field::Element>& b) const
{
@@ -1352,7 +1263,7 @@ namespace LinBox
}
std::vector<typename Field::Element>& operator() (const Field& F,
- const TriangularBlasMatrix<typename Field::Element>& A,
+ const TriangularBlasMatrix<Field>& A,
std::vector<typename Field::Element>& b) const
{
@@ -1360,15 +1271,15 @@ namespace LinBox
linbox_check( A.rowdim() == b.size());
switch (A.getUpLo()) {
- case BlasTag::up:
+ case LinBoxTag::Upper:
switch(A.getDiag()) {
- case BlasTag::unit:
- FFLAS::ftrsv( F,
+ case LinBoxTag::Unit:
+ FFLAS::ftrsv((typename Field::Father_t) F,
FFLAS::FflasUpper,FFLAS::FflasNoTrans,FFLAS::FflasUnit,
b.size(),A.getPointer(),A.getStride(),&b[0],1);
break;
- case BlasTag::nonunit:
- FFLAS::ftrsv( F,
+ case LinBoxTag::NonUnit:
+ FFLAS::ftrsv((typename Field::Father_t) F,
FFLAS::FflasUpper,FFLAS::FflasNoTrans,FFLAS::FflasNonUnit,
b.size(),A.getPointer(),A.getStride(),&b[0],1);
break;
@@ -1376,15 +1287,15 @@ namespace LinBox
throw LinboxError ("Error in BlasMatrixDomain (triangular matrix not well defined)");
}
break;
- case BlasTag::low:
+ case LinBoxTag::Lower:
switch(A.getDiag()) {
- case BlasTag::unit:
- FFLAS::ftrsv( F,
+ case LinBoxTag::Unit:
+ FFLAS::ftrsv((typename Field::Father_t) F,
FFLAS::FflasLower,FFLAS::FflasNoTrans,FFLAS::FflasUnit,
b.size(),A.getPointer(),A.getStride(),&b[0],1);
break;
- case BlasTag::nonunit:
- FFLAS::ftrsv( F,
+ case LinBoxTag::NonUnit:
+ FFLAS::ftrsv((typename Field::Father_t) F,
FFLAS::FflasLower,FFLAS::FflasNoTrans,FFLAS::FflasNonUnit,
b.size(),A.getPointer(),A.getStride(),&b[0],1);
break;
@@ -1401,11 +1312,11 @@ namespace LinBox
};
template <class Field>
- class BlasMatrixDomainRightSolve<Field, std::vector<typename Field::Element>, TriangularBlasMatrix<typename Field::Element> > {
+ class BlasMatrixDomainRightSolve<Field, std::vector<typename Field::Element>, TriangularBlasMatrix<Field> > {
public:
std::vector<typename Field::Element>& operator() (const Field& F,
std::vector<typename Field::Element>& x,
- const TriangularBlasMatrix<typename Field::Element>& A,
+ const TriangularBlasMatrix<Field>& A,
const std::vector<typename Field::Element>& b) const
{
@@ -1419,7 +1330,7 @@ namespace LinBox
}
std::vector<typename Field::Element>& operator() (const Field& F,
- const TriangularBlasMatrix<typename Field::Element>& A,
+ const TriangularBlasMatrix<Field>& A,
std::vector<typename Field::Element>& b) const
{
@@ -1428,15 +1339,15 @@ namespace LinBox
switch (A.getUpLo()) {
- case BlasTag::up:
+ case LinBoxTag::Upper:
switch(A.getDiag()) {
- case BlasTag::unit:
- FFLAS::ftrsv( F,
- FFLAS::FflasUpper,FFLAS::FflasTrans,FFLAS::FflasUnit,
+ case LinBoxTag::Unit:
+ FFLAS::ftrsv( (typename Field::Father_t)F,
+ FFLAS::FflasUpper, FFLAS::FflasTrans, FFLAS::FflasUnit,
b.size(),A.getPointer(),A.getStride(),&b[0],1);
break;
- case BlasTag::nonunit:
- FFLAS::ftrsv( F,
+ case LinBoxTag::NonUnit:
+ FFLAS::ftrsv((typename Field::Father_t) F,
FFLAS::FflasUpper,FFLAS::FflasTrans,FFLAS::FflasNonUnit,
b.size(),A.getPointer(),A.getStride(),&b[0],1);
break;
@@ -1444,15 +1355,15 @@ namespace LinBox
throw LinboxError ("Error in BlasMatrixDomain (triangular matrix not well defined)");
}
break;
- case BlasTag::low:
+ case LinBoxTag::Lower:
switch(A.getDiag()) {
- case BlasTag::unit:
- FFLAS::ftrsv( F,
+ case LinBoxTag::Unit:
+ FFLAS::ftrsv((typename Field::Father_t) F,
FFLAS::FflasLower,FFLAS::FflasTrans,FFLAS::FflasUnit,
b.size(),A.getPointer(),A.getStride(),&b[0],1);
break;
- case BlasTag::nonunit:
- FFLAS::ftrsv( F,
+ case LinBoxTag::NonUnit:
+ FFLAS::ftrsv( (typename Field::Father_t)F,
FFLAS::FflasLower,FFLAS::FflasTrans,FFLAS::FflasNonUnit,
b.size(),A.getPointer(),A.getStride(),&b[0],1);
break;
@@ -1469,11 +1380,11 @@ namespace LinBox
};
template< class Field, class Polynomial>
- class BlasMatrixDomainMinpoly< Field, Polynomial, BlasMatrix<typename Field::Element > > {
+ class BlasMatrixDomainMinpoly< Field, Polynomial, BlasMatrix<Field> > {
public:
- Polynomial& operator() (const Field &F, Polynomial& P, const BlasMatrix<typename Field::Element >& A) const
+ Polynomial& operator() (const Field &F, Polynomial& P, const BlasMatrix<Field>& A) const
{
- commentator.start ("Modular Dense Minpoly ", "MDMinpoly");
+ commentator().start ("Modular Dense Minpoly ", "MDMinpoly");
size_t n = A.coldim();
linbox_check( n == A.rowdim());
@@ -1482,24 +1393,24 @@ namespace LinBox
for ( size_t i=0; i<n; ++i)
Perm[i] = 0;
FFPACK::MinPoly<Field,Polynomial>( F, P, n, A.getPointer(), A.getStride(), X, n, Perm);
- commentator.report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "minpoly with " << P.size() << " coefficients" << std::endl;
+ commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "minpoly with " << P.size() << " coefficients" << std::endl;
delete[] Perm;
delete[] X;
- commentator.stop ("done",NULL,"MDMinpoly");
+ commentator().stop ("done",NULL,"MDMinpoly");
return P;
}
};
-#if !defined(__INTEL_COMPILER) && !defined(__CUDACC__)
- template <>
-#endif
+// #if !defined(__INTEL_COMPILER) && !defined(__CUDACC__) && !defined(__clang__)
+ // template <>
+// #endif
template< class Field, class ContPol >
- class BlasMatrixDomainCharpoly< Field, ContPol, BlasMatrix<typename Field::Element > > {
+ class BlasMatrixDomainCharpoly< Field, ContPol, BlasMatrix<Field> > {
public:
ContPol& operator() ( const Field &F,
ContPol &P,
- const BlasMatrix<typename Field::Element > &A) const
+ const BlasMatrix<Field> &A) const
{
size_t n = A.coldim();
@@ -1514,3 +1425,12 @@ namespace LinBox
#endif // __LINBOX_blas_matrix_domain_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/block-lanczos.h b/linbox/algorithms/block-lanczos.h
index 0306e7e..1e731e1 100644
--- a/linbox/algorithms/block-lanczos.h
+++ b/linbox/algorithms/block-lanczos.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* block-lanczos.h
* Copyright (C) 2002 Bradford Hovinen
*
@@ -7,8 +5,24 @@
*
* --------------------------------------------
*
- * Licensed under the GNU Lesser General Public License. See COPYING for
- * details.
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
*
* Class definitions for block Lanczos iteration
*/
@@ -23,18 +37,11 @@
#include "linbox/field/archetype.h"
#include "linbox/vector/vector-domain.h"
#include "linbox/blackbox/archetype.h"
-#include "linbox/blackbox/dense.h"
-#include "linbox/matrix/dense-submatrix.h"
#include "linbox/solutions/methods.h"
// I'm putting everything inside the LinBox namespace so that I can drop all of
// this in to LinBox easily at a later date, without any messy porting.
-// Fix for Solaris wierdness
-#undef _S
-#undef _M
-#undef _N
-
namespace LinBox
{
@@ -55,7 +62,7 @@ namespace LinBox
* unlikely any other vector archetypes will be supported in the future.
* @bib [Montgomery '95]
*/
- template <class Field, class Matrix = DenseMatrixBase<typename Field::Element> >
+ template <class Field, class Matrix = BlasMatrix<typename Field::Element> >
class BlockLanczosSolver {
public:
@@ -67,10 +74,10 @@ namespace LinBox
* options for the solver
*/
BlockLanczosSolver (const Field &F, const BlockLanczosTraits &traits) :
- _traits (traits), _F (F), _VD (F), _MD (F), _randiter (F), _N (traits.blockingFactor ())
+ _traits (traits), _field (F), _VD (F), _MD (F), _randiter (F), _block (traits.blockingFactor ())
{
init_temps ();
- _F.init (_one, 1);
+ _field.init (_one, 1);
}
/** Constructor with a random iterator.
@@ -80,10 +87,10 @@ namespace LinBox
* @param r Random iterator to use for randomization
*/
BlockLanczosSolver (const Field &F, const BlockLanczosTraits &traits, typename Field::RandIter r) :
- _traits (traits), _F (F), _VD (F), _MD (F), _randiter (r), _N (traits.blockingFactor ())
+ _traits (traits), _field (F), _VD (F), _MD (F), _randiter (r), _block (traits.blockingFactor ())
{
init_temps ();
- _F.init (_one, 1);
+ _field.init (_one, 1);
}
/** Solve the linear system Ax = b.
@@ -205,21 +212,21 @@ namespace LinBox
// Private variables
const BlockLanczosTraits _traits;
- const Field &_F;
+ const Field &_field;
VectorDomain<Field> _VD;
MatrixDomain<Field> _MD;
typename Field::RandIter _randiter;
// Temporaries used in the computation
- Matrix _V[3]; // n x N
+ Matrix _matV[3]; // n x N
Matrix _AV; // n x N
Matrix _VTAV; // N x N
Matrix _Winv[2]; // N x N
Matrix _AVTAVSST_VTAV; // N x N
- Matrix _T; // N x N
+ Matrix _matT; // N x N
Matrix _DEF; // N x N
- std::vector<bool> _S; // N-vector of bools
+ std::vector<bool> _vecS; // N-vector of bools
mutable typename Vector<Field>::Dense _tmp; // N
@@ -227,11 +234,11 @@ namespace LinBox
std::vector<size_t> _indices; // N
- mutable Matrix _M; // N x 2N
+ mutable Matrix _matM; // N x 2N
// Blocking factor
- size_t _N;
+ size_t _block;
// Construct a transpose matrix on the fly
template <class Matrix1>
@@ -265,3 +272,12 @@ namespace LinBox
#include "block-lanczos.inl"
#endif // __LINBOX_block_lanczos_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/block-lanczos.inl b/linbox/algorithms/block-lanczos.inl
index 733b7bd..23e3ae9 100644
--- a/linbox/algorithms/block-lanczos.inl
+++ b/linbox/algorithms/block-lanczos.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* block-lanczos.inl
* Copyright (C) 2002 LinBox
*
@@ -7,9 +5,24 @@
*
* --------------------------------------------
*
- * Licensed under the GNU Lesser General Public License. See COPYING for
- * details.
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
* Function definitions for block Lanczos iteration
*/
@@ -22,7 +35,6 @@
#include "linbox/util/debug.h"
#include "linbox/solutions/methods.h"
-#include "linbox/matrix/dense-submatrix.h"
#include "linbox/blackbox/diagonal.h"
#include "linbox/blackbox/compose.h"
#include "linbox/blackbox/transpose.h"
@@ -35,11 +47,6 @@
// I'm putting everything inside the LinBox namespace so that I can drop all of
// this in to LinBox easily at a later date, without any messy porting.
-// Fix for Solaris wierdness
-#undef _S
-#undef _M
-#undef _N
-
namespace LinBox
{
@@ -68,7 +75,7 @@ namespace LinBox
void checkAConjugacy (const MatrixDomain<Field> &MD, const Matrix &AV, Matrix &V, Matrix &T,
size_t AV_iter, size_t V_iter)
{
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Checking whether V_" << V_iter << " is A-conjugate to V_" << AV_iter << "...";
@@ -79,7 +86,7 @@ namespace LinBox
else {
report << "no" << std::endl;
- std::ostream &err_report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR);
+ std::ostream &err_report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR);
err_report << "ERROR: V_" << V_iter << " is not A-conjugate to V_" << AV_iter << std::endl;
err_report << "Computed V_" << V_iter << "^T AV_" << AV_iter << ":" << std::endl;
MD.write (report, T);
@@ -107,7 +114,7 @@ namespace LinBox
# define TIMER_START(part) part##_timer.start ()
# define TIMER_STOP(part) part##_timer.stop (); part##_time += part##_timer.time ()
# define TIMER_REPORT(part) \
- commentator.report (Commentator::LEVEL_NORMAL, TIMING_MEASURE) \
+ commentator().report (Commentator::LEVEL_NORMAL, TIMING_MEASURE) \
<< "Total " #part " time: " << part##_time << "s" << std::endl;
#else
# define TIMER_DECLARE(part)
@@ -125,22 +132,22 @@ namespace LinBox
linbox_check ((x.size () == A.coldim ()) &&
(b.size () == A.rowdim ()));
- commentator.start ("Solving linear system (Block Lanczos)", "BlockLanczosSolver::solve");
+ commentator().start ("Solving linear system (Block Lanczos)", "BlockLanczosSolver::solve");
bool success = false;
Vector d1, d2, b1, b2, bp, y, Ax, ATAx, ATb;
// Get the temporaries into the right sizes
- _V[0].resize (A.coldim (), _N);
- _V[1].resize (A.coldim (), _N);
- _V[2].resize (A.coldim (), _N);
- _AV.resize (A.coldim (), _N);
+ _matV[0].resize (A.coldim (), _block);
+ _matV[1].resize (A.coldim (), _block);
+ _matV[2].resize (A.coldim (), _block);
+ _AV.resize (A.coldim (), _block);
- NonzeroRandIter<Field> real_ri (_F, _randiter);
- RandomDenseStream<Field, Vector, NonzeroRandIter<Field> > stream (_F, real_ri, A.coldim ());
+ NonzeroRandIter<Field> real_ri (_field, _randiter);
+ RandomDenseStream<Field, Vector, NonzeroRandIter<Field> > stream (_field, real_ri, A.coldim ());
for (unsigned int i = 0; !success && i < _traits.maxTries (); ++i) {
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
switch (_traits.preconditioner ()) {
case BlockLanczosTraits::NO_PRECONDITIONER:
@@ -167,7 +174,7 @@ namespace LinBox
VectorWrapper::ensureDim (y, A.coldim ());
stream >> d1;
- Diagonal<Field> D (_F, d1);
+ Diagonal<Field> D (_field, d1);
Compose<Blackbox, Diagonal<Field> > B (&A, &D);
report << "Random D: ";
@@ -192,7 +199,7 @@ namespace LinBox
typedef Compose<PC2, CO1> CO2;
stream >> d1;
- PC1 D (_F, d1);
+ PC1 D (_field, d1);
PC2 AT (&A);
CO1 B1 (&D, &A);
CO2 B (&AT, &B1);
@@ -225,8 +232,8 @@ namespace LinBox
typedef Compose<PC1, CO3> CO4;
stream >> d1 >> d2;
- PC1 D1 (_F, d1);
- PC1 D2 (_F, d2);
+ PC1 D1 (_field, d1);
+ PC1 D2 (_field, d2);
PC2 AT (&A);
CO1 B1 (&A, &D1);
CO2 B2 (&D2, &B1);
@@ -311,32 +318,32 @@ namespace LinBox
VectorWrapper::ensureDim (ATAx, A.coldim ());
VectorWrapper::ensureDim (ATb, A.coldim ());
- commentator.start ("Checking whether A^T Ax = A^T b");
+ commentator().start ("Checking whether A^T Ax = A^T b");
A.apply (Ax, x);
A.applyTranspose (ATAx, Ax);
A.applyTranspose (ATb, b);
if (_VD.areEqual (ATAx, ATb)) {
- commentator.stop ("passed");
+ commentator().stop ("passed");
success = true;
}
else {
- commentator.stop ("FAILED");
+ commentator().stop ("FAILED");
success = false;
}
}
else if (_traits.checkResult ()) {
- commentator.start ("Checking whether Ax=b");
+ commentator().start ("Checking whether Ax=b");
A.apply (Ax, x);
if (_VD.areEqual (Ax, b)) {
- commentator.stop ("passed");
+ commentator().stop ("passed");
success = true;
}
else {
- commentator.stop ("FAILED");
+ commentator().stop ("FAILED");
success = false;
}
}
@@ -344,11 +351,11 @@ namespace LinBox
}
if (success) {
- commentator.stop ("done", "Solve successful", "BlockLanczosSolver::solve");
+ commentator().stop ("done", "Solve successful", "BlockLanczosSolver::solve");
return x;
}
else {
- commentator.stop ("done", "Solve failed", "BlockLanczosSolver::solve");
+ commentator().stop ("done", "Solve failed", "BlockLanczosSolver::solve");
throw SolveFailed ();
}
}
@@ -357,13 +364,13 @@ namespace LinBox
template <class Blackbox, class Vector>
bool BlockLanczosSolver<Field, Matrix>::iterate (const Blackbox &A, Vector &x, const Vector &b)
{
- linbox_check (_V[0].rowdim () == A.rowdim ());
- linbox_check (_V[1].rowdim () == A.rowdim ());
- linbox_check (_V[2].rowdim () == A.rowdim ());
- linbox_check (_V[0].coldim () == _V[1].coldim ());
- linbox_check (_V[0].coldim () == _V[2].coldim ());
+ linbox_check (_matV[0].rowdim () == A.rowdim ());
+ linbox_check (_matV[1].rowdim () == A.rowdim ());
+ linbox_check (_matV[2].rowdim () == A.rowdim ());
+ linbox_check (_matV[0].coldim () == _matV[1].coldim ());
+ linbox_check (_matV[0].coldim () == _matV[2].coldim ());
- commentator.start ("Block Lanczos iteration", "BlockLanczosSolver::iterate", A.rowdim ());
+ commentator().start ("Block Lanczos iteration", "BlockLanczosSolver::iterate", A.rowdim ());
size_t Ni;
size_t total_dim = 0;
@@ -393,30 +400,30 @@ namespace LinBox
TIMER_DECLARE(solution);
TIMER_DECLARE(orthogonalization)
- // Get a random fat vector _V[0]
- RandomDenseStream<Field, typename Matrix::Col> stream (_F, _randiter, A.coldim ());
+ // Get a random fat vector _matV[0]
+ RandomDenseStream<Field, typename Matrix::Col> stream (_field, _randiter, A.coldim ());
- for (k = _V[0].colBegin (); k != _V[0].colEnd (); ++k)
+ for (k = _matV[0].colBegin (); k != _matV[0].colEnd (); ++k)
stream >> *k;
TIMER_START(AV);
- _MD.blackboxMulLeft (_AV, A, _V[0]);
+ _MD.blackboxMulLeft (_AV, A, _matV[0]);
TIMER_STOP(AV);
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
// Initialize S_-1 to IN
- std::fill (_S.begin (), _S.end (), true);
+ std::fill (_vecS.begin (), _vecS.end (), true);
// Iteration 1
TIMER_START(Winv);
- _MD.mul (_VTAV, transpose (_V[0]), _AV);
- Ni = compute_Winv_S (_Winv[0], _S, _VTAV);
+ _MD.mul (_VTAV, transpose (_matV[0]), _AV);
+ Ni = compute_Winv_S (_Winv[0], _vecS, _VTAV);
TIMER_STOP(Winv);
// Check for catastrophic breakdown
if (Ni == 0) {
- commentator.stop ("breakdown", NULL, "BlockLanczosSolver::iterate");
+ commentator().stop ("breakdown", NULL, "BlockLanczosSolver::iterate");
return false;
}
@@ -428,45 +435,45 @@ namespace LinBox
#endif
TIMER_START(solution);
- vectorMulTranspose (tmp, _V[0], b, _S);
+ vectorMulTranspose (tmp, _matV[0], b, _vecS);
_MD.vectorMul (tmp1, _Winv[0], tmp);
- vectorMul (x, _V[0], tmp1, _S);
+ vectorMul (x, _matV[0], tmp1, _vecS);
TIMER_STOP(solution);
- mul_SST (_V[1], _AV, _S);
+ mul_SST (_matV[1], _AV, _vecS);
TIMER_START(orthogonalization);
- mul (_AVTAVSST_VTAV, transpose (_AV), _AV, _S);
+ mul (_AVTAVSST_VTAV, transpose (_AV), _AV, _vecS);
- BLTraceReport (report, _MD, "V", 0, _V[0]);
+ BLTraceReport (report, _MD, "V", 0, _matV[0]);
BLTraceReport (report, _MD, "AV", 0, _AV);
BLTraceReport (report, _MD, "V^T A V", 0, _VTAV);
BLTraceReport (report, _MD, "Winv", 0, _Winv[0]);
- reportS (report, _S, 0);
+ reportS (report, _vecS, 0);
BLTraceReport (report, _VD, "x", 0, x);
- BLTraceReport (report, _MD, "AVSS^T", 0, _V[1]);
+ BLTraceReport (report, _MD, "AVSS^T", 0, _matV[1]);
BLTraceReport (report, _MD, "V^T A^2 V", 0, _AVTAVSST_VTAV);
_MD.addin (_AVTAVSST_VTAV, _VTAV);
_MD.mul (_DEF, _Winv[0], _AVTAVSST_VTAV);
addIN (_DEF);
- _MD.axpyin (_V[1], _V[0], _DEF);
+ _MD.axpyin (_matV[1], _matV[0], _DEF);
TIMER_START(orthogonalization);
BLTraceReport (report, _MD, "D", 1, _DEF);
- BLTraceReport (report, _MD, "V", 1, _V[1]);
- checkAConjugacy (_MD, _AV, _V[1], _DEF, 0, 1);
+ BLTraceReport (report, _MD, "V", 1, _matV[1]);
+ checkAConjugacy (_MD, _AV, _matV[1], _DEF, 0, 1);
- if (_MD.isZero (_V[1])) {
- commentator.stop ("done", NULL, "BlockLanczosSolver::iterate");
+ if (_MD.isZero (_matV[1])) {
+ commentator().stop ("done", NULL, "BlockLanczosSolver::iterate");
return true;
}
// Iteration 2
TIMER_START(AV);
- _MD.blackboxMulLeft (_AV, A, _V[1]);
+ _MD.blackboxMulLeft (_AV, A, _matV[1]);
TIMER_STOP(AV);
#ifdef DETAILED_TRACE
@@ -476,13 +483,13 @@ namespace LinBox
#endif
TIMER_START(Winv);
- _MD.mul (_VTAV, transpose (_V[1]), _AV);
- Ni = compute_Winv_S (_Winv[1], _S, _VTAV);
+ _MD.mul (_VTAV, transpose (_matV[1]), _AV);
+ Ni = compute_Winv_S (_Winv[1], _vecS, _VTAV);
TIMER_STOP(Winv);
// Check for catastrophic breakdown
if (Ni == 0) {
- commentator.stop ("breakdown", NULL, "BlockLanczosSolver::iterate");
+ commentator().stop ("breakdown", NULL, "BlockLanczosSolver::iterate");
return false;
}
@@ -494,47 +501,47 @@ namespace LinBox
#endif
TIMER_START(solution);
- vectorMulTranspose (tmp, _V[1], b, _S);
+ vectorMulTranspose (tmp, _matV[1], b, _vecS);
_MD.vectorMul (tmp1, _Winv[1], tmp);
- vectorMul (tmp2, _V[1], tmp1, _S);
+ vectorMul (tmp2, _matV[1], tmp1, _vecS);
_VD.addin (x, tmp2);
TIMER_STOP(solution);
- mul_SST (_V[2], _AV, _S);
+ mul_SST (_matV[2], _AV, _vecS);
TIMER_START(orthogonalization);
- mul (_AVTAVSST_VTAV, transpose (_AV), _AV, _S);
+ mul (_AVTAVSST_VTAV, transpose (_AV), _AV, _vecS);
BLTraceReport (report, _MD, "AV", 1, _AV);
BLTraceReport (report, _MD, "V^T A V", 1, _VTAV);
BLTraceReport (report, _MD, "Winv", 1, _Winv[1]);
- reportS (report, _S, 1);
+ reportS (report, _vecS, 1);
BLTraceReport (report, _VD, "x", 1, x);
BLTraceReport (report, _MD, "V^T A^2 V", 1, _AVTAVSST_VTAV);
_MD.addin (_AVTAVSST_VTAV, _VTAV);
_MD.mul (_DEF, _Winv[1], _AVTAVSST_VTAV);
addIN (_DEF);
- _MD.axpyin (_V[2], _V[1], _DEF);
+ _MD.axpyin (_matV[2], _matV[1], _DEF);
BLTraceReport (report, _MD, "D", 2, _DEF);
- mul (_DEF, _Winv[0], _VTAV, _S);
- _MD.axpyin (_V[2], _V[0], _DEF);
+ mul (_DEF, _Winv[0], _VTAV, _vecS);
+ _MD.axpyin (_matV[2], _matV[0], _DEF);
TIMER_STOP(orthogonalization);
BLTraceReport (report, _MD, "E", 2, _DEF);
- BLTraceReport (report, _MD, "V", 2, _V[2]);
+ BLTraceReport (report, _MD, "V", 2, _matV[2]);
- checkAConjugacy (_MD, _AV, _V[2], _DEF, 1, 2);
+ checkAConjugacy (_MD, _AV, _matV[2], _DEF, 1, 2);
// Now we're ready to begin the real iteration
- while (!_MD.isZero (_V[j])) {
+ while (!_MD.isZero (_matV[j])) {
next_j = j + 1;
if (next_j > 2) next_j = 0;
TIMER_START(AV);
- _MD.blackboxMulLeft (_AV, A, _V[j]);
+ _MD.blackboxMulLeft (_AV, A, _matV[j]);
TIMER_STOP(AV);
// First compute F_i+1, where we use Winv_i-2; then Winv_i and
@@ -543,16 +550,16 @@ namespace LinBox
// _DEF
TIMER_START(orthogonalization);
- _MD.mul (_T, _VTAV, _Winv[1 - i]);
- addIN (_T);
- _MD.mul (_DEF, _Winv[i], _T);
+ _MD.mul (_matT, _VTAV, _Winv[1 - i]);
+ addIN (_matT);
+ _MD.mul (_DEF, _Winv[i], _matT);
_MD.mulin (_DEF, _AVTAVSST_VTAV);
TIMER_STOP(orthogonalization);
// Now get the next VTAV, Winv, and S_i
TIMER_START(Winv);
- _MD.mul (_VTAV, transpose (_V[j]), _AV);
- Ni = compute_Winv_S (_Winv[i], _S, _VTAV);
+ _MD.mul (_VTAV, transpose (_matV[j]), _AV);
+ Ni = compute_Winv_S (_Winv[i], _vecS, _VTAV);
TIMER_STOP(Winv);
// Check for catastrophic breakdown
@@ -572,18 +579,18 @@ namespace LinBox
BLTraceReport (report, _MD, "F", iter + 1, _DEF);
BLTraceReport (report, _MD, "V^T AV", iter, _VTAV);
BLTraceReport (report, _MD, "Winv", iter, _Winv[i]);
- reportS (report, _S, iter);
+ reportS (report, _vecS, iter);
// Now that we have S_i, finish off with F_i+1
TIMER_START(orthogonalization);
- mulin (_V[next_j], _DEF, _S);
+ mulin (_matV[next_j], _DEF, _vecS);
TIMER_STOP(orthogonalization);
// Update x
TIMER_START(solution);
- vectorMulTranspose (tmp, _V[j], b, _S);
+ vectorMulTranspose (tmp, _matV[j], b, _vecS);
_MD.vectorMul (tmp1, _Winv[i], tmp);
- vectorMul (tmp2, _V[j], tmp1, _S);
+ vectorMul (tmp2, _matV[j], tmp1, _vecS);
_VD.addin (x, tmp2);
TIMER_STOP(solution);
@@ -591,7 +598,7 @@ namespace LinBox
// Compute the next _AVTAVSST_VTAV
TIMER_START(orthogonalization);
- mul (_AVTAVSST_VTAV, transpose (_AV), _AV, _S);
+ mul (_AVTAVSST_VTAV, transpose (_AV), _AV, _vecS);
BLTraceReport (report, _MD, "V^T A^2 V", iter, _AVTAVSST_VTAV);
@@ -600,25 +607,25 @@ namespace LinBox
// Compute D and update V_i+1
_MD.mul (_DEF, _Winv[i], _AVTAVSST_VTAV);
addIN (_DEF);
- _MD.axpyin (_V[next_j], _V[j], _DEF);
+ _MD.axpyin (_matV[next_j], _matV[j], _DEF);
BLTraceReport (report, _MD, "D", iter + 1, _DEF);
// Compute E and update V_i+1
- mul (_DEF, _Winv[1 - i], _VTAV, _S);
- _MD.axpyin (_V[next_j], _V[prev_j], _DEF);
+ mul (_DEF, _Winv[1 - i], _VTAV, _vecS);
+ _MD.axpyin (_matV[next_j], _matV[prev_j], _DEF);
BLTraceReport (report, _MD, "E", iter + 1, _DEF);
// Add AV_i S_i S_i^T
- addin (_V[next_j], _AV, _S);
+ addin (_matV[next_j], _AV, _vecS);
TIMER_STOP(orthogonalization);
- BLTraceReport (report, _MD, "V", iter + 1, _V[next_j]);
- checkAConjugacy (_MD, _AV, _V[next_j], _DEF, iter, iter + 1);
+ BLTraceReport (report, _MD, "V", iter + 1, _matV[next_j]);
+ checkAConjugacy (_MD, _AV, _matV[next_j], _DEF, iter, iter + 1);
#ifdef DETAILED_TRACE
- checkAConjugacy (_MD, AV1_backup, _V[next_j], _DEF, 1, iter + 1);
+ checkAConjugacy (_MD, AV1_backup, _matV[next_j], _DEF, 1, iter + 1);
#endif
i = 1 - i;
@@ -627,12 +634,12 @@ namespace LinBox
++iter;
if (!(iter % progress_interval))
- commentator.progress (total_dim);
+ commentator().progress (total_dim);
if (total_dim > A.rowdim ()) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "Maximum number of iterations passed without termination" << std::endl;
- commentator.stop ("ERROR", NULL, "BlockLanczosSolver::iterate");
+ commentator().stop ("ERROR", NULL, "BlockLanczosSolver::iterate");
return false;
}
}
@@ -648,7 +655,7 @@ namespace LinBox
TIMER_REPORT(solution);
TIMER_REPORT(orthogonalization)
- commentator.stop (ret ? "done" : "breakdown", NULL, "BlockLanczosSolver::iterate");
+ commentator().stop (ret ? "done" : "breakdown", NULL, "BlockLanczosSolver::iterate");
return ret;
}
@@ -663,19 +670,19 @@ namespace LinBox
linbox_check (S.size () == Winv.coldim ());
linbox_check (S.size () == T.rowdim ());
linbox_check (S.size () == T.coldim ());
- linbox_check (S.size () == _M.rowdim ());
- linbox_check (S.size () * 2 == _M.coldim ());
+ linbox_check (S.size () == _matM.rowdim ());
+ linbox_check (S.size () * 2 == _matM.coldim ());
#ifdef DETAILED_TRACE
- commentator.start ("Computing Winv and S", "BlockLanczosSolver::compute_Winv_S", S.size ());
+ commentator().start ("Computing Winv and S", "BlockLanczosSolver::compute_Winv_S", S.size ());
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Input T:" << std::endl;
_MD.write (report, T);
#endif
- DenseSubmatrix<Element> M1 (_M, 0, 0, T.rowdim (), T.coldim ());
- DenseSubmatrix<Element> M2 (_M, 0, T.coldim (), T.rowdim (), T.coldim ());
+ BlasMatrix<Field> M1 (_matM, 0, 0, T.rowdim (), T.coldim ());
+ BlasMatrix<Field> M2 (_matM, 0, T.coldim (), T.rowdim (), T.coldim ());
_MD.copy (M1, T);
setIN (M2);
@@ -690,16 +697,16 @@ namespace LinBox
for (row = 0; row < S.size (); ++row) {
#ifdef DETAILED_TRACE
if (!(row & ((1 << 10) - 1)))
- commentator.progress (row);
+ commentator().progress (row);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Iteration " << row << ": Matrix M = " << std::endl;
- _MD.write (report, _M);
+ _MD.write (report, _matM);
#endif
- if (find_pivot_row (_M, row, 0, _indices)) {
+ if (find_pivot_row (_matM, row, 0, _indices)) {
#ifdef DETAILED_TRACE
- commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION)
<< "Pivot found for column " << _indices[row] << std::endl;
#endif
@@ -708,17 +715,17 @@ namespace LinBox
S[_indices[row]] = true; // Use column j of V_i in W_i
// Give the (j, j) entry unity
- _F.inv (Mjj_inv, _M.getEntry (_indices[row], _indices[row]));
- _VD.mulin (*(_M.rowBegin () + _indices[row]), Mjj_inv);
+ _field.inv (Mjj_inv, _matM.getEntry (_indices[row], _indices[row]));
+ _VD.mulin (*(_matM.rowBegin () + _indices[row]), Mjj_inv);
// Zero the rest of the column j
- eliminate_col (_M, row, 0, _indices, Mjj_inv);
+ eliminate_col (_matM, row, 0, _indices, Mjj_inv);
++Ni;
}
else {
#ifdef DETAILED_TRACE
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "No pivot found for column " << _indices[row] << std::endl;
#endif
@@ -726,17 +733,17 @@ namespace LinBox
S[_indices[row]] = false; // Skip column j
- find_pivot_row (_M, row, _N, _indices);
+ find_pivot_row (_matM, row, _block, _indices);
- const typename Field::Element &Mjj = _M.refEntry (_indices[row], _indices[row] + _N);
+ const typename Field::Element &Mjj = _matM.refEntry (_indices[row], _indices[row] + _block);
- linbox_check (!_F.isZero (Mjj));
+ linbox_check (!_field.isZero (Mjj));
// Zero the rest of the column j + N
- eliminate_col (_M, row, _N, _indices, _F.inv (Mjj_inv, Mjj));
+ eliminate_col (_matM, row, _block, _indices, _field.inv (Mjj_inv, Mjj));
// Zero row j
- _VD.subin (*(_M.rowBegin () + _indices[row]), *(_M.rowBegin () + _indices[row]));
+ _VD.subin (*(_matM.rowBegin () + _indices[row]), *(_matM.rowBegin () + _indices[row]));
}
}
@@ -746,7 +753,7 @@ namespace LinBox
report << "Computed Winv:" << std::endl;
_MD.write (report, Winv);
- commentator.stop ("done", NULL, "BlockLanczosSolver::compute_Winv_S");
+ commentator().stop ("done", NULL, "BlockLanczosSolver::compute_Winv_S");
#endif
return Ni;
@@ -837,7 +844,7 @@ namespace LinBox
if (*l)
_VD.dot (*k, *i, *j);
else
- _F.subin (*k, *k);
+ _field.subin (*k, *k);
}
_VD.copy (*i, _tmp);
@@ -902,7 +909,7 @@ namespace LinBox
size_t idx = 0;
for (i = A.rowBegin (); i != A.rowEnd (); ++i, ++idx)
- _F.addin ((*i)[idx], _one);
+ _field.addin ((*i)[idx], _one);
return A;
}
@@ -962,7 +969,7 @@ namespace LinBox
for (i = A.rowBegin (), i_idx = 0; i != A.rowEnd (); ++i, ++i_idx) {
_VD.subin (*i, *i);
- _F.assign ((*i)[i_idx], _one);
+ _field.assign ((*i)[i_idx], _one);
}
return A;
@@ -986,11 +993,11 @@ namespace LinBox
typename Matrix::Col col_vec;
typename Matrix::Row row_vec;
- col_vec = *(_M.colBegin () + indices[row] + col_offset);
- row_vec = *(_M.rowBegin () + indices[row]);
+ col_vec = *(_matM.colBegin () + indices[row] + col_offset);
+ row_vec = *(_matM.rowBegin () + indices[row]);
for (idx = row; idx < A.rowdim (); ++idx) {
- if (!_F.isZero (A.getEntry (indices[idx], indices[row] + col_offset))) {
+ if (!_field.isZero (A.getEntry (indices[idx], indices[row] + col_offset))) {
if (idx != row) {
typename Matrix::Row row1 = *(A.rowBegin () + indices[idx]);
std::swap_ranges (row_vec.begin (), row_vec.end (), row1.begin ());
@@ -1014,7 +1021,7 @@ namespace LinBox
// I'm assuming everything left of the column with the index of the pivot row is 0
size_t row;
- typename DenseSubmatrix<Element>::Row pivot_row;
+ typename BlasMatrix<Field>::Row pivot_row;
typename Field::Element p;
pivot_row = *(A.rowBegin () + indices[pivot]);
@@ -1022,31 +1029,31 @@ namespace LinBox
for (row = 0; row < pivot; ++row) {
const typename Field::Element &Aij = A.getEntry (indices[row], indices[pivot] + col_offset);
- if (!_F.isZero (Aij))
- _VD.axpyin (*(A.rowBegin () + indices[row]), _F.neg (p, Aij), pivot_row);
+ if (!_field.isZero (Aij))
+ _VD.axpyin (*(A.rowBegin () + indices[row]), _field.neg (p, Aij), pivot_row);
}
for (++row; row < A.rowdim (); ++row) {
const typename Field::Element &Aij = A.getEntry (indices[row], indices[pivot] + col_offset);
- if (!_F.isZero (Aij))
- _VD.axpyin (*(A.rowBegin () + indices[row]), _F.neg (p, Aij), pivot_row);
+ if (!_field.isZero (Aij))
+ _VD.axpyin (*(A.rowBegin () + indices[row]), _field.neg (p, Aij), pivot_row);
}
}
template <class Field, class Matrix>
void BlockLanczosSolver<Field, Matrix>::init_temps ()
{
- _VTAV.resize (_N, _N);
- _Winv[0].resize (_N, _N);
- _Winv[1].resize (_N, _N);
- _AVTAVSST_VTAV.resize (_N, _N);
- _T.resize (_N, _N);
- _DEF.resize (_N, _N);
- _S.resize (_N);
- _M.resize (_N, 2 * _N);
- _tmp.resize (_N);
- _indices.resize (_N);
+ _VTAV.resize (_block, _block);
+ _Winv[0].resize (_block, _block);
+ _Winv[1].resize (_block, _block);
+ _AVTAVSST_VTAV.resize (_block, _block);
+ _matT.resize (_block, _block);
+ _DEF.resize (_block, _block);
+ _vecS.resize (_block);
+ _matM.resize (_block, 2 * _block);
+ _tmp.resize (_block);
+ _indices.resize (_block);
}
// Check whether the given matrix is "almost" the identity, i.e. the identity
@@ -1060,19 +1067,19 @@ namespace LinBox
typename Field::Element neg_one;
- _F.init (neg_one, -1);
+ _field.init (neg_one, -1);
size_t i, j;
for (i = 0; i < M.rowdim (); ++i) {
for (j = 0; j < M.coldim (); ++j) {
- if (i != j && !_F.isZero (M.getEntry (i, j))) {
- if (!_F.isZero (M.getEntry (i, i))) {
+ if (i != j && !_field.isZero (M.getEntry (i, j))) {
+ if (!_field.isZero (M.getEntry (i, i))) {
typename Matrix::ConstRowIterator row = M.rowBegin () + j;
if (!_VD.isZero (*row))
return false;
}
- else if (!_F.isZero (M.getEntry (j, j))) {
+ else if (!_field.isZero (M.getEntry (j, j))) {
typename Matrix::ConstColIterator col = M.colBegin () + i;
if (!_VD.isZero (*col))
return false;
@@ -1080,7 +1087,7 @@ namespace LinBox
else
return false;
}
- else if (!_F.isZero (M.getEntry (i, j)) && !_F.areEqual (M.getEntry (i, j), neg_one))
+ else if (!_field.isZero (M.getEntry (i, j)) && !_field.areEqual (M.getEntry (i, j), neg_one))
return false;
}
}
@@ -1101,7 +1108,7 @@ namespace LinBox
template <class Field, class Matrix>
bool BlockLanczosSolver<Field, Matrix>::test_compute_Winv_S_mul (int n) const
{
- commentator.start ("Testing compute_Winv_S, mul, addIN, and isZero", "test_compute_Winv_S_mul");
+ commentator().start ("Testing compute_Winv_S, mul, addIN, and isZero", "test_compute_Winv_S_mul");
Matrix A (n, n);
Matrix AT (n, n);
@@ -1112,7 +1119,7 @@ namespace LinBox
bool ret = true;
- RandomDenseStream<Field, typename Matrix::Row> stream (_F, _randiter, n);
+ RandomDenseStream<Field, typename Matrix::Row> stream (_field, _randiter, n);
typename Matrix::RowIterator i = A.rowBegin ();
typename Matrix::ColIterator j = AT.colBegin ();
@@ -1125,7 +1132,7 @@ namespace LinBox
_MD.mul (ATA, AT, A);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Computed A^T A:" << std::endl;
_MD.write (report, ATA);
@@ -1141,7 +1148,7 @@ namespace LinBox
_MD.write (report, WA);
if (!isAlmostIdentity (WA)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: WA^T A != I" << std::endl;
ret = false;
}
@@ -1154,12 +1161,12 @@ namespace LinBox
_MD.write (report, WA);
if (!isAlmostIdentity (WA)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: A^T AW != I" << std::endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), NULL, "test_compute_Winv_S_mul");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_compute_Winv_S_mul");
return ret;
}
@@ -1169,7 +1176,7 @@ namespace LinBox
template <class Field, class Matrix>
bool BlockLanczosSolver<Field, Matrix>::test_compute_Winv_S_mulin (int n) const
{
- commentator.start ("Testing compute_Winv_S, copy, mulin, addIN, and isZero", "test_compute_Winv_S_mulin");
+ commentator().start ("Testing compute_Winv_S, copy, mulin, addIN, and isZero", "test_compute_Winv_S_mulin");
Matrix A (n, n);
Matrix AT (n, n);
@@ -1180,7 +1187,7 @@ namespace LinBox
bool ret = true;
- RandomDenseStream<Field, typename Matrix::Row> stream (_F, _randiter, n);
+ RandomDenseStream<Field, typename Matrix::Row> stream (_field, _randiter, n);
typename Matrix::RowIterator i = A.rowBegin ();
typename Matrix::ColIterator j = AT.colBegin ();
@@ -1193,7 +1200,7 @@ namespace LinBox
_MD.mul (ATA, AT, A);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Computed A^T A:" << std::endl;
_MD.write (report, ATA);
@@ -1211,7 +1218,7 @@ namespace LinBox
_MD.write (report, WA);
if (!isAlmostIdentity (WA)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: WA^T A != I" << std::endl;
ret = false;
}
@@ -1226,12 +1233,12 @@ namespace LinBox
_MD.write (report, WA);
if (!isAlmostIdentity (WA)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: A^T AW != I" << std::endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), NULL, "test_compute_Winv_S_mulin");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_compute_Winv_S_mulin");
return ret;
}
@@ -1243,11 +1250,11 @@ namespace LinBox
template <class Field, class Matrix>
bool BlockLanczosSolver<Field, Matrix>::test_mul_SST (int n) const
{
- commentator.start ("Testing addin", "test_mulTranspose");
+ commentator().start ("Testing addin", "test_mulTranspose");
bool ret = true;
- commentator.stop (MSG_STATUS (ret), NULL, "test_mulTranspose");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_mulTranspose");
return ret;
}
@@ -1258,11 +1265,11 @@ namespace LinBox
template <class Field, class Matrix>
bool BlockLanczosSolver<Field, Matrix>::test_mul_ABSST (int n) const
{
- commentator.start ("Testing addin", "test_mulTranspose");
+ commentator().start ("Testing addin", "test_mulTranspose");
bool ret = true;
- commentator.stop (MSG_STATUS (ret), NULL, "test_mulTranspose");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_mulTranspose");
return ret;
}
@@ -1273,7 +1280,7 @@ namespace LinBox
template <class Field, class Matrix>
bool BlockLanczosSolver<Field, Matrix>::test_mulTranspose (int m, int n) const
{
- commentator.start ("Testing mulTranspose, m-v mul", "test_mulTranspose");
+ commentator().start ("Testing mulTranspose, m-v mul", "test_mulTranspose");
Matrix A (m, n);
typename Vector<Field>::Dense x (m), y (n);
@@ -1282,20 +1289,20 @@ namespace LinBox
bool ret = true;
- RandomDenseStream<Field, typename Matrix::Row> stream (_F, _randiter, n);
+ RandomDenseStream<Field, typename Matrix::Row> stream (_field, _randiter, n);
typename Matrix::RowIterator i = A.rowBegin ();
for (; i != A.rowEnd (); ++i)
stream >> *i;
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Computed A:" << std::endl;
_MD.write (report, A);
- RandomDenseStream<Field, Matrix> stream1 (_F, _randiter, m);
+ RandomDenseStream<Field, Matrix> stream1 (_field, _randiter, m);
stream1 >> x;
- RandomDenseStream<Field, Matrix> stream2 (_F, _randiter, n);
+ RandomDenseStream<Field, Matrix> stream2 (_field, _randiter, n);
stream1 >> y;
report << "Computed x: ";
@@ -1317,20 +1324,20 @@ namespace LinBox
_VD.dot (ATxy, ATx, y);
report << "Computed ATxy: ";
- _F.write (report, ATxy) << std::endl;
+ _field.write (report, ATxy) << std::endl;
_VD.dot (xAy, x, Ay);
report << "Computed xAy: ";
- _F.write (report, xAy) << std::endl;
+ _field.write (report, xAy) << std::endl;
- if (!_F.areEqual (ATxy, xAy)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ if (!_field.areEqual (ATxy, xAy)) {
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: <A^T x, y> != <x, Ay>" << std::endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), NULL, "test_mulTranspose");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_mulTranspose");
return ret;
}
@@ -1340,11 +1347,11 @@ namespace LinBox
template <class Field, class Matrix>
bool BlockLanczosSolver<Field, Matrix>::test_mulTranspose_ABSST (int n) const
{
- commentator.start ("Testing addin_ABSST", "test_mulTranspose_ABSST");
+ commentator().start ("Testing addin_ABSST", "test_mulTranspose_ABSST");
bool ret = true;
- commentator.stop (MSG_STATUS (ret), NULL, "test_mulTranspose_ABSST");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_mulTranspose_ABSST");
return ret;
}
@@ -1354,11 +1361,11 @@ namespace LinBox
template <class Field, class Matrix>
bool BlockLanczosSolver<Field, Matrix>::test_mulin_ABSST (int n) const
{
- commentator.start ("Testing addin_ABSST", "test_mulin_ABSST");
+ commentator().start ("Testing addin_ABSST", "test_mulin_ABSST");
bool ret = true;
- commentator.stop (MSG_STATUS (ret), NULL, "test_mulin_ABSST");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_mulin_ABSST");
return ret;
}
@@ -1368,11 +1375,11 @@ namespace LinBox
template <class Field, class Matrix>
bool BlockLanczosSolver<Field, Matrix>::test_addin_ABSST (int n) const
{
- commentator.start ("Testing addin_ABSST", "test_addin_ABSST");
+ commentator().start ("Testing addin_ABSST", "test_addin_ABSST");
bool ret = true;
- commentator.stop (MSG_STATUS (ret), NULL, "test_addin_ABSST");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_addin_ABSST");
return ret;
}
@@ -1382,18 +1389,18 @@ namespace LinBox
{
bool ret = true;
- commentator.start ("Running self check", "runSelfCheck", 10);
+ commentator().start ("Running self check", "runSelfCheck", 10);
- if (!test_compute_Winv_S_mul (_N)) ret = false;
- if (!test_compute_Winv_S_mulin (_N)) ret = false;
- if (!test_mul_SST (_N)) ret = false;
- if (!test_mul_ABSST (_N)) ret = false;
- if (!test_mulTranspose (_N * 10, _N)) ret = false;
- if (!test_mulTranspose_ABSST (_N)) ret = false;
- if (!test_mulin_ABSST (_N)) ret = false;
- if (!test_addin_ABSST (_N)) ret = false;
+ if (!test_compute_Winv_S_mul (_block)) ret = false;
+ if (!test_compute_Winv_S_mulin (_block)) ret = false;
+ if (!test_mul_SST (_block)) ret = false;
+ if (!test_mul_ABSST (_block)) ret = false;
+ if (!test_mulTranspose (_block * 10, _block)) ret = false;
+ if (!test_mulTranspose_ABSST (_block)) ret = false;
+ if (!test_mulin_ABSST (_block)) ret = false;
+ if (!test_addin_ABSST (_block)) ret = false;
- commentator.stop (MSG_STATUS (ret), NULL, "runSelfCheck");
+ commentator().stop (MSG_STATUS (ret), NULL, "runSelfCheck");
return ret;
}
@@ -1402,3 +1409,12 @@ namespace LinBox
#endif // __LINBOX_block_lanczos_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/block-massey-domain.h b/linbox/algorithms/block-massey-domain.h
index 5301f94..559403b 100644
--- a/linbox/algorithms/block-massey-domain.h
+++ b/linbox/algorithms/block-massey-domain.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/block-massey-domain.h
* Copyright (C) 2002 Pascal Giorgi
*
- * Written by Pascal Giorgi pascal.giorgi at ens-lyon.fr
+ * Written by Pascal Giorgi pascal.giorgi at lirmm.fr
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -31,16 +32,18 @@
#include <iostream>
#include <iomanip>
-#include <linbox/util/commentator.h>
-#include <linbox/util/timer.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/field/unparametric.h>
-#include <linbox/matrix/matrix-domain.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/matrix/factorized-matrix.h>
-#include <linbox/algorithms/blas-domain.h>
-#include <linbox/util/timer.h>
+#include "linbox/util/commentator.h"
+#include "linbox/util/timer.h"
+#include "linbox/field/unparametric.h"
+#include "linbox/matrix/matrix-domain.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/matrix/factorized-matrix.h"
+#include "linbox/algorithms/blas-domain.h"
+#include "linbox/algorithms/sigma-basis.h"
+
+
+#include "linbox/util/timer.h"
//#define __CHECK_RESULT
//#define __DEBUG_MAPLE
@@ -73,12 +76,12 @@ namespace LinBox
typedef _Field Field;
typedef typename Field::Element Element;
typedef _Sequence Sequence;
- typedef BlasMatrix<Element> Coefficient;
+ typedef BlasMatrix<Field> Coefficient;
private:
Sequence *_container;
- Field _F;
+ Field _field;
BlasMatrixDomain<Field> _BMD;
MatrixDomain<Field> _MD;
unsigned long EARLY_TERM_THRESHOLD;
@@ -132,7 +135,7 @@ namespace LinBox
Total+=T;
if (T.count() > 0) {
std::cout<<title<<": "<<timer;
- for (int i=strlen(timer); i<28; i++)
+ for (int i=(int)strlen(timer); i<28; i++)
std::cout << ' ';
std::cout<<T<<std::endl;
}
@@ -161,8 +164,9 @@ namespace LinBox
#endif
- BlockMasseyDomain (const BlockMasseyDomain<Field, Sequence> &M, unsigned long ett_default = DEFAULT_EARLY_TERM_THRESHOLD) :
- _container(M._container), _F(M._F), _BMD(M._F), _MD(M._F), EARLY_TERM_THRESHOLD (ett_default)
+ BlockMasseyDomain (const BlockMasseyDomain<Field, Sequence> &Mat, unsigned long ett_default = DEFAULT_EARLY_TERM_THRESHOLD) :
+ _container(Mat._container), _field(Mat._field), _BMD(Mat._field),
+ _MD(Mat._field), EARLY_TERM_THRESHOLD (ett_default)
{
#ifdef _BM_TIMING
clearTimer();
@@ -170,7 +174,7 @@ namespace LinBox
}
BlockMasseyDomain (Sequence *D, unsigned long ett_default = DEFAULT_EARLY_TERM_THRESHOLD) :
- _container(D), _F(D->getField ()), _BMD(D->getField ()), _MD(D->getField ()), EARLY_TERM_THRESHOLD (ett_default)
+ _container(D), _field(D->getField ()), _BMD(D->getField ()), _MD(D->getField ()), EARLY_TERM_THRESHOLD (ett_default)
{
#ifdef _BM_TIMING
clearTimer();
@@ -180,7 +184,7 @@ namespace LinBox
// field of the domain
const Field &getField () const
- { return _F; }
+ { return _field; }
// sequence of the domain
Sequence *getSequence () const
@@ -248,7 +252,6 @@ namespace LinBox
tSetup.start();
#endif
const size_t length = _container->size ();
-
const size_t m = _container->rowdim();
const size_t n = _container->coldim();
@@ -260,30 +263,26 @@ namespace LinBox
typename Sequence::const_iterator _iter (_container->begin ());
// Reservation of memory for the entire sequence
- std::vector<Coefficient> S (length); //,Coefficient(m,n));
+ std::vector<Coefficient> S (length,Coefficient(m,n));
+ //std::vector<Coefficient> S (length); //,Coefficient(m,n));
Coefficient Unit(m+n,m);
const Coefficient Zero(m+n,m);
- Element one,zero,mone;
- _F.init(one,1L);
- _F.init(zero,0L);
- _F.init(mone,-1L);
+ Element one,zero,mOne;
+ _field.init(one,1L);
+ _field.init(zero,0L);
+ _field.init(mOne,-1L);
for (size_t i=0;i<m;i++)
Unit.setEntry(i,i,one);
size_t min_mn=(m <n)? m :n;
-
-
// initialization of discrepancy
Coefficient Discrepancy(m+n,n);
for (size_t i=0;i<n;i++)
Discrepancy.setEntry(i+m,i,one);
-
// initialization of sigma base
- std::vector<Coefficient> SigmaBase(length);
- SigmaBase.resize(1);
- SigmaBase[0]=Unit;
+ std::vector<Coefficient> SigmaBase(1, Unit);
// initialization of order of sigma base's rows
std::vector<long> order(m+n,1);
@@ -300,42 +299,28 @@ namespace LinBox
tCheckSequence.clear();
tCheckSequence.start();
#endif
-
-
-
// The first sequence element should be of full rank
// this is due to the strategy which say that we can compute
// only the first column of the approximation of [ S(x) Id]^T
// since the other colums have always lower degree.
if (_BMD.rank(*_iter)< min_mn)
throw PreconditionFailed (__func__, __LINE__, "Bad random Blocks, abort\n");
-#if 0
- cerr<<"\n**************************************************\n";
- cerr<<"*** THE FIRST ELEMENT OF SEQUENCE IS SINGULAR ***\n";
- cerr<<"*** ALGORTIHM ABORTED ***\n";
- cerr<<"**************************************************\n";
-#endif
-
-
#ifdef _BM_TIMING
tCheckSequence.stop();
ttCheckSequence += tCheckSequence;
#endif
unsigned long early_stop=0;
- long N;
-
- for (N = 0; (N < (long)length) && (early_stop < EARLY_TERM_THRESHOLD) ; ++N, ++_iter) {
+ long NN;
+ for (NN = 0; (NN < (long)length) && (early_stop < EARLY_TERM_THRESHOLD) ; ++NN, ++_iter) {
// Get the next coefficient in the sequence
- S[N]=*_iter;
-
+ S[NN]=*_iter;
#ifdef _BM_TIMING
- if (N != 0){
+ if (NN != 0){
tGetCoeff.stop();
ttGetCoeff += tGetCoeff;
}
-
tDiscrepancy.clear();
tDiscrepancy.start();
#endif
@@ -349,10 +334,10 @@ namespace LinBox
// view of m first rows of Discrepancy
Coefficient Discr(Discrepancy,0,0,m,n);
- _BMD.mul(Discr,Sigma,S[N]);
+ _BMD.mul(Discr,Sigma,S[NN]);
for (size_t i=1;i<SigmaBase.size();i++){
Coefficient Sigmaview(SigmaBase[i],0,0,m,m);
- _BMD.axpyin(Discr,Sigmaview,S[N-i]);
+ _BMD.axpyin(Discr,Sigmaview,S[NN-i]);
}
#ifdef _BM_TIMING
@@ -360,21 +345,19 @@ namespace LinBox
ttDiscrepancy += tDiscrepancy;
#endif
- typename Coefficient::RawIterator _iter_Discr = Discr.rawBegin();
+ typename Coefficient::Iterator _iter_Discr = Discr.Begin();
- while ((_F.isZero(*_iter_Discr) && _iter_Discr != Discr.rawEnd()))
+ while ((_field.isZero(*_iter_Discr) && _iter_Discr != Discr.End()))
++_iter_Discr;
// maybe there is something to do here
// increase the last n rows of orders
// multiply by X the last n rows of SigmaBase
- if (_iter_Discr != Discr.rawEnd())
+ if (_iter_Discr != Discr.End())
early_stop=0;
else {
early_stop++;
}
-
-
#ifdef _BM_TIMING
tGetPermutation.clear();
tGetPermutation.start();
@@ -385,7 +368,7 @@ namespace LinBox
std::vector<size_t> Perm1(m+n);
for (size_t i=0;i<m+n;++i)
Perm1[i]=i;
- if (N>=2) {
+ if (NN>=2) {
for (size_t i=0;i<m+n;++i) {
size_t idx_min=i;
for (size_t j=i+1;j<m+n;++j)
@@ -414,9 +397,11 @@ namespace LinBox
tLQUP.start();
#endif
+
#ifdef __CHECK_DISCREPANCY
- std::cout<<"Discrepancy"<<N<<":=Matrix(";
- Discrepancy.write(std::cout,_F,true)<<");"<<std::endl;
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ report<<"Discrepancy"<<NN<<":=Matrix(";
+ Discrepancy.write(report,_field,true)<<");"<<std::endl;
#endif
@@ -424,9 +409,9 @@ namespace LinBox
// Computation of the LQUP decomposition of the discrepancy
Coefficient CopyDiscr;
CopyDiscr=Discrepancy;
- BlasPermutation<size_t> P (CopyDiscr.coldim());
+ BlasPermutation<size_t> Pp (CopyDiscr.coldim());
BlasPermutation<size_t> Qt (CopyDiscr.rowdim());
- LQUPMatrix<Field> LQUP(_F, CopyDiscr,P,Qt);
+ LQUPMatrix<Field> LQUP(_field, CopyDiscr,Pp,Qt);
#ifdef _BM_TIMING
tLQUP.stop();
@@ -434,7 +419,7 @@ namespace LinBox
#endif
// Get the matrix L of LQUP decomposition
- TriangularBlasMatrix<Element> L(m+n,m+n, BlasTag::low, BlasTag::unit );
+ TriangularBlasMatrix<Field> L(_field,m+n,m+n, LinBoxTag::Lower, LinBoxTag::Unit );
LQUP.getL(L);
// Get the tranposed permutation of Q from LQUP
@@ -460,8 +445,8 @@ namespace LinBox
tInverseL.start();
#endif
// compute the inverse of L
- TriangularBlasMatrix<Element> invL (m+n,m+n, BlasTag::low,BlasTag::unit);
- FFPACK::trinv_left(_F,m+n,L.getPointer(),L.getStride(),invL.getWritePointer(),invL.getStride());
+ TriangularBlasMatrix<Field> invL (_field,m+n,m+n, LinBoxTag::Lower,LinBoxTag::Unit);
+ FFPACK::trinv_left(_field,m+n,L.getPointer(),L.getStride(),invL.getWritePointer(),invL.getStride());
#ifdef _BM_TIMING
tInverseL.stop();
@@ -469,8 +454,8 @@ namespace LinBox
#endif
#ifdef __CHECK_TRANSFORMATION
- std::cout<<"invL"<<N<<":=Matrix(";
- invL.write(std::cout,_F,true)<<");"<<std::endl;
+ report<<"invL"<<N<<":=Matrix(";
+ invL.write(report,_field,true)<<");"<<std::endl;
#endif
// SigmaBase = BPerm2.Qt. L^(-1) . BPerm1 . SigmaBase
@@ -510,7 +495,7 @@ namespace LinBox
#endif
// Apply BPerm2 and Qt to the vector of order and increase by 1 the last n rows
- UnparametricField<long> UF;
+ UnparametricField<long> UF(0);
BlasMatrixDomain<UnparametricField<long> > BMDUF(UF);
BMDUF.mulin_right(Qt,order);
BMDUF.mulin_right(BPerm2,order);
@@ -538,16 +523,30 @@ namespace LinBox
if (SigmaBase.size()<= (size_t)max_degree)
{
SigmaBase.resize(size+1,Zero);
+ //report << size << std::endl;
size++;
}
+ //report << "size going in" << size << std::endl;
for (int i= (int)size-2;i>=0;i--)
for (size_t j=0;j<n;j++)
- for (size_t k=0;k<n;++k)
- _F.assign(SigmaBase[i+1].refEntry(m+j,k), SigmaBase[i].getEntry(m+j,k));
+ for (size_t k=0;k<n;++k){
+
+ // report << " i+1 item: ";
+ // report << SigmaBase[i+1].getEntry(m+j,k) ;
+ // report << " i item: ";
+ // report << SigmaBase[i].getEntry(m+j,k)
+ // << std::endl;
+ // typename Field::Element& x = SigmaBase[i+1].refEntry(m+j,k);
+ // report << &x << " " << x << " &x and x" << std::endl;
+ // x = SigmaBase[i].getEntry(m+j,k);
+ // report << x << " new x" << std::endl;
+ _field.assign(SigmaBase[i+1].refEntry(m+j,k), SigmaBase[i].getEntry(m+j,k));
+
+ }
for (size_t j=0;j<n;j++)
for (size_t k=0;k<n;++k)
- _F.assign(SigmaBase[0].refEntry(m+j,k),zero);
+ _field.assign(SigmaBase[0].refEntry(m+j,k),zero);
#ifdef _BM_TIMING
@@ -557,35 +556,35 @@ namespace LinBox
#ifdef __DEBUG_MAPLE
- std::cout<<"\n\nSigmaBase"<<N<<":= ";
- write_maple(_F,SigmaBase);
+ report<<"\n\nSigmaBase"<<NN<<":= ";
+ write_maple(_field,SigmaBase);
- std::cout<<"order"<<N<<":=<";
+ report<<"order"<<NN<<":=<";
for (size_t i=0;i<m+n;++i){
- std::cout<<order[i];
- if (i!=m+n-1) std::cout<<",";
+ report<<order[i];
+ if (i!=m+n-1) report<<",";
}
- std::cout<<">;"<<std::endl;
- std::cout<<"degree"<<N<<":=<";
+ report<<">;"<<std::endl;
+ report<<"degree"<<NN<<":=<";
for (size_t i=0;i<m+n;++i){
- std::cout<<degree[i];
- if (i!=m+n-1) std::cout<<",";
+ report<<degree[i];
+ if (i!=m+n-1) report<<",";
}
- std::cout<<">;"<<std::endl;
+ report<<">;"<<std::endl;
#endif
#ifdef __CHECK_LOOP
- std::cout<<"\nCheck validity of current SigmaBase\n";
- std::cout<<"SigmaBase size: "<<SigmaBase.size()<<std::endl;
- std::cout<<"Sequence size: "<<N+1<<std::endl;
- size_t min_t = (SigmaBase.size() > N+1)? N+1: SigmaBase.size();
- for (size_t i=min_t - 1 ; i<N+1; ++i){
+ report<<"\nCheck validity of current SigmaBase\n";
+ report<<"SigmaBase size: "<<SigmaBase.size()<<std::endl;
+ report<<"Sequence size: "<<NN+1<<std::endl;
+ size_t min_t = (SigmaBase.size() > NN+1)? NN+1: SigmaBase.size();
+ for (size_t i=min_t - 1 ; i<NN+1; ++i){
Coefficient Disc(m+n,n);
_BMD.mul(Disc,SigmaBase[0],S[i]);
for (size_t j=1;j<min_t -1;++j)
_BMD.axpyin(Disc,SigmaBase[j],S[i-j]);
- Disc.write(std::cout,_F)<<std::endl;
+ Disc.write(report,_field)<<std::endl;
}
#endif
@@ -594,13 +593,13 @@ namespace LinBox
tNewDiscrepancy.clear();
tNewDiscrepancy.start();
#endif
- // Discrepancy= BPerm2.U.P from LQUP
+ // Discrepancy= BPerm2.U.Pp from LQUP
Coefficient U(m+n,n);
- TriangularBlasMatrix<Element> trU(U,BlasTag::up,BlasTag::nonunit);
+ TriangularBlasMatrix<Field> trU(U,LinBoxTag::Upper,LinBoxTag::NonUnit);
LQUP.getU(trU);
- Discrepancy=U;
- // BlasPermutation<size_t> P= LQUP.getP();
- _BMD.mulin_left(Discrepancy,P);
+ //Discrepancy=U;
+ // BlasPermutation<size_t> Pp= LQUP.getP();
+ _BMD.mul(Discrepancy,trU, Pp);
_BMD.mulin_right(BPerm2,Discrepancy);
#ifdef _BM_TIMING
@@ -613,23 +612,25 @@ namespace LinBox
#endif
}
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+
if ( early_stop == EARLY_TERM_THRESHOLD)
- std::cout<<"Early termination is used: stop at "<<N<<" from "<<length<<" iterations\n\n";
+ report<<"Early termination is used: stop at "<<NN<<" from "<<length<<" iterations\n\n";
#ifdef __PRINT_SEQUENCE
- std::cout<<"\n\nSequence:= ";
- write_maple(_F,S);
+ report<<"\n\nSequence:= ";
+ write_maple(_field,S);
#endif
#ifdef __CHECK_SIGMA_RESULT
- std::cout<<"Check SigmaBase application\n";
+ report<<"Check SigmaBase application\n";
for (size_t i=SigmaBase.size()-1 ;i< length ;++i){
Coefficient res(m+n,n);
for (size_t k=0;k<SigmaBase.size();++k)
_BMD.axpyin(res,SigmaBase[k],S[i-k]);
- res.write(std::cout,_F)<<std::endl;
+ res.write(report,_field)<<std::endl;
}
#endif
@@ -638,22 +639,24 @@ namespace LinBox
tGetMinPoly.clear();
tGetMinPoly.start();
#endif
- // Get the reverse matrix polynomial of the forst m rows of SigmaBase according to degree.
+ // Get the reverse matrix polynomial of the first m rows of SigmaBase according to degree.
degree=order;
long max=degree[0];
for (size_t i=1;i<m;i++) {
if (degree[i]>max)
max=degree[i];
}
- P = std::vector<Coefficient> (max+1);
+ //P = std::vector<Coefficient> (max+1);
+ P.clear();
Coefficient tmp(m,m);
- for (long i=0;i< max+1;++i)
- P[i]=tmp;
+ P.resize(max+1, tmp);
+ //for (long i=0;i< max+1;++i)
+ // P[i]=tmp;
for (size_t i=0;i<m;i++)
for (long j=0;j<=degree[i];j++)
for (size_t k=0;k<m;k++)
- _F.assign(P[degree[i]-j].refEntry(i,k), SigmaBase[j].getEntry(i,k));
+ _field.assign(P[degree[i]-j].refEntry(i,k), SigmaBase[j].getEntry(i,k));
#ifdef _BM_TIMING
tGetMinPoly.stop();
ttGetMinPoly +=tGetMinPoly;
@@ -661,45 +664,55 @@ namespace LinBox
#ifdef __CHECK_RESULT
- std::cout<<"Check minimal polynomial application\n";
+ report<<"Check minimal polynomial application\n";
bool valid=true;
- for (size_t i=0;i< N - P.size();++i){
+ for (size_t i=0;i< NN - P.size();++i){
Coefficient res(m,n);
_BMD.mul(res,P[0],S[i]);
for (size_t k=1,j=i+1;k<P.size();++k,++j)
_BMD.axpyin(res,P[k],S[j]);
for (size_t j=0;j<m*n;++j)
- if (!_F.isZero(*(res.getPointer()+j)))
+ if (!_field.isZero(*(res.getPointer()+j)))
valid= false;
- //res.write(std::cout,_F)<<std::endl;
+ //res.write(report,_field)<<std::endl;
}
if (valid)
- std::cout<<"minpoly is correct\n";
+ report<<"minpoly is correct\n";
else
- std::cout<<"minpoly is wrong\n";
+ report<<"minpoly is wrong\n";
#endif
#ifdef __PRINT_MINPOLY
- std::cout<<"MinPoly:=";
- write_maple(_F,P);
+ report<<"MinPoly:=";
+ write_maple(_field,P);
#if 0
Coefficient Mat(*_container->getBB());
- std::cout<<"A:=Matrix(";
- Mat.write(std::cout,_F,true);
+ report<<"A:=Matrix(";
+ Mat.write(report,_field,true);
#endif
#endif
std::vector<size_t> deg(m);
for (size_t i=0;i<m;++i)
- deg[i]=degree[i];
-
+ deg[i]=(size_t)degree[i];
+
+ //report << "clearing S " << S.size() << std::endl;
+ //S.clear();
+ //report << "cleared S " << S.size() << std::endl;
+ // report << "clearing SigmaBase " << SigmaBase.size() << std::endl;
+ // SigmaBase.resize(SigmaBase.size()-2);
+ // report << "clearing last 4 of SigmaBase " << SigmaBase.size() << std::endl;
+ // SigmaBase.clear();
+ // report << "cleared SigmaBase " << SigmaBase.size() << std::endl;
return deg;
}
std::vector<size_t> masseyblock_left_rec (std::vector<Coefficient> &P)
{
-
+#ifdef __CHECK_RESULT
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+#endif
// Get information of the Sequence (U.A^i.V)
size_t length = _container->size();
size_t m, n;
@@ -708,11 +721,11 @@ namespace LinBox
// Set some useful constant
Element one;
- _F.init(one,1UL);
+ _field.init(one,1UL);
const Coefficient Zero(2*m,2*m);
// Make the Power Serie from Sequence (U.A^i.V) and Identity
- _container->recompute(); // make sure sequence is already computed
+ //_container->recompute(); // make sure sequence is already computed
std::vector<Coefficient> PowerSerie(length);
typename Sequence::const_iterator _iter (_container->begin ());
for (size_t i=0;i< length; ++i, ++_iter){
@@ -725,8 +738,8 @@ namespace LinBox
for (size_t j=0;j<n;++j)
PowerSerie[0].setEntry(m+j, j, one);
#ifdef __PRINT_SEQUENCE
- std::cout<<"PowerSerie:=";
- write_maple(_F,PowerSerie);
+ report<<"PowerSerie:=";
+ write_maple(_field,PowerSerie);
#endif
@@ -739,7 +752,8 @@ namespace LinBox
std::vector<Coefficient> SigmaBase(length,Zero);
// Compute Sigma Base up to the order length - 1
- PM_Basis(SigmaBase, PowerSerie, length-1, defect);
+ SigmaBasis<Field> SB(_field, PowerSerie);
+ SB.left_basis(SigmaBase, length-1, defect);
// take the m rows which have lowest defect
// compute permutation such that first m rows have lowest defect
@@ -761,8 +775,8 @@ namespace LinBox
_BMD.mulin_right(BPerm,SigmaBase[i]);
#if 0
- std::cout<<"SigmaBase:=";
- write_maple(_F,SigmaBase);
+ report<<"SigmaBase:=";
+ write_maple(_field,SigmaBase);
#endif
// Compute the reverse polynomial of SigmaBase according to defect of each row
size_t max=defect[0];
@@ -777,11 +791,11 @@ namespace LinBox
for (size_t i=0;i<m;i++)
for (size_t j=0;j<=defect[i];j++)
for (size_t k=0;k<m;k++)
- _F.assign(P[defect[i]-j].refEntry(i,k), SigmaBase[j].getEntry(i,k));
+ _field.assign(P[defect[i]-j].refEntry(i,k), SigmaBase[j].getEntry(i,k));
#ifdef __CHECK_RESULT
- std::cout<<"Check minimal polynomial application\n";
- _container->recompute();
+ report<<"Check minimal polynomial application\n";
+ //_container->recompute();
typename Sequence::const_iterator _ptr (_container->begin ());
for (size_t i=0;i< length; ++i, ++_ptr){
PowerSerie[i] = *_ptr;
@@ -796,22 +810,22 @@ namespace LinBox
_BMD.axpyin(res,P[k],Powerview);
}
for (size_t j=0;j<m*n;++j)
- if (!_F.isZero(*(res.getPointer()+j)))
+ if (!_field.isZero(*(res.getPointer()+j)))
valid= false;
- //res.write(std::cout,_F)<<std::endl;
+ //res.write(report,_field)<<std::endl;
}
if (valid)
- std::cout<<"minpoly is correct\n";
+ report<<"minpoly is correct\n";
else
- std::cout<<"minpoly is wrong\n";
+ report<<"minpoly is wrong\n";
#endif
#ifdef __PRINT_MINPOLY
- std::cout<<"MinPoly:=";
- write_maple(_F,P);
+ report<<"MinPoly:=";
+ write_maple(_field,P);
//Coefficient Mat(*_container->getBB());
- //std::cout<<"A:=Matrix(";
- //Mat.write(std::cout,_F,true);
+ //report<<"A:=Matrix(";
+ //Mat.write(report,_field,true);
#endif
std::vector<size_t> degree(m);
for (size_t i=0;i<m;++i)
@@ -819,418 +833,17 @@ namespace LinBox
return degree;
}
-
- // Computation of a minimal Sigma Base of a Power Serie up to a degree
- // according to a vector of defect.
- // algorithm is from Giorgi, Jeannerod and Villard ISSAC'03
- //
- // SigmaBase must be already allocated with degree+1 elements
-
- void PM_Basis(std::vector<Coefficient> &SigmaBase,
- std::vector<Coefficient> &PowerSerie,
- size_t degree,
- std::vector<size_t> &defect)
- {
-
- size_t m,n;
- m = PowerSerie[0].rowdim();
- n = PowerSerie[0].coldim();
- Element one;
- _F.init(one,1UL);
- const Coefficient ZeroSigma(m,m);
- const Coefficient ZeroSerie(m,n);
-
- if (degree == 0) {
- Coefficient Identity(m,m);
- for (size_t i=0;i< m;++i)
- Identity.setEntry(i,i,one);
- SigmaBase[0]=Identity;
- }
- else {
- if (degree == 1) {
-#ifdef _BM_TIMING
- tMBasis.clear();
- tMBasis.start();
-#endif
- M_Basis(SigmaBase, PowerSerie, degree, defect);
-#ifdef _BM_TIMING
- tMBasis.stop();
- ttMBasis += tMBasis;
-#endif
- }
- else {
- size_t degree1,degree2;
- degree1 = (degree >> 1) + (degree & 1);
- degree2 = degree - degree1;
-
- // Compute Sigma Base of half degree
- std::vector<Coefficient> Sigma1(degree1+1,ZeroSigma);
- std::vector<Coefficient> Serie1(degree1+1);
- for (size_t i=0;i< degree1+1;++i)
- Serie1[i] = PowerSerie[i];
- PM_Basis(Sigma1, Serie1, degree1, defect);
-#ifdef _BM_TIMING
- tUpdateSerie.clear();
- tUpdateSerie.start();
-#endif
- // Compute Serie2 = x^(-degree1).Sigma.PowerSerie mod x^degree2
- std::vector<Coefficient> Serie2(degree1+1,ZeroSerie);
- ComputeNewSerie(Serie2,Sigma1,PowerSerie, degree1, degree2);
-#ifdef _BM_TIMING
- tUpdateSerie.stop();
- ttUpdateSerie += tUpdateSerie;
-#endif
- // Compute Sigma Base of half degree from updated Power Serie
- std::vector<Coefficient> Sigma2(degree2+1,ZeroSigma);
- PM_Basis(Sigma2, Serie2, degree2, defect);
-
-#ifdef _BM_TIMING
- tBasisMultiplication.clear();
- tBasisMultiplication.start();
-#endif
- // Compute the whole Sigma Base through the product
- // of the Sigma Basis Sigma1 x Sigma2
- MulSigmaBasis(SigmaBase,Sigma2,Sigma1);
-#ifdef _BM_TIMING
- tBasisMultiplication.stop();
- ttBasisMultiplication += tBasisMultiplication;
-#endif
-
- }
- }
- }
-
-
- // Computation of a minimal Sigma Base of a Power Serie up to length
- // algorithm is from Giorgi, Jeannerod and Villard ISSAC'03
- void M_Basis(std::vector<Coefficient> &SigmaBase,
- std::vector<Coefficient> &PowerSerie,
- size_t length,
- std::vector<size_t> &defect)
- {
-
- // Get the dimension of matrices inside
- // the Matrix Power Serie
- size_t m,n;
- m = PowerSerie[0].rowdim();
- n = PowerSerie[0].coldim();
-
- // Set some useful constants
- const Coefficient Zero(m,m);
- Element one, zero;
- _F.init(one,1UL);
- _F.init(zero,0UL);
-
- // Reserve memory for the Sigma Base and set SigmaBase[0] to Identity
- SigmaBase.reserve(length+1);
- SigmaBase.resize(1);
- Coefficient Identity(m,m);
- for (size_t i=0;i< m;++i)
- Identity.setEntry(i,i,one);
- SigmaBase[0]=Identity;
-
- // Keep track on Sigma Base's row degree
- std::vector<size_t> degree(m,0);
- for (size_t i=0;i<n;++i)
- degree[i]=0;
-
-
- // Compute the minimal Sigma Base of the PowerSerie up to length
- for (size_t k=0; k< length; ++k) {
-
- // compute BPerm1 such that BPerm1.defect is in increasing order
- std::vector<size_t> Perm1(m);
- for (size_t i=0;i<m;++i)
- Perm1[i]=i;
- for (size_t i=0;i<m;++i) {
- size_t idx_min=i;
- for (size_t j=i+1;j<m;++j)
- if (defect[j]< defect[idx_min])
- idx_min=j;
- std::swap(defect[i], defect[idx_min]);
- Perm1[i]=idx_min;
- }
- BlasPermutation<size_t> BPerm1(Perm1);
-
- // Apply Bperm1 to the current SigmaBase
- for (size_t i=0;i<SigmaBase.size();++i)
- _BMD.mulin_right(BPerm1,SigmaBase[i]);
-
- // Compute Discrepancy
- Coefficient Discrepancy(m,n);
- _BMD.mul(Discrepancy,SigmaBase[0],PowerSerie[k]);
- for (size_t i=1;i<SigmaBase.size();i++){
- _BMD.axpyin(Discrepancy,SigmaBase[i],PowerSerie[k-i]);
- }
-
- // Compute LQUP of Discrepancy
- BlasPermutation<size_t> P (Discrepancy.coldim());
- BlasPermutation<size_t> Qt (Discrepancy.rowdim());
-
- LQUPMatrix<Field> LQUP(_F,Discrepancy,P,Qt);
-
- // Get L from LQUP
- TriangularBlasMatrix<Element> L(m, m, BlasTag::low, BlasTag::unit);
- LQUP.getL(L);
-
- // get the transposed permutation of Q from LQUP
- // BlasPermutation<size_t> Qt =LQUP.getQ();
-
- // Compute the inverse of L
- TriangularBlasMatrix<Element> invL(m, m, BlasTag::low, BlasTag::unit);
- FFPACK::trinv_left(_F,m,L.getPointer(),L.getStride(),invL.getWritePointer(),invL.getStride());
-
- // Update Sigma by L^(-1)
- // Sigma = L^(-1) . Sigma
- for (size_t i=0;i<SigmaBase.size();++i)
- _BMD.mulin_right(invL,SigmaBase[i]);
-#if 0
- std::cout<<"BaseBis"<<k<<":=";
- write_maple(_F,SigmaBase);
-#endif
- // Increase by degree and defect according to row choosen as pivot in LQUP
- for (size_t i=0;i<n;++i){
- defect[*(Qt.getPointer()+i)]++;
- degree[*(Qt.getPointer()+i)]++;
- }
-
- size_t max_degree=degree[*(Qt.getPointer())];
- for (size_t i=0;i<n;++i) {
- if (degree[*(Qt.getPointer()+i)]>max_degree)
- max_degree=degree[*(Qt.getPointer()+i)];
- }
-
-
- size_t size=SigmaBase.size();
- if (SigmaBase.size()<= max_degree+1)
- {
- SigmaBase.resize(size+1,Zero);
- size++;
- }
- // Mulitply by x the rows of Sigma involved as pivot in LQUP
- for (size_t i=0;i<n;++i){
- for (int j= (int) size-2;j>=0; --j){
- for (size_t l=0;l<m;++l)
- _F.assign(SigmaBase[j+1].refEntry(*(Qt.getPointer()+i),l),
- SigmaBase[j].getEntry(*(Qt.getPointer()+i),l));
- }
- for (size_t l=0;l<m;++l)
- _F.assign(SigmaBase[0].refEntry(*(Qt.getPointer()+i),l),zero);
- }
-
- //std::cout<<"Base"<<k<<":=";
- //write_maple(_F,SigmaBase);
- }
-#if 0
- std::cout<<"defect: ";
- for (size_t i=0;i<m;++i)
- std::cout<<defect[i]<<" ";
- std::cout<<std::endl;
-
- std::cout<<"SigmaBase"<<length<<":=";
- write_maple(_F,SigmaBase);
-#endif
- }
-
-
- // compute the middle product of A [1..n].B[1..2n]
- // using Karatsuba multiplication
- // algorithm is that of Hanrot, Quercia and Zimmermann 2002
-
- void MP_Karatsuba(std::vector<Coefficient> &C, const std::vector<Coefficient> &A, const std::vector<Coefficient> &B)
- {
-
- if (A.size() == 1)
- _BMD.mul(C[0],A[0],B[0]);
- else {
- size_t k0= A.size()>>1;
- size_t k1= A.size()-k0;
-
- size_t m = B[0].rowdim();
- size_t n = B[0].coldim();
-
- const Coefficient Zero(m,n);
- std::vector<Coefficient> alpha(k1,Zero), beta(k1,Zero), gamma(k0,Zero);
- std::vector<Coefficient> A_low(k0), A_high(k1), B1(2*k1-1), B2(2*k1-1);
-
- for (size_t i=0;i<k0;++i)
- A_low[i] = A[i];
-
- for (size_t i=k0;i<A.size();++i)
- A_high[i-k0] = A[i];
-
- for (size_t i=0;i<2*k1-1;++i){
- B1[i] = B[i];
- B2[i] = B[i+k1];
- _MD.addin(B1[i],B2[i]);
- }
- MP_Karatsuba(alpha, A_high, B1);
-
- if (k0 == k1) {
- for (size_t i=0;i<k1;++i)
- _MD.subin(A_high[i],A_low[i]);
- MP_Karatsuba(beta, A_high, B2);
- }
- else {
- for (size_t i=1;i<k1;++i)
- _MD.subin(A_high[i],A_low[i-1]);
- MP_Karatsuba(beta, A_high, B2);
- }
-
- std::vector<Coefficient> B3(2*k0-1,Zero);
- for (size_t i=0;i<2*k0-1;++i)
- _MD.add(B3[i],B[i+2*k1],B[i+k1]);
-
- MP_Karatsuba(gamma, A_low, B3);
-
- for (size_t i=0;i<k1;++i)
- _MD.sub(C[i],alpha[i],beta[i]);
-
- for (size_t i=0;i<k0;++i){
- C[k1+i]=gamma[i];
- _MD.addin(C[k1+i],beta[i]);
- }
- }
- }
-
-
- // Multiply a Power Serie by a Sigma Base.
- // only affect coefficients of the Power Serie between degree1 and degree2
- void ComputeNewSerie(std::vector<Coefficient> &NewSerie,
- const std::vector<Coefficient> &SigmaBase,
- const std::vector<Coefficient> &OldSerie,
- size_t degree1,
- size_t degree2)
- {
-
-
- // degree1 >= degree2
- //size_t size = 2*degree1 + 1;
-
- const Coefficient ZeroSerie (OldSerie[0].rowdim(), OldSerie[0].coldim());
- const Coefficient ZeroBase (SigmaBase[0].rowdim(), SigmaBase[0].coldim());
-
- // Work on a copy of the old Serie (increase size by one for computation of middle product)
- std::vector<Coefficient> Serie(OldSerie.size()+1,ZeroSerie);
- for (size_t i=0;i< OldSerie.size();++i)
- Serie[i] = OldSerie[i];
-
- // Work on a copy of the Sigma Base
- std::vector<Coefficient> Sigma(SigmaBase.size());
- for (size_t i=0;i<SigmaBase.size();++i){
- Sigma[i] = SigmaBase[i];
- }
-
- MP_Karatsuba(NewSerie, Sigma, Serie);
-#if 0
- std::vector<Coefficient> NewPowerSerie(SigmaBase.size()+OldSerie.size(), Zero);
- MulSigmaBasis(NewPowerSerie, Sigma, Serie);
- for (size_t i=0;i<degree2;++i)
- NewSerie[i] = NewPowerSerie[i+degree1];
-#endif
-
- }
-
-
- // matrix polynomial multiplication
- // using Karatsuba's algorithm
- void MulPolyMatrix(std::vector<Coefficient> &C, size_t shiftC,
- std::vector<Coefficient> &A, size_t shiftA, size_t degA,
- std::vector<Coefficient> &B, size_t shiftB, size_t degB)
- {
-
- const Coefficient ZeroC(C[0].rowdim(), C[0].coldim());
- const Coefficient ZeroA(A[0].rowdim(), A[0].coldim());
- const Coefficient ZeroB(B[0].rowdim(), B[0].coldim());
-
- if ((degA == 1) || (degB == 1)) {
-
- if ((degA == 1) && (degB == 1))
- _BMD.mul(C[shiftC],A[shiftA],B[shiftB]);
- else
- if (degA == 1)
- for (size_t i=0;i< degB;++i)
- _BMD.mul(C[shiftC+i],A[shiftA],B[shiftB+i]);
- else
- for (size_t i=0;i< degA;++i)
- _BMD.mul(C[shiftC+i],A[shiftA+i],B[shiftB]);
- }
- else {
- size_t degA_low, degA_high, degB_low, degB_high, half_degA, half_degB, degSplit;
- half_degA= (degA & 1) + degA >>1;
- half_degB= (degB & 1) + degB >>1;
- degSplit= (half_degA > half_degB) ? half_degA : half_degB;
-
- degB_low = (degB < degSplit) ? degB : degSplit;
- degA_low = (degA < degSplit) ? degA : degSplit;
- degA_high= degA - degA_low;
- degB_high= degB - degB_low;
-
- // multiply low degrees
- MulPolyMatrix(C, shiftC, A, shiftA, degA_low, B, shiftB, degB_low);
-
- // multiply high degrees (only if they are both different from zero)
- if ((degA_high !=0) && (degB_high != 0)) {
- MulPolyMatrix(C, shiftC+(degSplit << 1), A, shiftA+degSplit, degA_high, B, shiftB+degSplit, degB_high);
- }
-
- // allocate space for summation of low and high degrees
- std::vector<Coefficient> A_tmp(degA_low,ZeroA);
- std::vector<Coefficient> B_tmp(degB_low,ZeroB);
- std::vector<Coefficient> C_tmp(degA_low+degB_low-1,ZeroC);
-
- // add low and high degrees of A
- for (size_t i=0;i<degA_low;++i)
- A_tmp[i]=A[shiftA+i];
- if ( degA_high != 0)
- for (size_t i=0;i<degA_high;++i)
- _MD.addin(A_tmp[i],A[shiftA+degSplit+i]);
-
- // add low and high degrees of B
- for (size_t i=0;i<degB_low;++i)
- B_tmp[i]=B[shiftA+i];
- if ( degB_high != 0)
- for (size_t i=0;i<degB_high;++i)
- _MD.addin(B_tmp[i],B[shiftB+degSplit+i]);
-
- // multiply the sums
- MulPolyMatrix(C_tmp, 0, A_tmp, 0, degA_low, B_tmp, 0, degB_low);
-
- // subtract the low product from the product of sums
- for (size_t i=0;i< C_tmp.size();++i)
- _MD.subin(C_tmp[i], C[shiftC+i]);
-
- // subtract the high product from the product of sums
- if ((degA_high !=0) && (degB_high != 0))
- for (size_t i=0;i< degA_high+degB_high-1; ++i)
- _MD.subin(C_tmp[i], C[shiftC+(degSplit << 1)+i]);
-
- // add the middle term of the product
- size_t mid= (degA_low+degB_high > degB_low+degA_high)? degA_low+degB_high :degB_low+degA_high;
- for (size_t i=0;i< mid-1; ++i)
- _MD.addin(C[shiftC+degSplit+i], C_tmp[i]);
- }
- }
-
- // Multiply two Sigma Basis
- // in fact this is matrix polynomial multiplication
- // we assume that we can modify each operand
- // since only result will be used
- void MulSigmaBasis(std::vector<Coefficient> &C,
- std::vector<Coefficient> &A,
- std::vector<Coefficient> &B)
- {
- //std::cout<<"C=A*B: "<<C.size()<<" "<<A.size()<<" "<<B.size()<<std::endl;
- MulPolyMatrix(C, 0, A, 0, A.size(), B, 0, B.size());
-#if 0
- for (size_t i=0;i<A.size();++i)
- for (size_t j=0;j<B.size();++j)
- _BMD.axpyin(C[i+j],A[i],B[j]);
-#endif
- }
-
}; //end of class BlockMasseyDomain
} // end of namespace LinBox
#endif // __LINBOX_massey_block_domain_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/block-wiedemann.h b/linbox/algorithms/block-wiedemann.h
index 619a296..8203262 100644
--- a/linbox/algorithms/block-wiedemann.h
+++ b/linbox/algorithms/block-wiedemann.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/block-wiedemann.h
* Copyright (C) 2004 Pascal Giorgi
*
* Written by Pascal Giorgi pascal.giorgi at ens-lyon.fr
+ * modified by Pascal Giorgi (pascal.giorgi at lirmm.fr) 2011
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -27,16 +28,16 @@
#include <vector>
-#include <linbox/integer.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/algorithms/blas-domain.h>
-#include <linbox/algorithms/blackbox-block-container.h>
-#include <linbox/algorithms/block-massey-domain.h>
-#include <linbox/vector/vector-domain.h>
-#include <linbox/blackbox/transpose.h>
+#include "linbox/integer.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/algorithms/blas-domain.h"
+#include "linbox/algorithms/blackbox-block-container.h"
+#include "linbox/algorithms/block-massey-domain.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/blackbox/transpose.h"
-#include <linbox/util/error.h>
-#include <linbox/util/debug.h>
+#include "linbox/util/error.h"
+#include "linbox/util/debug.h"
namespace LinBox
{
@@ -52,26 +53,23 @@ namespace LinBox
typedef BlasMatrix<Element> Block;
protected:
- Field _F;
+ Field _field;
BlasMatrixDomain<Field> _BMD;
VectorDomain<Field> _VDF;
RandIter _rand;
public:
BlockWiedemannSolver (const Field &F) :
- _F(F), _BMD(F), _VDF(F), _rand(F)
+ _field(F), _BMD(F), _VDF(F), _rand(F)
{}
BlockWiedemannSolver (const Field &F, const RandIter &rand) :
- _F(F), _BMD(F), _VDF(F), _rand(rand)
+ _field(F), _BMD(F), _VDF(F), _rand(rand)
{}
-
template <class Blackbox>
Vector &solveNonSingular (Vector &x, const Blackbox &B, const Vector &y) const
{
-
-
Transpose<Blackbox> A(B);
size_t m,n;
@@ -81,13 +79,13 @@ namespace LinBox
size_t p,q;
integer tmp;
tmp = m;
- //p = tmp.bitsize()-1;
- p=sqrt(tmp);
+ p = tmp.bitsize()-1;
+ //p=sqrt(tmp);
tmp = n;
- //q = tmp.bitsize()-1;
- q=sqrt(tmp);
- cout<<"row block: "<<p<<endl;
- cout<<"col block: "<<q<<endl;
+ q = tmp.bitsize()-1;
+ //q=sqrt(tmp);
+ std::cout<<"row block: "<<p<<std::endl;
+ std::cout<<"col block: "<<q<<std::endl;
Block U(p,m), UA(p-1,m), V(n,q);
@@ -100,8 +98,8 @@ namespace LinBox
for (size_t j=0;j<m;++j)
_rand.random(UA.refEntry(i,j));
- Block::RowIterator iter_U = U.rowBegin();
- Block::ConstRowIterator iter_UA = UA.rowBegin();
+ typename Block::RowIterator iter_U = U.rowBegin();
+ typename Block::ConstRowIterator iter_UA = UA.rowBegin();
++iter_U;
for (; iter_UA != UA.rowEnd(); ++iter_UA, ++iter_U)
A.applyTranspose( *iter_U , *iter_UA );
@@ -109,19 +107,19 @@ namespace LinBox
for (size_t i=0;i<m;++i)
U.setEntry(0,i,y[i]);
- BlackboxBlockContainer<Field,Transpose<Blackbox> > Sequence (&A,_F,U,V);
+ BlackboxBlockContainer<Field,Transpose<Blackbox> > Sequence (&A,_field,U,V);
BlockMasseyDomain <Field,BlackboxBlockContainer<Field,Transpose<Blackbox> > > MBD(&Sequence);
std::vector<Block> minpoly;
std::vector<size_t> degree;
- MBD.left_minpoly(minpoly,degree);
-
+ MBD.left_minpoly_rec(minpoly,degree);
+ MBD.printTimer();
size_t idx=0;
- if ( _F.isZero(minpoly[0].getEntry(0,0))) {
+ if ( _field.isZero(minpoly[0].getEntry(0,0))) {
size_t i=1;
- while ( _F.isZero(minpoly[0].getEntry(i,0)))
+ while ( _field.isZero(minpoly[0].getEntry(i,0)))
++i;
if (i == m)
throw LinboxError(" block minpoly: matrix seems to be singular - abort");
@@ -130,7 +128,7 @@ namespace LinBox
}
- bool classic = false;
+ bool classic = true;
if ( classic) {
/*
* Compute the solution according to the polynomial combination
@@ -165,15 +163,12 @@ namespace LinBox
_VDF.axpy (lhs, combi[k][i], row, lhsbis);
A.applyTranspose (lhsbis, lhs);
}
-
-
_VDF.addin(accu,lhs);
}
-
Element scaling;
- _F.init(scaling);
- _F.neg(scaling,combi[0][0]);
- _F.invin(scaling);
+ _field.init(scaling);
+ _field.neg(scaling,combi[0][0]);
+ _field.invin(scaling);
_VDF.mul(x,accu,scaling);
}
@@ -184,15 +179,14 @@ namespace LinBox
* this should decrease the number of sparse apply but increase memory requirement.
*/
size_t deg = degree[idx];
- BlasMatrix<Element> idx_poly(deg+1,p-1);
+ Block idx_poly(deg+1,p-1);
for (size_t i=0;i<deg+1;++i)
for (size_t j=0;j<p-1;++j)
idx_poly.setEntry(i,j,minpoly[i].getEntry(idx,j+1));
- BlasMatrix<Element> Combi(deg+1,m);
+ Block Combi(deg+1,m);
_BMD.mul(Combi,idx_poly,UA);
-
Vector lhs(n),row(m);
for (size_t i=0;i<m;++i)
row[i]= Combi.getEntry(deg,i);
@@ -208,7 +202,6 @@ namespace LinBox
Vector accu (lhs);
-
A.applyTranspose(lhs,y);
_VDF.mulin(lhs,minpoly[deg].getEntry(idx,0));
lhsbis=lhs;
@@ -219,9 +212,9 @@ namespace LinBox
_VDF.addin(accu,lhs);
Element scaling;
- _F.init(scaling);
- _F.neg(scaling,minpoly[0].getEntry(idx,0));
- _F.invin(scaling);
+ _field.init(scaling);
+ _field.neg(scaling,minpoly[0].getEntry(idx,0));
+ _field.invin(scaling);
_VDF.mul(x,accu,scaling);
}
@@ -237,3 +230,12 @@ namespace LinBox
}// end of namespace LinBox
#endif //__LINBOX_block_wiedemann_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/bm-seq.h b/linbox/algorithms/bm-seq.h
new file mode 100644
index 0000000..9d9ce52
--- /dev/null
+++ b/linbox/algorithms/bm-seq.h
@@ -0,0 +1,716 @@
+
+/* linbox/algorithms/bm-seq.h
+ * Copyright (C) 2008 George Yuhasz
+ *
+ * Written by George Yuhasz gyuhasz at math.ncsu.edu
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+
+
+#ifndef __BM_SEQ_H
+#define __BM_SEQ_H
+
+//Preprocessor variables for the state of BM_iterators
+#define DeltaExceeded 4
+#define SequenceExceeded 3
+#define GeneratorFound 2
+#define GeneratorUnconfirmed 1
+
+#include <vector>
+#include <list>
+#include <set>
+
+#include "linbox/util/timer.h"
+#include "linbox/matrix/matrix-domain.h"
+
+
+
+namespace LinBox {
+ template<class _Field>
+ class BM_Seq {
+
+ public:
+
+ typedef _Field Field;
+ typedef BlasMatrix<Field> value_type;
+ typedef typename std::list<value_type>::const_iterator const_iterator;
+ typedef int size_type;
+
+ private:
+
+ Field& _field;
+ std::list<value_type > _seq;
+ size_type _size;
+ size_t _row, _col;
+
+ public:
+ BM_Seq(Field& F, size_t r, size_t c) : _field(F)
+ {
+ _row = r;
+ _col = c;
+ _size = 0;
+ }
+ BM_Seq(Field& F, size_t r) : _field(F)
+ {
+ _row = r;
+ _col = r;
+ _size = 0;
+ }
+ BM_Seq(int n, value_type& M) : _field(M.field()), _seq(n, M), _size(n)
+ {
+ _row = M.rowdim();
+ _col = M.coldim();
+ }
+
+ BM_Seq() {}
+
+ BM_Seq(const BM_Seq<Field>& S) :
+ _field(S._field), _seq(S._seq), _size(S._size), _row(S._row), _col(S._col)
+ {}
+
+ BM_Seq & operator=(const BM_Seq<Field>& S)
+ {
+ if(this != &S){
+ (*this)._size = S._size;
+ (*this)._row = S._row;
+ (*this)._col = S._col;
+ (*this)._field = S._field;
+ _seq.clear();
+ for(typename std::list<value_type>::const_iterator it = S._seq.begin(); it != S._seq.end(); it++)
+ _seq.push_back(*it);
+ }
+ return *this;
+ }
+
+ Field& field()
+ {
+ return _field;
+ }
+
+ size_t rowdim()
+ {
+ return _row;
+ }
+
+ size_t coldim()
+ {
+ return _col;
+ }
+
+ const_iterator begin() const
+ {
+ return _seq.begin();
+ }
+
+ const_iterator end() const
+ {
+ return _seq.end();
+ }
+
+ void push_back(const value_type &M)
+ {
+ if(_row==M.rowdim() && _col==M.coldim()){
+ _seq.push_back(M);
+ _size++;
+ }
+ }
+
+ bool operator==(const BM_Seq<Field>& l)
+ {
+ typename std::list<value_type>::const_iterator it, lit;
+ bool test = false;
+ if(_size==l._size && _row==l._row && _col==l._col){
+ test = true;
+ MatrixDomain<Field> MD(_field);
+ it = _seq.begin();
+ lit = l._seq.begin();
+ if(_size==0){
+ return test;
+ }
+ else{
+ while(test && it!=_seq.end()){
+ test = MD.areEqual(*it,*lit);
+ it++;
+ lit++;
+ }
+ }
+ }
+ return test;
+ }
+
+ bool operator!=(const BM_Seq<Field>& l)
+ {
+ return !(*this == l);
+ }
+
+ size_type size()
+ {
+ return _size;
+ }
+
+ class BM_iterator {
+ public:
+ typedef std::list<typename BM_Seq<Field>::value_type> value_type;
+
+ private:
+ typedef typename BM_Seq<Field>::value_type matrix_type;
+ Field& _field;
+ BM_Seq<Field>& _seq;
+ typename BM_Seq<Field>::size_type _size;
+ typename BM_Seq<Field>::size_type _t;
+ typename BM_Seq<Field>::const_iterator _seqel;
+ std::list<matrix_type> _gen;
+ std::vector<int> _deg;
+ int _delta;
+ int _mu;
+ int _beta;
+ int _sigma;
+ int _gensize;
+ size_t _row, _col;
+
+ public:
+ // This is an enumeration class that tells what state the berlekamp/massey algoithm iterator is in.
+ // The four states are:
+ // DeltaExceeded = 4
+ // SequenceExceeded = 3
+ // GeneratorFound = 2
+ // GeneratorUnconfirmed = 1
+ class TerminationState{
+ private:
+
+ int _state;
+ friend class BM_iterator;
+ TerminationState() : _state(GeneratorUnconfirmed) {}
+ TerminationState(int m) : _state(m) {}
+ public:
+ TerminationState(const TerminationState& t) : _state(t._state) {}
+ TerminationState & operator=(const TerminationState & t){
+ if(this != &t){
+ (*this)._state = t._state;
+ }
+ return *this;
+ }
+ bool IsGeneratorUnconfirmed(){
+ return _state==GeneratorUnconfirmed;
+ }
+ bool IsGeneratorFound()
+ {
+ return _state==GeneratorFound;
+ }
+ bool IsSequenceExceeded()
+ {
+ return _state==SequenceExceeded;
+ }
+ bool IsDeltaExceeded()
+ {
+ return _state==DeltaExceeded;
+ }
+ };
+
+ private:
+ TerminationState _state;
+ public:
+ TerminationState state() const
+ {
+ return _state;
+ }
+ void setDelta(int d)
+ {
+ _delta=d;
+ if((_delta < 0 || _beta < _delta - _sigma + _mu +1) && _state._state!=3){
+ if(_sigma <= _delta || _delta < 0)
+ _state._state = GeneratorUnconfirmed;
+ else
+ _state._state = DeltaExceeded;
+ }
+ else{
+ if(_sigma > _delta)
+ _state._state = DeltaExceeded;
+ else
+ _state._state = GeneratorFound;
+ }
+ }
+ //Constructor
+ explicit BM_iterator(BM_Seq<Field>& s, typename BM_Seq<Field>::size_type elinit=0) :
+ _field(s.field()), _seq(s)
+ {
+ _row = s.rowdim();
+ _col = s.coldim();
+ _size = _seq.size();
+ _t = elinit;
+ _delta = -1;
+ _seqel = _seq.begin();
+ _deg = std::vector<int>(_row+_col);
+ for(size_t i = _col; i < _row+_col; i++)
+ _deg[i] = 1;
+ typename Field::Element one;
+ _field.init(one,1);
+ matrix_type gen1(_field,_col,_row+_col);
+ for(size_t i = 0; i<_col; i++)
+ gen1.setEntry(i,i,one);
+ _gen.push_back(gen1);
+ _gensize = 1;
+ if(_size==0 || _t==_size)
+ _state._state = SequenceExceeded;
+ _sigma = 0;
+ _mu = 0;
+ _beta = 1;
+ }
+
+ //Copy constructor
+ BM_iterator(const BM_Seq<Field>::BM_iterator & it) :
+ _field(it._field), _seq(it._seq), _size(it._size), _t(it._t),
+ _seqel(it._seqel), _gen(it._gen), _deg(it._deg),
+ _delta(it._delta), _mu(it._mu), _beta(it._beta),
+ _sigma(it._sigma), _gensize(it._gensize),
+ _row(it._row), _col(it._col), _state(it._state) {}
+
+ //Assignment operator not overloaded since BlasMatrix class has overloaded assignment error
+ //Overloaded assignment operator
+ BM_iterator& operator=(const typename BM_Seq<Field>::BM_iterator& it)
+ {
+ if(this != &it){
+ (*this)._field = it._field;
+ (*this)._row = it._row;
+ (*this)._col = it._col;
+ (*this)._seq = it._seq;
+ (*this)._size = it._size;
+ (*this)._t = it._t;
+ (*this)._seqel = it._seqel;
+ (*this)._deg = it._deg;
+ (*this)._gensize = it._gensize;
+ (*this)._delta = it._delta;
+ (*this)._mu = it._mu;
+ (*this)._sigma = it._sigma;
+ (*this)._beta = it._beta;
+ (*this)._state = it._state;
+ _gen.clear();
+ for(typename std::list<matrix_type>::const_iterator git = it._gen.begin(); git != it._gen.end(); git++)
+ _seq.push_back(*git);
+ }
+ return (*this);
+ }
+
+ bool operator==(const BM_Seq<Field>::BM_iterator& it)
+ {
+ TerminationState check = it.state();
+ bool test1 = (_seq==it._seq);
+ bool test2 = (_t==it._t);
+ bool test3 = _delta==it._delta;
+ bool test4 = (_state._state == check._state && _state.IsSequenceExceeded());
+ return (test1 && test2 && (test3 || test4));
+ }
+
+ bool operator!=(const BM_iterator& it)
+ {
+ return !((*this) == it);
+ }
+ private:
+
+ // Column Copy
+ template <class Matrix>
+ void ColumnCopy(Matrix &M, const Matrix &A, size_t i)
+ {
+ size_t rowd = A.rowdim();
+ for(size_t j = 0; j<rowd; j++){
+ M.setEntry(j,i,A.getEntry(j,i));
+ }
+ }
+ // Column Swap
+ template <class Matrix>
+ void ColumnSwap(Matrix &M, size_t i, size_t j)
+ {
+ typename Matrix::Field F = M.field();
+ typename Matrix::Element t;
+ F.init(t,0);
+ size_t rowd = M.rowdim();
+ for(size_t k = 0; k < rowd; k++){
+ F.assign(t,M.getEntry(k,i));
+ M.setEntry(k,i,M.getEntry(k,j));
+ M.setEntry(k,j,t);
+ }
+ }
+ // Column Operation
+ template <class Matrix>
+ void ColumnAdd(Matrix &M, size_t i, size_t j, typename Matrix::Element el)
+ {
+ typename Matrix::Field F = M.field();
+ typename Matrix::Element t;
+ F.init(t,0);
+ size_t rowd = M.rowdim();
+ for (size_t k=0; k<rowd; k++){
+ F.mul(t, M.getEntry(k,j), el);
+ F.addin(t,M.getEntry(k,i));
+ M.setEntry(k,i,t);
+ }
+ }
+ template <class Matrix>
+ Matrix Algorithm3dot2(Matrix &D, std::vector<int> &d, int &mu, int &sigma, int &beta)
+ {
+ typename Matrix::Field F = D.field();
+ typename Matrix::Element one, pivel;
+ F.init(one, 1);
+ F.init(pivel,0);
+ // Retrieve the row and column dimensions of the sequence and the dimension of the discrepancy
+ size_t n = D.rowdim();
+ size_t nm = D.coldim();
+ size_t m = nm-n;
+ //Initialize tau to the identity matrix
+ Matrix tau(F,nm,nm);
+ for(size_t i = 0; i<nm; i++)
+ tau.setEntry(i,i,one);
+ //Create the set of generator columns
+ std::set<size_t> gen;
+ typedef std::set<size_t>::key_type index_type;
+ for(index_type i=0; i<m; i++)
+ gen.insert(i);
+ for(index_type i = 0; i<n; i++){
+ //Compute pi, the columns of D with nonzero entries in row i
+ std::set<size_t> pi;
+ pi.insert(m+i);
+ for(typename std::set<size_t>::iterator genit = gen.begin(); genit != gen.end(); genit++){
+ if(!F.isZero(D.getEntry(i,*genit)))
+ pi.insert(*genit);
+ }
+
+ //Choose the pivot row with the smallest nominal degree
+ index_type piv = m+i;
+ for(std::set<size_t>::iterator itpi = pi.begin(); itpi != pi.end(); itpi++){
+ size_t j = *itpi;
+ if(d[j] <= d[piv]){
+ if(d[j]==d[piv]){
+ if(piv < m+i){
+ if(j<piv)
+ piv = j;
+ }
+ }
+ else
+ piv = j;
+ }
+ }
+ pi.erase(piv);
+ F.assign(pivel,D.getEntry(i,piv));
+ //Handle the case when piv=m+i, so no swap is done
+ if(piv==m+i){
+ for(std::set<size_t>::iterator itpi = pi.begin(); itpi != pi.end(); itpi++){
+ typename Matrix::Element temp;
+ F.init(temp,D.getEntry(i, *itpi));
+ F.negin(temp);
+ F.divin(temp,pivel);
+ ColumnAdd(tau, *itpi, piv, temp);
+ ColumnAdd(D, *itpi, piv, temp);
+ }
+ }
+ else{
+ //Remove column index m+i and handle it separately
+ pi.erase(m+i);
+ //Eliminate nonzero discrepancies in generator columns
+ for(typename std::set<size_t>::iterator itpi = pi.begin(); itpi != pi.end(); itpi++){
+ typename Matrix::Element temp;
+ F.init(temp,D.getEntry(i, *itpi));
+ F.negin(temp);
+ F.divin(temp,pivel);
+ ColumnAdd(tau, *itpi, piv, temp);
+ ColumnAdd(D, *itpi, piv, temp);
+ }
+ typename Matrix::Element auxel;
+ F.init(auxel,D.getEntry(i,m+i));
+ //Perform a major change and update an initialized auxiliary column
+ if(!F.isZero(auxel)){
+ typename Matrix::Element temp;
+ F.init(temp,D.getEntry(i, m+i));
+ F.negin(temp);
+ F.divin(temp,pivel);
+ ColumnAdd(tau, m+i, piv, temp);
+ ColumnAdd(D, m+i, piv, temp);
+ ColumnSwap(tau,piv, m+i);
+ ColumnSwap(D, piv, m+i);
+ }
+ else{
+ ColumnAdd(tau,m+i,piv,one);
+ ColumnAdd(D,m+i,piv,one);
+ gen.erase(piv);
+ }
+ int tempdeg = d[piv];
+ d[piv] = d[m+i];
+ d[m+i] = tempdeg;
+ if(tempdeg < beta)
+ beta = tempdeg;
+ if(d[piv] > mu)
+ mu = d[piv];
+ sigma = sigma - tempdeg + d[piv];
+ }
+ }
+ return tau;
+ }
+ public:
+ BM_iterator& operator++()
+ {
+ //See if a matrix has been pushed on the sequence
+ //if it has, then recompute the seqel since it may
+ //have become corrupt.
+ //Also reset the size to the correct size of the sequence
+ if(_size < _seq.size()){
+ _seqel = _seq.begin();
+ for(int i = 0; i<_t; i++)
+ _seqel++;
+ _size = _seq.size();
+ }
+ //if the iterator points past the seq elements, do nothing
+ if(_t == _size){
+ return *this;
+ }
+ //Initialize the discrepancy
+ matrix_type disc(_field,_row, _row+_col);
+ //Create two iterators, one for seq, and one for gen
+ typename BM_Seq<Field>::const_iterator cseqit;
+ typename std::list<matrix_type>::iterator genit;
+ //get a iterator to the seq element to be processed
+ cseqit = _seqel;
+ //Create a matrix domain for addition and multiplication
+ MatrixDomain<Field> MD(_field);
+ //Compute the discrepancy
+ for(genit = _gen.begin(); genit!=_gen.end(); genit++){
+ MD.axpyin(disc,*cseqit,*genit);
+ cseqit--;
+ }
+ //Compute tau with Algorith3.2
+ matrix_type tau(Algorithm3dot2(disc, _deg, _mu, _sigma, _beta));
+ //Multiply tau into each matrix in the generator
+ for(genit = _gen.begin(); genit!=_gen.end(); genit++){
+ MD.mulin(*genit,tau);
+ }
+ //Increment the auxiliary degrees and beta
+ for(size_t j = _col; j <_row+_col; j++)
+ _deg[j]++;
+ _beta++;
+ //Add a zero matrix to the end of the generator if needed.
+ int tmax = _deg[0];
+ for(size_t j = 1; j<_row+_col; j++)
+ if(tmax < _deg[j])
+ tmax = _deg[j];
+ if(tmax+1 > _gensize){
+ _gen.push_back(matrix_type(_field,_col,_row+_col));
+ _gensize++;
+ }
+ //Mimic multiplication be z in the auxiliary columns
+ typename std::list<matrix_type>::reverse_iterator g1,g2;
+ g1 = _gen.rbegin();
+ g2 = _gen.rbegin();
+ g1++;
+ while(g1!=_gen.rend()){
+ for(size_t k = _col; k < _row+_col; k++){
+ ColumnCopy(*g2,*g1,k);
+ }
+ g1++;
+ g2++;
+ }
+ genit = _gen.begin();
+ matrix_type z1(_field,_col,_row+_col);
+ for(size_t k = _col; k < _row+_col; k++)
+ ColumnCopy(*genit, z1,k);
+ //Increment the t and seqel to the next element
+ _t++;
+ _seqel++;
+ //Update the state
+ if(_delta < 0 || _beta < _delta - _sigma + _mu +1){
+ if(_t == _size)
+ _state._state = SequenceExceeded;
+ else{
+ if(_sigma > _delta && _delta >= 0)
+ _state._state = DeltaExceeded;
+ else
+ _state._state = GeneratorUnconfirmed;
+ }
+ }
+ else{
+ if(_sigma > _delta)
+ _state._state = DeltaExceeded;
+ else
+ _state._state = GeneratorFound;
+ }
+
+ return *this;
+ }
+ BM_iterator operator++(int)
+ {
+ //Create a copy of this
+ BM_iterator temp(*this);
+
+ //See if a matrix has been pushed on the sequence
+ //if it has, then recompute the seqel since it may
+ //have become corrupt.
+ //Also reset the size to the correct size of the sequence
+ if(_size < _seq.size()){
+ _seqel = _seq.begin();
+ for(int i = 0; i<_t; i++)
+ _seqel++;
+ _size = _seq.size();
+ }
+ //if the iterator points past the seq elements, do nothing
+ if(_t == _size){
+ return *this;
+ }
+ //Initialize the discrepancy
+ matrix_type disc(_field,_row, _row+_col);
+ //Create two iterators, one for seq, and one for gen
+ typename BM_Seq<Field>::const_iterator cseqit;
+ typename std::list<matrix_type>::iterator genit;
+ //get an iterator to the seq element to be processed
+ cseqit = _seqel;
+ //Create a matrix domain for addition and multiplication
+ MatrixDomain<Field> MD(_field);
+ //Compute the discrepancy
+ for(genit = _gen.begin(); genit!=_gen.end(); genit++, cseqit--){
+ MD.axpyin(disc,*cseqit,*genit);
+ } // cost: k*n^3 (nxn matrix muladds where k is current generator length)
+ // is a reductive addition over independent muls.
+ //Compute tau with Algorith3.2
+ matrix_type tau(Algorithm3dot2(disc, _deg, _mu, _sigma, _beta));
+ // cost: n^3 for elim on n x about 2n
+ //Multiply tau into each matrix in the generator
+ for(genit = _gen.begin(); genit!=_gen.end(); genit++){
+ MD.mulin(*genit,tau);
+ } // cost: k*n^3 (nxn matrix muls where k is current generator length)
+ // is k independent muls with a shared mat tau.
+ //Increment the auxiliary degrees and beta
+ for(size_t j = _col; j <_row+_col; j++)
+ _deg[j]++;
+ _beta++;
+ //Add a zero matrix to the end of the generator if needed.
+ int tmax = _deg[0];
+ for(size_t j = 1; j<_row+_col; j++)
+ if(tmax < _deg[j])
+ tmax = _deg[j];
+ if(tmax+1 > _gensize){
+ _gen.push_back(matrix_type(_field,_col,_row+_col));
+ _gensize++;
+ }
+ //Mimic multiplication by z in the auxiliary columns
+ typename std::list<matrix_type>::reverse_iterator g1,g2;
+ g1 = _gen.rbegin();
+ g2 = _gen.rbegin();
+ g1++;
+ while(g1!=_gen.rend()){
+ for(size_t k = _col; k < _row+_col; k++){
+ ColumnCopy(*g2,*g1,k);
+ }
+ g1++;
+ g2++;
+ }
+ genit = _gen.begin();
+ matrix_type z1(_field,_col,_row+_col);
+ for(size_t k = _col; k < _row+_col; k++)
+ ColumnCopy(*genit, z1,k);
+ //Increment the t and seqel to the next element
+ _t++;
+ _seqel++;
+ //Update the state
+ if(_delta < 0 || _beta < _delta - _sigma + _mu +1){
+ if(_t == _size)
+ _state._state = SequenceExceeded;
+ else{
+ if(_sigma > _delta && _delta >= 0)
+ _state._state = DeltaExceeded;
+ else
+ _state._state = GeneratorUnconfirmed;
+ }
+ }
+ else{
+ if(_sigma > _delta)
+ _state._state = DeltaExceeded;
+ else
+ _state._state = GeneratorFound;
+ }
+
+ return temp;
+ }
+ //return a reference to the current generator, in its algorithmic reversed form
+ value_type& operator*()
+ {
+ return _gen;
+ }
+ //overload the pointer operator
+ value_type* operator->()
+ {
+ return &_gen;
+ }
+ //Return a vector representing the reversal, by nominal degree, of the current generator
+ std::vector<matrix_type> GetGenerator()
+ {
+ std::vector<matrix_type> revgen(_mu+1, matrix_type(_field,_col,_col));
+ for(size_t i = 0; i<_col; i++){
+ typename std::list<matrix_type>::iterator genit = _gen.begin();
+ for(int j = 0; j < _deg[i]+1; j++){
+ ColumnCopy(revgen[_deg[i]-j], *genit,i);
+ genit++;
+ }
+ }
+ return revgen;
+ }
+
+ typename BM_Seq<Field>::size_type get_t()
+ {
+ return _t;
+ }
+
+ int get_mu()
+ {
+ return _mu;
+ }
+
+ int get_sigma()
+ {
+ return _sigma;
+ }
+ int get_beta()
+ {
+ return _beta;
+ }
+ int get_delta()
+ {
+ return _delta;
+ }
+ };
+ //return an initialized BM_iterator
+ typename BM_Seq<Field>::BM_iterator BM_begin()
+ {
+ return typename BM_Seq<Field>::BM_iterator(*this);
+ }
+ //return an initialized BM_iterator that points to one past the end of the sequence
+ typename BM_Seq<Field>::BM_iterator BM_end()
+ {
+ return typename BM_Seq<Field>::BM_iterator(*this, _size);
+ }
+ /**/
+ };
+}
+
+#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/charpoly-rational.h b/linbox/algorithms/charpoly-rational.h
index 16ffa2a..9322628 100644
--- a/linbox/algorithms/charpoly-rational.h
+++ b/linbox/algorithms/charpoly-rational.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/rational-reconstruction-base.h
* Copyright (C) 2009 Anna Marszalek
*
* Written by Anna Marszalek <aniau at astronet.pl>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_charpoly_rational_H
@@ -26,12 +27,11 @@
#include "linbox/util/commentator.h"
#include "linbox/util/timer.h"
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
//#include "linbox/field/gmp-rational.h"
#include "linbox/field/PID-integer.h"
#include "linbox/blackbox/rational-matrix-factory.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/algorithms/cra-early-multip.h"
#include "linbox/algorithms/cra-domain.h"
//#include "linbox/algorithms/rational-cra.h"
@@ -85,7 +85,8 @@ namespace LinBox
A(b), M(n), mul(p)
{}
MyRationalModularCharpoly(MyRationalModularCharpoly& C) :
- MyRationalModularCharpoly(C.A,C.M,C.mul)
+ // MyRationalModularCharpoly(C.A,C.M,C.mul)
+ A(C.A),M(C.M),mul(C.mul)
{}
template<typename Polynomial, typename Field>
@@ -121,7 +122,8 @@ namespace LinBox
A(b), M(n), vD(ve), mul(p) {}
MyIntegerModularCharpoly(MyIntegerModularCharpoly& C) :
- MyIntegerModularCharpoly(C.A,C.M,C.vD,C.mul)
+ // MyIntegerModularCharpoly(C.A,C.M,C.vD,C.mul)
+ A(C.A),M(C.M),vD(C.vD),mul(C.mul)
{}
template<typename Polynomial, typename Field>
@@ -159,14 +161,14 @@ namespace LinBox
template <class Rationals, template <class> class Vector, class MyMethod >
Vector<typename Rationals::Element>& rational_charpoly (Vector<typename Rationals::Element> &p,
- const DenseMatrix<Rationals > &A,
+ const BlasMatrix<Rationals > &A,
const MyMethod &Met= Method::Hybrid())
{
typedef Modular<double> myModular;
typedef typename Rationals::Element Quotient;
- commentator.start ("Rational Charpoly", "Rminpoly");
+ commentator().start ("Rational Charpoly", "Rminpoly");
RandomPrimeIterator genprime( 26-(int)ceil(log((double)A.rowdim())*0.7213475205));
@@ -174,8 +176,7 @@ namespace LinBox
std::vector<Integer> M(A.rowdim()+1,1);
std::vector<Integer> Di(A.rowdim());
- //DenseMatrixBase<Quotient> ABase(A);
- RationalMatrixFactory<PID_integer,Rationals,DenseMatrix<Rationals > > FA(&A);
+ RationalMatrixFactory<PID_integer,Rationals,BlasMatrix<Rationals > > FA(&A);
Integer da=1, di=1; Integer D=1;
FA.denominator(da);
@@ -191,14 +192,14 @@ namespace LinBox
}
PID_integer Z;
- DenseMatrix<PID_integer> Atilde(Z,A.rowdim(), A.coldim());
+ BlasMatrix<PID_integer> Atilde(Z,A.rowdim(), A.coldim());
FA.makeAtilde(Atilde);
ChineseRemainder< EarlyMultipCRA<Modular<double> > > cra(4UL);
- MyRationalModularCharpoly<DenseMatrix<Rationals > , MyMethod> iteration1(A, Met, M);
- MyIntegerModularCharpoly<DenseMatrix<PID_integer>, MyMethod> iteration2(Atilde, Met, Di, M);
- MyModularCharpoly<MyRationalModularCharpoly<DenseMatrix<Rationals > , MyMethod>,
- MyIntegerModularCharpoly<DenseMatrix<PID_integer>, MyMethod> > iteration(&iteration1,&iteration2);
+ MyRationalModularCharpoly<BlasMatrix<Rationals > , MyMethod> iteration1(A, Met, M);
+ MyIntegerModularCharpoly<BlasMatrix<PID_integer>, MyMethod> iteration2(Atilde, Met, Di, M);
+ MyModularCharpoly<MyRationalModularCharpoly<BlasMatrix<Rationals > , MyMethod>,
+ MyIntegerModularCharpoly<BlasMatrix<PID_integer>, MyMethod> > iteration(&iteration1,&iteration2);
RReconstruction<PID_integer, ClassicMaxQRationalReconstruction<PID_integer> > RR;
@@ -264,7 +265,7 @@ namespace LinBox
size_t i =0;
integer t,tt,ttt;
integer err;
- size_t max_err = 0;
+ // size_t max_err = 0;
Quotient qerr;
p.resize(PP.size());
typename Vector <typename Rationals::Element>::iterator it;
@@ -289,9 +290,10 @@ namespace LinBox
size_t i =0;
integer t,tt;
integer err;
- size_t max_res=0;int max_i; double rel;
+ size_t max_res=0;int max_i;
+ // double rel;
size_t max_resu=0; int max_iu;
- size_t max_err = 0;
+ // size_t max_err = 0;
Quotient qerr;
p.resize(PP.size());
@@ -323,7 +325,7 @@ namespace LinBox
//if (err.bitsize() > max_err) max_err = err.bitsize();
}
- commentator.stop ("done", NULL, "Iminpoly");
+ commentator().stop ("done", NULL, "Iminpoly");
return p;
@@ -332,3 +334,12 @@ namespace LinBox
}
#endif //__LINBOX_charpoly_rational_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/cia.h b/linbox/algorithms/cia.h
index c7cd943..aa61e1c 100644
--- a/linbox/algorithms/cia.h
+++ b/linbox/algorithms/cia.h
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/cia.h
* Copyright(C) LinBox
*
* Written by Clement Pernet <clement.pernet at imag.fr>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_cia_H
@@ -33,15 +49,15 @@ namespace LinBox
Polynomial& cia (Polynomial & P, const Blackbox & A,
const Method::BlasElimination & M)
{
- commentator.start ("Integer ::Givaro::Dense Charpoly ", "CIA");
+ commentator().start ("Integer Givaro::Dense Charpoly ", "CIA");
typename Blackbox::Field intRing = A.field();
- typedef Modular<double> Field;
- typedef typename Blackbox::template rebind<Field>::other FBlackbox;
- typedef GivPolynomialRing<typename Blackbox::Field, ::Givaro::Dense> IntPolyDom;
- typedef GivPolynomialRing<Field, ::Givaro::Dense> FieldPolyDom;
- typedef typename IntPolyDom::Element IntPoly;
- typedef typename FieldPolyDom::Element FieldPoly;
+ typedef Modular<double> Field;
+ typedef typename Blackbox::template rebind<Field>::other FBlackbox;
+ typedef GivPolynomialRing<typename Blackbox::Field, Givaro::Dense> IntPolyDom;
+ typedef GivPolynomialRing<Field, Givaro::Dense> FieldPolyDom;
+ typedef typename IntPolyDom::Element IntPoly;
+ typedef typename FieldPolyDom::Element FieldPoly;
IntPolyDom IPD(intRing);
@@ -60,8 +76,8 @@ namespace LinBox
RandomPrimeIterator primeg (22);
++primeg;
Field F(*primeg);
- FBlackbox fbb(F, A.rowdim(), A.coldim());
- MatrixHom::map(fbb, A, F);
+ FBlackbox fbb(F, (int)A.rowdim(), (int)A.coldim());
+ MatrixHom::map(fbb, A);
charpoly (fieldCharPoly, fbb, M);
/* Determination of the multiplicities */
FieldPolyDom FPD (F);
@@ -99,7 +115,7 @@ namespace LinBox
}
for (size_t i = 0; i < nf; ++i)
delete intFactors[i];
- commentator.stop ("done", NULL, "CIA");
+ commentator().stop ("done", NULL, "CIA");
return P = intCharPoly;
}
@@ -107,3 +123,12 @@ namespace LinBox
#endif // __LINBOX_cia_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/classic-rational-reconstruction.h b/linbox/algorithms/classic-rational-reconstruction.h
index ad996d7..90da6f6 100644
--- a/linbox/algorithms/classic-rational-reconstruction.h
+++ b/linbox/algorithms/classic-rational-reconstruction.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/classic-rational-reconstruction.h
* Copyright (C) 2009 Anna Marszalek
*
* Written by Anna Marszalek <aniau at astronet.pl>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -43,17 +44,17 @@ namespace LinBox
const bool _reduce;
const bool _recursive;
public:
- const Ring _Z;
+ const Ring _intRing;
typedef typename Ring::Element Element;
ClassicRationalReconstruction(const Ring& Z, const bool reduce = true, const bool recursive = false) :
RReconstructionBase<Ring>(Z),
- _reduce(reduce), _recursive (recursive), _Z(Z)
+ _reduce(reduce), _recursive (recursive), _intRing(Z)
{}
ClassicRationalReconstruction<Ring> (const ClassicRationalReconstruction<Ring>& RR):
- RReconstructionBase<Ring>(RR._Z),
- _reduce(RR._reduce), _recursive(RR._recursive), _Z(RR._Z)
+ RReconstructionBase<Ring>(RR._intRing),
+ _reduce(RR._reduce), _recursive(RR._recursive), _intRing(RR._intRing)
{}
~ClassicRationalReconstruction() {}
@@ -61,7 +62,7 @@ namespace LinBox
//Wang method
bool reconstructRational(Element& a, Element& b, const Element& x, const Element& m) const
{
- Element a_bound; _Z.sqrt(a_bound, m/2);
+ Element a_bound; _intRing.sqrt(a_bound, m/2);
bool res = reconstructRational(a,b,x,m,a_bound);
res = res && (b <= a_bound);
return res;
@@ -108,14 +109,14 @@ namespace LinBox
{
q = r0;
- _Z.divin(q,a); // r0/num
+ _intRing.divin(q,a); // r0/num
//++this->C.div_counter;
u = a;
a = r0;
r0 = u; // r0 <-- num
- _Z.maxpyin(a,u,q); // num <-- r0-q*num
+ _intRing.maxpyin(a,u,q); // num <-- r0-q*num
//++this->C.mul_counter;
//if (a == 0) return false;
@@ -123,21 +124,21 @@ namespace LinBox
b = t0;
t0 = u; // t0 <-- den
- _Z.maxpyin(b,u,q); // den <-- t0-q*den
+ _intRing.maxpyin(b,u,q); // den <-- t0-q*den
//++this->C.mul_counter;
//u = s1;
//s1 = s0;
//s0 = u;
- //_Z.maxpyin(s0,u,q);
+ //_intRing.maxpyin(s0,u,q);
//++this->C.mul_counter;
}
//if (den < 0) {
- // _Z.negin(num);
- // _Z.negin(den);
+ // _intRing.negin(num);
+ // _intRing.negin(den);
//}
if ((a>0) && (_reduce)) {
@@ -146,7 +147,7 @@ namespace LinBox
// (ii)
Element gg;
//++this->C.gcd_counter;
- if (_Z.gcd(gg,a,b) != 1) {
+ if (_intRing.gcd(gg,a,b) != 1) {
Element ganum, gar2;
for( q = 1, ganum = r0-a, gar2 = r0 ; (ganum >= a_bound) || (gar2<a_bound); ++q ) {
@@ -154,9 +155,9 @@ namespace LinBox
gar2 -= a;
}
- //_Z.maxpyin(r0,q,a);
+ //_intRing.maxpyin(r0,q,a);
r0 = ganum;
- _Z.maxpyin(t0,q,b);
+ _intRing.maxpyin(t0,q,b);
//++this->C.mul_counter;++this->C.mul_counter;
if (t0 < 0) {
a = -r0;
@@ -181,7 +182,7 @@ namespace LinBox
}
return false;
}
- if (_Z.gcd(gg,a,b) != 1) {
+ if (_intRing.gcd(gg,a,b) != 1) {
if (!_recursive)
std::cerr
<< "*** Error *** There exists no rational reconstruction of "
@@ -206,8 +207,8 @@ namespace LinBox
}
// (i)
if (b < 0) {
- _Z.negin(a);
- _Z.negin(b);
+ _intRing.negin(a);
+ _intRing.negin(b);
}
// std::cerr << "RatRecon End " << num << "/" << den << std::endl;
@@ -223,15 +224,15 @@ namespace LinBox
template <class Ring>
class ClassicMaxQRationalReconstruction:public ClassicRationalReconstruction<Ring> {
public:
- const Ring _Z;
+ const Ring _intRing;
typedef typename Ring::Element Element;
ClassicMaxQRationalReconstruction(const Ring& Z, const bool reduce = true, const bool recursive = false) :
- ClassicRationalReconstruction<Ring>(Z,reduce,recursive), _Z(Z)
+ ClassicRationalReconstruction<Ring>(Z,reduce,recursive), _intRing(Z)
{}
ClassicMaxQRationalReconstruction(const ClassicMaxQRationalReconstruction<Ring>& RR) :
- ClassicRationalReconstruction<Ring>(RR), _Z(RR._Z)
+ ClassicRationalReconstruction<Ring>(RR), _intRing(RR._intRing)
{}
~ClassicMaxQRationalReconstruction() {}
@@ -265,7 +266,7 @@ namespace LinBox
while((a>0) && (r0.bitsize() > T.bitsize() + c))
{
q = r0;
- _Z.divin(q,a); // r0/num
+ _intRing.divin(q,a); // r0/num
//++this->C.div_counter;
if (q > qmax) {
amax = a;
@@ -278,7 +279,7 @@ namespace LinBox
a = r0;
r0 = u; // r0 <-- num
- _Z.maxpyin(a,u,q); // num <-- r0-q*num
+ _intRing.maxpyin(a,u,q); // num <-- r0-q*num
//++this->C.mul_counter;
//if (a == 0) return false;
@@ -286,7 +287,7 @@ namespace LinBox
b = t0;
t0 = u; // t0 <-- den
- _Z.maxpyin(b,u,q); // den <-- t0-q*den
+ _intRing.maxpyin(b,u,q); // den <-- t0-q*den
//++this->C.mul_counter;
}
@@ -294,12 +295,12 @@ namespace LinBox
b = bmax;
if (b < 0) {
- _Z.negin(a);
- _Z.negin(b);
+ _intRing.negin(a);
+ _intRing.negin(b);
}
Element gg;
- _Z.gcd(gg,a,b);
+ _intRing.gcd(gg,a,b);
//++this->C.gcd_counter;
//if (q > T)
@@ -318,3 +319,12 @@ namespace LinBox
}
#endif //__LINBOX_classic_reconstruction_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/cra-domain-omp.h b/linbox/algorithms/cra-domain-omp.h
index 611c62b..5648f85 100644
--- a/linbox/algorithms/cra-domain-omp.h
+++ b/linbox/algorithms/cra-domain-omp.h
@@ -1,17 +1,18 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/cra-domain-omp.h
* Copyright (C) 1999-2010 The LinBox group
*
* Naive parallel chinese remaindering
* Launch NN iterations in parallel, where NN=omp_get_max_threads()
* Then synchronization and termintation test.
- * Time-stamp: <16 Jul 10 16:59:17 Jean-Guillaume.Dumas at imag.fr>
+ * Time-stamp: <13 Mar 12 13:49:58 Jean-Guillaume.Dumas at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,17 +20,22 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file algorithms/cra-domain-omp.h
+ * @brief Parallel (OMP) version of \ref CRA
+ * @ingroup CRA
*/
+
#ifndef __LINBOX_omp_cra_H
#define __LINBOX_omp_cra_H
// commentator is not thread safe
#define DISABLE_COMMENTATOR
#include "linbox/algorithms/cra-domain-seq.h"
#include <set>
-#include <vector>
namespace LinBox
{
@@ -54,7 +60,7 @@ namespace LinBox
{
size_t NN = omp_get_max_threads();
//std::cerr << "Blocs: " << NN << " iterations." << std::endl;
- // commentator.start ("Parallel OMP Modular iteration", "mmcrait");
+ // commentator().start ("Parallel OMP Modular iteration", "mmcrait");
if (NN == 1) return Father_t::operator()(res,Iteration,primeiter);
int coprime =0;
@@ -85,7 +91,7 @@ namespace LinBox
}
#pragma omp parallel for
- for(long i=0;i<NN;++i) {
+ for(size_t i=0;i<NN;++i) {
Iteration(ROUNDresidues[i], ROUNDdomains[i]);
}
#pragma omp barrier
@@ -95,12 +101,11 @@ namespace LinBox
++this->IterCounter;
this->Builder_.progress( ROUNDdomains[i],ROUNDresidues[i]);
}
- // commentator.report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
+ // commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
}
while( ! this->Builder_.terminated() ) {
//std::cerr << "Computed: " << this->IterCounter << " primes." << std::endl;
- size_t NN = omp_get_max_threads();
std::set<Integer> coprimeset;
while(coprimeset.size() < NN) {
++primeiter;
@@ -125,7 +130,7 @@ namespace LinBox
}
#pragma omp parallel for
- for(long i=0;i<NN;++i) {
+ for(size_t i=0;i<NN;++i) {
Iteration(ROUNDresidues[i], ROUNDdomains[i]);
}
#pragma omp barrier
@@ -134,7 +139,7 @@ namespace LinBox
this->Builder_.progress( ROUNDdomains[i],ROUNDresidues[i]);
}
}
- // commentator.stop ("done", NULL, "mmcrait");
+ // commentator().stop ("done", NULL, "mmcrait");
//std::cerr << "Used: " << this->IterCounter << " primes." << std::endl;
return this->Builder_.result(res);
}
@@ -145,7 +150,7 @@ namespace LinBox
typedef typename CRATemporaryVectorTrait<Function, DomainElement>::Type_t ElementContainer;
size_t NN = omp_get_max_threads();
//std::cerr << "Blocs: " << NN << " iterations." << std::endl;
- // commentator.start ("Parallel OMP Modular iteration", "mmcrait");
+ // commentator().start ("Parallel OMP Modular iteration", "mmcrait");
if (NN == 1) return Father_t::operator()(res,Iteration,primeiter);
int coprime =0;
@@ -188,12 +193,11 @@ namespace LinBox
++this->IterCounter;
this->Builder_.progress( ROUNDdomains[i],ROUNDresidues[i]);
}
- // commentator.report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
+ // commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
}
while( ! this->Builder_.terminated() ) {
//std::cerr << "Computed: " << this->IterCounter << " primes." << std::endl;
- size_t NN = omp_get_max_threads();
std::set<Integer> coprimeset;
while(coprimeset.size() < NN) {
++primeiter;
@@ -229,7 +233,7 @@ namespace LinBox
this->Builder_.progress( ROUNDdomains[i],ROUNDresidues[i]);
}
}
- // commentator.stop ("done", NULL, "mmcrait");
+ // commentator().stop ("done", NULL, "mmcrait");
//std::cerr << "Used: " << this->IterCounter << " primes." << std::endl;
return this->Builder_.result(res);
}
@@ -240,3 +244,12 @@ namespace LinBox
}
#endif //__LINBOX_omp_cra_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/cra-domain-seq.h b/linbox/algorithms/cra-domain-seq.h
index 527c5cd..96001ca 100644
--- a/linbox/algorithms/cra-domain-seq.h
+++ b/linbox/algorithms/cra-domain-seq.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/cra-domain-seq.h
* Copyright (C) 1999-2010 The LinBox group
*
* Time-stamp: <01 Apr 11 15:47:48 Jean-Guillaume.Dumas at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/cra-domain-seq.h
@@ -34,6 +35,7 @@
#include "linbox/solutions/methods.h"
#include <vector>
#include <utility>
+#include "linbox/util/commentator.h"
//$define _LB_CRATIMING
@@ -92,11 +94,13 @@ namespace LinBox
template<class Function, class PrimeIterator>
Integer& operator() (Integer& res, Function& Iteration, PrimeIterator& primeiter)
{
- commentator.start ("Modular iteration", "mmcrait");
+ commentator().start ("Modular iteration", "mmcrait");
if (IterCounter==0) {
++IterCounter;
Domain D(*primeiter);
- commentator.report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
+ std::ostream& report = commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ report << "With prime " << *primeiter << std::endl;
+ //commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
++primeiter;
DomainElement r; D.init(r);
Builder_.initialize( D, Iteration(r, D) );
@@ -117,12 +121,12 @@ namespace LinBox
}
coprime =0;
Domain D(*primeiter);
- commentator.report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
- ++primeiter;
+ commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
+ ++primeiter;
DomainElement r; D.init(r);
Builder_.progress( D, Iteration(r, D) );
}
- commentator.stop ("done", NULL, "mmcrait");
+ commentator().stop ("done", NULL, "mmcrait");
//std::cerr << "Used: " << IterCounter << " primes." << std::endl;
return Builder_.result(res);
}
@@ -140,7 +144,7 @@ namespace LinBox
++i;
++IterCounter;
Domain D(*primeiter);
- commentator.report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
+ commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
++primeiter;
DomainElement r; D.init(r);
Builder_.initialize( D, Iteration(r, D) );
@@ -163,7 +167,7 @@ namespace LinBox
coprime =0;
Domain D(*primeiter);
- commentator.report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
+ commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
++primeiter;
DomainElement r; D.init(r);
Builder_.progress( D, Iteration(r, D) );
@@ -177,11 +181,11 @@ namespace LinBox
template<class Iterator, class Function, class PrimeIterator>
Iterator& operator() (Iterator& res, Function& Iteration, PrimeIterator& primeiter)
{
- commentator.start ("Modular vectorized iteration", "mmcravit");
+ commentator().start ("Modular vectorized iteration", "mmcravit");
if (IterCounter==0) {
Domain D(*primeiter);
- commentator.report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
+ commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
++primeiter;
typename CRATemporaryVectorTrait<Function, DomainElement>::Type_t r;
Builder_.initialize( D, Iteration(r, D) );
@@ -202,12 +206,12 @@ namespace LinBox
}
Domain D(*primeiter);
- commentator.report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
- ++primeiter;
+ commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
+ ++primeiter;
typename CRATemporaryVectorTrait<Function, DomainElement>::Type_t r;
Builder_.progress( D, Iteration(r, D) );
}
- commentator.stop ("done", NULL, "mmcravit");
+ commentator().stop ("done", NULL, "mmcravit");
return Builder_.result(res);
}
@@ -224,7 +228,7 @@ namespace LinBox
++i;
++IterCounter;
Domain D(*primeiter);
- commentator.report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
+ commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "With prime " << *primeiter << std::endl;
++primeiter;
typename CRATemporaryVectorTrait<Function, DomainElement>::Type_t r;
Builder_.initialize( D, Iteration(r, D) );
@@ -332,3 +336,12 @@ namespace LinBox
#undef _LB_CRATIMING
#endif //__LINBOX_sequential_cra_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/cra-domain.h b/linbox/algorithms/cra-domain.h
index 84e5575..de8506e 100644
--- a/linbox/algorithms/cra-domain.h
+++ b/linbox/algorithms/cra-domain.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/cra-domain.h
* Copyright (C) 1999-2010 The LinBox group
*
@@ -7,10 +5,13 @@
* Parallel versions are transparent to the user
* Time-stamp: <30 Mar 10 15:11:42 Jean-Guillaume.Dumas at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_cra_domain_H
#define __LINBOX_cra_domain_H
@@ -98,3 +99,12 @@ namespace LinBox
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/cra-early-multip.h b/linbox/algorithms/cra-early-multip.h
index 3f6b821..979303c 100644
--- a/linbox/algorithms/cra-early-multip.h
+++ b/linbox/algorithms/cra-early-multip.h
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2007 LinBox
* Written by JG Dumas
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/cra-early-multip.h
@@ -171,10 +172,10 @@ namespace LinBox
++shelf;
if (*_occ_it) {
Integer D = _mod_it->operator()();
- std::vector<Integer> e(randv.size());
- e = *_tab_it;
+ std::vector<Integer> e_v(randv.size());
+ e_v = *_tab_it;
Integer z;
- dot(z,D, e, randv);
+ dot(z,D, e_v, randv);
Integer prev_residue_ = EarlySingleCRA<Domain>::residue_;
EarlySingleCRA<Domain>::progress(D,z);
if (prev_residue_ == EarlySingleCRA<Domain>::residue_ )
@@ -220,11 +221,20 @@ namespace LinBox
++ v1_p, ++ v2_p)
D.axpyin(z, (*v1_p), D.init(tmp, (*v2_p)));
- // commentator.report(Commentator::LEVEL_ALWAYS, INTERNAL_DESCRIPTION) << "v: " << v2 << std::endl;
- // commentator.report(Commentator::LEVEL_ALWAYS, INTERNAL_DESCRIPTION) << "z: " << z << std::endl;
+ // commentator().report(Commentator::LEVEL_ALWAYS, INTERNAL_DESCRIPTION) << "v: " << v2 << std::endl;
+ // commentator().report(Commentator::LEVEL_ALWAYS, INTERNAL_DESCRIPTION) << "z: " << z << std::endl;
return z;
}
};
}
#endif //__LINBOX_cra_early_multip_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/cra-early-single.h b/linbox/algorithms/cra-early-single.h
index c8e15d7..3c3496a 100644
--- a/linbox/algorithms/cra-early-single.h
+++ b/linbox/algorithms/cra-early-single.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2007 LinBox
* written by JG Dumas
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/cra-early-single.h
@@ -68,7 +69,10 @@ namespace LinBox
public:
EarlySingleCRA(const unsigned long EARLY=DEFAULT_EARLY_TERM_THRESHOLD) :
- primeProd_(1UL), nextM_(1UL), occurency_(0), EARLY_TERM_THRESHOLD(EARLY-1)
+ primeProd_(1UL),
+ nextM_(1UL),
+ occurency_(0U),
+ EARLY_TERM_THRESHOLD((unsigned)EARLY-1)
{
#ifdef CRATIMING
clearTimers();
@@ -288,3 +292,12 @@ namespace LinBox
#endif //__LINBOX_cra_early_single_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/cra-full-multip-fixed.h b/linbox/algorithms/cra-full-multip-fixed.h
index 3d33ea3..74f7955 100644
--- a/linbox/algorithms/cra-full-multip-fixed.h
+++ b/linbox/algorithms/cra-full-multip-fixed.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by <Jean-Guillaume.Dumas at imag.fr>
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/cra-full-multip-fixed.h
@@ -85,7 +86,8 @@ namespace LinBox
/*! Constructor.
* @param p is a pair such that
* - \c p.first is the size of a residue (ie. it would be 1 for \"FullSingle\")
- * - \c p.second is the theoretical upperbound (natural logarithm) on the size of the integers to reconstruct.
+ * - \c p.second is the theoretical upperbound (natural
+ * logarithm) on the size of the integers to reconstruct.
* .
*/
FullMultipFixedCRA(const std::pair<size_t,double>& p ) :
@@ -141,7 +143,7 @@ namespace LinBox
}
Integer tmp;
D.characteristic(tmp);
- double ltp = ::Givaro::naturallog(tmp);
+ double ltp = Givaro::naturallog(tmp);
di = *_dsz_it + ltp;
this->totalsize += ltp;
mi.mulin(tmp);
@@ -153,7 +155,7 @@ namespace LinBox
// Put the new residue here and exit
Integer tmp;
D.characteristic(tmp);
- double ltp = ::Givaro::naturallog(tmp);
+ double ltp = Givaro::naturallog(tmp);
_mod_it->initialize(tmp);
*_dsz_it = ltp;
this->totalsize += ltp;
@@ -236,7 +238,7 @@ namespace LinBox
// It is the only shelf of the radix
// We normalize the result and output it
for( ; t_it != _tab_it->end(); ++t0_it, ++t_it)
- normalize(*t0_it = *t_it, *t_it,
+ this->normalize(*t0_it = *t_it, *t_it,
_mod_it->operator()());
this->RadixPrimeProd_.resize(1);
return d;
@@ -333,7 +335,8 @@ namespace LinBox
/*! Constructor.
* @param p is a pair such that
* - \c p.first is the size of a residue, it would be 1 for \"FullSingle\"
- * - \c p.second is the theoretical upperbound (natural logarithm) on the size of the integers to reconstruct.
+ * - \c p.second is the theoretical upperbound (natural
+ * logarithm) on the size of the integers to reconstruct.
* .
*/
FullMultipBlasMatCRA(const std::pair<size_t,double>& p ) :
@@ -373,7 +376,7 @@ namespace LinBox
// Combine it with the new residue
// The for loop will transmit the resulting
// combination to the upper shelf
- typename Matrix::RawIterator e_it = e.rawBegin();
+ typename Matrix::Iterator e_it = e.Begin();
IntVect_Iterator ri_it = ri.begin();
IntVect_ConstIterator t0_it = _tab_it->begin();
@@ -386,7 +389,7 @@ namespace LinBox
}
Integer tmp;
D.characteristic(tmp);
- double ltp = ::Givaro::naturallog(tmp);
+ double ltp = Givaro::naturallog(tmp);
di = *_dsz_it + ltp;
this->totalsize += ltp;
mi.mulin(tmp);
@@ -398,11 +401,11 @@ namespace LinBox
// Put the new residue here and exit
Integer tmp;
D.characteristic(tmp);
- double ltp = ::Givaro::naturallog(tmp);
+ double ltp = Givaro::naturallog(tmp);
_mod_it->initialize(tmp);
*_dsz_it = ltp;
this->totalsize += ltp;
- typename Matrix::RawIterator e_it = e.rawBegin();
+ typename Matrix::Iterator e_it = e.Begin();
_tab_it->resize(this->size);
IntVect_Iterator t0_it= _tab_it->begin();
for( ; t0_it != _tab_it->end(); ++e_it, ++ t0_it){
@@ -477,13 +480,13 @@ namespace LinBox
if (*_occ_it) {
// Found the lowest occupied shelf
Product = *_mod_it;
- typename Matrix::RawIterator t0_it = d.rawBegin();
+ typename Matrix::Iterator t0_it = d.Begin();
IntVect_Iterator t_it = _tab_it->begin();
if (++_occ_it == this->RadixOccupancy_.end()) {
// It is the only shelf of the radix
// We normalize the result and output it
for( ; t_it != _tab_it->end(); ++t0_it, ++t_it)
- normalize(*t0_it = *t_it, *t_it,
+ this->normalize(*t0_it = *t_it, *t_it,
_mod_it->operator()());
this->RadixPrimeProd_.resize(1);
return d;
@@ -504,7 +507,7 @@ namespace LinBox
if (*_occ_it) {
// This shelf is occupied
// We need to combine it with the actual value of the result
- typename Matrix::RawIterator t0_it = d.rawBegin();
+ typename Matrix::Iterator t0_it = d.Begin();
IntVect_ConstIterator t_it = _tab_it->begin();
Integer invprod;
@@ -517,7 +520,7 @@ namespace LinBox
Product.mulin(*_mod_it);
// Moding out and normalization
- t0_it = d.rawBegin();
+ t0_it = d.Begin();
for(size_t i=0;i<this->size; ++i, ++t0_it) {
*t0_it %= Product();
Integer tmp(*t0_it);
@@ -543,3 +546,12 @@ namespace LinBox
#endif //__LINBOX_cra_full_multip_fixed_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/cra-full-multip.h b/linbox/algorithms/cra-full-multip.h
index 7c99a2b..4377702 100644
--- a/linbox/algorithms/cra-full-multip.h
+++ b/linbox/algorithms/cra-full-multip.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/cra-full-multip.h
* Copyright (C) 1999-2010 The LinBox group
*
* Time-stamp: <15 Dec 10 15:54:00 Jean-Guillaume.Dumas at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*!@file algorithms/cra-full-multip.h
@@ -96,7 +97,7 @@ namespace LinBox
std::vector< std::vector<Integer> >::iterator _tab_it = RadixResidues_.begin();
std::vector< bool >::iterator _occ_it = RadixOccupancy_.begin();
_mod_it->initialize(D);
- *_dsz_it = ::Givaro::naturallog(D);
+ *_dsz_it = Givaro::naturallog(D);
typename Vect::const_iterator e_it = e.begin();
_tab_it->resize(e.size());
@@ -138,7 +139,7 @@ namespace LinBox
smallbigreconstruct(*ri_it, *t0_it, invprod );
}
Integer tmp = D;
- di = *_dsz_it + ::Givaro::naturallog(tmp);
+ di = *_dsz_it + Givaro::naturallog(tmp);
mi.mulin(tmp);
mi.mulin(*_mod_it);
*_occ_it = false;
@@ -146,7 +147,7 @@ namespace LinBox
else {
Integer tmp = D;
_mod_it->initialize(tmp);
- *_dsz_it = ::Givaro::naturallog(tmp);
+ *_dsz_it = Givaro::naturallog(tmp);
typename Vect<Integer, Alloc<Integer> >::const_iterator e_it = e.begin();
_tab_it->resize(e.size());
std::vector<Integer>::iterator t0_it= _tab_it->begin();
@@ -201,7 +202,7 @@ namespace LinBox
for( ; ri_it != ri.end(); ++e_it, ++ri_it, ++ t0_it)
fieldreconstruct(*ri_it, D, *e_it, *t0_it, invP0, (*_mod_it).operator()() );
Integer tmp; D.characteristic(tmp);
- double ltp = ::Givaro::naturallog(tmp);
+ double ltp = Givaro::naturallog(tmp);
di = *_dsz_it + ltp;
totalsize += ltp;
mi.mulin(tmp);
@@ -212,7 +213,7 @@ namespace LinBox
// Lower shelf is free
// Put the new residue here and exit
Integer tmp; D.characteristic(tmp);
- double ltp = ::Givaro::naturallog(tmp);
+ double ltp = Givaro::naturallog(tmp);
_mod_it->initialize(tmp);
*_dsz_it = ltp;
totalsize += ltp;
@@ -335,7 +336,7 @@ namespace LinBox
RadixPrimeProd_.resize(1);
RadixPrimeProd_.front() = Product;
RadixSizes_.resize(1);
- RadixSizes_.front() = ::Givaro::naturallog(Product());
+ RadixSizes_.front() = Givaro::naturallog(Product());
RadixResidues_.resize(1);
RadixResidues_.front() = d;
RadixOccupancy_.resize(1);
@@ -419,3 +420,12 @@ namespace LinBox
#endif //__LINBOX_cra_full_multip_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/cra-givrnsfixed.h b/linbox/algorithms/cra-givrnsfixed.h
index 701f350..c3d9592 100644
--- a/linbox/algorithms/cra-givrnsfixed.h
+++ b/linbox/algorithms/cra-givrnsfixed.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-// vim:sts=4:sw=4:ts=4:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/cra-full-multip.h
* Copyright (C) 1999-2010 The LinBox group
*
* Time-stamp: <05 Apr 11 10:49:43 Jean-Guillaume.Dumas at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*!@file algorithms/cra-givrnsfixed.h
@@ -40,11 +41,11 @@ namespace LinBox
* @bib
*/
template<class Domain_Type>
- struct GivaroRnsFixedCRA : public ::Givaro::RNSsystemFixed<integer> {
+ struct GivaroRnsFixedCRA : public Givaro::RNSsystemFixed<integer> {
typedef Domain_Type Domain;
typedef typename Domain::Element DomainElement;
- typedef ::Givaro::RNSsystemFixed<integer> Father_t;
+ typedef Givaro::RNSsystemFixed<integer> Father_t;
typedef GivaroRnsFixedCRA<Domain> Self_t;
const size_t nbloops;
@@ -63,7 +64,7 @@ namespace LinBox
{
for(size_t i=0; i<primes.size(); ++i)
_product *= primes[i];
- ::Givaro::Integer::div(_midprod,_product,2);
+ Givaro::Integer::div(_midprod,_product,2);
}
Integer& getModulus(Integer& m)
@@ -135,3 +136,12 @@ namespace LinBox
#endif //__LINBOX_cra_givrnsfix_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/cra-kaapi.h b/linbox/algorithms/cra-kaapi.h
index 06eca65..e755658 100644
--- a/linbox/algorithms/cra-kaapi.h
+++ b/linbox/algorithms/cra-kaapi.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
* author: B. David Saunders and Zhendong Wan
* parallelized for BOINC computing by Bryan Youse
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/cra-kaapi.h
@@ -185,3 +186,12 @@ a1::IStream& operator>>( a1::IStream& in, LinBox::Residue<Function, Domain>& )
}
#endif //__LINBOX_cra_kaapi_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/cra-mpi.h b/linbox/algorithms/cra-mpi.h
index e8e8a6d..8618b85 100644
--- a/linbox/algorithms/cra-mpi.h
+++ b/linbox/algorithms/cra-mpi.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2007 LinBox
* Written by bds and zw
*
@@ -7,10 +5,13 @@
* parallelized for BOINC computing by Bryan Youse
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -222,3 +223,12 @@ namespace LinBox
#undef MPICH_IGNORE_CXX_SEEK
#endif // __LINBOX_cra_mpi_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/cra.doxy b/linbox/algorithms/cra.doxy
index e3ab13e..195c065 100644
--- a/linbox/algorithms/cra.doxy
+++ b/linbox/algorithms/cra.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 Brice Boyer, part of LinBox, GNU LGPL, see COPYING
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/*!
\ingroup algorithms
\defgroup CRA Chinese Remaindering Algorithm
@@ -8,7 +27,7 @@
NO DOC
- Integer CRA
- at see algorithms/cra-domain.h
+ at see algorithms/cra-domain.h
- Rational CRA
diff --git a/linbox/algorithms/default.h b/linbox/algorithms/default.h
index 4ae9507..d9eb3a4 100644
--- a/linbox/algorithms/default.h
+++ b/linbox/algorithms/default.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
* Written by Zhendong Wan
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_default_H
@@ -37,3 +38,12 @@ namespace LinBox
}
#endif //__LINBOX_default_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/dense-container.h b/linbox/algorithms/dense-container.h
index addafcf..ab9e77b 100644
--- a/linbox/algorithms/dense-container.h
+++ b/linbox/algorithms/dense-container.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/blackbox-container.h
* Copyright (C) 1999, 2001 Jean-Guillaume Dumas, Bradford Hovinen
*
@@ -8,15 +6,33 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_blackbox_container_H
#define __LINBOX_blackbox_container_H
-#include <linbox/randiter/archetype.h>
-#include <linbox/algorithms/blackbox-container-base.h>
-#include <linbox/util/timer.h>
+#include "linbox/randiter/archetype.h"
+#include "linbox/algorithms/blackbox-container-base.h"
+#include "linbox/util/timer.h"
namespace LinBox
{
@@ -105,7 +121,7 @@ namespace LinBox
i=0;
for (; it!=v.end(); it++, i++){
*(Up+i) = *it;
- _F.convert(tmp,*it);
+ _field.convert(tmp,*it);
cerr<<" copie of "<<tmp;
}
cerr<<endl;
@@ -129,7 +145,7 @@ namespace LinBox
it = w.begin();
i=0;
for (; it!=w.end(); it++, i++){
- _F.convert(tmp,*it);
+ _field.convert(tmp,*it);
cerr<<" copie of "<<tmp;
*(Up+i) = *it;
}
@@ -159,3 +175,12 @@ namespace LinBox
#endif // __LINBOX_blackbox_container_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/dense-nullspace.h b/linbox/algorithms/dense-nullspace.h
index 18e6a19..082066d 100644
--- a/linbox/algorithms/dense-nullspace.h
+++ b/linbox/algorithms/dense-nullspace.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by <brice.boyer at imag.fr>
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,12 +17,12 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
-/** \file linbox/algorithm/dense-nullspace.h
+/** \file algorithms/dense-nullspace.h
* @ingroup algorithm
*
* @brief We provide the right or left nullspace (kernel or cokernel) of a dense matrix.
@@ -111,3 +112,12 @@ namespace LinBox
#endif // __LINBOX_dense_nullspace_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/dense-nullspace.inl b/linbox/algorithms/dense-nullspace.inl
index a137198..87e5184 100644
--- a/linbox/algorithms/dense-nullspace.inl
+++ b/linbox/algorithms/dense-nullspace.inl
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by <brice.boyer at imag.fr>
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_dense_nullspace_INL
@@ -123,7 +124,7 @@ namespace LinBox
{
size_t *P = new size_t[N];
size_t *Qt = new size_t[M];
- size_t R = FFPACK::LUdivine (F, FFLAS::FflasNonUnit, FFLAS::FflasNoTrans,
+ size_t R = FFPACK::LUdivine ((typename Field::Father_t)F, FFLAS::FflasNonUnit, FFLAS::FflasNoTrans,
M, N, A, lda, P, Qt, FFPACK::FfpackLQUP);
delete[] Qt;
@@ -141,10 +142,10 @@ namespace LinBox
}
for (size_t i = 0 ; i < R ; ++i) // V <- U2
- FFLAS::fcopy (F, ker_dim, V + i * ldV, 1, A + R + i*lda, 1);
+ FFLAS::fcopy ((typename Field::Father_t)F, ker_dim, V + i * ldV, 1, A + R + i*lda, 1);
typename Field::Element one ;
F.init(one,1UL);
- FFLAS::ftrsm(F, FFLAS::FflasLeft, FFLAS::FflasUpper,
+ FFLAS::ftrsm((typename Field::Father_t)F, FFLAS::FflasLeft, FFLAS::FflasUpper,
FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
R, ker_dim, one, A, lda , V, ldV) ; // (V = U2, A = U1) : U2 <- inv(U1)*U2 ;
@@ -166,8 +167,8 @@ namespace LinBox
*/
}
- FFPACK::applyP(F, FFLAS::FflasLeft, FFLAS::FflasTrans,
- ker_dim, 0, R, V, ldV , P); // X = P^{-1}V
+ FFPACK::applyP((typename Field::Father_t)F, FFLAS::FflasLeft, FFLAS::FflasTrans,
+ ker_dim, 0, (int)R, V, ldV , P); // X = P^{-1}V
delete[] P;
return V;
@@ -185,7 +186,7 @@ namespace LinBox
{
size_t *P = new size_t[M];
size_t *Qt = new size_t[N];
- size_t R = FFPACK::LUdivine (F, FFLAS::FflasNonUnit, FFLAS::FflasTrans,
+ size_t R = FFPACK::LUdivine ((typename Field::Father_t)F, FFLAS::FflasNonUnit, FFLAS::FflasTrans,
M, N, A, lda, P, Qt, FFPACK::FfpackLQUP);
@@ -214,8 +215,8 @@ namespace LinBox
Zero (F,V,ldV,0,0,R,ker_dim);
Identity(F,V,ldV,R,0,N,ker_dim);
// write_field (F, std::cout<<"V init ="<<std::endl, V, N, ker_dim, ker_dim,true);
- FFPACK::applyP(F, FFLAS::FflasLeft, FFLAS::FflasNoTrans,
- ker_dim, 0, R, V, ldV, Qt); // V = Q V
+ FFPACK::applyP((typename Field::Father_t)F, FFLAS::FflasLeft, FFLAS::FflasNoTrans,
+ ker_dim, 0, (int)R, V, ldV, Qt); // V = Q V
// write_field (F, std::cout<<"V reordered ="<<std::endl, V, N,ker_dim, ker_dim,true);
@@ -236,13 +237,14 @@ namespace LinBox
*(A+i*N+j) = zero;
}
- //FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasNoTrans, M,0,M, A, N, Q );
- FFPACK::applyP( F, FFLAS::FflasLeft, FFLAS::FflasNoTrans, N,0,N, A, N, Qt );
+ //FFPACK::applyP((typename Field::Father_t) F, FFLAS::FflasRight, FFLAS::FflasNoTrans, M,0,M, A, N, Q );
+ FFPACK::applyP((typename Field::Father_t) F, FFLAS::FflasLeft, FFLAS::FflasNoTrans,
+ N,0,(int)N, A, N, Qt );
for ( size_t i=0; i< N; ++i )
*(A+N*i+i) = one ;
//write_field (F, std::cout<<"A avant trsm ="<<std::endl, A, M, N, N,true);
- FFLAS::ftrsm(F, FFLAS::FflasLeft, FFLAS::FflasUpper,
+ FFLAS::ftrsm((typename Field::Father_t)F, FFLAS::FflasLeft, FFLAS::FflasUpper,
FFLAS::FflasNoTrans, FFLAS::FflasUnit,
N, ker_dim, one, A, lda , V, ldV) ; // V = inv(Lower) V ;
//write_field (F, std::cout<<"V if after trsm ="<<std::endl, V, N,ker_dim, ker_dim,true);
@@ -266,13 +268,13 @@ namespace LinBox
for (size_t j = 0 ; j<N; ++j )
*(L+i*N+j) = zero ;
- FFPACK::applyP( F, FFLAS::FflasLeft, FFLAS::FflasNoTrans,
- N,0,R, L, N, Qt );
- for ( size_t i=0; i< N; ++i )
- *(L+N*i+i) = one ;
+ FFPACK::applyP((typename Field::Father_t) F, FFLAS::FflasLeft, FFLAS::FflasNoTrans,
+ N,0,(int)R, L, N, Qt );
+ for ( size_t ii=0; ii< N; ++ii )
+ *(L+N*ii+ii) = one ;
// fin de L.
//write_field (F, std::cout<<"U_1="<<std::endl, L, M, M, M,true);
- FFLAS::ftrsm(F, FFLAS::FflasLeft, FFLAS::FflasUpper,
+ FFLAS::ftrsm((typename Field::Father_t)F, FFLAS::FflasLeft, FFLAS::FflasUpper,
FFLAS::FflasNoTrans, FFLAS::FflasUnit,
N, ker_dim, one, L, N , V, ldV); // V = inv(Lower) V ;
@@ -298,7 +300,7 @@ namespace LinBox
{
size_t *P = new size_t[M];
size_t *Qt = new size_t[N];
- size_t R = FFPACK::LUdivine (F, FFLAS::FflasNonUnit, FFLAS::FflasTrans,
+ size_t R = FFPACK::LUdivine ((typename Field::Father_t)F, FFLAS::FflasNonUnit, FFLAS::FflasTrans,
M, N, A, lda, P, Qt, FFPACK::FfpackLQUP);
delete[] Qt;
@@ -316,11 +318,11 @@ namespace LinBox
}
for (size_t i = 0 ; i < coker_dim ; ++i) // copy U2 to result V before updating with U1
- FFLAS::fcopy (F, R, V + i * ldV, 1, A + (R + i)*lda, 1);
+ FFLAS::fcopy ((typename Field::Father_t)F, R, V + i * ldV, 1, A + (R + i)*lda, 1);
typename Field::Element one, minus_one ;
F.init(one,1UL);
F.neg(minus_one, one);
- FFLAS::ftrsm(F, FFLAS::FflasRight, FFLAS::FflasLower,
+ FFLAS::ftrsm((typename Field::Father_t)F, FFLAS::FflasRight, FFLAS::FflasLower,
FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
coker_dim, R, minus_one, A, lda , V, ldV) ; // V = U2 ; A = U1 ; U2 <- inv(U1)*U2 ;
@@ -343,8 +345,8 @@ namespace LinBox
}
#endif
- FFPACK::applyP(F, FFLAS::FflasRight, FFLAS::FflasNoTrans,
- coker_dim, 0, R, V, ldV , P); // X = P^{-1}V
+ FFPACK::applyP((typename Field::Father_t)F, FFLAS::FflasRight, FFLAS::FflasNoTrans,
+ coker_dim, 0,(int) R, V, ldV , P); // X = P^{-1}V
delete[] P;
return V;
@@ -365,7 +367,7 @@ namespace LinBox
size_t *Q = new size_t[M];
//write_field (F, std::cout<<"A avant LU ="<<std::endl, A, M, N, N, true);
- size_t R = FFPACK::LUdivine (F, FFLAS::FflasNonUnit, FFLAS::FflasNoTrans,
+ size_t R = FFPACK::LUdivine ((typename Field::Father_t)F, FFLAS::FflasNonUnit, FFLAS::FflasNoTrans,
M, N, A, lda, P, Q, FFPACK::FfpackLQUP);
assert(R<=std::min(M,N));
@@ -397,8 +399,8 @@ namespace LinBox
Zero (F,V,ldV,0,0,coker_dim,R);
Identity(F,V,ldV,0,R,coker_dim,M);
// write_field (F, std::cout<<"V init ="<<std::endl, V, coker_dim, M, M,true);
- FFPACK::applyP(F, FFLAS::FflasRight, FFLAS::FflasNoTrans,
- coker_dim, 0, R, V, ldV, Q); // V = V tQ
+ FFPACK::applyP((typename Field::Father_t)F, FFLAS::FflasRight, FFLAS::FflasNoTrans,
+ coker_dim, 0, (int)R, V, ldV, Q); // V = V tQ
//write_field (F, std::cout<<"V reordered ="<<std::endl, V, coker_dim, M, M,true);
@@ -409,12 +411,13 @@ namespace LinBox
for (size_t j = i ; j<N; ++j )
*(A+i*N+j) = zero;
- FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasNoTrans, M,0,M, A, N, Q );
+ FFPACK::applyP((typename Field::Father_t) F, FFLAS::FflasRight, FFLAS::FflasNoTrans,
+ M,0,(int)M, A, N, Q );
for ( size_t i=0; i< M; ++i )
*(A+N*i+i) = one ;
//write_field (F, std::cout<<"A avant trsm ="<<std::endl, A, M, N, N,true);
- FFLAS::ftrsm(F, FFLAS::FflasRight, FFLAS::FflasLower,
+ FFLAS::ftrsm((typename Field::Father_t)F, FFLAS::FflasRight, FFLAS::FflasLower,
FFLAS::FflasNoTrans, FFLAS::FflasUnit,
coker_dim , M , one, A, lda , V, ldV) ; // V = V inv(Lower) ;
}
@@ -428,12 +431,13 @@ namespace LinBox
for (; j<M; ++j )
*(L+i*M+j) = zero;
}
- FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasNoTrans, M,0,R, L, M, Q );
+ FFPACK::applyP((typename Field::Father_t) F, FFLAS::FflasRight, FFLAS::FflasNoTrans,
+ M,0,(int)R, L, M, Q );
for ( size_t i=0; i< M; ++i )
*(L+M*i+i) = one ;
//write_field (F, std::cout<<"U_1="<<std::endl, L, M, M, M,true);
- FFLAS::ftrsm(F, FFLAS::FflasRight, FFLAS::FflasLower,
+ FFLAS::ftrsm((typename Field::Father_t)F, FFLAS::FflasRight, FFLAS::FflasLower,
FFLAS::FflasNoTrans, FFLAS::FflasUnit,
coker_dim , M , one, L, M , V, ldV) ; // V = V inv(Lower) ;
@@ -488,7 +492,7 @@ namespace LinBox
Ker = BlasMatrix<typename Field::Element>(kerdim,A.coldim());
}
//! @todo this is slow : use a constructor from Ker ?
- for(typename BlasMatrix<typename Field::Element>::RawIterator it=Ker.rawBegin(); it!= Ker.rawEnd(); ++it,++Ker_ptr)
+ for(typename BlasMatrix<typename Field::Element>::Iterator it=Ker.Begin(); it!= Ker.End(); ++it,++Ker_ptr)
*it=*Ker_ptr;
delete[] Ker_ptr ;
return kerdim;
@@ -498,3 +502,12 @@ namespace LinBox
} // LinBox
#endif // __LINBOX_dense_nullspace_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/det-rational.h b/linbox/algorithms/det-rational.h
index 185769f..26ffdd6 100644
--- a/linbox/algorithms/det-rational.h
+++ b/linbox/algorithms/det-rational.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/rational-reconstruction-base.h
* Copyright (C) 2009 Anna Marszalek
*
* Written by Anna Marszalek <aniau at astronet.pl>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_det_rational_H
@@ -26,12 +27,11 @@
#include "linbox/util/commentator.h"
#include "linbox/util/timer.h"
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
//#include "linbox/field/gmp-rational.h"
#include "linbox/field/PID-integer.h"
#include "linbox/blackbox/rational-matrix-factory.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/algorithms/varprec-cra-early-single.h"
#include "linbox/algorithms/cra-domain.h"
#include "linbox/algorithms/rational-reconstruction-base.h"
@@ -87,8 +87,10 @@ namespace LinBox
const Integer & p1, const Integer & p2) :
A(b), M(n), mul(p1), div(p2)
{}
+
MyRationalModularDet(MyRationalModularDet& C) :
- MyRationalModularDet(C.A,C.M,C.mul)
+ // MyRationalModularDet(C.A,C.M,C.mul)
+ A(C.A),M(C.M),mul(C.mul),div(C.div)
{}
void setDiv (const Integer& d) {div = d;}
@@ -121,7 +123,8 @@ namespace LinBox
{}
MyIntegerModularDet(MyIntegerModularDet& C) :
- MyIntegerModularDet(C.A,C.M)
+ // MyIntegerModularDet(C.A,C.M)
+ A(C.A), M(C.M)
{}
template<typename Int, typename Field>
@@ -156,32 +159,32 @@ namespace LinBox
}
template <class Rationals, class MyMethod >
- typename Rationals::Element& rational_det (typename Rationals::Element &d,
- const DenseMatrix<Rationals > &A,
- const MyMethod &Met= Method::Hybrid())
+ typename Rationals::Element& rational_det (typename Rationals::Element &d,
+ const BlasMatrix<Rationals > &A,
+ const MyMethod &Met= Method::Hybrid())
{
typedef Modular<double> myModular;
typedef typename Rationals::Element Quotient;
- commentator.start ("Rational Det", "Rdeterminant");
+ commentator().start ("Rational Det", "Rdeterminant");
RandomPrimeIterator genprime( 26-(int)ceil(log((double)A.rowdim())*0.7213475205));
Integer F = 1;
Integer M = 1;
- //DenseMatrixBase<Quotient> ABase(A);
- RationalMatrixFactory<PID_integer,Rationals, DenseMatrix<Rationals > > FA(&A);
+ //BlasMatrixBase<Quotient> ABase(A);
+ RationalMatrixFactory<PID_integer,Rationals, BlasMatrix<Rationals > > FA(&A);
Integer di=1;
- for (int i=A.rowdim()-1; i >= 0 ; --i) {
+ for (int i=(int)A.rowdim()-1; i >= 0 ; --i) {
FA.denominator(di,i);
M *=di;
}
PID_integer Z;
- DenseMatrix<PID_integer> Atilde(Z,A.rowdim(), A.coldim());
+ BlasMatrix<PID_integer> Atilde(Z,A.rowdim(), A.coldim());
FA.makeAtilde(Atilde);
UserTimer t0, t1,t2;bool term = false;
@@ -191,10 +194,10 @@ namespace LinBox
corrections(Atilde,F);
ChineseRemainder< VarPrecEarlySingleCRA<Modular<double> > > cra(3UL);
- MyRationalModularDet<DenseMatrix<Rationals > , MyMethod> iteration1(A, Met, M, F);
- MyIntegerModularDet<DenseMatrix<PID_integer>, MyMethod> iteration2(Atilde, Met);
- MyModularDet<MyRationalModularDet<DenseMatrix<Rationals > , MyMethod>,
- MyIntegerModularDet<DenseMatrix<PID_integer>, MyMethod> > iteration(&iteration1,&iteration2);
+ MyRationalModularDet<BlasMatrix<Rationals > , MyMethod> iteration1(A, Met, M, F);
+ MyIntegerModularDet<BlasMatrix<PID_integer>, MyMethod> iteration2(Atilde, Met);
+ MyModularDet<MyRationalModularDet<BlasMatrix<Rationals > , MyMethod>,
+ MyIntegerModularDet<BlasMatrix<PID_integer>, MyMethod> > iteration(&iteration1,&iteration2);
RReconstruction<PID_integer, ClassicMaxQRationalReconstruction<PID_integer> > RR;
@@ -203,10 +206,10 @@ namespace LinBox
t1.clear();
t2.clear();
t1.start();
- term = cra(k,dd,iteration1,genprime);
+ term = cra((int)k,dd,iteration1,genprime);
t1.stop();
t2.start();
- term = cra(k,dd,iteration2,genprime);
+ term = cra((int)k,dd,iteration2,genprime);
t2.stop();
double s1 = t1.time(), s2 = t2.time();
@@ -252,7 +255,7 @@ namespace LinBox
k *= 2;
t1.clear();t2.clear();
- while (! cra(k,dd, iteration, genprime)) {
+ while (! cra((int)k,dd, iteration, genprime)) {
k *=2;
Integer m,res,res1; //Integer r; Integer a,b;
cra.getModulus(m);
@@ -319,7 +322,7 @@ namespace LinBox
//err = M/t;
//cout << "terminated by ET at step "<< (int)(log(k)/log(2)) << "in " << std::flush;
- commentator.stop ("done", NULL, "Iminpoly");
+ commentator().stop ("done", NULL, "Iminpoly");
t0.stop();
return d;
@@ -330,3 +333,12 @@ namespace LinBox
#endif //__LINBOX_det_rational_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/diophantine-solver.C b/linbox/algorithms/diophantine-solver.C
index b07cbe5..b714644 100644
--- a/linbox/algorithms/diophantine-solver.C
+++ b/linbox/algorithms/diophantine-solver.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,13 +16,13 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
-#include <linbox/algorithms/diophantine-solver.h>
+#include "linbox/algorithms/diophantine-solver.h"
namespace LinBox
{
@@ -30,3 +31,12 @@ namespace LinBox
= {"OK", "FAILED", "SINGULAR", "INCONSISTENT", "BAD_PRECONDITIONER", "BAD_PRIME"};
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/diophantine-solver.h b/linbox/algorithms/diophantine-solver.h
index bfde0e0..419057f 100644
--- a/linbox/algorithms/diophantine-solver.h
+++ b/linbox/algorithms/diophantine-solver.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/diophantine-solver.h
* Copyright (C) 2004 David Pritchard
*
* Written by David Pritchard <daveagp at mit.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,20 +17,20 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_diophantine_solver_H
#define __LINBOX_diophantine_solver_H
-#include <linbox/algorithms/rational-solver.h>
-#include <linbox/solutions/methods.h>
-#include <linbox/blackbox/archetype.h>
-#include <linbox/blackbox/lambda-sparse.h>
-#include <linbox/blackbox/compose.h>
+#include "linbox/algorithms/rational-solver.h"
+#include "linbox/solutions/methods.h"
+#include "linbox/blackbox/archetype.h"
+#include "linbox/blackbox/lambda-sparse.h"
+#include "linbox/blackbox/compose.h"
namespace LinBox
{
@@ -52,8 +53,7 @@ namespace LinBox
typedef typename QSolver::RingType Ring;
typedef typename Ring::Element Integer;
QSolver& _rationalSolver;
- Ring _R;
- Integer _rone;
+ Ring _ring;
public:
// information for last diophantine solve
@@ -67,9 +67,8 @@ namespace LinBox
* @param rs a rationalSolver
*/
DiophantineSolver (QSolver& rs) :
- _rationalSolver(rs), _R(rs.getRing()), lastCertificate(_R, 0) {
- _R.init(_rone, 1);
- };
+ _rationalSolver(rs), _ring(rs.getRing()), lastCertificate(_ring, 0)
+ { }
/** Solve a linear system \c Ax=b over quotient field of a ring.
*
@@ -131,7 +130,16 @@ namespace LinBox
};
}
-#include <linbox/algorithms/diophantine-solver.inl>
+#include "linbox/algorithms/diophantine-solver.inl"
#endif //__LINBOX_diophantine_solver_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/diophantine-solver.inl b/linbox/algorithms/diophantine-solver.inl
index 1765df0..bd82dcf 100644
--- a/linbox/algorithms/diophantine-solver.inl
+++ b/linbox/algorithms/diophantine-solver.inl
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/diophantine-solver.inl
* Copyright (C) 2004 David Pritchard
*
* Written by David Pritchard <daveagp at mit.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,23 +17,22 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_diophantine_solver_INL
#define __LINBOX_diophantine_solver_INL
-#include <linbox/blackbox/dense.h>
-#include <linbox/blackbox/sparse.h>
-#include <linbox/blackbox/lambda-sparse.h>
-#include <linbox/algorithms/rational-solver.h>
-#include <linbox/algorithms/vector-fraction.h>
-#include <linbox/solutions/methods.h>
-#include <linbox/util/debug.h>
+#include "linbox/blackbox/sparse.h"
+#include "linbox/blackbox/lambda-sparse.h"
+#include "linbox/algorithms/rational-solver.h"
+#include "linbox/algorithms/vector-fraction.h"
+#include "linbox/solutions/methods.h"
+#include "linbox/util/debug.h"
-#include <linbox/linbox-config.h>
+#include "linbox/linbox-config.h"
//#define DEBUG_DIO
//#define INFO_DIO
@@ -86,7 +86,7 @@ namespace LinBox
return status;
}
- VectorFraction<Ring> y(_R,x.size());
+ VectorFraction<Ring> y(_ring,x.size());
y. numer = x;
y. denom = den;
VectorFraction<Ring> y0(y);
@@ -94,7 +94,7 @@ namespace LinBox
Integer ODB = y0.denom, n1; //ODB -- original denominator bound. equal to g(y0) from Muld+Storj.
if (level >= SL_CERTIFIED) {
lastCertificate.copy(_rationalSolver.lastCertificate);
- _R.assign(n1, _rationalSolver.lastZBNumer);
+ _ring.assign(n1, _rationalSolver.lastZBNumer);
}
Integer upperDenBound = ODB;
@@ -102,7 +102,7 @@ namespace LinBox
if (level >= SL_LASVEGAS)
lowerDenBound = _rationalSolver.lastCertifiedDenFactor;
else
- _R.init(lowerDenBound, 1);
+ _ring.init(lowerDenBound, 1);
#ifdef DEBUG_DIO
std::cout << "lower bound on denominator: " << lowerDenBound << std::endl;
std::cout << "upper bound on denominator: " << upperDenBound << std::endl;
@@ -111,7 +111,7 @@ namespace LinBox
numFailedCallsToSolver = 0;
numRevelantSolutions=1;
int boredom = 0; //used in monte carlo, when we assume there's a diophantine solution
- while (! _R.areEqual(upperDenBound, lowerDenBound)) {
+ while (! _ring.areEqual(upperDenBound, lowerDenBound)) {
_rationalSolver.chooseNewPrime();
status = _rationalSolver.monolithicSolve(x, den, A, b, (level >= SL_LASVEGAS), true, 1, level);
numSolutionsNeeded++;
@@ -122,7 +122,7 @@ namespace LinBox
numFailedCallsToSolver++;
continue;
}
- VectorFraction<Ring> yhat(_R, x.size());
+ VectorFraction<Ring> yhat(_ring, x.size());
yhat. numer = x;
yhat. denom = den;
// goodCombination first represents whether a decrease in upperDenBound is achieved
@@ -147,14 +147,14 @@ namespace LinBox
else if (level == SL_LASVEGAS) {
#ifdef DEBUG_DIO
goodCombination =
- !_R.isDivisor(lowerDenBound, _rationalSolver.lastCertifiedDenFactor);
+ !_ring.isDivisor(lowerDenBound, _rationalSolver.lastCertifiedDenFactor);
#endif
- _R.lcmin(lowerDenBound, _rationalSolver.lastCertifiedDenFactor);
+ _ring.lcmin(lowerDenBound, _rationalSolver.lastCertifiedDenFactor);
}
else { //level == SL_CERTIFIED
// paranoid check
- // if (_R.isZero(_rationalSolver.lastCertifiedDenFactor)) {
+ // if (_ring.isZero(_rationalSolver.lastCertifiedDenFactor)) {
// std::cout << "ERROR: got a 0 den factor" << std::endl;
// return SS_FAILED;
// }
@@ -186,3 +186,12 @@ namespace LinBox
#endif //__LINBOX_diophantine_solver_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/diophantine.doxy b/linbox/algorithms/diophantine.doxy
index a1dcf69..237cc84 100644
--- a/linbox/algorithms/diophantine.doxy
+++ b/linbox/algorithms/diophantine.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** @ingroup algorithms
@defgroup diophant Diophantine solvers
diff --git a/linbox/algorithms/double-det.h b/linbox/algorithms/double-det.h
index a021c77..7a010a5 100644
--- a/linbox/algorithms/double-det.h
+++ b/linbox/algorithms/double-det.h
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/doubledet.h
* Copyright (C) LinBox
*
* Written by Clement Pernet <clement.pernet at gmail.com>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_doubledet_H
@@ -38,12 +54,13 @@ namespace LinBox
typename Field::Element& d2,
typename Field::Element* A, const size_t lda,
typename Field::Element* b, const size_t incb,
- typename Field::Element* c, const size_t incc){
+ typename Field::Element* c, const size_t incc)
+ {
size_t* P = new size_t[N];
size_t* Qt = new size_t[N-1];
- FFPACK::LUdivine (F, FFLAS::FflasUnit, FFLAS::FflasNoTrans, N-1, N,
+ FFPACK::LUdivine ((typename Field::Father_t)F, FFLAS::FflasUnit, FFLAS::FflasNoTrans, N-1, N,
A, lda, P, Qt);
typename Field::Element d;
@@ -59,14 +76,16 @@ namespace LinBox
F.negin(d);
// Trick: instead of Right-Trans, do Left-NoTrans in order to use inc*
- FFPACK::applyP (F, FFLAS::FflasLeft, FFLAS::FflasNoTrans, 1, 0, N-1,
- b, incb, P);
- FFPACK::applyP (F, FFLAS::FflasLeft, FFLAS::FflasNoTrans, 1, 0, N-1,
- c, incc, P);
- FFLAS::ftrsv (F, FFLAS::FflasUpper, FFLAS::FflasTrans,
- FFLAS::FflasUnit, N, A, lda, b, incb);
- FFLAS::ftrsv (F, FFLAS::FflasUpper, FFLAS::FflasTrans,
- FFLAS::FflasUnit, N, A, lda, c, incc);
+ FFPACK::applyP ((typename Field::Father_t)F, FFLAS::FflasLeft, FFLAS::FflasNoTrans,
+ 1, 0,(int) N-1, b, incb, P);
+ FFPACK::applyP ((typename Field::Father_t)F, FFLAS::FflasLeft, FFLAS::FflasNoTrans,
+ 1, 0,(int) N-1, c, incc, P);
+ FFLAS::ftrsv ((typename Field::Father_t)F, FFLAS::FflasUpper, FFLAS::FflasTrans,
+ FFLAS::FflasUnit,
+ N, A, lda, b, (int)incb);
+ FFLAS::ftrsv ((typename Field::Father_t)F, FFLAS::FflasUpper, FFLAS::FflasTrans,
+ FFLAS::FflasUnit,
+ N, A, lda, c, (int)incc);
F.mul (d1, d, *(b + (N-1) * incb));
@@ -80,13 +99,13 @@ namespace LinBox
template <class BlackBox>
struct IntegerDoubleDetIteration{
- const BlackBox& _A;
+ const BlackBox& _matA;
const typename BlackBox::Field::Element _s1;
const typename BlackBox::Field::Element _s2;
IntegerDoubleDetIteration(const BlackBox& A,
const typename BlackBox::Field::Element& s1,
const typename BlackBox::Field::Element& s2) :
- _A(A), _s1(s1), _s2(s2)
+ _matA(A), _s1(s1), _s2(s2)
{}
template<class Field>
@@ -100,8 +119,8 @@ namespace LinBox
dd.resize(2);
F.init(s1p, _s1);
F.init(s2p, _s2);
- FBlackbox Ap(_A, F);
- const size_t N = _A.coldim();
+ FBlackbox Ap(_matA, F);
+ const size_t N = _matA.coldim();
//Timer tim;
//tim.clear();
//tim.start();
@@ -274,8 +293,7 @@ namespace LinBox
linbox_check (A.coldim() == A.rowdim()+1);
const size_t N = A.coldim();
- // BlasBlackbox<typename BlackBox::Field> B (A,0,0,N,N);
- BlasBlackbox<typename BlackBox::Field> B (A.field(),N,N);
+ BlasMatrix<typename BlackBox::Field> B (A.field(),N,N);
typename BlackBox::Field::Element den1, den2;
std::vector<typename BlackBox::Field::Element> x1(N);
for (size_t i=0; i<N; ++i){
@@ -312,3 +330,12 @@ namespace LinBox
#endif // __LINBOX_doubledet_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/dyadic-to-rational.h b/linbox/algorithms/dyadic-to-rational.h
index 2d637d4..e1ced43 100644
--- a/linbox/algorithms/dyadic-to-rational.h
+++ b/linbox/algorithms/dyadic-to-rational.h
@@ -11,14 +11,32 @@
*
* Evolved by bds from rational-reconstruction2.h by Z. Wan.
*
- * standard linbox copyright/license applies. See COPYING.
+ * Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#include <stack>
#include <assert.h>
#include <vector>
-//#include <linbox/integer.h>
+//#include "linbox/integer.h"
namespace LinBox{
@@ -71,7 +89,7 @@ int dyadicToRational (
// Partial_hegcd is defined below.
bool found = partial_hegcd(Z, e, b, an, d/*q*/, B); // e = b*an - ?*d and |b| <= B
- Z.axmyin(e, b, an);
+ Z.axmyin(e, b, an);
Z.div(a, e, d); //a = (e - b*an)/d, div is exact.
//std::cout << "Z.axmyin(e, b, an); " << e << " " << b << " " << an << ", a = e/d exact " << a << " " << d << std::endl;
// now a/b is solution but signs may be wrong
@@ -80,7 +98,7 @@ int dyadicToRational (
Int zero; Z.init(zero, 0);
if (Z.compare(n, zero) < 0) Z.negin(a); // a = -a;
-//std::cout << "DtR in n, d " << n << " "<< d << ", bound " << B << ", out a, b " << a << " " << b << std::endl;
+//std::cout << "DtR in n, d " << n << " "<< d << ", bound " << B << ", out a, b " << a << " " << b << std::endl;
bool guarantee = b*B < d;
if (found && guarantee) return 2;
if (b == 0) return 0;
@@ -198,8 +216,9 @@ int dyadicToRational(
Int t; Z.init(t, 1);
while ( S.size() > 1 ) {
Z.mulin(t, S.top().second);
- int k = S.top().first; S.pop();
- int j = S.top().first;
+ int k = (int)S.top().first;
+ S.pop();
+ int j = (int)S.top().first;
for (int i = k-1; i >= j; --i) {
Z.mulin(num[i], t);
}
@@ -209,7 +228,7 @@ int dyadicToRational(
} // vector dyadicToRational
-/* ****
+#if 0
// vector rational reconstruction building num, den from numx, denx
// This one -- very inefficient -- just reconstructs each one, then goes thru to fix for lcm.
void rational_reconstruction(std::vector<integer>& num, integer& den, std::vector<integer>& numx, integer& denx, integer& denBound) {
@@ -226,211 +245,19 @@ void rational_reconstruction(std::vector<integer>& num, integer& den, std::vecto
num[i] *= missing_factor;
}
} // vector rational_reconstruction
-**** */
+****
+#endif
}// LinBox
#endif // __DYADICTORATIONAL_H
-#ifdef TestingDyadicToRational
-using namespace LinBox;
-
-#include <vector>
-#include <cmath>
-#include <linbox/field/PID-integer.h>
-#include "linbox/util/timer.h"
-#include <linbox/util/commentator.h>
-
-int test1(size_t k, size_t dxa, size_t denBs) {
-
-/* Check reconstruction of i/k when it is well approximated
-by something over dxa and when the denominator bound (for k) is denBs.
-Values of numerator i from -k-2 to k+2 are checked.
-When dxa^2 <= denBs, 2 should be returned.
-*/
- typedef PID_integer Ring; Ring Z;
- typedef Ring::Element Int;
-
-//std::cout << "test1(k " << k << ", dxa " << dxa << ", denBs " << denBs << ")" << std::endl;
- // k is our denominator
- Int denB = denBs; // denominator bound
- // approximate(i*k^2)/k for i = 0..k-1
- size_t kp = k+2;
- size_t kp2 = 2*kp;
- std::vector<Int> nx(kp2);
- for (size_t i = 0; i < kp2 ; ++i) Z.init(nx[i],floor(((double(i)-double(kp))*dxa)/k + 0.5));
- // |nx[i]/dxa - (i-kp)/k| <= 1/2dxa
- std::vector<Int> n(kp2);
- Int d;
- bool pass = true;
- bool claim;
- int ret = 2;
-
- // check of individual reconstructions
- Int dx; Z.init(dx, dxa);
- int c;
- // individual reconstructions
- for (size_t i = 0; i < kp2 ; ++i) {
- bool loopclaim = true;
-//std::cout << nx[i] << " " << dx << " " << denB << std::endl;
- c = dyadicToRational(Z, n[i], d, nx[i], dx, denB);
-//std::cout << " c " << c << " n " << n[i] << " d " << d << " nx " << nx[i] << " dx " << dx << " denB " << denB << std::endl;
- loopclaim = ((c > 0) && (n[i]*k == ((int(i)-int(kp))*d)));
- if ( c == 2 ) loopclaim = loopclaim && d*denB < dx;
- if (c < ret) ret = c;
- if (! loopclaim) ret = 0;
-//if (! claim) std::cout << "F " << pass << claim << ret << std::endl;
- //if (! loopclaim)
-//std::cout << "F2 " << loopclaim << " i " << i << " nx/dx " << nx[i] << "/" << dx << ", n/d " << n[i] << "/" << d << std::endl;
- pass = pass && loopclaim;
- }
-//std::cout << "result, pass " << pass << " ret " << ret << std::endl;
-
-#if 1
- // check vector reconstruction
- c = dyadicToRational(Z, n, d, nx, dx, denB);
- commentator.report() << "In test1 dyadicToRational returns " << c << std::endl;
- claim = 0 < c;
- if (claim) {
- for (size_t i = 0; i < k ; ++i) claim = claim && (n[i] == (int(i)-int(kp)));
- }
- pass = pass && claim;
- if (!claim) {
- commentator.report() << "first example fails" << std::endl;
- commentator.report() << "data for first example" << std::endl;
- for (size_t i = 0; i < 10 ; ++i)
- commentator.report() << nx[i] << std::endl;
- commentator.report() << dx << " den in" << std::endl;
- commentator.report() << "results for first example" << std::endl;
- for (size_t i = 0; i < 10 ; ++i)
- commentator.report() << n[i] << std::endl;
- commentator.report() << d << " den out" << std::endl;
- }
-
- if (c < ret) ret = c;
- if (! claim) ret = 0;
- pass = pass && claim;
-//std::cout << "v " << pass << claim << ret << std::endl;
-#endif
-
- //return pass;
- return ret;
-}
-
-bool testDyadicToRational(size_t k = 10, bool benchmarking = false) {
- typedef PID_integer Ring; Ring Z;
- typedef Ring::Element Int;
- bool pass = true;
- bool claim = false;
- size_t pow2 = 1; // upperbound for k.
- for (size_t i = k; i > 0; i >>= 1) pow2 *= 2;
-
- UserTimer clock;
- double totaltime = 0;
-
- clock.clear(); clock.start();
- claim = 1 <= test1(k, pow2*pow2, k); // some 1's and some 2's
- if (!claim) commentator.report() << "failure: 1 !=test1(k, k*k, k)" << std::endl;
- pass = pass && claim;
- claim = 1 == test1(k, k*k, k*k); // all 1's
- if (!claim) commentator.report() << "failure: 1 !=test1(k, k*k, k*k)" << std::endl;
- pass = pass && claim;
- claim = 2 == test1(k, k*k+2*k + 1, k+1); // all 2's
- if (!claim) commentator.report() << "failure: 2 !=test1(k, (k + 1)^2, k+1)" << std::endl;
- pass = pass && claim;
- clock.stop(); totaltime += clock.time();
-
-#if 1
-// special case 1
- Int B; Z.init(B, 1000000000);
- Int B2; Z.init(B2); B2 = B*B;
- Int denB = 4*B+294967296; // 2^32
-
- Int d;
- Int dxs = denB*denB; // 2^64
- size_t k2 = 10;
- std::vector<Int> nx;
- std::vector<Int> n;
- nx.resize(k2);
- n.resize(k2);
-
- nx[0] =-143*B2-298423624*B-962150784;
- nx[1] = 239*B2+120348615*B+509085366;
- nx[2] = -4*B2-959983787*B-562075119;
- nx[3] = 27*B2+ 8864641*B+551149627;
- nx[4] = 62*B2+971469325*B+838237476;
- nx[5] = 190*B2+559070838*B+297135961;
- nx[6] = 176*B2+172593329*B+811309753;
- nx[7] = -70*B2-861003759*B-845628342;
- nx[8] =-228*B2-416339507*B-338896853;
- nx[9] = -14*B2-398832745*B-762391791;
-
- claim = 0 < dyadicToRational(Z, n, d, nx, dxs, denB);
-
- if (!claim) commentator.report() << "in special case 1 failure claimed" << std::endl;
-
- pass = pass && claim;
-
- std::vector<Int> ntrue(k2);
- Int dentrue = 691617936;
- ntrue[0] = -5*B-372642434;
- ntrue[1] = 8*B+965263534;
- ntrue[2] = -185963102;
- ntrue[3] = 1*B+ 12634812;
- ntrue[4] = 2*B+360969365;
- ntrue[5] = 7*B+144570919;
- ntrue[6] = 6*B+605183272;
- ntrue[7] = -2*B-656769182;
- ntrue[8] = -8*B-563941509;
- ntrue[9] = -539850878;
- claim = (d == dentrue);
- for (size_t i = 0; i < k2 ; ++i) claim = claim && (n[i] == ntrue[i]);
- pass = pass && claim;
- if (!claim)
- {
- commentator.report() << "data for failing special case 1" << std::endl;
- for (size_t i = 0; i < k2 ; ++i)
- commentator.report() << nx[i] << std::endl;
- commentator.report() << dxs << " den in" << std::endl;
- commentator.report() << "results for failing special case 1" << std::endl;
- for (size_t i = 0; i < k2 ; ++i)
- commentator.report() << n[i] << std::endl;
- commentator.report() << d << " den out" << std::endl;
- }
-
-#endif
-#if 1
-// case where false should be returned.
- denB = 1023*B+948656640;
-
- dxs = 4*B2+611686018*B+427387904;
- size_t k3 = 10;
- nx.resize(k3);
- n.resize(k3);
-
- nx[0] = -4*B2-474720817*B-626139615;
- nx[1] = -9*B2-632772311*B-132715070;
- nx[2] = -19*B2-805041562*B-739831073;
- nx[3] = 35*B2+521355378*B+297487606;
- nx[4] = 27*B2+922294617*B+624925795;
- nx[5] = 1*B2+494454325*B+592253092;
- nx[6] = -27*B2-985233904*B-197462327;
- nx[7] = -20*B2-336729946*B-917106131;
- nx[8] = -42*B2-807924857*B-450940124;
- nx[9] = -27*B2-863559911*B-142533799;
-
- // this should fail
- claim = 2 > dyadicToRational(Z, n, d, nx, dxs, denB);
-//std::cout << "d " << d << " dxs " << dxs << " denB " << denB << std::endl;
-
- pass = pass && claim;
- if (claim) commentator.report() << "third ratrecon falsely claims success" << std::endl;
-#endif
-
-// done
- if (benchmarking) commentator.report() << "vec size" << k << ", rat recon time: " << clock << " totaltime " << totaltime << std::endl;
- return pass;
-}
-#endif // TestingRationalReconstructionSN
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
diff --git a/linbox/algorithms/echelon-form.h b/linbox/algorithms/echelon-form.h
index dc18029..1c0d1ad 100644
--- a/linbox/algorithms/echelon-form.h
+++ b/linbox/algorithms/echelon-form.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/echelon-form.h
* Copyright (C) 2006 Pascal Giorgi
*
* Written by Pascal Giorgi pascal.giorgi at univ-perp.fr
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -26,11 +27,11 @@
#ifndef __LINBOX_echelon_form_H
#define __LINBOX_echelon_form_H
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/algorithms/blas-domain.h>
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/algorithms/blas-domain.h"
-#include <linbox/matrix/matrix-domain.h>
-#include <linbox/matrix/factorized-matrix.h>
+#include "linbox/matrix/matrix-domain.h"
+#include "linbox/matrix/factorized-matrix.h"
namespace LinBox
{
@@ -40,7 +41,7 @@ namespace LinBox
private:
- Field _F;
+ Field _field;
BlasMatrixDomain<Field> _BMD;
MatrixDomain<Field> _MD;
@@ -49,7 +50,7 @@ namespace LinBox
// constructor
EchelonFormDomain(const Field &F) :
- _F(F), _BMD(F), _MD(F)
+ _field(F), _BMD(F), _MD(F)
{}
@@ -64,7 +65,7 @@ namespace LinBox
n = A.coldim();
// get the transposed of A
- BlasMatrix<Element> At(n, m);
+ BlasMatrix<Field> At(_field,n, m);
for (size_t i=0;i<m;++i)
for (size_t j=0;j<n;++j)
At.setEntry(j,i,A.getEntry(i,j));
@@ -77,7 +78,7 @@ namespace LinBox
for (size_t j=0;j<n;++j){
E.setEntry(i,j, At.getEntry(j,i));
}
- return rank;
+ return (int)rank;
}
@@ -93,7 +94,7 @@ namespace LinBox
n = A.coldim();
// get the transposed of A
- BlasMatrix<Element> At(n, m);
+ BlasMatrix<Field> At(_field,n, m);
for (size_t i=0;i<m;++i)
for (size_t j=0;j<n;++j)
At.setEntry(j,i,A.getEntry(i,j));
@@ -104,7 +105,7 @@ namespace LinBox
for (size_t i=0; i<rank;++i)
for (size_t j=0;j<n;++j)
E.setEntry(i,j, At.getEntry(j,i));
- return rank;
+ return (int)rank;
}
@@ -153,16 +154,16 @@ namespace LinBox
m = E.rowdim();
n = E.coldim();
Element zero, one;
- _F.init(zero,0);
- _F.init(one,1);
+ _field.init(zero,0);
+ _field.init(one,1);
BlasPermutation<size_t> P(E.coldim());
BlasPermutation<size_t> Qt(E.rowdim());
// compute the LQUP of E
- LQUPMatrix<Field> LQUP(_F, E,P,Qt);
+ LQUPMatrix<Field> LQUP(E,P,Qt);
// get the rank
- rank = LQUP.getrank();
+ rank = LQUP.getRank();
// get permutation Qt
// BlasPermutation<size_t> Qt = LQUP.getQ();
@@ -177,7 +178,7 @@ namespace LinBox
E.setEntry(*(Qt.getPointer()+i),i,one);
}
- return rank;
+ return (int)rank;
}
// column reduced echelon form (IN-PLACE VERSION)
@@ -189,17 +190,17 @@ namespace LinBox
m = E.rowdim();
n = E.coldim();
Element zero, one;
- _F.init(zero,0);
- _F.init(one,1);
+ _field.init(zero,0);
+ _field.init(one,1);
// compute the LQUP of E
BlasPermutation<size_t> P(E.coldim());
BlasPermutation<size_t> Qt(E.rowdim());
- LQUPMatrix<Field> LQUP(_F, E, P, Qt);
+ LQUPMatrix<Field> LQUP( E, P, Qt);
// get the rank
- rank = LQUP.getrank();
+ rank = LQUP.getRank();
// BlasPermutation<size_t> Qt = LQUP.getQ();
TransposedBlasMatrix<BlasPermutation<size_t> > Q(Qt);
@@ -217,9 +218,9 @@ namespace LinBox
E.setEntry(i,i, one);//*(Qt.getPointer()+i),one);
// Update the first r columns of E by Err^(-1)
- BlasMatrix<Element> Er(E,0,0,rank,rank);
- TriangularBlasMatrix<Element> Err(Er, BlasTag::low, BlasTag::unit);
- BlasMatrix<Element> En(E,rank,0,m-rank,rank);
+ BlasMatrix<Field> Er(E,0,0,rank,rank);
+ TriangularBlasMatrix<Field> Err(Er, LinBoxTag::Lower, LinBoxTag::Unit);
+ BlasMatrix<Field> En(E,rank,0,m-rank,rank);
_BMD.right_solve(Err, En);
@@ -231,7 +232,7 @@ namespace LinBox
// permute L such that L<-Q.E
_BMD.mulin_right(Q,E);
- return rank;
+ return (int)rank;
}
template<class Matrix>
@@ -246,13 +247,13 @@ namespace LinBox
for (size_t i=0;i<m-1;++i){
std::cout<<"[";
for (size_t j=0;j<n-1;++j)
- _F.write(std::cout,A.getEntry(i,j))<<",";
- _F.write(std::cout, A.getEntry(i,n-1))<<"] , ";
+ _field.write(std::cout,A.getEntry(i,j))<<",";
+ _field.write(std::cout, A.getEntry(i,n-1))<<"] , ";
}
std::cout<<"[";
for (size_t j=0;j<n-1;++j)
- _F.write(std::cout,A.getEntry(m-1,j))<<",";
- _F.write(std::cout, A.getEntry(m-1,n-1))<<"]]);\n ";
+ _field.write(std::cout,A.getEntry(m-1,j))<<",";
+ _field.write(std::cout, A.getEntry(m-1,n-1))<<"]]);\n ";
}
};
@@ -260,3 +261,12 @@ namespace LinBox
}
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/elimination.doxy b/linbox/algorithms/elimination.doxy
index 4fdd9f4..fff94ed 100644
--- a/linbox/algorithms/elimination.doxy
+++ b/linbox/algorithms/elimination.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** @ingroup algorithms
@defgroup elim Elimination
diff --git a/linbox/algorithms/eliminator.h b/linbox/algorithms/eliminator.h
index 7662388..b315f77 100644
--- a/linbox/algorithms/eliminator.h
+++ b/linbox/algorithms/eliminator.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* elim.h
* Copyright (C) 2002 Bradford Hovinen
*
@@ -7,9 +5,24 @@
*
* --------------------------------------------
*
- * Licensed under the GNU Lesser General Public License. See COPYING for
- * details.
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
* Elimination code for lookahead block Lanczos
*/
@@ -23,17 +36,8 @@
#include "linbox/field/archetype.h"
#include "linbox/vector/vector-domain.h"
#include "linbox/blackbox/archetype.h"
-#include "linbox/blackbox/dense.h"
-#include "linbox/matrix/dense-submatrix.h"
#include "linbox/solutions/methods.h"
-// Fix for Solaris wierdness
-#undef _S
-#undef _M
-#undef _N
-#undef _P
-#undef _U
-#undef _T
namespace LinBox
{
@@ -43,7 +47,7 @@ namespace LinBox
* This is the supporting elimination system for a lookahead-based
* variant of block Lanczos.
*/
- template <class Field, class Matrix = DenseMatrixBase<typename Field::Element> >
+ template <class Field, class Matrix = BlasMatrix<Field> >
class Eliminator {
public:
@@ -216,26 +220,26 @@ namespace LinBox
// Private variables
- const Field &_F;
+ const Field &_field;
VectorDomain<Field> _VD;
MatrixDomain<Field> _MD;
- unsigned int _N;
+ unsigned int _number;
typename Field::Element _one;
// Temporaries used in the computation
- mutable Permutation _P;
+ mutable Permutation _perm;
- mutable DenseMatrixBase<Element> _A; // Variable
- mutable DenseMatrixBase<Element> _U; // Variable
- mutable DenseMatrixBase<Element> _tmp;
+ mutable BlasMatrix<Field> _matA; // Variable
+ mutable BlasMatrix<Field> _matU; // Variable
+ mutable BlasMatrix<Field> _tmp;
// These record the independent rows and columns found during the
// elimination process
- mutable std::vector<bool> _S; // Independent rows
- mutable std::vector<bool> _T; // Independent columns
+ mutable std::vector<bool> _indepRows; // Independent rows
+ mutable std::vector<bool> _indepCols; // Independent columns
std::vector<unsigned int> _profile;
unsigned int _profile_idx;
@@ -255,3 +259,12 @@ namespace LinBox
#endif // __LINBOX_eliminator_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/eliminator.inl b/linbox/algorithms/eliminator.inl
index 75a0134..a1399fd 100644
--- a/linbox/algorithms/eliminator.inl
+++ b/linbox/algorithms/eliminator.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* eliminator.inl
* Copyright (C) 2002, 2003 LinBox, Bradford Hovinen
*
@@ -7,9 +5,24 @@
*
* --------------------------------------------
*
- * Licensed under the GNU Lesser General Public License. See COPYING for
- * details.
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
* Elimination code for lookahead block Lanczos
*/
@@ -22,7 +35,6 @@
#include "linbox/util/debug.h"
#include "linbox/solutions/methods.h"
-#include "linbox/matrix/dense-submatrix.h"
#include "linbox/blackbox/diagonal.h"
#include "linbox/blackbox/compose.h"
#include "linbox/blackbox/transpose.h"
@@ -32,10 +44,6 @@
#include "eliminator.h"
-#undef _F
-#undef _N
-#undef _S
-#undef _T
namespace LinBox
{
@@ -57,9 +65,9 @@ namespace LinBox
template <class Field, class Matrix>
Eliminator<Field, Matrix>::Eliminator (const Field &F, unsigned int N) :
- _F (F), _VD (F), _MD (F), _N (N), _S (N), _T (N)
+ _field (F), _VD (F), _MD (F), _number (N), _indepRows (N), _indepCols (N)
{
- _F.init (_one, 1);
+ _field.init (_one, 1);
}
template <class Field, class Matrix>
@@ -82,8 +90,8 @@ namespace LinBox
std::vector<unsigned int>::iterator i;
unsigned int idx;
- _A.resize (A.rowdim (), A.coldim ());
- _U.resize (A.rowdim (), A.rowdim ());
+ _matA.resize (A.rowdim (), A.coldim ());
+ _matU.resize (A.rowdim (), A.rowdim ());
_tmp.resize (A.rowdim (), A.coldim ());
_profile.resize (A.coldim ());
_indices.resize (A.rowdim ());
@@ -91,35 +99,35 @@ namespace LinBox
for (i = _indices.begin (), idx = 0; i != _indices.end (); ++i, ++idx)
*i = idx;
- _MD.subin (_A, _A);
+ _MD.subin (_matA, _matA);
- DenseSubmatrix<Element> A1 (_A, 0, 0, A.rowdim (), A.coldim ());
+ BlasMatrix<Field> A1 (_matA, 0, 0, A.rowdim (), A.coldim ());
_MD.copy (A1, A);
- setIN (_U);
- _P.clear ();
+ setIN (_matU);
+ _perm.clear ();
_profile_idx = 0;
kthGaussJordan (rank, d, 0, 0, A.coldim (), _one);
- buildMinimalPermutation (P, rank, A.rowdim (), _P);
+ buildMinimalPermutation (P, rank, A.rowdim (), _perm);
buildMinimalPermutationFromProfile (Q, rank, A.coldim (), _profile);
- _MD.permuteColumns (_U, _P.rbegin (), _P.rend ());
- _MD.permuteColumns (_U, P.begin (), P.end ());
+ _MD.permuteColumns (_matU, _perm.rbegin (), _perm.rend ());
+ _MD.permuteColumns (_matU, P.begin (), P.end ());
- DenseSubmatrix<Element> Tu1 (Tu, rank, 0, A.rowdim () - rank, rank);
- DenseSubmatrix<Element> U2 (_U, rank, 0, A.rowdim () - rank, rank);
+ BlasMatrix<Field> Tu1 (Tu, rank, 0, A.rowdim () - rank, rank);
+ BlasMatrix<Field> U2 (_matU, rank, 0, A.rowdim () - rank, rank);
_MD.copy (Tu1, U2);
- DenseSubmatrix<Element> Ainv1 (Ainv, 0, 0, rank, rank);
- DenseSubmatrix<Element> U1 (_U, 0, 0, rank, rank);
- _F.inv (dinv, d);
+ BlasMatrix<Field> Ainv1 (Ainv, 0, 0, rank, rank);
+ BlasMatrix<Field> U1 (_matU, 0, 0, rank, rank);
+ _field.inv (dinv, d);
_MD.mul (Ainv1, U1, dinv);
- DenseSubmatrix<Element> Tv1 (Tv, 0, rank, rank, A.coldim () - rank);
- DenseSubmatrix<Element> U3 (_U, 0, 0, rank, A.rowdim ());
- DenseSubmatrix<Element> A2 (_A, 0, rank, A.rowdim (), A.coldim () - rank);
+ BlasMatrix<Field> Tv1 (Tv, 0, rank, rank, A.coldim () - rank);
+ BlasMatrix<Field> U3 (_matU, 0, 0, rank, A.rowdim ());
+ BlasMatrix<Field> A2 (_matA, 0, rank, A.rowdim (), A.coldim () - rank);
_MD.copy (A1, A);
_MD.permuteColumns (A1, Q.begin (), Q.end ());
_MD.permuteRows (A2, P.begin (), P.end ());
@@ -161,22 +169,22 @@ namespace LinBox
timer.start ();
- linbox_check (_N == S.size ());
- linbox_check (_N == T.size ());
- linbox_check (_N == W.rowdim ());
- linbox_check (_N == W.coldim ());
- linbox_check (_N == A.rowdim ());
- linbox_check (_N == A.coldim ());
+ linbox_check (_number == S.size ());
+ linbox_check (_number == T.size ());
+ linbox_check (_number == W.rowdim ());
+ linbox_check (_number == W.coldim ());
+ linbox_check (_number == A.rowdim ());
+ linbox_check (_number == A.coldim ());
#ifdef ELIM_DETAILED_TRACE
- commentator.start ("Computing W, S, T", "Eliminator::permuteAndInvert", _N);
+ commentator().start ("Computing W, S, T", "Eliminator::permuteAndInvert", _number);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix:" << std::endl;
_MD.write (report, A);
#endif
- /* Apply initial permutations to A, copying to _A */
+ /* Apply initial permutations to A, copying to _matA */
buildPermutation (Qp, rightPriorityIdx); // Column permutation
@@ -185,70 +193,70 @@ namespace LinBox
reportPermutation (report, Qp) << endl;
#endif
- _A.resize (A.rowdim (), A.coldim ());
- _U.resize (A.rowdim (), A.rowdim ());
+ _matA.resize (A.rowdim (), A.coldim ());
+ _matU.resize (A.rowdim (), A.rowdim ());
_tmp.resize (A.rowdim (), A.coldim ());
_indices.resize (A.rowdim ());
for (i = _indices.begin (), idx = 0; i != _indices.end (); ++i, ++idx)
*i = idx;
- _MD.copy (_A, A);
+ _MD.copy (_matA, A);
- _MD.permuteColumns (_A, Qp.begin (), Qp.end ());
+ _MD.permuteColumns (_matA, Qp.begin (), Qp.end ());
/* Initialise temporaries for the computation */
- setIN (_U);
- _P.clear ();
+ setIN (_matU);
+ _perm.clear ();
_profile.resize (A.coldim ());
_profile_idx = 0;
- std::fill (_T.begin (), _T.end (), false);
+ std::fill (_indepCols.begin (), _indepCols.end (), false);
/* Run the computation */
- kthGaussJordan (rank, d, 0, 0, _A.coldim (), _one);
+ kthGaussJordan (rank, d, 0, 0, _matA.coldim (), _one);
- /* Set _S based on the permutation */
- std::fill (_S.begin (), _S.begin () + rank, true);
- std::fill (_S.begin () + rank, _S.end (), false);
- permute (_S, _P.rbegin (), _P.rend ());
+ /* Set _indepRows based on the permutation */
+ std::fill (_indepRows.begin (), _indepRows.begin () + rank, true);
+ std::fill (_indepRows.begin () + rank, _indepRows.end (), false);
+ permute (_indepRows, _perm.rbegin (), _perm.rend ());
- permute (_T, Qp.rbegin (), Qp.rend ());
+ permute (_indepCols, Qp.rbegin (), Qp.rend ());
- /* Apply final permutations to _U, copying to W */
- DenseSubmatrix<Element> U1 (_U, rank, 0, _U.rowdim () - rank, _U.coldim ());
+ /* Apply final permutations to _matU, copying to W */
+ BlasMatrix<Field> U1 (_matU, rank, 0, _matU.rowdim () - rank, _matU.coldim ());
_MD.subin (U1, U1);
- _MD.permuteColumns (_U, _P.rbegin (), _P.rend ());
+ _MD.permuteColumns (_matU, _perm.rbegin (), _perm.rend ());
- /* Divide _U by the determinant and copy to W */
- _F.invin (d);
- _MD.mulin (_U, d);
+ /* Divide _matU by the determinant and copy to W */
+ _field.invin (d);
+ _MD.mulin (_matU, d);
_MD.subin (W, W);
typename std::vector<unsigned int>::iterator pi;
- for (pi = _profile.begin (), ui = _U.rowBegin (); pi != _profile.begin () + rank; ++ui, ++pi)
+ for (pi = _profile.begin (), ui = _matU.rowBegin (); pi != _profile.begin () + rank; ++ui, ++pi)
_VD.copy (*(W.rowBegin () + *pi), *ui);
// _MD.permuteRows (W, Qp.rbegin (), Qp.rend ());
/* Rebuild leftPriorityIdx and rightPriorityIdx */
- cleanPriorityIndexList (rightPriorityIdx, _T, T);
+ cleanPriorityIndexList (rightPriorityIdx, _indepCols, T);
/* Reverse the row priority index list */
std::reverse (_indices.begin (), _indices.end ());
- S = _S;
- T = _T;
+ S = _indepRows;
+ T = _indepCols;
#ifdef ELIM_DETAILED_TRACE
report << "Computed W:" << std::endl;
_MD.write (report, W);
- commentator.stop ("done", NULL, "Eliminator::permuteAndInvert");
+ commentator().stop ("done", NULL, "Eliminator::permuteAndInvert");
#endif
timer.stop ();
@@ -274,8 +282,8 @@ namespace LinBox
std::vector<unsigned int>::iterator i;
unsigned int idx;
- _A.resize (A.rowdim (), A.coldim ());
- _U.resize (A.rowdim (), A.rowdim ());
+ _matA.resize (A.rowdim (), A.coldim ());
+ _matU.resize (A.rowdim (), A.rowdim ());
_tmp.resize (A.rowdim (), A.coldim ());
_profile.resize (A.coldim ());
_indices.resize (A.rowdim ());
@@ -283,32 +291,32 @@ namespace LinBox
for (i = _indices.begin (), idx = 0; i != _indices.end (); ++i, ++idx)
*i = idx;
- setIN (_U);
- _P.clear ();
- _MD.copy (_A, A);
+ setIN (_matU);
+ _perm.clear ();
+ _MD.copy (_matA, A);
_profile_idx = 0;
- kthGaussJordan (rank, det, 0, 0, A.coldim (), _one);
+ kthGaussJordan (rank, det, 0, 0, (unsigned int) A.coldim (), _one);
- buildMinimalPermutation (P, rank, A.rowdim (), _P);
- buildMinimalPermutationFromProfile (Q, rank, A.coldim (), _profile);
+ buildMinimalPermutation (P, rank, (unsigned int) A.rowdim (), _perm);
+ buildMinimalPermutationFromProfile (Q, rank, (unsigned int) A.coldim (), _profile);
- _MD.permuteColumns (_U, _P.rbegin (), _P.rend ());
- _MD.permuteColumns (_U, P.begin (), P.end ());
+ _MD.permuteColumns (_matU, _perm.rbegin (), _perm.rend ());
+ _MD.permuteColumns (_matU, P.begin (), P.end ());
- DenseSubmatrix<Element> Tu1 (Tu, rank, 0, A.rowdim () - rank, rank);
- DenseSubmatrix<Element> U2 (_U, rank, 0, A.rowdim () - rank, rank);
+ BlasMatrix<Field> Tu1 (Tu, rank, 0, A.rowdim () - rank, rank);
+ BlasMatrix<Field> U2 (_matU, rank, 0, A.rowdim () - rank, rank);
_MD.copy (Tu1, U2);
- DenseSubmatrix<Element> Ainv1 (U, 0, 0, rank, rank);
- DenseSubmatrix<Element> U1 (_U, 0, 0, rank, rank);
- _F.inv (dinv, det);
+ BlasMatrix<Field> Ainv1 (U, 0, 0, rank, rank);
+ BlasMatrix<Field> U1 (_matU, 0, 0, rank, rank);
+ _field.inv (dinv, det);
_MD.mul (Ainv1, U1, dinv);
- DenseSubmatrix<Element> Tv1 (Tv, 0, rank, rank, A.coldim () - rank);
- DenseSubmatrix<Element> U3 (_U, 0, 0, rank, A.rowdim ());
- DenseSubmatrix<Element> A2 (_A, 0, rank, A.rowdim (), A.coldim () - rank);
- _MD.copy (_A, A);
- _MD.permuteColumns (_A, Q.begin (), Q.end ());
+ BlasMatrix<Field> Tv1 (Tv, 0, rank, rank, A.coldim () - rank);
+ BlasMatrix<Field> U3 (_matU, 0, 0, rank, A.rowdim ());
+ BlasMatrix<Field> A2 (_matA, 0, rank, A.rowdim (), A.coldim () - rank);
+ _MD.copy (_matA, A);
+ _MD.permuteColumns (_matA, Q.begin (), Q.end ());
_MD.permuteRows (A2, P.begin (), P.end ());
_MD.mul (Tv1, U3, A2);
_MD.negin (Tv1);
@@ -345,9 +353,9 @@ namespace LinBox
return out;
}
- /* Perform the kth indexed Gauss-Jordan transform on _A, storing the
- * transformation matrix in _U and the permutation in _P. The caller is
- * responsible for ensuring that _U and _P are the identity and that _A is set
+ /* Perform the kth indexed Gauss-Jordan transform on _matA, storing the
+ * transformation matrix in _matU and the permutation in _perm. The caller is
+ * responsible for ensuring that _matU and _perm are the identity and that _matA is set
* to a copy of the input on the initial call.
*/
@@ -363,50 +371,50 @@ namespace LinBox
unsigned int i;
#ifdef ELIM_DETAILED_TRACE
- commentator.start ("kth indexed Gauss-Jordan transform", "Eliminator::kthGaussJordan");
+ commentator().start ("kth indexed Gauss-Jordan transform", "Eliminator::kthGaussJordan");
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "k = " << k << std::endl;
report << "Starting column: " << s << std::endl;
report << "Column dimension: " << m << std::endl;
- DenseMatrixBase<Element> Acopy (_A);
+ BlasMatrix<Field> Acopy (_matA);
- unsigned int P_start = _P.size ();
+ unsigned int P_start = _perm.size ();
#endif
- DenseSubmatrix<Element> Ap (_A, k, s, _A.rowdim () - k, m);
+ BlasMatrix<Field> Ap (_matA, k, s, _matA.rowdim () - k, m);
if (_MD.isZero (Ap)) {
r = 0;
- _F.assign (d, d0);
+ _field.assign (d, d0);
}
else if (m == 1) {
- // Find minimal index i > k with _A[i, 1] != 0
- for (i = 0; i < _A.rowdim (); ++i)
- if (_indices[i] >= k && !_F.isZero (_A.getEntry (_indices[i], s)))
+ // Find minimal index i > k with _matA[i, 1] != 0
+ for (i = 0; i < _matA.rowdim (); ++i)
+ if (_indices[i] >= k && !_field.isZero (_matA.getEntry (_indices[i], s)))
break;
- linbox_check (i < _A.rowdim ());
+ linbox_check (i < _matA.rowdim ());
- _T[s] = true; // This column is independent
+ _indepCols[s] = true; // This column is independent
- if (_indices[i] != k) _P.push_back (Transposition (_indices[i], k));
+ if (_indices[i] != k) _perm.push_back (Transposition (_indices[i], k));
r = 1;
- _A.getEntry (d, _indices[i], s);
+ _matA.getEntry (d, _indices[i], s);
- typename Matrix::ColIterator Uk = _U.colBegin () + k;
- typename Matrix::ColIterator A1 = _A.colBegin () + s;
+ typename Matrix::ColIterator Uk = _matU.colBegin () + k;
+ typename Matrix::ColIterator A1 = _matA.colBegin () + s;
_VD.neg (*Uk, *A1);
- _F.assign ((*Uk)[_indices[i]], (*Uk)[k]);
- _F.assign ((*Uk)[k], d0);
+ _field.assign ((*Uk)[_indices[i]], (*Uk)[k]);
+ _field.assign ((*Uk)[k], d0);
std::swap (_indices[i], _indices[k]);
- for (i = k + 1; i < _U.rowdim (); ++i)
- _U.setEntry (i, i, d);
+ for (i = k + 1; i < _matU.rowdim (); ++i)
+ _matU.setEntry (i, i, d);
_profile[_profile_idx++] = s;
}
@@ -416,30 +424,30 @@ namespace LinBox
unsigned int r1, r2;
typename Field::Element d1, d0inv, d1inv, d1neg;
- DenseSubmatrix<Element> B (_A, 0, s + m1, _A.rowdim (), m2);
+ BlasMatrix<Field> B (_matA, 0, s + m1, _matA.rowdim (), m2);
- unsigned int P_start = _P.size ();
+ unsigned int P_start = (unsigned int) _perm.size ();
kthGaussJordan (r1, d1, k, s, m1, d0);
- unsigned int P_end = _P.size ();
+ unsigned int P_end = (unsigned int) _perm.size ();
- _MD.permuteRows (B, _P.begin () + P_start, _P.end ());
+ _MD.permuteRows (B, _perm.begin () + P_start, _perm.end ());
- unsigned int l1 = _U.rowdim () - (k + r1);
+ unsigned int l1 = (unsigned int) _matU.rowdim () - (k + r1);
- DenseSubmatrix<Element> a (_U, 0, k, k, r1);
- DenseSubmatrix<Element> u (_U, k, k, r1, r1);
- DenseSubmatrix<Element> c (_U, k + r1, k, l1, r1);
+ BlasMatrix<Field> a (_matU, 0, k, k, r1);
+ BlasMatrix<Field> u (_matU, k, k, r1, r1);
+ BlasMatrix<Field> c (_matU, k + r1, k, l1, r1);
- DenseSubmatrix<Element> et (_tmp, 0, 0, k, m2);
- DenseSubmatrix<Element> gt (_tmp, 0, 0, l1, m2);
+ BlasMatrix<Field> et (_tmp, 0, 0, k, m2);
+ BlasMatrix<Field> gt (_tmp, 0, 0, l1, m2);
- DenseSubmatrix<Element> e (_A, 0, s + m1, k, m2);
- DenseSubmatrix<Element> f (_A, k, s + m1, r1, m2);
- DenseSubmatrix<Element> g (_A, k + r1, s + m1, l1, m2);
+ BlasMatrix<Field> e (_matA, 0, s + m1, k, m2);
+ BlasMatrix<Field> f (_matA, k, s + m1, r1, m2);
+ BlasMatrix<Field> g (_matA, k + r1, s + m1, l1, m2);
- _F.inv (d0inv, d0);
+ _field.inv (d0inv, d0);
_MD.mul (et, a, f);
_MD.mulin (e, d1);
@@ -456,52 +464,52 @@ namespace LinBox
#ifdef ELIM_DETAILED_TRACE
report << "(" << k << ") Matrix A prepared for second recursive call: " << std::endl;
- _MD.write (report, _A);
+ _MD.write (report, _matA);
#endif
kthGaussJordan (r2, d, k + r1, s + m1, m2, d1);
#ifdef ELIM_DETAILED_TRACE
report << "(" << k << ") Transform U after recursive calls: " << std::endl;
- _MD.write (report, _U);
+ _MD.write (report, _matU);
#endif
- DenseSubmatrix<Element> U1 (_U, 0, k, _U.rowdim (), r1);
+ BlasMatrix<Field> U1 (_matU, 0, k, _matU.rowdim (), r1);
- _F.neg (d1neg, d1);
- adddIN (_U, d1neg);
- _MD.permuteRows (U1, _P.begin () + P_end, _P.end ());
- adddIN (_U, d1);
+ _field.neg (d1neg, d1);
+ adddIN (_matU, d1neg);
+ _MD.permuteRows (U1, _perm.begin () + P_end, _perm.end ());
+ adddIN (_matU, d1);
#ifdef ELIM_DETAILED_TRACE
report << "(" << k << ") P2 U P2^-1: " << std::endl;
- _MD.write (report, _U);
+ _MD.write (report, _matU);
#endif
r = r1 + r2;
- unsigned int l2 = _U.rowdim () - (k + r);
+ unsigned int l2 = (unsigned int) _matU.rowdim () - (k + r);
- DenseSubmatrix<Element> a1 (_U, 0, k, k, r1);
- DenseSubmatrix<Element> u1 (_U, k, k, r1, r1);
- DenseSubmatrix<Element> c1 (_U, k + r1, k, r2, r1);
- DenseSubmatrix<Element> c1bar (_U, k + r, k, l2, r1);
+ BlasMatrix<Field> a1 (_matU, 0, k, k, r1);
+ BlasMatrix<Field> u1 (_matU, k, k, r1, r1);
+ BlasMatrix<Field> c1 (_matU, k + r1, k, r2, r1);
+ BlasMatrix<Field> c1bar (_matU, k + r, k, l2, r1);
- DenseSubmatrix<Element> &a11 = a1;
- DenseSubmatrix<Element> &u11 = u1;
- DenseSubmatrix<Element> &u21 = c1;
- DenseSubmatrix<Element> &c11 = c1bar;
+ BlasMatrix<Field> &a11 = a1;
+ BlasMatrix<Field> &u11 = u1;
+ BlasMatrix<Field> &u21 = c1;
+ BlasMatrix<Field> &c11 = c1bar;
- DenseSubmatrix<Element> a11t (_tmp, 0, 0, k, r1);
- DenseSubmatrix<Element> u11t (_tmp, 0, 0, r1, r1);
- DenseSubmatrix<Element> c11t (_tmp, 0, 0, l2, r1);
+ BlasMatrix<Field> a11t (_tmp, 0, 0, k, r1);
+ BlasMatrix<Field> u11t (_tmp, 0, 0, r1, r1);
+ BlasMatrix<Field> c11t (_tmp, 0, 0, l2, r1);
- DenseSubmatrix<Element> a2 (_U, 0, k + r1, k, r2);
- DenseSubmatrix<Element> a2bar (_U, k, k + r1, r1, r2);
- DenseSubmatrix<Element> u2 (_U, k + r1, k + r1, r2, r2);
- DenseSubmatrix<Element> c2 (_U, k + r, k + r1, l2, r2);
+ BlasMatrix<Field> a2 (_matU, 0, k + r1, k, r2);
+ BlasMatrix<Field> a2bar (_matU, k, k + r1, r1, r2);
+ BlasMatrix<Field> u2 (_matU, k + r1, k + r1, r2, r2);
+ BlasMatrix<Field> c2 (_matU, k + r, k + r1, l2, r2);
- _F.inv (d1inv, d1);
+ _field.inv (d1inv, d1);
_MD.mul (a11t, a2, c1);
_MD.mulin (a1, d);
@@ -524,20 +532,20 @@ namespace LinBox
#ifdef ELIM_DETAILED_TRACE
report << "(" << k << ") Finished U: " << std::endl;
- _MD.write (report, _U);
+ _MD.write (report, _matU);
report << "(" << k << ") Finished P: " << std::endl;
- reportPermutation (report, _P);
+ reportPermutation (report, _perm);
typename Field::Element dinv, d0inv;
- _F.inv (dinv, d);
- _F.inv (d0inv, d0);
+ _field.inv (dinv, d);
+ _field.inv (d0inv, d0);
- DenseMatrixBase<Element> R (_A.rowdim () - k, _A.coldim () - s);
- DenseSubmatrix<Element> Atest (Acopy, k, s, _A.rowdim () - k, _A.coldim () - s);
- DenseSubmatrix<Element> Utest (_U, k, k, _U.rowdim () - k, _U.coldim () - k);
- _MD.permuteRows (Acopy, _P.begin () + P_start, _P.end ());
+ BlasMatrix<Field> R (_matA.rowdim () - k, _matA.coldim () - s);
+ BlasMatrix<Field> Atest (Acopy, k, s, _matA.rowdim () - k, _matA.coldim () - s);
+ BlasMatrix<Field> Utest (_matU, k, k, _matU.rowdim () - k, _matU.coldim () - k);
+ _MD.permuteRows (Acopy, _perm.begin () + P_start, _perm.end ());
report << "(" << k << ") PA: " << std::endl;
_MD.write (report, Acopy);
@@ -549,10 +557,10 @@ namespace LinBox
report << "(" << k << ") R:=1/d U 1/d0 PA: " << std::endl;
_MD.write (report, R);
- commentator.stop ("done", NULL, "Eliminator::kthGaussJordan");
+ commentator().stop ("done", NULL, "Eliminator::kthGaussJordan");
#endif
- return _U;
+ return _matU;
}
template <class Field, class Matrix>
@@ -565,7 +573,7 @@ namespace LinBox
unsigned int idx;
for (i = A.rowBegin (), idx = 0; i != A.rowEnd (); ++i, ++idx)
- _F.addin ((*i)[idx], d);
+ _field.addin ((*i)[idx], d);
return A;
}
@@ -581,7 +589,7 @@ namespace LinBox
for (i = A.rowBegin (), i_idx = 0; i != A.rowEnd (); ++i, ++i_idx) {
_VD.subin (*i, *i);
- _F.assign ((*i)[i_idx], _one);
+ _field.assign ((*i)[i_idx], _one);
}
return A;
@@ -672,21 +680,21 @@ namespace LinBox
P.clear ();
- std::fill (_S.begin (), _S.begin () + rank, true);
- std::fill (_S.begin () + rank, _S.begin () + dim, false);
+ std::fill (_indepRows.begin (), _indepRows.begin () + rank, true);
+ std::fill (_indepRows.begin () + rank, _indepRows.begin () + dim, false);
for (j = Pold.rbegin (); j != Pold.rend (); ++j) {
- bool tmp = _S[j->first];
- _S[j->first] = _S[j->second];
- _S[j->second] = tmp;
+ bool tmp = _indepRows[j->first];
+ _indepRows[j->first] = _indepRows[j->second];
+ _indepRows[j->second] = tmp;
}
idx = 0;
idx2 = dim - 1;
while (idx < rank && idx2 >= rank) {
- while (_S[idx] && idx < rank) ++idx;
- while (!_S[idx2] && idx2 >= rank) --idx2;
+ while (_indepRows[idx] && idx < rank) ++idx;
+ while (!_indepRows[idx2] && idx2 >= rank) --idx2;
if (idx < rank && idx2 >= rank)
P.push_back (Transposition (idx, idx2));
@@ -719,3 +727,12 @@ namespace LinBox
#endif // __LINBOX_eliminator_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/fast-rational-reconstruction.h b/linbox/algorithms/fast-rational-reconstruction.h
index 69ca681..a405352 100644
--- a/linbox/algorithms/fast-rational-reconstruction.h
+++ b/linbox/algorithms/fast-rational-reconstruction.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/classic-rational-reconstruction.h
* Copyright (C) 2009 Anna Marszalek
*
* Written by Anna Marszalek <aniau at astronet.pl>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_fast_reconstruction_H
@@ -44,11 +45,11 @@ namespace LinBox
protected:
size_t _threshold;
public:
- const Ring _Z;
+ const Ring _intRing;
typedef typename Ring::Element Element;
FastRationalReconstruction(const Ring& Z) :
- RReconstructionBase<Ring>(Z), _Z(Z)
+ RReconstructionBase<Ring>(Z), _intRing(Z)
{
_threshold = __FASTRR_DEFAULT_THRESHOLD;
if (_threshold < 2) _threshold = 2;
@@ -58,7 +59,7 @@ namespace LinBox
bool reconstructRational(Element& a, Element& b, const Element& x, const Element& m) const
{
- Element a_bound; _Z.sqrt(a_bound, m/2);
+ Element a_bound; _intRing.sqrt(a_bound, m/2);
reconstructRational(a,b,x,m,a_bound);
return (a < a_bound);
}
@@ -82,7 +83,7 @@ namespace LinBox
if (m/bound > 1) {
fastReconstructRational(a,b,x,m,m/bound);
- if (_Z.abs(a) < a_bound) {
+ if (_intRing.abs(a) < a_bound) {
return true;
}
return false;
@@ -136,11 +137,11 @@ namespace LinBox
size_t log_bound = d_bound.bitsize()-1;
Element ai, bi, ci, di;
ai=1;bi=0;ci=0;di=1;
- Element bound; _Z.powtwo(bound, log_bound);
+ Element bound; _intRing.powtwo(bound, log_bound);
cur_ri = m;
cur_rinext = x;
- _Z.quo(cur_ainext, cur_ri, cur_rinext);
+ _intRing.quo(cur_ainext, cur_ri, cur_rinext);
cur_qinext = cur_ainext;// ri/ri_next
if (!fastEEA (ai,bi,ci,di,m,log_m,x,bound, log_bound)) return false;
@@ -160,12 +161,12 @@ namespace LinBox
ai = cur_ainext;
bi = tmp;
tmp = ci;
- _Z.axpy(ci, cur_qinext,tmp, di);
+ _intRing.axpy(ci, cur_qinext,tmp, di);
++this->C.mul_counter;
di = tmp;
tmp = cur_rinext;
- _Z.axpy(cur_rinext, -cur_qinext, tmp, cur_ri);
+ _intRing.axpy(cur_rinext, -cur_qinext, tmp, cur_ri);
cur_ri = tmp;
if (cur_rinext==0 ) {
@@ -175,15 +176,15 @@ namespace LinBox
}
++this->C.mul_counter;
- _Z.quo(cur_qinext, cur_rinext, cur_ri);
+ _intRing.quo(cur_qinext, cur_rinext, cur_ri);
++this->C.div_counter;
- _Z.axpy(cur_ainext, ai, cur_qinext, bi);
+ _intRing.axpy(cur_ainext, ai, cur_qinext, bi);
++this->C.mul_counter;
}
}
- _Z.mul(n,x, ai);
- _Z.maxpyin(n,m,ci);
+ _intRing.mul(n,x, ai);
+ _intRing.maxpyin(n,m,ci);
//n = x_in*ai-m*ci;
d = ai;
return true;
@@ -206,15 +207,15 @@ namespace LinBox
//before last matrix we know next call to prevEEA is Id
}
Element qi;
- _Z.quo(qi, ai, bi);
+ _intRing.quo(qi, ai, bi);
++this->C.div_counter;
- _Z.axpy(bprev, -qi, bi,ai);
- _Z.axpy(dprev, -qi, di,ci);
+ _intRing.axpy(bprev, -qi, bi,ai);
+ _intRing.axpy(dprev, -qi, di,ci);
++this->C.mul_counter;++this->C.mul_counter;
Element tmp;
tmp = cur_ri;
- _Z.axpy(cur_ri, tmp, qi, cur_rinext);
+ _intRing.axpy(cur_ri, tmp, qi, cur_rinext);
//cur_ri = cur_ri *qi + cur_rinext;
cur_rinext = tmp;
cur_ainext = ai;
@@ -234,12 +235,12 @@ namespace LinBox
Element ainext,cinext;
Element qinext;
- _Z.quo(qinext,ri,rinext);
+ _intRing.quo(qinext,ri,rinext);
++this->C.div_counter;
while (1) {
++K;
//ainext = ai*qinext + bi;
- _Z.axpy(ainext, ai,qinext,bi);
+ _intRing.axpy(ainext, ai,qinext,bi);
++this->C.mul_counter;
if (bound < ainext) {
cur_ri = ri;
@@ -252,13 +253,13 @@ namespace LinBox
bi = ai;
ai = ainext;
Element temp = ci;
- _Z.axpy(ci, temp,qinext,di);
+ _intRing.axpy(ci, temp,qinext,di);
++this->C.mul_counter;
di = temp;
temp = ri;
ri=rinext;
- _Z.axpy(rinext, -qinext,ri,temp);//rinext = ri-qinext*rinext
+ _intRing.axpy(rinext, -qinext,ri,temp);//rinext = ri-qinext*rinext
++this->C.mul_counter;
if (rinext==0) {
//ainext = infinity
@@ -268,7 +269,7 @@ namespace LinBox
cur_qinext = cur_ainext;//infinity
return true;
}
- _Z.quo(qinext,ri,rinext);
+ _intRing.quo(qinext,ri,rinext);
++this->C.div_counter;
}
}
@@ -322,7 +323,7 @@ namespace LinBox
if ((n << 1) > m) {
cur_ri = n;
cur_rinext = m-n;
- _Z.quo(cur_qinext, cur_ri, cur_rinext);
+ _intRing.quo(cur_qinext, cur_ri, cur_rinext);
++this->C.div_counter;
cur_ainext = cur_qinext + 1;
ai=1; bi=1; ci=1; di=0;
@@ -330,7 +331,7 @@ namespace LinBox
else {
cur_ri = m;
cur_rinext = n;
- _Z.quo(cur_ainext,m,n);
+ _intRing.quo(cur_ainext,m,n);
++this->C.div_counter;
cur_qinext = cur_ainext;
}
@@ -366,10 +367,10 @@ namespace LinBox
ai = aistar; bi =bistar; ci = cistar; di= distar;
}
- _Z.mul(cur_ri,m,di);
- _Z.maxpyin(cur_ri,n,bi);
- _Z.mul(cur_rinext,n,ai);
- _Z.maxpyin(cur_rinext,m,ci);
+ _intRing.mul(cur_ri,m,di);
+ _intRing.maxpyin(cur_ri,n,bi);
+ _intRing.mul(cur_rinext,n,ai);
+ _intRing.maxpyin(cur_rinext,m,ci);
this->C.mul_counter+=4;
if (cur_ri < 0) {
@@ -377,9 +378,9 @@ namespace LinBox
cur_rinext = -cur_rinext;
}
if (cur_rinext>0) {
- _Z.quo(cur_qinext,cur_ri,cur_rinext);
+ _intRing.quo(cur_qinext,cur_ri,cur_rinext);
++this->C.div_counter;
- _Z.axpy(cur_ainext, ai,cur_qinext,bi);
+ _intRing.axpy(cur_ainext, ai,cur_qinext,bi);
++this->C.mul_counter;
}
else {
@@ -408,7 +409,7 @@ namespace LinBox
log_m = rinext.bitsize()-1;
Element m2, n2;
m2 = rinext;
- _Z.axpy(n2, -cur_qinext, rinext, ri);
+ _intRing.axpy(n2, -cur_qinext, rinext, ri);
++this->C.mul_counter;
/* compute Q(i+1) */
@@ -416,14 +417,15 @@ namespace LinBox
a1 = cur_ainext;
b1 = tmp;
tmp = c1;
- _Z.axpy (tmp, cur_qinext, c1, d1);
+ _intRing.axpy (tmp, cur_qinext, c1, d1);
++this->C.mul_counter;
d1 = c1;
c1 = tmp;
- int k = a1.bitsize()-1 ;
+ int k = (int)a1.bitsize()-1 ;
int _k;
- if (h-k > 2) _k = h-k-2;
+ if (h-k > 2)
+ _k = (int)(h-k-2);
else _k = 0;
if (n2 >0) {
if (a1 < powh) {
@@ -433,9 +435,9 @@ namespace LinBox
ai = a1; bi = b1; ci=c1; di = d1;
cur_ri = m2;
cur_rinext = n2;
- _Z.quo(cur_qinext,m2,n2);
+ _intRing.quo(cur_qinext,m2,n2);
++this->C.div_counter;
- _Z.axpy(cur_ainext,a1,cur_qinext,b1);
+ _intRing.axpy(cur_ainext,a1,cur_qinext,b1);
++this->C.mul_counter;
return true;
}
@@ -458,24 +460,24 @@ namespace LinBox
return true;
}
- _Z.mul(ai,b1,c2);
- _Z.axpyin(ai,a1,a2);
+ _intRing.mul(ai,b1,c2);
+ _intRing.axpyin(ai,a1,a2);
//aistar = a1*a2 + b1*c2;
- _Z.mul(bi,b1,d2);
- _Z.axpyin(bi, a1,b2);
+ _intRing.mul(bi,b1,d2);
+ _intRing.axpyin(bi, a1,b2);
//bistar = a1*b2 + b1*d2;
- _Z.mul(ci,d1,c2);
- _Z.axpyin(ci, c1,a2);
+ _intRing.mul(ci,d1,c2);
+ _intRing.axpyin(ci, c1,a2);
//cistar = c1*a2 + d1*c2;
- _Z.mul(di,d1,d2);
- _Z.axpyin(di, c1,b2);
+ _intRing.mul(di,d1,d2);
+ _intRing.axpyin(di, c1,b2);
//distar = c1*b2 + d1*d2;
this->C.mul_counter+=8;
- _Z.mul(cur_ri,m,di);
- _Z.maxpyin(cur_ri,n,bi);
- _Z.mul(cur_rinext,n,ai);
- _Z.maxpyin(cur_rinext,m,ci);
+ _intRing.mul(cur_ri,m,di);
+ _intRing.maxpyin(cur_ri,n,bi);
+ _intRing.mul(cur_rinext,n,ai);
+ _intRing.maxpyin(cur_rinext,m,ci);
this->C.mul_counter+=4;
//ri = m*di - n*bi;
//rinext = -m*ci + n*ai;
@@ -484,9 +486,9 @@ namespace LinBox
cur_rinext = -cur_rinext;
}
if (cur_rinext>0) {
- _Z.quo(cur_qinext,cur_ri,cur_rinext);
+ _intRing.quo(cur_qinext,cur_ri,cur_rinext);
++this->C.div_counter;
- _Z.axpy(cur_ainext, ai,cur_qinext,bi);
+ _intRing.axpy(cur_ainext, ai,cur_qinext,bi);
++this->C.mul_counter;
}
else {
@@ -561,7 +563,7 @@ namespace LinBox
ai = ainext;
Element temp = ci;
//ci = ci*qinext + di;
- _Z.axpy(ci, ci,qinext,di);
+ _intRing.axpy(ci, ci,qinext,di);
++this->C.mul_counter;
di = temp;
@@ -569,7 +571,7 @@ namespace LinBox
ri=rinext;
//rinext=qinext*ri+temp;
//rinext = temp - qinext*ri;
- _Z.axpy(rinext, -qinext,ri,temp);
+ _intRing.axpy(rinext, -qinext,ri,temp);
++this->C.mul_counter;
if (rinext==0) {
cur_ri = ri;
@@ -578,9 +580,9 @@ namespace LinBox
cur_qinext = m+1;
return true;
}
- _Z.quo(qinext,ri,rinext);
+ _intRing.quo(qinext,ri,rinext);
++this->C.div_counter;
- _Z.axpy(ainext, ai,qinext,bi);
+ _intRing.axpy(ainext, ai,qinext,bi);
++this->C.mul_counter;
}
}
@@ -595,20 +597,20 @@ namespace LinBox
template <class Ring>
class QMatrix {
public:
- Ring _Z;
+ Ring _intRing;
typedef typename Ring::Element Element;
Element a,b,c,d;
Element q;
QMatrix(const Ring Z) :
- _Z(Z)
+ _intRing(Z)
{
a=1;b=0;c=0;d=1;q=0;
}
QMatrix(const QMatrix& Q) :
- _Z(Q._Z)
+ _intRing(Q._intRing)
{
a = Q.a;
b = Q.b;
@@ -618,7 +620,7 @@ namespace LinBox
}
QMatrix(Ring Z,const Element& ai, const Element& bi, const Element& ci, const Element& di, const Element& qi=0) :
- _Z(Z)
+ _intRing(Z)
{
a = ai;
b = bi;
@@ -642,17 +644,17 @@ namespace LinBox
void leftmultiply(const Element& ai,const Element& bi,const Element& ci,const Element& di) {
Element tmpa,tmpb,tmpc,tmpd;
- _Z.mul(tmpa,ai,a);
- _Z.axpyin(tmpa,bi,c);
+ _intRing.mul(tmpa,ai,a);
+ _intRing.axpyin(tmpa,bi,c);
- _Z.mul(tmpb,ai,b);
- _Z.axpyin(tmpb,bi,d);
+ _intRing.mul(tmpb,ai,b);
+ _intRing.axpyin(tmpb,bi,d);
- _Z.mul(tmpc,ci,a);
- _Z.axpyin(tmpc,di,c);
+ _intRing.mul(tmpc,ci,a);
+ _intRing.axpyin(tmpc,di,c);
- _Z.mul(tmpd,ci,b);
- _Z.axpyin(tmpd,di,d);
+ _intRing.mul(tmpd,ci,b);
+ _intRing.axpyin(tmpd,di,d);
a = tmpa; b = tmpb; c = tmpc; d = tmpd;
}
@@ -691,7 +693,7 @@ namespace LinBox
bool pushpop(QMatrix_& top, const QMatrix_& bottom) {
if (_size+1 < _maxSize) {
- push_back(bottom);
+ this->push_back(bottom);
return false;
++_size;
}
@@ -699,7 +701,7 @@ namespace LinBox
if (!this->empty()) {
top = this->front();
this->pop_front();
- push_back(bottom);
+ this->push_back(bottom);
}
else {
@@ -726,11 +728,11 @@ namespace LinBox
template <class Ring>
class FastMaxQRationalReconstruction: public FastRationalReconstruction<Ring> {
public:
- const Ring _Z;
+ const Ring _intRing;
typedef typename Ring::Element Element;
FastMaxQRationalReconstruction(const Ring& Z) :
- FastRationalReconstruction<Ring>(Z), _Z(Z)
+ FastRationalReconstruction<Ring>(Z), _intRing(Z)
{}
bool reconstructRational(Element& a, Element& b, const Element& x, const Element& m) const
@@ -767,14 +769,15 @@ namespace LinBox
cur_ri = m;
cur_rinext = x;
- _Z.quo(cur_ainext, cur_ri, cur_rinext);
+ _intRing.quo(cur_ainext, cur_ri, cur_rinext);
cur_qinext = cur_ainext;// ri/ri_next
Element powh;
myQueue<Ring > queueMax(0);
- QMatrix<Ring > maxQ(_Z);
+ QMatrix<Ring > maxQ(_intRing);
- if (!fastQMaxEEA (ai,bi,ci,di,m,log_m,x,powtwo(powh,log_m+1), log_m+1,queueMax,maxQ)) {
+ if (!fastQMaxEEA (ai,bi,ci,di,m,log_m,x,
+ this->powtwo(powh,log_m+1), log_m+1,queueMax,maxQ)) {
return false;
}
@@ -786,8 +789,8 @@ namespace LinBox
std::cout << "Queue is not empty\n - sth wrong" << std::flush;
}
#endif
- _Z.mul(n,x, maxQ.a);
- _Z.maxpyin(n,m,maxQ.c);
+ _intRing.mul(n,x, maxQ.a);
+ _intRing.maxpyin(n,m,maxQ.c);
//n = x_in*ai-m*ci;
d = maxQ.a;
@@ -806,14 +809,14 @@ namespace LinBox
if (rinext==0) return true;
Element ainext,cinext;
Element qinext;
- _Z.quo(qinext,ri,rinext);
+ _intRing.quo(qinext,ri,rinext);
++this->C.div_counter;
ainext =qinext;
while (ainext <= powh) {
- QMatrix<Ring> newQ(_Z,ai,bi,ci,di,qinext);
- QMatrix<Ring> top(_Z);
+ QMatrix<Ring> newQ(_intRing,ai,bi,ci,di,qinext);
+ QMatrix<Ring> top(_intRing);
if (queueMax.pushpop(top, newQ)) {
if (maxQ.q < top.q) {
maxQ = top;
@@ -826,13 +829,13 @@ namespace LinBox
bi = ai;
ai = ainext;
Element temp = ci;
- _Z.axpy(ci, temp,qinext,di);
+ _intRing.axpy(ci, temp,qinext,di);
++this->C.mul_counter;
di = temp;
temp = ri;
ri=rinext;
- _Z.axpy(rinext, -qinext,ri,temp);//rinext = ri-qinext*rinext
+ _intRing.axpy(rinext, -qinext,ri,temp);//rinext = ri-qinext*rinext
++this->C.mul_counter;
if (rinext==0) {
@@ -844,9 +847,9 @@ namespace LinBox
return true;
}
- _Z.quo(qinext,ri,rinext);
+ _intRing.quo(qinext,ri,rinext);
++this->C.div_counter;
- _Z.axpy(ainext, ai,qinext,bi);
+ _intRing.axpy(ainext, ai,qinext,bi);
++this->C.mul_counter;
}
@@ -874,8 +877,8 @@ namespace LinBox
cur_ainext = m+1;//infinity
cur_qinext = m+1;
ai=1; bi=1; ci=1; di=0;
- QMatrix<Ring> newQ(_Z,1,0,0,1,1);
- QMatrix<Ring> top(_Z);
+ QMatrix<Ring> newQ(_intRing,1,0,0,1,1);
+ QMatrix<Ring> top(_intRing);
if (queueMax.pushpop(top, newQ)) {
if (maxQ.q < top.q) {
maxQ = top;
@@ -903,8 +906,8 @@ namespace LinBox
cur_rinext = 0;
cur_ainext = m+1;
cur_qinext = m+1;
- QMatrix<Ring> newQ(_Z,1,0,0,1,m);
- QMatrix<Ring> top(_Z);
+ QMatrix<Ring> newQ(_intRing,1,0,0,1,m);
+ QMatrix<Ring> top(_intRing);
if (queueMax.pushpop(top, newQ)) {
if (maxQ.q < top.q) {
maxQ = top;
@@ -922,12 +925,12 @@ namespace LinBox
if ((n << 1) > m) {
cur_ri = n;
cur_rinext = m-n;
- _Z.quo(cur_qinext, cur_ri, cur_rinext);
+ _intRing.quo(cur_qinext, cur_ri, cur_rinext);
++this->C.div_counter;
cur_ainext = cur_qinext + 1;
ai=1; bi=1; ci=1; di=0;
- QMatrix<Ring> newQ(_Z,1,0,0,1,1);
- QMatrix<Ring> top(_Z);
+ QMatrix<Ring> newQ(_intRing,1,0,0,1,1);
+ QMatrix<Ring> top(_intRing);
if (queueMax.pushpop(top, newQ)) {
if (maxQ.q < top.q) {
maxQ = top;
@@ -939,7 +942,7 @@ namespace LinBox
//we do not have to treat identity;
cur_ri = m;
cur_rinext = n;
- _Z.quo(cur_ainext,m,n);
+ _intRing.quo(cur_ainext,m,n);
++this->C.div_counter;
cur_qinext = cur_ainext;
}
@@ -981,10 +984,10 @@ namespace LinBox
}
queueMax._maxSize -=2;
- _Z.mul(cur_ri,m,di);
- _Z.maxpyin(cur_ri,n,bi);
- _Z.mul(cur_rinext,n,ai);
- _Z.maxpyin(cur_rinext,m,ci);
+ _intRing.mul(cur_ri,m,di);
+ _intRing.maxpyin(cur_ri,n,bi);
+ _intRing.mul(cur_rinext,n,ai);
+ _intRing.maxpyin(cur_rinext,m,ci);
this->C.mul_counter+=4;
if (cur_ri < 0) {
@@ -992,9 +995,9 @@ namespace LinBox
cur_rinext = -cur_rinext;
}
if (cur_rinext>0) {
- _Z.quo(cur_qinext,cur_ri,cur_rinext);
+ _intRing.quo(cur_qinext,cur_ri,cur_rinext);
++this->C.div_counter;
- _Z.axpy(cur_ainext, ai,cur_qinext,bi);
+ _intRing.axpy(cur_ainext, ai,cur_qinext,bi);
++this->C.mul_counter;
}
else {//should never happen
@@ -1010,7 +1013,7 @@ namespace LinBox
Element sqrth;
size_t logsqrth;
logsqrth = h >> (int) 1;
- powtwo(sqrth, logsqrth);
+ this->powtwo(sqrth, logsqrth);
if (!fastQMaxEEA(a1,b1,c1,d1,m,d,n,sqrth, logsqrth, queueMax, maxQ)) return false;
if (maxQ.q.bitsize() > T.bitsize() + c) return true;
@@ -1023,11 +1026,11 @@ namespace LinBox
size_t log_m;
myQueue<Ring> queueTmp (queueMax._maxSize);
- QMatrix<Ring> maxQTmp(_Z);
+ QMatrix<Ring> maxQTmp(_intRing);
if ((rinext > 0) && (cur_ainext <= powh)){
- QMatrix<Ring> newQ(_Z,ai,bi,ci,di,cur_qinext);
- QMatrix<Ring> top(_Z);
+ QMatrix<Ring> newQ(_intRing,ai,bi,ci,di,cur_qinext);
+ QMatrix<Ring> top(_intRing);
if (queueMax.pushpop(top, newQ)) {
if (maxQ.q < top.q) {
maxQ = top;
@@ -1038,34 +1041,37 @@ namespace LinBox
log_m = rinext.bitsize()-1;
Element m2, n2;
m2 = rinext;
- _Z.axpy(n2, -cur_qinext, rinext, ri);
+ _intRing.axpy(n2, -cur_qinext, rinext, ri);
++this->C.mul_counter;
/* compute Q(i+1) */
Element tmp = a1;
a1 = cur_ainext;
b1 = tmp;
tmp = c1;
- _Z.axpy (tmp, cur_qinext, c1, d1);
+ _intRing.axpy (tmp, cur_qinext, c1, d1);
++this->C.mul_counter;
d1 = c1;
c1 = tmp;
size_t k = a1.bitsize()-1 ;
int _k;
- if (h-k>2) _k = h-k-2;
+ if (h-k>2)
+ _k = (int)(h-k-2);
else _k = 0;
if (n2 >0) {
if (a1 < powh) {
- if (!fastQMaxEEA(a2,b2,c2,d2,m2,log_m,n2, powtwo(sqrth,_k), _k, queueTmp,maxQTmp)) return false;
+ if (!fastQMaxEEA(a2,b2,c2,d2,m2,log_m,n2,
+ this->powtwo(sqrth,_k), _k, queueTmp,maxQTmp))
+ return false;
}
else {
ai = a1; bi = b1; ci=c1; di = d1;
cur_ri = m2;
cur_rinext = n2;
- _Z.quo(cur_qinext,m2,n2);
+ _intRing.quo(cur_qinext,m2,n2);
++this->C.div_counter;
- _Z.axpy(cur_ainext,a1,cur_qinext,b1);
+ _intRing.axpy(cur_ainext,a1,cur_qinext,b1);
++this->C.mul_counter;
return true;
}
@@ -1089,24 +1095,24 @@ namespace LinBox
return true;
}
- _Z.mul(ai,b1,c2);
- _Z.axpyin(ai,a1,a2);
+ _intRing.mul(ai,b1,c2);
+ _intRing.axpyin(ai,a1,a2);
//aistar = a1*a2 + b1*c2;
- _Z.mul(bi,b1,d2);
- _Z.axpyin(bi, a1,b2);
+ _intRing.mul(bi,b1,d2);
+ _intRing.axpyin(bi, a1,b2);
//bistar = a1*b2 + b1*d2;
- _Z.mul(ci,d1,c2);
- _Z.axpyin(ci, c1,a2);
+ _intRing.mul(ci,d1,c2);
+ _intRing.axpyin(ci, c1,a2);
//cistar = c1*a2 + d1*c2;
- _Z.mul(di,d1,d2);
- _Z.axpyin(di, c1,b2);
+ _intRing.mul(di,d1,d2);
+ _intRing.axpyin(di, c1,b2);
//distar = c1*b2 + d1*d2;
this->C.mul_counter+=8;
- _Z.mul(cur_ri,m,di);
- _Z.maxpyin(cur_ri,n,bi);
- _Z.mul(cur_rinext,n,ai);
- _Z.maxpyin(cur_rinext,m,ci);
+ _intRing.mul(cur_ri,m,di);
+ _intRing.maxpyin(cur_ri,n,bi);
+ _intRing.mul(cur_rinext,n,ai);
+ _intRing.maxpyin(cur_rinext,m,ci);
this->C.mul_counter+=4;
if (cur_ri < 0) {
@@ -1115,9 +1121,9 @@ namespace LinBox
}
if (cur_rinext>0) {
- _Z.quo(cur_qinext,cur_ri,cur_rinext);
+ _intRing.quo(cur_qinext,cur_ri,cur_rinext);
++this->C.div_counter;
- _Z.axpy(cur_ainext, ai,cur_qinext,bi);
+ _intRing.axpy(cur_ainext, ai,cur_qinext,bi);
++this->C.mul_counter;
}
else {
@@ -1126,7 +1132,7 @@ namespace LinBox
}
//multiply queueTmp by a1b1c1d1
- QMatrix<Ring > Q_i(_Z,a1,b1,c1,d1);
+ QMatrix<Ring > Q_i(_intRing,a1,b1,c1,d1);
//update maximum
if (maxQ.q < maxQTmp.q) {
maxQTmp.leftmultiply(Q_i);
@@ -1134,7 +1140,7 @@ namespace LinBox
if (maxQ.q.bitsize() > T.bitsize() + c) return true;
}
int K=0;
- QMatrix<Ring > Q(_Z);
+ QMatrix<Ring > Q(_intRing);
while (!queueTmp.empty()) {
if (ai > powh) {
++K;
@@ -1145,7 +1151,7 @@ namespace LinBox
cur_ainext = ai;
cur_qinext = Q.q;
Element tmp = cur_ri;
- _Z.axpy(cur_ri,tmp,Q.q,rinext);
+ _intRing.axpy(cur_ri,tmp,Q.q,rinext);
cur_rinext = cur_ri;
ai = Q.a;
bi = Q.b;
@@ -1161,7 +1167,7 @@ namespace LinBox
if (maxQ.q < Q.q) {
Q.leftmultiply(Q_i);
}
- QMatrix<Ring > top(_Z);
+ QMatrix<Ring > top(_intRing);
if (queueMax.pushpop(top, Q)) {
if (maxQ.q < top.q) {
maxQ = top;
@@ -1223,8 +1229,8 @@ namespace LinBox
}
else {
- QMatrix<Ring > Q(_Z,ai,bi,ci,di,qinext);
- QMatrix<Ring > top(_Z);
+ QMatrix<Ring > Q(_intRing,ai,bi,ci,di,qinext);
+ QMatrix<Ring > top(_intRing);
if (queueMax.pushpop(top, Q)) {
if (maxQ.q < top.q) {
maxQ = top;
@@ -1236,7 +1242,7 @@ namespace LinBox
ai = ainext;
Element temp = ci;
//ci = ci*qinext + di;
- _Z.axpy(ci, ci,qinext,di);
+ _intRing.axpy(ci, ci,qinext,di);
++this->C.mul_counter;
di = temp;
//qi = qinext;
@@ -1245,7 +1251,7 @@ namespace LinBox
ri=rinext;
//rinext=qinext*ri+temp;
//rinext = temp - qinext*ri;
- _Z.axpy(rinext, -qinext,ri,temp);
+ _intRing.axpy(rinext, -qinext,ri,temp);
++this->C.mul_counter;
if (rinext==0) {
@@ -1255,10 +1261,10 @@ namespace LinBox
cur_qinext = m+1;
return true;
}
- _Z.quo(qinext,ri,rinext);
+ _intRing.quo(qinext,ri,rinext);
++this->C.div_counter;
- _Z.axpy(ainext, ai,qinext,bi);
+ _intRing.axpy(ainext, ai,qinext,bi);
++this->C.mul_counter;
}
}
@@ -1270,3 +1276,12 @@ namespace LinBox
}
#endif //__LINBOX_fast_reconstruction_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/gauss-det.inl b/linbox/algorithms/gauss-det.inl
deleted file mode 100644
index 7a2084d..0000000
--- a/linbox/algorithms/gauss-det.inl
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/algorithms/gauss-det.inl
- * Copyright (C) 2009 The LinBox group
- *
-// Time-stamp: <15 Jun 10 17:20:08 Jean-Guillaume.Dumas at imag.fr>
- *
- * See COPYING for license information.
- *
- * SparseElimination determinant calls
- */
-#ifndef __LINBOX_gauss_det_INL
-#define __LINBOX_gauss_det_INL
-
-namespace LinBox
-{
- template <class _Field>
- template <class Matrix> inline typename GaussDomain<_Field>::Element&
- GaussDomain<_Field>::detin(Element &determinant,
- Matrix &A,
- unsigned long Ni,
- unsigned long Nj,
- SparseEliminationTraits::PivotStrategy reord) const
- {
- unsigned long rank;
- if (reord == SparseEliminationTraits::PIVOT_NONE)
- NoReordering(rank, determinant, A, Ni, Nj);
- else
- InPlaceLinearPivoting(rank, determinant, A, Ni, Nj);
- return determinant;
- }
-
-
- template <class _Field>
- template <class Matrix> inline typename GaussDomain<_Field>::Element&
- GaussDomain<_Field>::detin(Element &determinant,
- Matrix &A,
- SparseEliminationTraits::PivotStrategy reord) const
- {
- return detin(determinant, A, A.rowdim (), A.coldim (), reord);
- }
-
-
-
- template <class _Field>
- template <class Matrix> inline typename GaussDomain<_Field>::Element&
- GaussDomain<_Field>::det(Element &determinant,
- const Matrix &A,
- SparseEliminationTraits::PivotStrategy reord) const
- {
- return det(determinant, A, A.rowdim (), A.coldim (), reord);
- }
-
- template <class _Field>
- template <class Matrix> inline typename GaussDomain<_Field>::Element&
- GaussDomain<_Field>::det(Element &determinant,
- const Matrix &A,
- unsigned long Ni,
- unsigned long Nj,
- SparseEliminationTraits::PivotStrategy reord) const
- {
- Matrix CopyA(Ni);
- for(unsigned long i = 0; i < Ni; ++i)
- CopyA[i] = A[i];
- return detin(determinant, CopyA, Ni, Nj, reord);
- }
-} // namespace LinBox
-
-#endif // __LINBOX_gauss_det_INL
diff --git a/linbox/algorithms/gauss-elim-gf2.inl b/linbox/algorithms/gauss-elim-gf2.inl
deleted file mode 100644
index 8b421f1..0000000
--- a/linbox/algorithms/gauss-elim-gf2.inl
+++ /dev/null
@@ -1,308 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/algorithms/gauss-elim-gf2.inl
- * Copyright (C) 2009 The LinBox group
- *
- * Time-stamp: <21 Jan 10 15:08:59 Jean-Guillaume.Dumas at imag.fr>
- *
- * See COPYING for license information.
- *
- * SparseElimination elimination routines over GF2
- */
-#ifndef __LINBOX_gauss_elim_gf2_INL
-#define __LINBOX_gauss_elim_gf2_INL
-
-namespace LinBox
-{
- template <class Vector> inline void
- GaussDomain<GF2>::permuteBinary (Vector &lignecourante,
- const unsigned long &indcol,
- const long &indpermut) const
- {
- const unsigned long k = indcol - 1;
-
-#if 0
- std::cerr << "B PERMUTE: " << indpermut << " <--> " << k << " of [";
- for(typename Vector::const_iterator refs = lignecourante.begin();
- refs != lignecourante.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "]" << std::endl;
-#endif
-
- // precondition indpermut != k
- if (lignecourante.size () ) {
- typename Vector::iterator kin_it=lignecourante.begin();
- for (; kin_it != lignecourante.end(); ++kin_it)
- if (*kin_it >= k) break;
- if (kin_it != lignecourante.end()) {
- typename Vector::iterator pin_it=kin_it;
- for (; pin_it != lignecourante.end(); ++pin_it)
- if (static_cast<long>(*pin_it) >= indpermut) break;
- if ( *kin_it == k) {
- if (pin_it != lignecourante.end()) {
- if ( static_cast<long>(*pin_it) != indpermut) {
- --pin_it;
- // Only k there
- *kin_it = indpermut;
- typename Vector::value_type etmp = *kin_it;
- typename Vector::iterator current = kin_it;
- typename Vector::iterator next = kin_it; ++next;
- for( ; current != pin_it; ++current, ++next)
- *current = *next;
- *pin_it = etmp;
- }
- }
- else {
- --pin_it;
- // Only k there
- *kin_it = indpermut;
- typename Vector::value_type etmp = *kin_it;
- typename Vector::iterator current = kin_it;
- typename Vector::iterator next = kin_it; ++next;
- for( ; current != pin_it; ++current, ++next)
- *current = *next;
- *pin_it = etmp;
- }
- }
- else {
- if (pin_it != lignecourante.end()) {
- if ( static_cast<long>(*pin_it) == indpermut) {
- // Only indpermut there
- *pin_it = k;
- typename Vector::value_type etmp = *pin_it;
- typename Vector::iterator current = pin_it;
- typename Vector::iterator prev = pin_it; --prev;
- for( ; current != kin_it; --current, --prev)
- *current = *prev;
- *kin_it = etmp;
- } // else Nobody
- } // else Nobody
- }
- } // else rien de supérieur à k dans l
- // donc rien à permuter
- }
-
-#if 0
- std::cerr << "E PERMUTE: " << indpermut << " <--> " << k << " of [";
- for(typename Vector::const_iterator refs = lignecourante.begin();
- refs != lignecourante.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "]" << std::endl;
-#endif
- }
-
-
- template <class Vector, class D> inline void
- GaussDomain<GF2>::eliminateBinary (bool &headpivot,
- Vector &lignecourante,
- const Vector &lignepivot,
- const unsigned long indcol,
- const long indpermut,
- const unsigned long npiv,
- D &columns) const
- {
-
- typedef typename Vector::value_type E;
-
- unsigned long k = indcol - 1;
- unsigned long nj = lignecourante.size () ;
-#if 0
- std::cerr << "BEGIN ELIMINATE, k: " << k << ", nj: " << nj << ", indpermut: " << indpermut << ", indcol: " << indcol << std::endl;
- std::cerr << "lignepivot: [";
- for(typename Vector::const_iterator refs = lignepivot.begin();
- refs != lignepivot.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "], lignecour: [";
- for(typename Vector::const_iterator refs = lignecourante.begin();
- refs != lignecourante.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << ']' << std::endl;
-#endif
- if (nj > 0) {
- unsigned long j_head = 0;
-
- for (; j_head < nj; ++j_head) {
- if (static_cast<long>(lignecourante[j_head]) >= indpermut) break;
-#if 0
- std::cerr << "ELIMINATE, j_head: " << j_head << std::endl;
-#endif
- }
-
- if (j_head < nj) {
- if (static_cast<long>(lignecourante[j_head]) == indpermut) {
- // -------------------------------------------
- // Permutation
- if ( indpermut != static_cast<long>(k)) {
- if (lignecourante[0] != k) {
- // zero <--> non zero
- E tmp = lignecourante[j_head];
- --columns[tmp];
- ++columns[k];
- tmp = k;
-
- for (long l = j_head; l > 0; l--)
- lignecourante[l] = lignecourante[l-1];
-
- lignecourante[0] = tmp;
- }
- j_head = 0;
- }
- // -------------------------------------------
- // Elimination
- Vector construit (nj + npiv);
-
- // construit : <-- j
- // courante : <-- m
- // pivot : <-- l
- unsigned long j = 0;
- unsigned long m = j_head + 1;
-
- // A[i,k] <-- - A[i,k] / A[k,k]
- headpivot = true;
- --columns[lignecourante[j_head] ];
-
- // if A[k,j]=0, then A[i,j] <-- A[i,j]
- while (j < j_head) {
- construit[j] = lignecourante[j];
- ++j;
- }
-
- unsigned long j_piv;
-
- unsigned long l = 0;
-
- for (; l < npiv; ++l)
- if (lignepivot[l] > k) break;
-
- // for all j such that (j>k) and A[k,j]!=0
- while (l < npiv) {
- j_piv = lignepivot[l];
-
- // if A[k,j]=0, then A[i,j] <-- A[i,j]
- while ((m < nj) && (lignecourante[m] < j_piv))
- construit[j++] = lignecourante[m++];
-
- // if A[i,j]!=0, then A[i,j] <-- A[i,j] - A[i,k]*A[k,j]
- if ((m < nj) && (lignecourante[m] == j_piv)) {
- --columns[lignecourante[m++]];
- }
- else {
- ++columns[j_piv];
- construit[j++] = E (j_piv);
- }
-
- ++l;
- }
-
- // if A[k,j]=0, then A[i,j] <-- A[i,j]
- while (m<nj)
- construit[j++] = lignecourante[m++];
-
- construit.resize (j);
- lignecourante = construit;
- }
- else {
- // -------------------------------------------
- // j_head < nj but nothing under the pivot
- // Permutation
-#if 0
- std::cerr << "----------------------------------------------------------" << std::endl;
- std::cerr << "j_head < nj" << std::endl;
- std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
- // << "lignepivot: " << lignepivot
- // << ", lignecour: " << lignecourante
- << std::endl;
- std::cerr << "----------------------------------------------------------" << std::endl;
-#endif
- if (indpermut != static_cast<long>(k)) {
- if (j_head>0) {
- unsigned long l = 0;
-
- for (; l < nj; ++l)
- if (lignecourante[l] >= k) break;
-
- if ((l < nj) && (lignecourante[l] == k)) {
- // non zero <--> zero
- E tmp = lignecourante[l];
- --columns[k];
- ++columns[indpermut];
- tmp = indpermut;
-
- unsigned long bjh = j_head-1;
- for (; l < bjh; ++l)
- lignecourante[l] = lignecourante[l + 1];
-
- lignecourante[bjh] = tmp;
- } // else // zero <--> zero
- } // else // zero <--> zero
- }
- }
- }
- else {
- // -------------------------------------------
- // j_head >= nj > 0
-#if 0
- std::cerr << "----------------------------------------------------------" << std::endl;
- std::cerr << "j_head >= nj > 0" << std::endl;
- std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
- // << "lignepivot: " << lignepivot
- // << ", lignecour: " << lignecourante
- << std::endl;
- std::cerr << "----------------------------------------------------------" << std::endl;
-#endif
- if (indpermut != static_cast<long>(k)) {
- unsigned long l = 0;
-
- for (; l < nj; ++l)
- if (lignecourante[l] >= k) break;
-
- if ((l < nj) && (lignecourante[l] == k)) {
- // non zero <--> zero
- E tmp = lignecourante[l];
- --columns[k];
- ++columns[indpermut];
- tmp = indpermut;
-
- unsigned long bjh = nj - 1;
- for (; l < bjh; ++l)
- lignecourante[l] = lignecourante[l + 1];
-
- lignecourante[bjh] = tmp;
- } // else
- // zero <--> zero
- }
-
- }
- }
-
-
-#if 0
- std::cerr << "END ELIMINATE, k: " << k << ", nj: " << nj << ", indpermut: " << indpermut << ", indcol: " << indcol << std::endl;
- std::cerr << "lignepivot: [";
- for(typename Vector::const_iterator refs = lignepivot.begin();
- refs != lignepivot.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "], lignecour: [";
- for(typename Vector::const_iterator refs = lignecourante.begin();
- refs != lignecourante.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << ']' << std::endl;
-#endif
-
- }
-
-
-
-
-
-
-} // namespace LinBox
-
-#endif // __LINBOX_gauss_elim_gf2_INL
-
diff --git a/linbox/algorithms/gauss-elim.inl b/linbox/algorithms/gauss-elim.inl
deleted file mode 100644
index e088f90..0000000
--- a/linbox/algorithms/gauss-elim.inl
+++ /dev/null
@@ -1,820 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/algorithms/gauss-elim.inl
- * Copyright (C) 2009 The LinBox group
- *
- * Time-stamp: <21 Jan 10 15:06:11 Jean-Guillaume.Dumas at imag.fr>
- *
- * See COPYING for license information.
- *
- * SparseElimination elimination routines
- */
-#ifndef __LINBOX_gauss_elim_INL
-#define __LINBOX_gauss_elim_INL
-
-namespace LinBox
-{
- template <class _Field>
- template <class Vector> inline void
- GaussDomain<_Field>::permute (Vector &lignecourante,
- const unsigned long &indcol,
- const long &indpermut) const
- {
- const unsigned long k = indcol - 1;
-
-#if 0
- std::cerr << "B PERMUTE: " << indpermut << " <--> " << k << " of [";
- for(typename Vector::const_iterator refs = lignecourante.begin();
- refs != lignecourante.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "]" << std::endl;
-#endif
-
- // precondition indpermut != k
- if (lignecourante.size () ) {
- typename Vector::iterator kin_it=lignecourante.begin();
- for (; kin_it != lignecourante.end(); ++kin_it)
- if (kin_it->first >= k) break;
- if (kin_it != lignecourante.end()) {
- typename Vector::iterator pin_it=kin_it;
- for (; pin_it != lignecourante.end(); ++pin_it)
- if (static_cast<long>(pin_it->first) >= indpermut) break;
- if ( kin_it->first == k) {
- if (pin_it != lignecourante.end()) {
- if ( static_cast<long>(pin_it->first) == indpermut) {
- // Both there
- std::swap( kin_it->second, pin_it->second);
- }
- else {
- // Only k there
- kin_it->first = indpermut;
- typename Vector::value_type etmp = *kin_it;
- --pin_it;
- typename Vector::iterator current = kin_it;
- typename Vector::iterator next = kin_it; ++next;
- for( ; current != pin_it; ++current, ++next)
- *current = *next;
- *pin_it = etmp;
- }
- }
- else {
- --pin_it;
- // Only k there
- kin_it->first = indpermut;
- typename Vector::value_type etmp = *kin_it;
- typename Vector::iterator current = kin_it;
- typename Vector::iterator next = kin_it; ++next;
- for( ; current != pin_it; ++current, ++next)
- *current = *next;
- *pin_it = etmp;
- }
- }
- else {
- if (pin_it != lignecourante.end()) {
- if ( static_cast<long>(pin_it->first) == indpermut) {
- // Only indpermut there
- pin_it->first = k;
- typename Vector::value_type etmp = *pin_it;
- typename Vector::iterator current = pin_it;
- typename Vector::iterator prev = pin_it; --prev;
- for( ; current != kin_it; --current, --prev)
- *current = *prev;
- *kin_it = etmp;
- } // else Nobody
- } // else Nobody
- }
- } // else rien de supérieur à k dans l
- // donc rien à permuter
- }
-
-#if 0
- std::cerr << "E PERMUTE: " << indpermut << " <--> " << k << " of [";
- for(typename Vector::const_iterator refs = lignecourante.begin();
- refs != lignecourante.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "]" << std::endl;
-#endif
- }
-
-
-
-
- template <class _Field>
- template <class Vector, class D> inline void
- GaussDomain<_Field>::eliminate (Vector &lignecourante,
- const Vector &lignepivot,
- const unsigned long &indcol,
- const long &indpermut,
- D &columns) const
- {
-
- typedef typename Vector::value_type E;
-
- unsigned long k = indcol - 1;
- unsigned long nj = lignecourante.size () ;
-#if 0
- std::cerr << "BEGIN ELIMINATE, k: " << k << ", nj: " << nj << ", indpermut: " << indpermut << ", indcol: " << indcol << std::endl;
- std::cerr << "lignepivot: [";
- for(typename Vector::const_iterator refs = lignepivot.begin();
- refs != lignepivot.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "], lignecour: [";
- for(typename Vector::const_iterator refs = lignecourante.begin();
- refs != lignecourante.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << ']' << std::endl;
-#endif
- if (nj > 0) {
- unsigned long j_head = 0;
-
- for (; j_head < nj; ++j_head) {
- if (static_cast<long>(lignecourante[j_head].first) >= indpermut) break;
-#if 0
- std::cerr << "ELIMINATE, j_head: " << j_head << std::endl;
-#endif
- }
-
- if (j_head < nj) {
- if (static_cast<long>(lignecourante[j_head].first) == indpermut) {
- // -------------------------------------------
- // Permutation
- if ( indpermut != static_cast<long>(k)) {
- if (lignecourante[0].first == k) {
- // non zero <--> non zero
- std::swap( lignecourante[0].second, lignecourante[j_head].second);
- }
- else {
- // zero <--> non zero
- E tmp = lignecourante[j_head];
- --columns[tmp.first];
- ++columns[k];
- tmp.first = k;
-
- for (long l = j_head; l > 0; l--)
- lignecourante[l] = lignecourante[l-1];
-
- lignecourante[0] = tmp;
- }
- j_head = 0;
- }
- // -------------------------------------------
- // Elimination
- unsigned long npiv = lignepivot.size ();
- Vector construit (nj + npiv);
-
- // construit : <-- j
- // courante : <-- m
- // pivot : <-- l
- unsigned long j = 0;
- unsigned long m = j_head + 1;
-
- // A[i,k] <-- - A[i,k] / A[k,k]
- Element headcoeff;
- _F.divin (_F.neg (headcoeff, lignecourante[j_head].second),
- lignepivot[0].second);
-
- --columns[lignecourante[j_head].first];
-
- // if A[k,j]=0, then A[i,j] <-- A[i,j]
- while (j < j_head) {
- construit[j] = lignecourante[j];
- j++;
- }
-
- unsigned long j_piv;
-
- unsigned long l = 0;
-
- for (; l < npiv; l++)
- if (lignepivot[l].first > k) break;
-
- // for all j such that (j>k) and A[k,j]!=0
- while (l < npiv) {
- j_piv = lignepivot[l].first;
-
- // if A[k,j]=0, then A[i,j] <-- A[i,j]
- while ((m < nj) && (lignecourante[m].first < j_piv))
- construit[j++] = lignecourante[m++];
-
- // if A[i,j]!=0, then A[i,j] <-- A[i,j] - A[i,k]*A[k,j]
- if ((m < nj) && (lignecourante[m].first == j_piv)) {
- Element tmp;
-
- _F.axpy (tmp, headcoeff, lignepivot[l].second,
- lignecourante[m].second);
-
- if (! _F.isZero (tmp)) {
- _F.assign (lignecourante[m].second, tmp);
- construit[j++] = lignecourante[m++];
- }
- else
- --columns[lignecourante[m++].first];
- }
- else {
- Element tmp;
-
- _F.mul (tmp, headcoeff, lignepivot[l].second);
-
- // if (! _F.isZero (tmp)) {
- ++columns[j_piv];
- construit[j++] = E (j_piv, tmp);
- // }
- // else
- // std::cerr << "NEVER HAPPENED" << std::endl;
-
- }
-
- l++;
- }
-
- // if A[k,j]=0, then A[i,j] <-- A[i,j]
- while (m<nj)
- construit[j++] = lignecourante[m++];
-
- construit.resize (j);
- lignecourante = construit;
- }
- else {
- // -------------------------------------------
- // j_head < nj but nothing under the pivot
- // Permutation
-#if 0
- std::cerr << "----------------------------------------------------------" << std::endl;
- std::cerr << "j_head < nj" << std::endl;
- std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
- // << "lignepivot: " << lignepivot
- // << ", lignecour: " << lignecourante
- << std::endl;
- std::cerr << "----------------------------------------------------------" << std::endl;
-#endif
- if (indpermut != static_cast<long>(k)) {
- if (j_head>0) {
- unsigned long l = 0;
-
- for (; l < nj; ++l)
- if (lignecourante[l].first >= k) break;
-
- if ((l < nj) && (lignecourante[l].first == k)) {
- // non zero <--> zero
- E tmp = lignecourante[l];
- --columns[k];
- ++columns[indpermut];
- tmp.first = indpermut;
-
- unsigned long bjh = j_head-1;
- for (; l < bjh; ++l)
- lignecourante[l] = lignecourante[l + 1];
-
- lignecourante[bjh] = tmp;
- } // else // zero <--> zero
- } // else // zero <--> zero
- }
- }
- }
- else {
- // -------------------------------------------
- // j_head >= nj > 0
-#if 0
- std::cerr << "----------------------------------------------------------" << std::endl;
- std::cerr << "j_head >= nj > 0" << std::endl;
- std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
- // << "lignepivot: " << lignepivot
- // << ", lignecour: " << lignecourante
- << std::endl;
- std::cerr << "----------------------------------------------------------" << std::endl;
-#endif
- if (indpermut != static_cast<long>(k)) {
- unsigned long l = 0;
-
- for (; l < nj; ++l)
- if (lignecourante[l].first >= k) break;
-
- if ((l < nj) && (lignecourante[l].first == k)) {
- // non zero <--> zero
- E tmp = lignecourante[l];
- --columns[k];
- ++columns[indpermut];
- tmp.first = indpermut;
-
- unsigned long bjh = nj - 1;
- for (; l < bjh; ++l)
- lignecourante[l] = lignecourante[l + 1];
-
- lignecourante[bjh] = tmp;
- } // else
- // zero <--> zero
- }
-
- }
- }
-
-
-#if 0
- std::cerr << "END ELIMINATE, k: " << k << ", nj: " << nj << ", indpermut: " << indpermut << ", indcol: " << indcol << std::endl;
- std::cerr << "lignepivot: [";
- for(typename Vector::const_iterator refs = lignepivot.begin();
- refs != lignepivot.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "], lignecour: [";
- for(typename Vector::const_iterator refs = lignecourante.begin();
- refs != lignecourante.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << ']' << std::endl;
-#endif
- }
-
-
- template <class _Field>
- template <class Vector, class D> inline void
- GaussDomain<_Field>::eliminate (Element &headpivot,
- Vector &lignecourante,
- const Vector &lignepivot,
- const unsigned long indcol,
- const long indpermut,
- const unsigned long npiv,
- D &columns) const
- {
-
- typedef typename Vector::value_type E;
-
- unsigned long k = indcol - 1;
- unsigned long nj = lignecourante.size () ;
-#if 0
- std::cerr << "BEGIN ELIMINATE, k: " << k << ", nj: " << nj << ", indpermut: " << indpermut << ", indcol: " << indcol << std::endl;
- std::cerr << "lignepivot: [";
- for(typename Vector::const_iterator refs = lignepivot.begin();
- refs != lignepivot.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "], lignecour: [";
- for(typename Vector::const_iterator refs = lignecourante.begin();
- refs != lignecourante.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << ']' << std::endl;
-#endif
- if (nj > 0) {
- unsigned long j_head = 0;
-
- for (; j_head < nj; ++j_head) {
- if (static_cast<long>(lignecourante[j_head].first) >= indpermut) break;
-#if 0
- std::cerr << "ELIMINATE, j_head: " << j_head << std::endl;
-#endif
- }
-
- if (j_head < nj) {
- if (static_cast<long>(lignecourante[j_head].first) == indpermut) {
- // -------------------------------------------
- // Permutation
- if ( indpermut != static_cast<long>(k)) {
- if (lignecourante[0].first == k) {
- // non zero <--> non zero
- std::swap( lignecourante[0].second, lignecourante[j_head].second);
- }
- else {
- // zero <--> non zero
- E tmp = lignecourante[j_head];
- --columns[tmp.first];
- ++columns[k];
- tmp.first = k;
-
- for (long l = j_head; l > 0; l--)
- lignecourante[l] = lignecourante[l-1];
-
- lignecourante[0] = tmp;
- }
- j_head = 0;
- }
- // -------------------------------------------
- // Elimination
- Vector construit (nj + npiv);
-
- // construit : <-- j
- // courante : <-- m
- // pivot : <-- l
- unsigned long j = 0;
- unsigned long m = j_head + 1;
-
- // A[i,k] <-- - A[i,k] / A[k,k]
- Element headcoeff;
- _F.div( headpivot, lignecourante[j_head].second,
- lignepivot[0].second);
- _F.neg(headcoeff, headpivot);
- // _F.divin (_F.neg (headcoeff, lignecourante[j_head].second),
- // lignepivot[0].second);
-
- --columns[lignecourante[j_head].first];
-
- // if A[k,j]=0, then A[i,j] <-- A[i,j]
- while (j < j_head) {
- construit[j] = lignecourante[j];
- j++;
- }
-
- unsigned long j_piv;
-
- unsigned long l = 0;
-
- for (; l < npiv; l++)
- if (lignepivot[l].first > k) break;
-
- // for all j such that (j>k) and A[k,j]!=0
- while (l < npiv) {
- j_piv = lignepivot[l].first;
-
- // if A[k,j]=0, then A[i,j] <-- A[i,j]
- while ((m < nj) && (lignecourante[m].first < j_piv))
- construit[j++] = lignecourante[m++];
-
- // if A[i,j]!=0, then A[i,j] <-- A[i,j] - A[i,k]*A[k,j]
- if ((m < nj) && (lignecourante[m].first == j_piv)) {
- Element tmp;
-
- _F.axpy (tmp, headcoeff, lignepivot[l].second,
- lignecourante[m].second);
-
- if (! _F.isZero (tmp)) {
- _F.assign (lignecourante[m].second, tmp);
- construit[j++] = lignecourante[m++];
- }
- else
- --columns[lignecourante[m++].first];
- }
- else {
- Element tmp;
-
- _F.mul (tmp, headcoeff, lignepivot[l].second);
-
- // if (! _F.isZero (tmp)) {
- ++columns[j_piv];
- construit[j++] = E (j_piv, tmp);
- // }
- // else
- // std::cerr << "NEVER HAPPENED" << std::endl;
-
- }
-
- l++;
- }
-
- // if A[k,j]=0, then A[i,j] <-- A[i,j]
- while (m<nj)
- construit[j++] = lignecourante[m++];
-
- construit.resize (j);
- lignecourante = construit;
- }
- else {
- // -------------------------------------------
- // j_head < nj but nothing under the pivot
- // Permutation
-#if 0
- std::cerr << "----------------------------------------------------------" << std::endl;
- std::cerr << "j_head < nj" << std::endl;
- std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
- // << "lignepivot: " << lignepivot
- // << ", lignecour: " << lignecourante
- << std::endl;
- std::cerr << "----------------------------------------------------------" << std::endl;
-#endif
- if (indpermut != static_cast<long>(k)) {
- if (j_head>0) {
- unsigned long l = 0;
-
- for (; l < nj; ++l)
- if (lignecourante[l].first >= k) break;
-
- if ((l < nj) && (lignecourante[l].first == k)) {
- // non zero <--> zero
- E tmp = lignecourante[l];
- --columns[k];
- ++columns[indpermut];
- tmp.first = indpermut;
-
- unsigned long bjh = j_head-1;
- for (; l < bjh; ++l)
- lignecourante[l] = lignecourante[l + 1];
-
- lignecourante[bjh] = tmp;
- } // else // zero <--> zero
- } // else // zero <--> zero
- }
- }
- }
- else {
- // -------------------------------------------
- // j_head >= nj > 0
-#if 0
- std::cerr << "----------------------------------------------------------" << std::endl;
- std::cerr << "j_head >= nj > 0" << std::endl;
- std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
- // << "lignepivot: " << lignepivot
- // << ", lignecour: " << lignecourante
- << std::endl;
- std::cerr << "----------------------------------------------------------" << std::endl;
-#endif
- if (indpermut != static_cast<long>(k)) {
- unsigned long l = 0;
-
- for (; l < nj; ++l)
- if (lignecourante[l].first >= k) break;
-
- if ((l < nj) && (lignecourante[l].first == k)) {
- // non zero <--> zero
- E tmp = lignecourante[l];
- --columns[k];
- ++columns[indpermut];
- tmp.first = indpermut;
-
- unsigned long bjh = nj - 1;
- for (; l < bjh; ++l)
- lignecourante[l] = lignecourante[l + 1];
-
- lignecourante[bjh] = tmp;
- } // else
- // zero <--> zero
- }
-
- }
- }
-
-#if 0
- std::cerr << "END ELIMINATE, k: " << k << ", nj: " << nj << ", indpermut: " << indpermut << ", indcol: " << indcol << std::endl;
- std::cerr << "lignepivot: [";
- for(typename Vector::const_iterator refs = lignepivot.begin();
- refs != lignepivot.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "], lignecour: [";
- for(typename Vector::const_iterator refs = lignecourante.begin();
- refs != lignecourante.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << ']' << std::endl;
-#endif
- }
-
-
-
- template <class _Field>
- template <class Vector> inline void
- GaussDomain<_Field>::eliminate (Vector &lignecourante,
- const Vector &lignepivot,
- const unsigned long &indcol,
- const long &indpermut) const
- {
- typedef typename Vector::value_type E;
-
- unsigned long k = indcol - 1;
- unsigned long nj = lignecourante.size () ;
-
- if (nj > 0) {
- unsigned long j_head = 0;
-
- for (; j_head < nj; ++j_head)
- if (static_cast<long>(lignecourante[j_head].first) >= indpermut) break;
-
- if (j_head < nj) {
- if (static_cast<long>(lignecourante[j_head].first) == indpermut) {
- // -------------------------------------------
- // Permutation
- if (indpermut != static_cast<long>(k)) {
- if (lignecourante[0].first == k) {
- // non zero <--> non zero
- std::swap( lignecourante[0].second, lignecourante[j_head].second);
- }
- else {
- // zero <--> non zero
- E tmp = lignecourante[j_head];
- tmp.first = k;
- for (long l = j_head; l > 0; l--)
- lignecourante[l] = lignecourante[l-1];
- lignecourante[0] = tmp;
- }
-
- j_head = 0;
- }
- // -------------------------------------------
- // Elimination
- unsigned long npiv = lignepivot.size ();
- Vector construit (nj + npiv);
- // construit : <-- j
- // courante : <-- m
- // pivot : <-- l
- unsigned long j = 0;
- unsigned long m = j_head + 1;
-
- // A[i,k] <-- - A[i,k] / A[k,k]
-
- Element headcoeff;
- _F.divin (_F.neg (headcoeff, lignecourante[j_head].second),
- lignepivot[0].second);
-
- // if A[k,j]=0, then A[i,j] <-- A[i,j]
- while (j < j_head) {
- construit[j] = lignecourante[j];
- j++;
- }
-
- unsigned long j_piv;
- unsigned long l = 0;
-
- for (; l < npiv; l++)
- if (lignepivot[l].first > k) break;
-
- // for all j such that (j>k) and A[k,j]!=0
- while (l < npiv) {
- j_piv = lignepivot[l].first;
-
- // if A[k,j]=0, then A[i,j] <-- A[i,j]
- while ((m < nj) && (lignecourante[m].first < j_piv))
- construit[j++] = lignecourante[m++];
-
- // if A[i,j]!=0, then A[i,j] <-- A[i,j] - A[i,k]*A[k,j]
- if ((m < nj) && (lignecourante[m].first == j_piv)) {
- Element tmp;
- _F.axpy (tmp, headcoeff, lignepivot[l].second,
- lignecourante[m].second);
-
- if (! _F.isZero (tmp)) {
- _F.assign (lignecourante[m].second, tmp);
- construit[j++] = lignecourante[m++];
- }
- else
- ++m;
-
- }
- else {
- Element tmp;
- _F.mul (tmp, headcoeff, lignepivot[l].second);
- // if (! _F.isZero (tmp))
- construit[j++] = E (j_piv, tmp);
- // else
- // std::cerr << "NEVER HAPPENED" << std::endl;
- }
- l++;
- }
-
- // if A[k,j]=0, then A[i,j] <-- A[i,j]
- while (m < nj)
- construit[j++] = lignecourante[m++];
-
- construit.resize (j);
- lignecourante = construit;
- }
- else {
- // -------------------------------------------
- // j_head < nj but nothing under the pivot
- // Permutation
- if (indpermut != static_cast<long>(k)) {
- if (j_head > 0) {
- unsigned long l = 0;
-
- for (; l < nj; ++l)
- if (lignecourante[l].first >= k) break;
-
- if ((l < nj) && (lignecourante[l].first == k)) {
- // non zero <--> zero
- E tmp = lignecourante[l];
- tmp.first = indpermut;
-
- unsigned long bjh = j_head -1;
- for (; l < bjh; l++)
- lignecourante[l] = lignecourante[l + 1];
-
- lignecourante[bjh] = tmp;
- } // else // zero <--> zero
- } // else // zero <--> zero
- }
- }
- }
- else {
- // -------------------------------------------
- // -------------------------------------------
- // j_head >= nj > 0
-#if 0
- std::cerr << "----------------------------------------------------------" << std::endl;
- std::cerr << "j_head >= nj > 0" << std::endl;
- std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
- // << "lignepivot: " << lignepivot
- // << ", lignecour: " << lignecourante
- << std::endl;
- std::cerr << "----------------------------------------------------------" << std::endl;
-#endif
- if (indpermut != static_cast<long>(k)) {
- unsigned long l = 0;
-
- for (; l < nj; ++l)
- if (lignecourante[l].first >= k) break;
-
- if ((l < nj) && (lignecourante[l].first == k)) {
- // non zero <--> zero
- E tmp = lignecourante[l];
- tmp.first = indpermut;
-
- unsigned long bjh = nj - 1;
- for (; l < bjh; l++)
- lignecourante[l] = lignecourante[l + 1];
-
- lignecourante[bjh] = tmp;
- } // else
- // zero <--> zero
- }
- }
- }
- }
-
-
-} // namespace LinBox
-
-#endif // __LINBOX_gauss_elim_INL
-
-#if 0
-template <class _Field>
-template <class Vector>
-void GaussDomain<_Field>::permute (Vector &lignecourante,
- const unsigned long &indcol,
- const long &indpermut)
-{
- const unsigned long k = indcol - 1;
-#if 0
- std::cerr << "B PERMUTE: " << indpermut << " <--> " << k << " of [";
- for(typename Vector::const_iterator refs = lignecourante.begin();
- refs != lignecourante.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "]" << std::endl;
-#endif
-
- // precondition indpermut != k
- unsigned long nj = lignecourante.size () ;
- if (nj > 0) {
- Element tmp; _F.init(tmp);
- unsigned long kin = 0;
- for (; kin < nj; ++kin)
- if (static_cast<long>(lignecourante[kin].first) >= k) break;
- if (kin < nj) {
- unsigned long pin = kin;
- for (; pin < nj; ++pin)
- if (static_cast<long>(lignecourante[pin].first) >= indpermut) break;
- if ( static_cast<long>(lignecourante[kin].first) == k) {
- if (pin < nj) {
- if ( static_cast<long>(lignecourante[pin].first) == indpermut) {
- // Both there
- std::swap( lignecourante[kin].second, lignecourante[pin].second);
- }
- else {
- // Only k there
- lignecourante[kin].first = indpermut;
- typename Vector::value_type etmp = lignecourante[kin];
- --pin;
- for(size_t i=kin; i<pin; ++i)
- lignecourante[i] = lignecourante[i+1];
- lignecourante[pin] = etmp;
- }
- }
- else {
- pin = nj-1;
- // Only k there
- lignecourante[kin].first = indpermut;
- typename Vector::value_type etmp = lignecourante[kin];
- for(size_t i=kin; i<pin; ++i)
- lignecourante[i] = lignecourante[i+1];
- lignecourante[pin] = etmp;
-
- }
- }
- else {
- if (pin < nj) {
- if ( static_cast<long>(lignecourante[pin].first) == indpermut) {
- // Only indpermut there
- lignecourante[pin].first = k;
- typename Vector::value_type etmp = lignecourante[pin];
- for(size_t i = pin; i>kin; --i)
- lignecourante[i] = lignecourante[i-1];
- lignecourante[kin] = etmp;
- } // else Nobody
- } // else Nobody
- }
- } // else rien de supérieur à k dans l
- // donc rien à permuter
- }
-#if 0
- std::cerr << "E PERMUTE: " << indpermut << " <--> " << k << " of [";
- for(typename Vector::const_iterator refs = lignecourante.begin();
- refs != lignecourante.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "]" << std::endl;
-#endif
-}
-#endif
-
-
diff --git a/linbox/algorithms/gauss-gf2.h b/linbox/algorithms/gauss-gf2.h
index 903099f..594b500 100644
--- a/linbox/algorithms/gauss-gf2.h
+++ b/linbox/algorithms/gauss-gf2.h
@@ -1,17 +1,32 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/gauss-gf2.h
* Copyright (C) 2009 The LinBox group
* Written by JG Dumas
*
- * Time-stamp: <14 Jun 10 15:36:56 Jean-Guillaume.Dumas at imag.fr>
+ * Time-stamp: <23 Mar 12 17:28:19 Jean-Guillaume.Dumas at imag.fr>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*
* SparseSeqMatrix is container< container< size_t > >
* as e.g. linbox/blackbox/zo-gf2.h
*/
-// ========================================================================= //
#ifndef __LINBOX_gauss_gf2_H
#define __LINBOX_gauss_gf2_H
@@ -65,14 +80,14 @@ namespace LinBox
//@{
///
///
- template <class SparseSeqMatrix> unsigned long& rankin(unsigned long &rank,
+ template <class SparseSeqMatrix> unsigned long& rankin(unsigned long &Rank,
SparseSeqMatrix &A,
unsigned long Ni,
unsigned long Nj,
SparseEliminationTraits::PivotStrategy reord = SparseEliminationTraits::PIVOT_LINEAR) const ;
///
- template <class SparseSeqMatrix> unsigned long& rankin(unsigned long &rank,
+ template <class SparseSeqMatrix> unsigned long& rankin(unsigned long &Rank,
SparseSeqMatrix &A,
SparseEliminationTraits::PivotStrategy reord = SparseEliminationTraits::PIVOT_LINEAR) const;
@@ -139,7 +154,7 @@ namespace LinBox
* In Ganzha et~al. CASC'2002, pages 47--62.
*/
template <class SparseSeqMatrix, class Perm>
- unsigned long& QLUPin(unsigned long &rank,
+ unsigned long& QLUPin(unsigned long &Rank,
Element& determinant,
Perm &Q,
SparseSeqMatrix &L,
@@ -149,31 +164,32 @@ namespace LinBox
unsigned long Nj) const;
template <class SparseSeqMatrix, class Perm, class Vector1, class Vector2>
- Vector1& solve(Vector1& x, unsigned long rank, const Perm& Q, const SparseSeqMatrix& L, const SparseSeqMatrix& U, const Perm& P, const Vector2& b, bool randomsol=false) const;
-
-
- template <class SparseSeqMatrix, class Perm, class Vector1, class Vector2>
- Vector1& solve(Vector1& x, Vector1& w, unsigned long rank, const Perm& Q, const SparseSeqMatrix& L, const SparseSeqMatrix& U, const Perm& P, const Vector2& b) const;
+ Vector1& solve(Vector1& x, Vector1& w, unsigned long Rank, const Perm& Q, const SparseSeqMatrix& L, const SparseSeqMatrix& U, const Perm& P, const Vector2& b) const;
template <class SparseSeqMatrix, class Vector1, class Vector2>
Vector1& solvein(Vector1& x,
SparseSeqMatrix &A,
- const Vector2& b, bool randomsol=false) const;
+ const Vector2& b) const;
+
+ template <class SparseSeqMatrix, class Vector1, class Vector2, class Random>
+ Vector1& solvein(Vector1& x,
+ SparseSeqMatrix &A,
+ const Vector2& b, Random& generator) const;
template <class SparseSeqMatrix, class Perm>
- unsigned long& InPlaceLinearPivoting(unsigned long &rank,
+ unsigned long& InPlaceLinearPivoting(unsigned long &Rank,
Element& determinant,
SparseSeqMatrix &A,
Perm &P,
unsigned long Ni,
unsigned long Nj) const;
template <class SparseSeqMatrix>
- unsigned long& NoReordering (unsigned long & rank, Element& , SparseSeqMatrix &, unsigned long , unsigned long ) const
+ unsigned long& NoReordering (unsigned long & Rank, Element& , SparseSeqMatrix &, unsigned long , unsigned long ) const
{
std::cerr << "Sparse elimination over GF2 without reordering not implemented" << std::endl;
- return rank;
+ return Rank;
}
@@ -220,11 +236,20 @@ namespace LinBox
};
} // namespace LinBox
-#include "linbox/algorithms/gauss-gf2.inl"
-#include "linbox/algorithms/gauss-pivot-gf2.inl"
-#include "linbox/algorithms/gauss-elim-gf2.inl"
-#include "linbox/algorithms/gauss-rank-gf2.inl"
-#include "linbox/algorithms/gauss-solve-gf2.inl"
+#include "linbox/algorithms/gauss/gauss-gf2.inl"
+#include "linbox/algorithms/gauss/gauss-pivot-gf2.inl"
+#include "linbox/algorithms/gauss/gauss-elim-gf2.inl"
+#include "linbox/algorithms/gauss/gauss-rank-gf2.inl"
+#include "linbox/algorithms/gauss/gauss-solve-gf2.inl"
#endif // __LINBOX_gauss_gf2_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/gauss-gf2.inl b/linbox/algorithms/gauss-gf2.inl
deleted file mode 100644
index 6090ffa..0000000
--- a/linbox/algorithms/gauss-gf2.inl
+++ /dev/null
@@ -1,387 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/algorithms/gauss-gf2.inl
- * Copyright (C) 2009 The LinBox group
- *
- * Time-stamp: <15 Jun 10 16:20:16 Jean-Guillaume.Dumas at imag.fr>
- *
- * See COPYING for license information.
- */
-#ifndef __LINBOX_gauss_gf2_INL
-#define __LINBOX_gauss_gf2_INL
-// SparseSeqMatrix is container< container< size_t > >
-
-#include "linbox/algorithms/gauss.h"
-#include "linbox/util/commentator.h"
-#include <utility>
-
-#ifdef __LINBOX_ALL__ //BB: ???
-#ifndef __LINBOX_COUNT__
-#define __LINBOX_COUNT__
-#endif
-#ifndef __LINBOX_OFTEN__
-#define __LINBOX_OFTEN__ __LINBOX_ALL__
-#endif
-#ifndef __LINBOX_FILLIN__
-#define __LINBOX_FILLIN__
-#endif
-#endif
-
-namespace LinBox
-{
- // Specialization over GF2
- template <class SparseSeqMatrix, class Perm>
- inline unsigned long&
- GaussDomain<GF2>::InPlaceLinearPivoting (unsigned long &rank,
- bool &determinant,
- SparseSeqMatrix &LigneA,
- Perm &P,
- unsigned long Ni,
- unsigned long Nj) const
- {
- // Requirements : LigneA is an array of sparse rows
- // In place (LigneA is modified)
- // With reordering (D is a density type. Density is allocated here)
- // long Ni = LigneA.n_row (), Nj = LigneA.n_col ();
- commentator.start ("Gaussian elimination with reordering over GF2",
- "IPLRGF2", Ni);
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
- << "Gaussian QLUP elimination on " << Ni << " x " << Nj << " matrix" << std::endl;
-
-#ifdef __LINBOX_COUNT__
- long long nbelem = 0;
-#endif
-
- determinant = true;
- // allocation of the column density
- std::vector<size_t> col_density (Nj);
-
-
- // assignment of LigneA with the domain object
- for (unsigned long jj = 0; jj < Ni; ++jj)
- for (unsigned long k = 0; k < LigneA[jj].size (); k++)
- ++col_density[LigneA[jj][k]];
-
- long last = Ni - 1;
- long c;
- rank = 0;
-
-#ifdef __LINBOX_OFTEN__
- long sstep = last/40;
- if (sstep > __LINBOX_OFTEN__) sstep = __LINBOX_OFTEN__;
-#else
- long sstep = 1000;
-#endif
- // Elimination steps with reordering
-
- typename SparseSeqMatrix::iterator LigneA_k = LigneA.begin();
- for (long k = 0; k < last; ++k, ++LigneA_k) {
- long p = k, s = 0;
-
-#ifdef __LINBOX_FILLIN__
- if ( ! (k % 100) )
-#else
- if ( ! (k % sstep) )
-#endif
- {
- commentator.progress (k);
-#ifdef __LINBOX_FILLIN__
- long sl(0);
- for (size_t l = 0; l < Ni; ++l)
- sl += LigneA[l].size ();
-
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Fillin (" << rank << "/" << Ni << ") = "
- << sl
- << " (" << double(sl)*100.0/double(Ni-k)/double(Nj-k) << "%, "
- << double(sl)/double(Ni-k) << " avg)"
- << std::endl;
-#endif
- }
-
- long l;
- for(l = k; l < static_cast<long>(Ni); ++l) {
- if ( (s = LigneA[l].size()) != 0 ) {
- p = l;
- break;
- }
- }
-
- if (s) {
- long sl;
- // Row permutation for the sparsest row
- for (; l < static_cast<long>(Ni); ++l)
- if (((sl = LigneA[l].size ()) < s) && (sl)) {
- s = sl;
- p = l;
- }
-
- if (p != k) {
- // std::cerr << "Permuting rows: " << k << " <--> " << p << std::endl;
- std::swap( *LigneA_k, LigneA[p]);
- }
-
-
- SparseFindPivotBinary (*LigneA_k, rank, c, col_density, determinant);
-
- if (c != -1) {
- long ll;
- if ( c != (static_cast<long>(rank)-1) ) {
- P.permute(rank-1,c);
- for (ll=0 ; ll < k ; ++ll)
- permuteBinary( LigneA[ll], rank, c);
- }
- long npiv=LigneA_k->size();
- for (ll = k+1; ll < static_cast<long>(Ni); ++ll) {
- bool elim=false;
- eliminateBinary (elim, LigneA[ll], *LigneA_k, rank, c, npiv, col_density);
- }
- }
-
- // LigneA.write(std::cerr << "AFT " )<<std::endl;
-#ifdef __LINBOX_COUNT__
- nbelem += LigneA_k->size ();
-#endif
- }
- // LigneA.write(rep << "U:= ", FORMAT_MAPLE) << std::endl;
- }//for k
-
- SparseFindPivotBinary ( LigneA[last], rank, c, determinant);
- if (c != -1) {
- if ( c != (static_cast<long>(rank)-1) ) {
- P.permute(rank-1,c);
- for (long ll=0 ; ll < last ; ++ll)
- permuteBinary( LigneA[ll], rank, c);
- }
- }
-
-#ifdef __LINBOX_COUNT__
- nbelem += LigneA[last].size ();
- commentator.report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
- << "Left elements : " << nbelem << std::endl;
-#endif
-
-#ifdef __LINBOX_FILLIN__
- long sl(0);
- for (size_t l=0; l < Ni; ++l)
- sl += LigneA[l].size ();
-
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Fillin (" << rank << "/" << Ni << ") = " << sl
- << std::endl;
-#endif
-
- if ((rank < Ni) || (rank < Nj) || (Ni == 0) || (Nj == 0))
- determinant = false;
-
- integer card;
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Determinant : " << determinant
- << " over GF (2)" << std::endl;
-
- // LigneA.write(rep << "U:= ", FORMAT_MAPLE) << ':' << std::endl;
-
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Rank : " << rank
- << " over GF (2)" << std::endl;
- commentator.stop ("done", 0, "IPLRGF2");
-
-
-
- return rank;
- }
-
- // Specialization over GF2
- template <class SparseSeqMatrix, class Perm> inline unsigned long&
- GaussDomain<GF2>::QLUPin (unsigned long &rank,
- bool &determinant,
- Perm &Q,
- SparseSeqMatrix &LigneL,
- SparseSeqMatrix &LigneA,
- Perm &P,
- unsigned long Ni,
- unsigned long Nj) const
- {
- linbox_check( Q.coldim() == Q.rowdim() );
- linbox_check( P.coldim() == P.rowdim() );
- linbox_check( Q.coldim() == LigneL.size() );
-
- typedef typename SparseSeqMatrix::value_type Vector;
- typedef typename Vector::value_type E;
-
- // Requirements : LigneA is an array of sparse rows
- // In place (LigneA is modified)
- // With reordering (D is a density type. Density is allocated here)
- // long Ni = LigneA.n_row (), Nj = LigneA.n_col ();
- commentator.start ("Gaussian elimination with reordering over GF2",
- "IPLRGF2", Ni);
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
- << "Gaussian QLUP elimination on " << Ni << " x " << Nj << " matrix" << std::endl;
-
-#ifdef __LINBOX_COUNT__
- long long nbelem = 0;
-#endif
-
- determinant = true;
- // allocation of the column density
- std::vector<size_t> col_density (Nj);
-
-
- for(typename SparseSeqMatrix::iterator LigneL_it = LigneL.begin() ;
- LigneL_it != LigneL.end(); ++LigneL_it)
- LigneL_it->reserve(16);
-
- std::deque<std::pair<size_t,size_t> > invQ;
-
- // assignment of LigneA with the domain object
- for (unsigned long jj = 0; jj < Ni; ++jj)
- for (unsigned long k = 0; k < LigneA[jj].size (); k++)
- ++col_density[LigneA[jj][k]];
-
- long last = Ni - 1;
- long c;
- rank = 0;
-
-#ifdef __LINBOX_OFTEN__
- long sstep = last/40;
- if (sstep > __LINBOX_OFTEN__) sstep = __LINBOX_OFTEN__;
-#else
- long sstep = 1000;
-#endif
- // Elimination steps with reordering
-
- typename SparseSeqMatrix::iterator LigneA_k = LigneA.begin();
- for (long k = 0; k < last; ++k, ++LigneA_k) {
- long p = k, s = 0;
-
-#ifdef __LINBOX_FILLIN__
- if ( ! (k % 100) )
-#else
- if ( ! (k % sstep) )
-#endif
- {
- commentator.progress (k);
-#ifdef __LINBOX_FILLIN__
- long sl(0);
- for (size_t l = 0; l < Ni; ++l)
- sl += LigneA[l].size ();
-
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Fillin (" << rank << "/" << Ni << ") = "
- << sl
- << " (" << double(sl)*100.0/double(Ni-k)/double(Nj-k) << "%, "
- << double(sl)/double(Ni-k) << " avg)"
- << std::endl;
-#endif
- }
-
- long l;
- for(l = k; l < static_cast<long>(Ni); ++l) {
- if ( (s = LigneA[l].size()) ) {
- p = l;
- break;
- }
- }
-
- if (s) {
- long sl;
- // Row permutation for the sparsest row
- for (; l < static_cast<long>(Ni); ++l)
- if (((sl = LigneA[l].size ()) < s) && (sl)) {
- s = sl;
- p = l;
- }
-
- if (p != k) {
- // std::cerr << "Permuting rows: " << k << " <--> " << p << std::endl;
- invQ.push_front( std::pair<size_t,size_t>(k,p) );
- std::swap( *LigneA_k, LigneA[p]);
- std::swap( LigneL[k], LigneL[p]);
- }
-
-
- SparseFindPivotBinary (*LigneA_k, rank, c, col_density, determinant);
-
- if (c != -1) {
- long ll;
- if ( c != (static_cast<long>(rank)-1) ) {
- P.permute(rank-1,c);
- for (ll=0 ; ll < k ; ++ll)
- permuteBinary( LigneA[ll], rank, c);
- }
- long npiv=LigneA_k->size();
- for (ll = k+1; ll < static_cast<long>(Ni); ++ll) {
- E hc; hc=rank-1; bool elim=false;
- eliminateBinary (elim, LigneA[ll], *LigneA_k, rank, c, npiv, col_density);
- if(elim) LigneL[ll].push_back(hc);
- }
- }
-
- // LigneA.write(std::cerr << "AFT " )<<std::endl;
-#ifdef __LINBOX_COUNT__
- nbelem += LigneA_k->size ();
-#endif
- }
- LigneL[k].push_back(k);
- // LigneL.write(rep << "L:= ", FORMAT_MAPLE) << std::endl;
- // LigneA.write(rep << "U:= ", FORMAT_MAPLE) << std::endl;
- }//for k
-
- SparseFindPivotBinary ( LigneA[last], rank, c, determinant);
- if (c != -1) {
- if ( c != (static_cast<long>(rank)-1) ) {
- P.permute(rank-1,c);
- for (long ll=0 ; ll < last ; ++ll)
- permuteBinary( LigneA[ll], rank, c);
- }
- }
-
- LigneL[last].push_back(last);
-
-#ifdef __LINBOX_COUNT__
- nbelem += LigneA[last].size ();
- commentator.report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
- << "Left elements : " << nbelem << std::endl;
-#endif
-
-#ifdef __LINBOX_FILLIN__
- long sl(0);
- for (size_t l=0; l < Ni; ++l)
- sl += LigneA[l].size ();
-
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Fillin (" << rank << "/" << Ni << ") = " << sl
- << std::endl;
-#endif
-
- if ((rank < Ni) || (rank < Nj) || (Ni == 0) || (Nj == 0))
- determinant = false;
-
- integer card;
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Determinant : " << determinant
- << " over GF (2)" << std::endl;
-
- for(std::deque<std::pair<size_t,size_t> >::const_iterator it = invQ.begin(); it!=invQ.end();++it)
- Q.permute( it->first, it->second );
-
-#if 0
- Q.write(rep << "Q:= ", FORMAT_MAPLE) << ':' << std::endl;
- LigneL.write(rep << "L:= ", FORMAT_MAPLE) << ':' << std::endl;
- LigneA.write(rep << "U:= ", FORMAT_MAPLE) << ':' << std::endl;
- P.write(rep << "P:= ", FORMAT_MAPLE) << ':' << std::endl;
-#endif
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Rank : " << rank
- << " over GF (2)" << std::endl;
- commentator.stop ("done", 0, "IPLRGF2");
-
-
-
- return rank;
- }
-
-
-} // namespace LinBox
-
-#endif // __LINBOX_gauss_gf2_INL
diff --git a/linbox/algorithms/gauss-nullspace.inl b/linbox/algorithms/gauss-nullspace.inl
deleted file mode 100644
index 5c70518..0000000
--- a/linbox/algorithms/gauss-nullspace.inl
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/algorithms/gauss-solve.inl
- * Copyright (C) LinBox 2008
- *
- * Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
- * Time-stamp: <21 Jun 10 14:43:11 Jean-Guillaume.Dumas at imag.fr>
- *
- * See COPYING for license information.
- */
-
-#ifndef __LINBOX_gauss_nullspace_INL
-#define __LINBOX_gauss_nullspace_INL
-
-#include "linbox/blackbox/sparse.h"
-#include "linbox/algorithms/gauss.h"
-#include "linbox/algorithms/triangular-solve.h"
-#include "linbox/blackbox/permutation.h"
-#include "linbox/vector/sparse.h"
-
-namespace LinBox
-{
-
-
-
- // U is supposed full rank upper triangular
- template <class _Field>
- template <class Matrix, class Perm, class Block> inline Block&
- GaussDomain<_Field>::nullspacebasis(Block& x, unsigned long rank, const Matrix& U, const Perm& P) const
- {
- if (rank == 0) {
- for(size_t i=0; i<U.coldim(); ++i)
- x.setEntry(i,i,_F.one);
- }
- else {
- unsigned long nullity = U.coldim()-rank;
- if (nullity != 0) {
- // compute U2T s.t. U = [ U1 | -U2T^T ]
- Matrix U2T(_F,nullity,rank);
-
- for(typename Matrix::ConstRawIndexedIterator uit=U.rawIndexedBegin();
- uit != U.rawIndexedEnd(); ++uit) {
- if (uit.colIndex() >= rank)
- U2T.setEntry(uit.colIndex()-rank,uit.rowIndex(),uit.value());
- }
- for(typename Matrix::RawIterator u2it=U2T.rawBegin();
- u2it != U2T.rawEnd(); ++u2it)
- _F.negin(*u2it);
-
-
- // Compute the basis vector by vector
- typedef Sparse_Vector< typename _Field::Element > SparseVect;
- for(size_t i=0; i<nullity; ++i) {
- SparseVect W1Ti;
- // Solve for upper part of basis
- upperTriangularSparseSolve(W1Ti, rank, U, U2T[i]);
- // Add identity for lower part
- W1Ti.push_back( typename SparseVect::Element(rank+i, _F.one ) );
-
- for(size_t j=0; j<W1Ti.size(); ++j) {
- // P.applyTranspose(x[i],W1T[i]);
- // Transposein(x)
- x.setEntry( P.getStorage()[ W1Ti[j].first ], i, W1Ti[j].second );
- }
- }
- }
- }
- // x.write( std::cerr << "X:=", FORMAT_MAPLE ) << ';' << std::endl;
- return x;
- }
-
- template <class Matrix>
- inline bool nextnonzero(size_t& k, size_t Ni, const Matrix& A)
- {
- for(++k; k<Ni; ++k)
- if (A[k].size() > 0) return true;
- return false;
- }
-
- // Matrix A is upper triangularized
- template <class _Field>
- template <class Matrix, class Block> inline Block&
- GaussDomain<_Field>::nullspacebasisin(Block& x, Matrix& A) const
- {
- typename Field::Element det;
- unsigned long rank;
- size_t Ni(A.rowdim()),Nj(A.coldim());
-
- Permutation<Field> P(Nj,_F);
-
- // A.write( std::cerr << "A:=", FORMAT_MAPLE ) << ';' << std::endl;
- this->InPlaceLinearPivoting(rank, det, A, P, Ni, Nj );
-
- // P.write( std::cerr << "P:=", FORMAT_MAPLE ) << ';' << std::endl;
- // A.write( std::cerr << "Ua:=", FORMAT_MAPLE ) << ';' << std::endl;
-
- for(size_t i=0; i< Ni; ++i) {
- if (A[i].size() == 0) {
- size_t j(i);
- if (nextnonzero(j,Ni,A)) {
- A[i] = A[j];
- A[j].resize(0);
- }
- else {
- break;
- }
- }
- }
-
- // A.write( std::cerr << "Ub:=", FORMAT_MAPLE ) << ';' << std::endl;
-
- return this->nullspacebasis(x, rank, A, P);
- }
-
- template <class _Field>
- template <class Matrix, class Block> inline Block&
- GaussDomain<_Field>::nullspacebasis(Block& x, const Matrix& A) const
- {
- SparseMatrix<Field, typename LinBox::Vector<Field>::SparseSeq> A1 (A);
- return this->nullspacebasisin(x, A1);
- }
-
-
-
-
-} // namespace LinBox
-
-#endif // __LINBOX_gauss_nullspace_INL
-
diff --git a/linbox/algorithms/gauss-pivot-gf2.inl b/linbox/algorithms/gauss-pivot-gf2.inl
deleted file mode 100644
index 22f392c..0000000
--- a/linbox/algorithms/gauss-pivot-gf2.inl
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/algorithms/gauss-pivot-gf2.inl
- * Copyright (C) 2009 The LinBox group
- *
- * Time-stamp: <21 Jan 10 15:08:59 Jean-Guillaume.Dumas at imag.fr>
- *
- * See COPYING for license information.
- *
- * SparseElimination search for pivots over GF2
- */
-#ifndef __LINBOX_gauss_pivot_gf2_INL
-#define __LINBOX_gauss_pivot_gf2_INL
-
-namespace LinBox
-{
- template <class Vector, class D> inline void
- GaussDomain<GF2>::SparseFindPivotBinary (Vector &lignepivot,
- unsigned long &indcol,
- long &indpermut,
- D &columns,
- bool &) const //determinant
- {
-
-#if 0
- std::cerr << "SFP BEG : lignepivot: [";
- for(typename Vector::const_iterator refs = lignepivot.begin();
- refs != lignepivot.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "]" << std::endl;
-#endif
- typedef typename Vector::value_type E;
-
- long nj = lignepivot.size ();
-
- if (nj > 0) {
- indpermut = lignepivot.front();
-
- long ds = --columns[indpermut], dl, p = 0;
-
- for (long j = 1; j < nj; ++j) {
- if ((dl = --columns[lignepivot[j]]) < ds) {
- ds = dl;
- p = j;
- }
- }
-
- if (p != 0) {
- if (indpermut == static_cast<long>(indcol)) {
- indpermut = lignepivot[p];
- }
- else {
- E ttm = lignepivot[p];
- indpermut = ttm;
-
- for (long m = p; m; --m)
- lignepivot[m] = lignepivot[m-1];
-
- lignepivot[0] = ttm;
- }
- }
-
- if (indpermut != static_cast<long>(indcol)) {
- // std::cerr << "Permuting col: " << indpermut << " <--> " << indcol << std::endl;
- // no need to decrement/increment, already done during the search
- lignepivot[0] = indcol;
- }
-
- ++indcol;
- }
- else
- indpermut = -1;
-#if 0
- std::cerr << "SFP END : lignepivot: [";
- for(typename Vector::const_iterator refs = lignepivot.begin();
- refs != lignepivot.end() ;
- ++refs )
- std::cerr << '(' << refs->first << ';' << refs->second << ')';
- std::cerr << "]" << std::endl;
-#endif
- }
-
- template <class Vector> inline void
- GaussDomain<GF2>::SparseFindPivotBinary (Vector &lignepivot,
- unsigned long &indcol,
- long &indpermut,
- bool& ) const // determinant
- {
- long nj = lignepivot.size ();
-
- if (nj > 0) {
- indpermut = lignepivot.front();
- if (indpermut != static_cast<long>(indcol)){
- lignepivot.front() = indcol;
- }
- ++indcol;
- }
- else
- indpermut = -1;
- }
-
-
-} // namespace LinBox
-
-#endif // __LINBOX_gauss_pivot_gf2_INL
-
diff --git a/linbox/algorithms/gauss-pivot.inl b/linbox/algorithms/gauss-pivot.inl
deleted file mode 100644
index ec24d95..0000000
--- a/linbox/algorithms/gauss-pivot.inl
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/algorithms/gauss-pivot.inl
- * Copyright (C) 2009,2010 The LinBox group
- * Written by JG Dumas <Jean-Guillaume.Dumas at imag.fr>
- *
- * See COPYING for license information.
- *
- * SparseElimination search for pivots
- */
-
-#ifndef __LINBOX_gauss_pivot_INL
-#define __LINBOX_gauss_pivot_INL
-
-namespace LinBox
-{
-
- template <class _Field>
- template <class Vector, class D> inline void
- GaussDomain<_Field>::SparseFindPivot (Vector &lignepivot,
- unsigned long &indcol,
- long &indpermut,
- D &columns,
- Element &determinant) const
- {
-
- // std::cerr << "SFP BEG : lignepivot: [";
- // for(typename Vector::const_iterator refs = lignepivot.begin();
- // refs != lignepivot.end() ;
- // ++refs )
- // std::cerr << '(' << refs->first << ';' << refs->second << ')';
- // std::cerr << "]" << std::endl;
- typedef typename Vector::value_type E;
-
- long nj = lignepivot.size ();
-
- bool pivoting = false;
-
- if (nj > 0) {
- indpermut = lignepivot[0].first;
-
- long ds = --columns[indpermut], dl, p = 0;
-
- for (long j = 1; j < nj; ++j) {
- if ((dl = --columns[lignepivot[j].first]) < ds) {
- ds = dl;
- p = j;
- }
- }
-
- if (p != 0) {
- pivoting = true;
- if (indpermut == static_cast<long>(indcol)) {
- indpermut = lignepivot[p].first;
- std::swap( lignepivot[p].second, lignepivot[0].second);
- }
- else {
- E ttm = lignepivot[p];
- indpermut = ttm.first;
-
- for (long m = p; m; --m)
- lignepivot[m] = lignepivot[m-1];
-
- lignepivot[0] = ttm;
- }
- }
-
- _F.mulin(determinant, lignepivot[0].second);
- if (indpermut != static_cast<long>(indcol)) {
- // std::cerr << "Permuting col: " << indpermut << " <--> " << indcol << std::endl;
- // no need to decrement/increment, already done during the search
- lignepivot[0].first = indcol;
- pivoting = true;
- }
-
- if (pivoting) _F.negin(determinant);
- ++indcol;
- }
- else
- indpermut = -1;
-
- // std::cerr << "SFP END : lignepivot: [";
- // for(typename Vector::const_iterator refs = lignepivot.begin();
- // refs != lignepivot.end() ;
- // ++refs )
- // std::cerr << '(' << refs->first << ';' << refs->second << ')';
- // std::cerr << "]" << std::endl;
- }
-
-
- template <class _Field>
- template <class Vector> inline void
- GaussDomain<_Field>::SparseFindPivot (Vector &lignepivot,
- unsigned long &indcol,
- long &indpermut,
- Element& determinant) const
- {
- long nj = lignepivot.size ();
-
- if (nj > 0) {
- indpermut = lignepivot[0].first;
- _F.mulin(determinant, lignepivot[0].second);
- if (indpermut != static_cast<long>(indcol)){
- // std::cerr << "Permuting col: " << lignepivot[0].first << " <--> " << indcol << std::endl;
- lignepivot[0].first = indcol;
- _F.negin(determinant);
- }
- ++indcol;
- }
- else
- indpermut = -1;
- }
-
- template <class _Field>
- template <class Vector> inline void
- GaussDomain<_Field>::FindPivot (Vector &lignepivot,
- unsigned long &k,
- long &indpermut) const
- {
- // Dense lignepivot
- long n = lignepivot.size ();
- long j = k;
-
- for (; j < n ; ++j )
- if (!_F.isZero (lignepivot[j])) break ;
-
- if (j == n )
- indpermut = -1 ;
- else {
- indpermut = j ;
- if (indpermut != k) {
- typename Vector::value_type tmp = lignepivot[k] ;
- lignepivot[k] = lignepivot[j] ;
- lignepivot[j] = tmp ;
- }
-
- ++k;
- }
- }
-
-} // namespace LinBox
-
-#endif // __LINBOX_gauss_pivot_INL
-
diff --git a/linbox/algorithms/gauss-rank-gf2.inl b/linbox/algorithms/gauss-rank-gf2.inl
deleted file mode 100644
index c257934..0000000
--- a/linbox/algorithms/gauss-rank-gf2.inl
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/algorithms/gauss-rank-gf2.inl
- * Copyright (C) 2009 The LinBox group
- *
- * Time-stamp: <14 Jun 10 15:26:01 Jean-Guillaume.Dumas at imag.fr>
- *
- * See COPYING for license information.
- *
- * SparseElimination rank calls over GF2
- */
-
-// =================================================================== //
-// =================================================================== //
-#ifndef __LINBOX_gauss_rank_gf2_INL
-#define __LINBOX_gauss_rank_gf2_INL
-
-namespace LinBox
-{
- template <class SparseSeqMatrix> unsigned long&
- GaussDomain<GF2>::rankin(unsigned long &rank,
- SparseSeqMatrix &A,
- unsigned long Ni,
- unsigned long Nj,
- SparseEliminationTraits::PivotStrategy reord) const
- {
- Element determinant;
- const GF2 F2;
- Permutation<GF2> P(A.coldim(),F2);
-
- if (reord == SparseEliminationTraits::PIVOT_NONE)
- return NoReordering(rank, determinant, A, Ni, Nj);
- else
- return InPlaceLinearPivoting(rank, determinant, A, P, Ni, Nj);
- }
-
-
- template <class SparseSeqMatrix> unsigned long&
- GaussDomain<GF2>::rankin(unsigned long &rank,
- SparseSeqMatrix &A,
- SparseEliminationTraits::PivotStrategy reord) const
- {
- return rankin(rank, A, A.rowdim (), A.coldim (), reord);
- }
-
-
-
- template <class SparseSeqMatrix> unsigned long&
- GaussDomain<GF2>::rank(unsigned long &rk,
- const SparseSeqMatrix &A,
- SparseEliminationTraits::PivotStrategy reord) const
- {
- return rank(rk, A, A.rowdim (), A.coldim (), reord);
- }
-
- template <class SparseSeqMatrix> unsigned long&
- GaussDomain<GF2>::rank(unsigned long &rank,
- const SparseSeqMatrix &A,
- unsigned long Ni,
- unsigned long Nj,
- SparseEliminationTraits::PivotStrategy reord) const
- {
- SparseSeqMatrix CopyA(Ni);
- for(unsigned long i = 0; i < Ni; ++i)
- CopyA[i] = A[i];
- return rankin(rank, CopyA, Ni, Nj, reord);
- }
-} // namespace LinBox
-
-#endif // __LINBOX_gauss_rank_gf2_INL
diff --git a/linbox/algorithms/gauss-rank.inl b/linbox/algorithms/gauss-rank.inl
deleted file mode 100644
index 9689397..0000000
--- a/linbox/algorithms/gauss-rank.inl
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/algorithms/gauss-rank.inl
- * Copyright (C) 2009 The LinBox group
- *
- * Time-stamp: <15 Jun 10 17:20:20 Jean-Guillaume.Dumas at imag.fr>
- *
- * See COPYING for license information.
- *
- * SparseElimination rank calls
- */
-#ifndef __LINBOX_gauss_rank_INL
-#define __LINBOX_gauss_rank_INL
-
-namespace LinBox
-{
- template <class _Field>
- template <class Matrix> unsigned long&
- GaussDomain<_Field>::rankin(unsigned long &rank,
- Matrix &A,
- unsigned long Ni,
- unsigned long Nj,
- SparseEliminationTraits::PivotStrategy reord) const
- {
- Element determinant;
- if (reord == SparseEliminationTraits::PIVOT_NONE)
- return NoReordering(rank, determinant, A, Ni, Nj);
- else
- return InPlaceLinearPivoting(rank, determinant, A, Ni, Nj);
- }
-
-
- template <class _Field>
- template <class Matrix> unsigned long&
- GaussDomain<_Field>::rankin(unsigned long &rank,
- Matrix &A,
- SparseEliminationTraits::PivotStrategy reord) const
- {
- return rankin(rank, A, A.rowdim (), A.coldim (), reord);
- }
-
-
-
- template <class _Field>
- template <class Matrix> unsigned long&
- GaussDomain<_Field>::rank(unsigned long &rk,
- const Matrix &A,
- SparseEliminationTraits::PivotStrategy reord) const
- {
- return rank(rk, A, A.rowdim (), A.coldim (), reord);
- }
-
- template <class _Field>
- template <class Matrix> unsigned long&
- GaussDomain<_Field>::rank(unsigned long &rank,
- const Matrix &A,
- unsigned long Ni,
- unsigned long Nj,
- SparseEliminationTraits::PivotStrategy reord) const
- {
- Matrix CopyA(Ni);
- for(unsigned long i = 0; i < Ni; ++i)
- CopyA[i] = A[i];
- return rankin(rank, CopyA, Ni, Nj, reord);
- }
-} // namespace LinBox
-
-#endif // __LINBOX_gauss_rank_INL
diff --git a/linbox/algorithms/gauss-solve-gf2.inl b/linbox/algorithms/gauss-solve-gf2.inl
deleted file mode 100644
index e102adc..0000000
--- a/linbox/algorithms/gauss-solve-gf2.inl
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/algorithms/gauss-solve-gf2.inl
- * Copyright (C) LinBox 2009
- *
- * Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
- * Time-stamp: <21 Jan 10 15:55:07 Jean-Guillaume.Dumas at imag.fr>
- *
- * See COPYING for license information.
- */
-
-#ifndef __LINBOX_gauss_solve_gf2_INL
-#define __LINBOX_gauss_solve_gf2_INL
-
-#include "linbox/algorithms/gauss-gf2.h"
-#include "linbox/algorithms/triangular-solve-gf2.h"
-#include "linbox/blackbox/permutation.h"
-
-namespace LinBox
-{
-
-
- template <class SparseSeqMatrix, class Perm, class Vector1, class Vector2>
- Vector1& GaussDomain<GF2>::solve(Vector1& x, Vector1& w, unsigned long rank,
- const Perm& Q, const SparseSeqMatrix& L,
- const SparseSeqMatrix& U, const Perm& P,
- const Vector2& b) const
- {
-
- Vector2 y(U.rowdim()), v(U.rowdim());
-
- Q.applyTranspose(y, b);
-
- lowerTriangularUnitarySolveBinary(v, L, y);
-
- upperTriangularSolveBinary(w, U, v);
-
- return P.applyTranspose(x, w);
- }
-
- template <class SparseSeqMatrix, class Perm, class Vector1, class Vector2>
- Vector1& GaussDomain<GF2>::solve(Vector1& x, unsigned long rank,
- const Perm& Q, const SparseSeqMatrix& L,
- const SparseSeqMatrix& U, const Perm& P,
- const Vector2& b, bool randomsol) const
- {
-
- Vector1 w(U.coldim());
- const GF2 F2;
- if (randomsol) {
- typename GF2::RandIter generator(F2);
- for(typename Vector1::iterator it=w.begin()+rank;it!=w.end();++it)
- generator.random( *it );
- }
- else {
- for(typename Vector1::iterator it=w.begin()+rank;it!=w.end();++it)
- F2.init(*it,0);
- }
-
- return this->solve(x, w, rank, Q, L, U, P, b);
- }
-
- template <class SparseSeqMatrix, class Vector1, class Vector2>
- Vector1& GaussDomain<GF2>::solvein(Vector1& x,
- SparseSeqMatrix &A,
- const Vector2& b, bool randomsol) const
- {
-
- typename GF2::Element det;
- unsigned long rank;
- const GF2 F2;
- SparseSeqMatrix L(F2, A.rowdim(), A.rowdim());
- Permutation<GF2> Q(A.rowdim(),F2);
- Permutation<GF2> P(A.coldim(),F2);
-
-
-
- this->QLUPin(rank, det, Q, L, A, P, A.rowdim(), A.coldim() );
-
- return this->solve(x, rank, Q, L, A, P, b, randomsol);
- }
-
-} // namespace LinBox
-
-#endif // __LINBOX_gauss_solve_gf2_INL
diff --git a/linbox/algorithms/gauss-solve.inl b/linbox/algorithms/gauss-solve.inl
deleted file mode 100644
index 617058f..0000000
--- a/linbox/algorithms/gauss-solve.inl
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/algorithms/gauss-solve.inl
- * Copyright (C) LinBox 2008
- *
- * Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
- * Time-stamp: <21 Jan 10 17:01:22 Jean-Guillaume.Dumas at imag.fr>
- *
- * See COPYING for license information.
- */
-
-#ifndef __LINBOX_gauss_solve_INL
-#define __LINBOX_gauss_solve_INL
-
-#include "linbox/algorithms/gauss.h"
-#include "linbox/algorithms/triangular-solve.h"
-#include "linbox/blackbox/permutation.h"
-
-namespace LinBox
-{
-
-
- template <class _Field>
- template <class Matrix, class Perm, class Vector1, class Vector2> inline Vector1&
- GaussDomain<_Field>::solve(Vector1& x, Vector1& w, unsigned long rank, const Perm& Q, const Matrix& L, const Matrix& U, const Perm& P, const Vector2& b) const
- {
-
- Vector2 y(U.rowdim()), v(U.rowdim());
-
- Q.applyTranspose(y, b);
-
- lowerTriangularUnitarySolve(v, L, y);
-
- upperTriangularSolve(w, U, v);
-
- return P.applyTranspose(x, w);
- }
-
- template <class _Field>
- template <class Matrix, class Perm, class Vector1, class Vector2> inline Vector1&
- GaussDomain<_Field>::solve(Vector1& x, unsigned long rank, const Perm& Q, const Matrix& L, const Matrix& U, const Perm& P, const Vector2& b, bool randomsol) const
- {
-
- Vector1 w(U.coldim());
- if (randomsol) {
- // Random solution is in output
- typename _Field::RandIter generator(_F);
- for(typename Vector1::iterator it=w.begin()+rank;it!=w.end();++it)
- generator.random( *it );
- }
- else {
- for(typename Vector1::iterator it=w.begin()+rank;it!=w.end();++it)
- _F.init(*it,0);
- }
- return this->solve(x, w, rank, Q, L, U, P, b);
- }
-
- template <class _Field>
- template <class Matrix, class Vector1, class Vector2> inline Vector1&
- GaussDomain<_Field>::solvein(Vector1& x, Matrix& A, const Vector2& b, bool randomsol) const
- {
-
- typename Field::Element det;
- unsigned long rank;
- Matrix L(_F, A.rowdim(), A.rowdim());
- Permutation<Field> Q(A.rowdim(),_F);
- Permutation<Field> P(A.coldim(),_F);
-
- this->QLUPin(rank, det, Q, L, A, P, A.rowdim(), A.coldim() );
-
- if (! randomsol) {
- // Sets solution values to 0 for coldim()-rank columns
- // Therefore, prune unnecessary elements
- // in those last columns of U
- for(typename Matrix::RowIterator row=A.rowBegin();
- row != A.rowEnd(); ++row) {
- if (row->size()) {
- size_t ns=0;
- for(typename Matrix::Row::iterator it = row->begin();
- it != row->end(); ++it, ++ns) {
- if (it->first >= rank) {
- row->resize(ns);
- break;
- }
- }
- }
- }
- }
-
- return this->solve(x, rank, Q, L, A, P, b, randomsol);
- }
-
-} // namespace LinBox
-
-#endif // __LINBOX_gauss_solve_INL
-
diff --git a/linbox/algorithms/gauss.doxy b/linbox/algorithms/gauss.doxy
new file mode 100644
index 0000000..521deeb
--- /dev/null
+++ b/linbox/algorithms/gauss.doxy
@@ -0,0 +1,29 @@
+// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/** @ingroup algorithms
+ @defgroup gauss Gauss
+ @brief NO DOC YET
+
+
+ */
+
+// vim:syntax=doxygen
diff --git a/linbox/algorithms/gauss.h b/linbox/algorithms/gauss.h
index bb7f907..c853e2c 100644
--- a/linbox/algorithms/gauss.h
+++ b/linbox/algorithms/gauss.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/gauss.h
* Copyright (C) 1999 Jean-Guillaume Dumas
*
@@ -14,12 +12,30 @@
* Move function definitions to gauss.inl
* -----------------------------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
// ========================================================================= //
// (C) The Linbox Group 1999
-// Calcul de rang par la méthode de Gauss pivot par ligne, sur matrice creuse
+// Calcul de rang par la méthode de Gauss pivot par ligne, sur matrice creuse
// Time-stamp: <03 Nov 00 19:19:06 Jean-Guillaume.Dumas at imag.fr>
// ========================================================================= //
@@ -57,7 +73,7 @@ namespace LinBox
typedef typename Field::Element Element;
private:
- const Field &_F;
+ const Field &_field;
public:
@@ -65,18 +81,18 @@ namespace LinBox
* over which to perform computations
*/
GaussDomain (const Field &F) :
- _F (F)
+ _field (F)
{}
//Copy constructor
///
- GaussDomain (const GaussDomain &M) :
- _F (M._F)
+ GaussDomain (const GaussDomain &Mat) :
+ _field (Mat._field)
{}
/** accessor for the field of computation
*/
- const Field &field () const { return _F; }
+ const Field &field () const { return _field; }
/** @name rank
Callers of the different rank routines\\
@@ -88,8 +104,8 @@ namespace LinBox
//@{
///
template <class Matrix> unsigned long& rankin(unsigned long &rank,
- Matrix &A,
- SparseEliminationTraits::PivotStrategy reord = SparseEliminationTraits::PIVOT_LINEAR) const;
+ Matrix &A,
+ SparseEliminationTraits::PivotStrategy reord = SparseEliminationTraits::PIVOT_LINEAR) const;
///
template <class Matrix> unsigned long& rankin(unsigned long &rank,
Matrix &A,
@@ -167,16 +183,18 @@ namespace LinBox
unsigned long Nj) const;
template <class Matrix, class Perm, class Vector1, class Vector2>
- Vector1& solve(Vector1& x, unsigned long rank, const Perm& Q, const Matrix& L, const Matrix& U, const Perm& P, const Vector2& b, bool randomsol=false) const;
-
- template <class Matrix, class Perm, class Vector1, class Vector2>
Vector1& solve(Vector1& x, Vector1& w, unsigned long rank, const Perm& Q, const Matrix& L, const Matrix& U, const Perm& P, const Vector2& b) const;
template <class Matrix, class Vector1, class Vector2>
Vector1& solvein(Vector1 &x,
Matrix &A,
- const Vector2 &b, bool randomsol=false) const;
+ const Vector2 &b) const;
+
+ template <class Matrix, class Vector1, class Vector2, class Random>
+ Vector1& solvein(Vector1 &x,
+ Matrix &A,
+ const Vector2 &b, Random& generator) const;
template <class Matrix, class Perm, class Block>
@@ -334,12 +352,21 @@ Using : FindPivot and LU
} // namespace LinBox
-#include "linbox/algorithms/gauss.inl"
-#include "linbox/algorithms/gauss-pivot.inl"
-#include "linbox/algorithms/gauss-elim.inl"
-#include "linbox/algorithms/gauss-solve.inl"
-#include "linbox/algorithms/gauss-nullspace.inl"
-#include "linbox/algorithms/gauss-rank.inl"
-#include "linbox/algorithms/gauss-det.inl"
+#include "linbox/algorithms/gauss/gauss.inl"
+#include "linbox/algorithms/gauss/gauss-pivot.inl"
+#include "linbox/algorithms/gauss/gauss-elim.inl"
+#include "linbox/algorithms/gauss/gauss-solve.inl"
+#include "linbox/algorithms/gauss/gauss-nullspace.inl"
+#include "linbox/algorithms/gauss/gauss-rank.inl"
+#include "linbox/algorithms/gauss/gauss-det.inl"
#endif // __LINBOX_gauss_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/gauss.inl b/linbox/algorithms/gauss.inl
deleted file mode 100644
index ab7dc71..0000000
--- a/linbox/algorithms/gauss.inl
+++ /dev/null
@@ -1,694 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/algorithms/gauss.inl
- * Copyright (C) 1999 Jean-Guillaume Dumas
- *
- * Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
- * Time-stamp: <18 Jun 10 15:48:38 Jean-Guillaume.Dumas at imag.fr>
- *
- * See COPYING for license information.
- */
-// ========================================================================= //
-// (C) The Linbox Group 1999
-// Calcul de rang par la méthode de Gauss pivot par ligne, sur matrice creuse
-// ========================================================================= //
-
-#ifndef __LINBOX_gauss_INL
-#define __LINBOX_gauss_INL
-
-#include "linbox/algorithms/gauss.h"
-#include "linbox/util/commentator.h"
-#include <utility>
-
-#ifdef __LINBOX_ALL__
-#define __LINBOX_COUNT__
-#define __LINBOX_OFTEN__ __LINBOX_ALL__ // BB: ???
-#define __LINBOX_FILLIN__
-#endif
-
-namespace LinBox
-{
- template <class _Field>
- template <class Matrix, class Perm> inline unsigned long&
- GaussDomain<_Field>::QLUPin (unsigned long &rank,
- Element &determinant,
- Perm &Q,
- Matrix &LigneL,
- Matrix &LigneA,
- Perm &P,
- unsigned long Ni,
- unsigned long Nj) const
- {
- linbox_check( Q.coldim() == Q.rowdim() );
- linbox_check( P.coldim() == P.rowdim() );
- linbox_check( LigneL.coldim() == LigneL.rowdim() );
- linbox_check( Q.coldim() == LigneL.rowdim() );
- linbox_check( LigneL.coldim() == LigneA.rowdim() );
- linbox_check( LigneA.coldim() == P.rowdim() );
-
- typedef typename Matrix::Row Vector;
- typedef typename Vector::value_type E;
-
- // Requirements : LigneA is an array of sparse rows
- // In place (LigneA is modified)
- // With reordering (D is a density type. Density is allocated here)
- // long Ni = LigneA.n_row (), Nj = LigneA.n_col ();
- commentator.start ("Gaussian elimination with reordering",
- "IPLR", Ni);
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
- << "Gaussian QLUP elimination on " << Ni << " x " << Nj << " matrix" << std::endl;
-
-#ifdef __LINBOX_COUNT__
- long long nbelem = 0;
-#endif
-
- Element Eone; _F.init(Eone,1UL);
- _F.init(determinant,1UL);
- // allocation of the column density
- std::vector<size_t> col_density (Nj);
-
-
- for(typename Matrix::RowIterator LigneL_it = LigneL.rowBegin() ;
- LigneL_it != LigneL.rowEnd(); ++LigneL_it)
- LigneL_it->reserve(16);
-
- std::deque<std::pair<size_t,size_t> > invQ;
-
- // assignment of LigneA with the domain object
- for (unsigned long jj = 0; jj < Ni; ++jj)
- for (unsigned long k = 0; k < LigneA[jj].size (); k++)
- ++col_density[LigneA[jj][k].first];
-
- long last = Ni - 1;
- long c;
- rank = 0;
-
-#ifdef __LINBOX_OFTEN__
- long sstep = last/40;
- if (sstep > __LINBOX_OFTEN__) sstep = __LINBOX_OFTEN__;
-#else
- long sstep = 1000;
-#endif
- // Elimination steps with reordering
-
- typename Matrix::RowIterator LigneA_k = LigneA.rowBegin(), LigneA_p;
- for (long k = 0; k < last; ++k, ++LigneA_k) {
- long p = k, s = 0;
-
-#ifdef __LINBOX_FILLIN__
- if ( ! (k % 100) ) {
-#else
- if ( ! (k % sstep) ) {
-#endif
- commentator.progress (k);
-#ifdef __LINBOX_FILLIN__
- long sl(0);
- for (size_t l = 0; l < Ni; ++l)
- sl += LigneA[l].size ();
-
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Fillin (" << rank << "/" << Ni << ") = "
- << sl
- << " (" << double(sl)*100.0/double(Ni-k)/double(Nj-k) << "%, "
- << double(sl)/double(Ni-k) << " avg)"
- << std::endl;
-#endif
- }
-
- long l;
- for(l = k; l < static_cast<long>(Ni); ++l) {
- if ( (s = LigneA[l].size()) ) {
- p = l;
- break;
- }
- }
-
- if (s) {
- long sl;
- // Row permutation for the sparsest row
- for (; l < static_cast<long>(Ni); ++l)
- if (((sl = LigneA[l].size ()) < s) && (sl)) {
- s = sl;
- p = l;
- }
-
- if (p != k) {
- // std::cerr << "Permuting rows: " << k << " <--> " << p << std::endl;
- invQ.push_front( std::pair<size_t,size_t>(k,p) );
- _F.negin(determinant);
- std::swap( *LigneA_k, LigneA[p]);
- std::swap( LigneL[k], LigneL[p]);
- }
-
-
- SparseFindPivot (*LigneA_k, rank, c, col_density, determinant);
-
- if (c != -1) {
- long ll;
- if ( c != (static_cast<long>(rank)-1) ) {
- P.permute(rank-1,c);
- for (ll=0 ; ll < k ; ++ll)
- permute( LigneA[ll], rank, c);
- }
- long npiv=LigneA_k->size();
- for (ll = k+1; ll < static_cast<long>(Ni); ++ll) {
- E hc; hc.first=rank-1;
- eliminate (hc.second, LigneA[ll], *LigneA_k, rank, c, npiv, col_density);
- if(! _F.isZero(hc.second)) LigneL[ll].push_back(hc);
- }
- }
-
- // LigneA.write(std::cerr << "AFT " )<<std::endl;
-#ifdef __LINBOX_COUNT__
- nbelem += LigneA_k->size ();
-#endif
- }
- E one(k,Eone);
- LigneL[k].push_back(one);
- // LigneL.write(rep << "L:= ", FORMAT_MAPLE) << std::endl;
- // LigneA.write(rep << "U:= ", FORMAT_MAPLE) << std::endl;
- }//for k
-
- SparseFindPivot ( LigneA[last], rank, c, determinant);
- if (c != -1) {
- if ( c != (static_cast<long>(rank)-1) ) {
- P.permute(rank-1,c);
- for (long ll=0 ; ll < last ; ++ll)
- permute( LigneA[ll], rank, c);
- }
- }
-
- E one(last,Eone);
- LigneL[last].push_back(one);
-
-#ifdef __LINBOX_COUNT__
- nbelem += LigneA[last].size ();
- commentator.report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
- << "Left elements : " << nbelem << std::endl;
-#endif
-
-#ifdef __LINBOX_FILLIN__
- long sl(0);
- for (size_t l=0; l < Ni; ++l)
- sl += LigneA[l].size ();
-
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Fillin (" << rank << "/" << Ni << ") = " << sl
- << std::endl;
-#endif
-
- if ((rank < Ni) || (rank < Nj) || (Ni == 0) || (Nj == 0))
- _F.init(determinant,0UL);
-
- integer card;
- _F.write(commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Determinant : ", determinant)
- << " over GF (" << _F.cardinality (card) << ")" << std::endl;
-
- for(std::deque<std::pair<size_t,size_t> >::const_iterator it = invQ.begin(); it!=invQ.end();++it)
- Q.permute( it->first, it->second );
-
-
- // std::ostream& rep = commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT);
- // Q.write(rep << "Q:= ", FORMAT_MAPLE) << ':' << std::endl;
- // LigneL.write(rep << "L:= ", FORMAT_MAPLE) << ':' << std::endl;
- // LigneA.write(rep << "U:= ", FORMAT_MAPLE) << ':' << std::endl;
- // P.write(rep << "P:= ", FORMAT_MAPLE) << ':' << std::endl;
-
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Rank : " << rank
- << " over GF (" << card << ")" << std::endl;
- commentator.stop ("done", 0, "IPLR");
-
-
-
- return rank;
- }
-
- template <class _Field>
- template <class Matrix> inline unsigned long&
- GaussDomain<_Field>::InPlaceLinearPivoting (unsigned long &rank,
- Element &determinant,
- Matrix &LigneA,
- unsigned long Ni,
- unsigned long Nj) const
- {
- typedef typename Matrix::Row Vector;
- typedef typename Vector::value_type E;
-
- // Requirements : LigneA is an array of sparse rows
- // In place (LigneA is modified)
- // With reordering (D is a density type. Density is allocated here)
- // long Ni = LigneA.n_row (), Nj = LigneA.n_col ();
- commentator.start ("Gaussian elimination with reordering",
- "IPLR", Ni);
- _F.write( commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
- << "Gaussian elimination on " << Ni << " x " << Nj << " matrix, over: ") << std::endl;
-
-#ifdef __LINBOX_COUNT__
- long long nbelem = 0;
-#endif
-
- _F.init(determinant,1UL);
- Vector Vzer (0);
- // allocation of the column density
- std::vector<size_t> col_density (Nj);
-
- // assignment of LigneA with the domain object
- for (unsigned long jj = 0; jj < Ni; ++jj)
- for (unsigned long k = 0; k < LigneA[jj].size (); k++)
- ++col_density[LigneA[jj][k].first];
-
- long last = Ni - 1;
- long c;
- rank = 0;
-
-#ifdef __LINBOX_OFTEN__
- long sstep = last/40;
- if (sstep > __LINBOX_OFTEN__) sstep = __LINBOX_OFTEN__;
-#else
- long sstep = 1000;
-#endif
- // Elimination steps with reordering
- for (long k = 0; k < last; ++k) {
- unsigned long l;
- long p = k, s = LigneA[k].size (), sl;
-
-#ifdef __LINBOX_FILLIN__
- if ( ! (k % 100) ) {
-#else
- if ( ! (k % sstep) ) {
-#endif
- commentator.progress (k);
-#ifdef __LINBOX_FILLIN__
- for (sl = 0, l = 0; l < Ni; ++l)
- sl += LigneA[l].size ();
-
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Fillin (" << rank << "/" << Ni << ") = "
- << sl
- << " (" << double(sl)*100.0/double(Ni-k)/double(Nj-k) << "%, "
- << double(sl)/double(Ni-k) << " avg)"
- << std::endl;
-#endif
- }
-
- if (s) {
- // Row permutation for the sparsest row
- for (l = k + 1; l < Ni; ++l)
- if (((sl = LigneA[l].size ()) < s) && (sl)) {
- s = sl;
- p = l;
- }
-
- if (p != k) {
- _F.negin(determinant);
- Vector vtm = LigneA[k];
- LigneA[k] = LigneA[p];
- LigneA[p] = vtm;
- }
-
- // LigneA.write(std::cerr << "BEF, k:" << k << ", rank:" << rank << ", c:" << c)<<std::endl;
-
- SparseFindPivot (LigneA[k], rank, c, col_density, determinant);
- // LigneA.write(std::cerr << "PIV, k:" << k << ", rank:" << rank << ", c:" << c)<<std::endl;
- if (c != -1) {
- for (l = k + 1; l < Ni; ++l)
- eliminate (LigneA[l], LigneA[k], rank, c, col_density);
- }
-
- // LigneA.write(std::cerr << "AFT " )<<std::endl;
-#ifdef __LINBOX_COUNT__
- nbelem += LigneA[k].size ();
-#endif
- LigneA[k] = Vzer;
- }
-
- }//for k
-
- SparseFindPivot (LigneA[last], rank, c, determinant);
-
-#ifdef __LINBOX_COUNT__
- nbelem += LigneA[last].size ();
- commentator.report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
- << "Left elements : " << nbelem << std::endl;
-#endif
-
-#ifdef __LINBOX_FILLIN__
- long sl(0);
- for (size_t l=0; l < Ni; ++l)
- sl += LigneA[l].size ();
-
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Fillin (" << rank << "/" << Ni << ") = " << sl
- << std::endl;
-#endif
-
- integer card;
-
- if ((rank < Ni) || (rank < Nj) || (Ni == 0) || (Nj == 0))
- _F.init(determinant,0UL);
-
- _F.write(commentator.report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
- << "Determinant : ", determinant)
- << " over GF (" << _F.cardinality (card) << ")" << std::endl;
-
- commentator.report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
- << "Rank : " << rank
- << " over GF (" << card << ")" << std::endl;
- commentator.stop ("done", 0, "IPLR");
- return rank;
- }
-
- template <class _Field>
- template <class Matrix, class Perm> inline unsigned long&
- GaussDomain<_Field>::InPlaceLinearPivoting (unsigned long &rank,
- Element &determinant,
- Matrix &LigneA,
- Perm &P,
- unsigned long Ni,
- unsigned long Nj) const
- {
- typedef typename Matrix::Row Vector;
- typedef typename Vector::value_type E;
-
- // Requirements : LigneA is an array of sparse rows
- // In place (LigneA is modified)
- // With reordering (D is a density type. Density is allocated here)
- // long Ni = LigneA.n_row (), Nj = LigneA.n_col ();
- commentator.start ("Gaussian elimination with reordering",
- "IPLR", Ni);
- _F.write( commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
- << "Gaussian elimination on " << Ni << " x " << Nj << " matrix, over: ") << std::endl;
-
-#ifdef __LINBOX_COUNT__
- long long nbelem = 0;
-#endif
-
- _F.init(determinant,1UL);
- // allocation of the column density
- std::vector<size_t> col_density (Nj);
-
- // assignment of LigneA with the domain object
- for (unsigned long jj = 0; jj < Ni; ++jj)
- for (unsigned long k = 0; k < LigneA[jj].size (); k++)
- ++col_density[LigneA[jj][k].first];
-
- long last = Ni - 1;
- long c;
- rank = 0;
-
-#ifdef __LINBOX_OFTEN__
- long sstep = last/40;
- if (sstep > __LINBOX_OFTEN__) sstep = __LINBOX_OFTEN__;
-#else
- long sstep = 1000;
-#endif
- // Elimination steps with reordering
- for (long k = 0; k < last; ++k) {
- unsigned long l;
- long p = k, s = LigneA[k].size (), sl;
-
-#ifdef __LINBOX_FILLIN__
- if ( ! (k % 100) ) {
-#else
- if ( ! (k % sstep) ) {
-#endif
- commentator.progress (k);
-#ifdef __LINBOX_FILLIN__
- for (sl = 0, l = 0; l < Ni; ++l)
- sl += LigneA[l].size ();
-
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Fillin (" << rank << "/" << Ni << ") = "
- << sl
- << " (" << double(sl)*100.0/double(Ni-k)/double(Nj-k) << "%, "
- << double(sl)/double(Ni-k) << " avg)"
- << std::endl;
-#endif
- }
-
- if (s) {
- // Row permutation for the sparsest row
- for (l = k + 1; l < Ni; ++l)
- if (((sl = LigneA[l].size ()) < s) && (sl)) {
- s = sl;
- p = l;
- }
-
- if (p != k) {
- _F.negin(determinant);
- Vector vtm = LigneA[k];
- LigneA[k] = LigneA[p];
- LigneA[p] = vtm;
- }
-
- // LigneA.write(std::cerr << "BEF, k:" << k << ", rank:" << rank << ", c:" << c)<<std::endl;
-
- SparseFindPivot (LigneA[k], rank, c, col_density, determinant);
- // LigneA.write(std::cerr << "PIV, k:" << k << ", rank:" << rank << ", c:" << c)<<std::endl;
- if (c != -1) {
- if ( c != (static_cast<long>(rank)-1) )
- P.permute(rank-1,c);
- for (long ll=0; ll < k ; ++ll)
- permute( LigneA[ll], rank, c);
-
- for (l = k + 1; l < Ni; ++l)
- eliminate (LigneA[l], LigneA[k], rank, c, col_density);
- }
-
- // LigneA.write(std::cerr << "AFT " )<<std::endl;
-#ifdef __LINBOX_COUNT__
- nbelem += LigneA[k].size ();
-#endif
- }
-
- }//for k
-
- SparseFindPivot (LigneA[last], rank, c, determinant);
- if ( (c != -1) && (c != (static_cast<long>(rank)-1) ) ) {
- P.permute(rank-1,c);
- for (long ll=0; ll < last ; ++ll)
- permute( LigneA[ll], rank, c);
- }
-
-
-#ifdef __LINBOX_COUNT__
- nbelem += LigneA[last].size ();
- commentator.report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
- << "Left elements : " << nbelem << std::endl;
-#endif
-
-#ifdef __LINBOX_FILLIN__
- long sl(0);
- for (size_t l=0; l < Ni; ++l)
- sl += LigneA[l].size ();
-
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
- << "Fillin (" << rank << "/" << Ni << ") = " << sl
- << std::endl;
-#endif
-
- integer card;
-
- if ((rank < Ni) || (rank < Nj) || (Ni == 0) || (Nj == 0))
- _F.init(determinant,0UL);
-
- _F.write(commentator.report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
- << "Determinant : ", determinant)
- << " over GF (" << _F.cardinality (card) << ")" << std::endl;
-
- commentator.report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
- << "Rank : " << rank
- << " over GF (" << card << ")" << std::endl;
- commentator.stop ("done", 0, "IPLR");
- return rank;
- }
-
- template <class _Field>
- template <class Matrix> inline unsigned long&
- GaussDomain<_Field>::NoReordering (unsigned long &res,
- Element &determinant,
- Matrix &LigneA,
- unsigned long Ni,
- unsigned long Nj) const
- {
- // Requirements : SLA is an array of sparse rows
- // IN PLACE.
- // Without reordering (Pivot is first non-zero in row)
- // long Ni = SLA.n_row (), Nj = SLA.n_col ();
- // long Ni = LigneA.n_row (), Nj = LigneA.n_col ();
- commentator.start ("Gaussian elimination (no reordering)",
- "NoRe", Ni);
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
- << "Gaussian elimination on " << Ni << " x " << Nj << " matrix" << std::endl;
-
- typedef typename Matrix::Row Vector;
- typedef typename Vector::value_type E;
- typedef typename Matrix::Element Element;
-
-#ifdef __LINBOX_COUNT__
- long long nbelem = 0;
-#endif
- Vector Vzer (0);
-
- _F.init(determinant,1UL);
- long last = Ni - 1;
- long c;
- unsigned long indcol (0);
-
- for (long k = 0; k < last; ++k) {
- if (!(k % 1000))
- commentator.progress (k);
-
- unsigned long l;
-
- if (!LigneA[k].empty ()) {
- SparseFindPivot (LigneA[k], indcol, c, determinant);
- if (c != -1)
- for (l = k + 1; l < Ni; ++l)
- eliminate (LigneA[l], LigneA[k], indcol, c);
-
-#ifdef __LINBOX_COUNT__
- nbelem += LigneA[k].size ();
-#endif
- LigneA[k] = Vzer;
- }
- }
-
- SparseFindPivot ( LigneA[last], indcol, c, determinant);
-
-#ifdef __LINBOX_COUNT__
- nbelem += LigneA[last].size ();
- commentator.report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
- << "Left elements : " << nbelem << std::endl;
-#endif
-
- res = indcol;
-
- if ((res < Ni) || (res < Nj))
- if ((res < Ni) || (res < Nj) || (Ni == 0) || (Nj == 0))
- _F.init(determinant,0UL);
-
- integer card;
-
- _F.write(commentator.report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
- << "Determinant : ", determinant)
- << " over GF (" << _F.cardinality (card) << ")" << std::endl;
-
- commentator.report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
- << "Rank : " << res
- << " over GF (" << card << ")" << std::endl;
- commentator.stop ("done", 0, "NoRe");
- return res;
- }
-
-
- template <class _Field>
- template<class Vector> inline void
- GaussDomain<_Field>::Upper (Vector &lignecur,
- const Vector &lignepivot,
- unsigned long indcol,
- long indpermut) const
- {
- static typename _Field::Element zero = _F.init(zero);
-
- long n = lignecur.size () ;
- long k = indcol - 1 ;
-
- // permutation if one has been performed to compute the pivot
- if (indpermut != k) {
- typename Vector::value_type tmp = lignecur[k];
- lignecur[k] = lignecur[indpermut];
- lignecur[indpermut] = tmp;
- }
-
- typename Vector::value_type headcoeff;
- _F.divin (_F.neg (headcoeff, lignecur[k]), lignepivot[k]);
-
-
-
- // LU in place
- _F.assign (lignecur[k], zero);
- for (long j = k; ++j < n;)
- _F.axpyin (lignecur[j], headcoeff, lignepivot[j]) ;
- }
-
- template <class _Field>
- template <class Vector> inline void
- GaussDomain<_Field>::LU (Vector &lignecur,
- const Vector &lignepivot,
- unsigned long indcol,
- long indpermut) const
- {
- long n = lignecur.size ();
- long k = indcol - 1;
-
- // permutation if one has been performed to compute the pivot
- if (indpermut != k) {
- typename Vector::value_type tmp = lignecur[k];
- lignecur[k] = lignecur[indpermut];
- lignecur[indpermut] = tmp;
- }
-
- typename Vector::value_type headcoeff;
- // LU in place
- _F.div (headcoeff, lignecur[k], lignepivot[k]);
- _F.assign (lignecur[k], headcoeff);
- _F.negin (headcoeff);
- for (long j = k; ++j < n;)
- _F.axpyin (lignecur[j],headcoeff,lignepivot[j]);
- }
-
-
- template <class _Field>
- template <class Matrix> inline unsigned long &
- GaussDomain<_Field>::upperin (unsigned long &res, Matrix &A) const
- {
- // Requirements : A is an array of rows
- // In place (A is modified)
- // Without reordering (Pivot is first non-zero in row)
- long Ni = A.rowdim ();
- long last = Ni - 1;
- long c;
- unsigned long indcol = 0;
-
- for (long k = 0; k < last; ++k) {
- FindPivot (A[k], indcol, c);
- if (c != -1)
- for (long l = k + 1; l < Ni; ++l)
- Upper (A[l], A[k], indcol, c);
- }
-
- FindPivot (A[last], indcol, c);
- return res = indcol;
- }
-
- template <class _Field>
- template <class Matrix> inline unsigned long &
- GaussDomain<_Field>::LUin (unsigned long &res, Matrix &A) const
- {
- // Requirements : A is an array of rows
- // In place (A is modified)
- // Without reordering (Pivot is first non-zero in row)
-
- long Ni = A.rowdim ();
- long last = Ni - 1;
- long c;
- unsigned long indcol = 0;
-
- for (long k = 0; k < last; ++k) {
- FindPivot (A[k], indcol, c);
- if (c != -1)
- for (long l = k + 1; l < Ni; ++l)
- LU (A[l], A[k], indcol, c);
- }
-
- FindPivot (A[last], indcol, c);
- return res = indcol;
- }
-
-
- } // namespace LinBox
-
-#endif // __LINBOX_gauss_INL
diff --git a/linbox/algorithms/gauss/Makefile.am b/linbox/algorithms/gauss/Makefile.am
new file mode 100644
index 0000000..e1e3947
--- /dev/null
+++ b/linbox/algorithms/gauss/Makefile.am
@@ -0,0 +1,39 @@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
+pkgincludesubdir=$(pkgincludedir)/algorithms/gauss
+
+
+pkgincludesub_HEADERS = \
+ gauss.inl \
+ gauss-det.inl \
+ gauss-rank.inl \
+ gauss-solve.inl \
+ gauss-nullspace.inl \
+ gauss-elim.inl \
+ gauss-pivot.inl \
+ gauss-gf2.inl \
+ gauss-elim-gf2.inl \
+ gauss-rank-gf2.inl \
+ gauss-pivot-gf2.inl \
+ gauss-solve-gf2.inl
+
+
diff --git a/linbox/algorithms/gauss/Makefile.in b/linbox/algorithms/gauss/Makefile.in
new file mode 100644
index 0000000..86f1b94
--- /dev/null
+++ b/linbox/algorithms/gauss/Makefile.in
@@ -0,0 +1,585 @@
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = linbox/algorithms/gauss
+DIST_COMMON = $(pkgincludesub_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
+ $(top_srcdir)/macros/config-header.m4 \
+ $(top_srcdir)/macros/debug.m4 \
+ $(top_srcdir)/macros/expat-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
+ $(top_srcdir)/macros/givaro-check.m4 \
+ $(top_srcdir)/macros/gmp-check.m4 \
+ $(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
+ $(top_srcdir)/macros/libtool.m4 \
+ $(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
+ $(top_srcdir)/macros/linbox-doc.m4 \
+ $(top_srcdir)/macros/linbox-misc.m4 \
+ $(top_srcdir)/macros/linbox-opt.m4 \
+ $(top_srcdir)/macros/ltoptions.m4 \
+ $(top_srcdir)/macros/ltsugar.m4 \
+ $(top_srcdir)/macros/ltversion.m4 \
+ $(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
+ $(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
+ $(top_srcdir)/macros/ntl-check.m4 \
+ $(top_srcdir)/macros/saclib-check.m4 \
+ $(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
+HEADERS = $(pkgincludesub_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
+BLAS_LIBS = @BLAS_LIBS@
+CC = @CC@
+CCNAM = @CCNAM@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DBG = @DBG@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
+DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
+DEFS = @DEFS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXPAT_CFLAGS = @EXPAT_CFLAGS@
+EXPAT_LIBS = @EXPAT_LIBS@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
+FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
+GIVARO_CFLAGS = @GIVARO_CFLAGS@
+GIVARO_LIBS = @GIVARO_LIBS@
+GMP_CFLAGS = @GMP_CFLAGS@
+GMP_LIBS = @GMP_LIBS@
+GMP_VERSION = @GMP_VERSION@
+GREP = @GREP@
+IML_CFLAGS = @IML_CFLAGS@
+IML_LIBS = @IML_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIDIA_CFLAGS = @LIDIA_CFLAGS@
+LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
+LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MAPLE_CFLAGS = @MAPLE_CFLAGS@
+MAPLE_HOME = @MAPLE_HOME@
+MAPLE_LIBS = @MAPLE_LIBS@
+MAPLE_VERSION = @MAPLE_VERSION@
+MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NTL_CFLAGS = @NTL_CFLAGS@
+NTL_LIBS = @NTL_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
+RANLIB = @RANLIB@
+RM = @RM@
+SACLIB_CFLAGS = @SACLIB_CFLAGS@
+SACLIB_LIBS = @SACLIB_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TESTS_CFLAGS = @TESTS_CFLAGS@
+VERSION = @VERSION@
+WARN = @WARN@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+pkgincludesubdir = $(pkgincludedir)/algorithms/gauss
+pkgincludesub_HEADERS = \
+ gauss.inl \
+ gauss-det.inl \
+ gauss-rank.inl \
+ gauss-solve.inl \
+ gauss-nullspace.inl \
+ gauss-elim.inl \
+ gauss-pivot.inl \
+ gauss-gf2.inl \
+ gauss-elim-gf2.inl \
+ gauss-rank-gf2.inl \
+ gauss-pivot-gf2.inl \
+ gauss-solve-gf2.inl
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/algorithms/gauss/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/algorithms/gauss/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
+ @$(NORMAL_INSTALL)
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
+ done
+
+uninstall-pkgincludesubHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+ for dir in "$(DESTDIR)$(pkgincludesubdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgincludesubHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgincludesubHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool ctags distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkgincludesubHEADERS install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/linbox/algorithms/gauss/gauss-det.inl b/linbox/algorithms/gauss/gauss-det.inl
new file mode 100644
index 0000000..45fc329
--- /dev/null
+++ b/linbox/algorithms/gauss/gauss-det.inl
@@ -0,0 +1,94 @@
+/* linbox/algorithms/gauss-det.inl
+ * Copyright (C) 2009 The LinBox group
+ *
+// Time-stamp: <15 Jun 10 17:20:08 Jean-Guillaume.Dumas at imag.fr>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ *
+ * SparseElimination determinant calls
+ */
+#ifndef __LINBOX_gauss_det_INL
+#define __LINBOX_gauss_det_INL
+
+namespace LinBox
+{
+ template <class _Field>
+ template <class Matrix> inline typename GaussDomain<_Field>::Element&
+ GaussDomain<_Field>::detin(Element &determinant,
+ Matrix &A,
+ unsigned long Ni,
+ unsigned long Nj,
+ SparseEliminationTraits::PivotStrategy reord) const
+ {
+ unsigned long Rank;
+ if (reord == SparseEliminationTraits::PIVOT_NONE)
+ NoReordering(Rank, determinant, A, Ni, Nj);
+ else
+ InPlaceLinearPivoting(Rank, determinant, A, Ni, Nj);
+ return determinant;
+ }
+
+
+ template <class _Field>
+ template <class Matrix> inline typename GaussDomain<_Field>::Element&
+ GaussDomain<_Field>::detin(Element &determinant,
+ Matrix &A,
+ SparseEliminationTraits::PivotStrategy reord) const
+ {
+ return detin(determinant, A, A.rowdim (), A.coldim (), reord);
+ }
+
+
+
+ template <class _Field>
+ template <class Matrix> inline typename GaussDomain<_Field>::Element&
+ GaussDomain<_Field>::det(Element &determinant,
+ const Matrix &A,
+ SparseEliminationTraits::PivotStrategy reord) const
+ {
+ return det(determinant, A, A.rowdim (), A.coldim (), reord);
+ }
+
+ template <class _Field>
+ template <class Matrix> inline typename GaussDomain<_Field>::Element&
+ GaussDomain<_Field>::det(Element &determinant,
+ const Matrix &A,
+ unsigned long Ni,
+ unsigned long Nj,
+ SparseEliminationTraits::PivotStrategy reord) const
+ {
+ Matrix CopyA(Ni);
+ for(unsigned long i = 0; i < Ni; ++i)
+ CopyA[i] = A[i];
+ return detin(determinant, CopyA, Ni, Nj, reord);
+ }
+} // namespace LinBox
+
+#endif // __LINBOX_gauss_det_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/gauss/gauss-elim-gf2.inl b/linbox/algorithms/gauss/gauss-elim-gf2.inl
new file mode 100644
index 0000000..abd99b5
--- /dev/null
+++ b/linbox/algorithms/gauss/gauss-elim-gf2.inl
@@ -0,0 +1,333 @@
+/* linbox/algorithms/gauss-elim-gf2.inl
+ * Copyright (C) 2009 The LinBox group
+ *
+ * Time-stamp: <21 Jan 10 15:08:59 Jean-Guillaume.Dumas at imag.fr>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ *
+ * SparseElimination elimination routines over GF2
+ */
+#ifndef __LINBOX_gauss_elim_gf2_INL
+#define __LINBOX_gauss_elim_gf2_INL
+
+namespace LinBox
+{
+ template <class Vector> inline void
+ GaussDomain<GF2>::permuteBinary (Vector &lignecourante,
+ const unsigned long &indcol,
+ const long &indpermut) const
+ {
+ const unsigned long k = indcol - 1;
+
+#if 0
+ std::cerr << "B PERMUTE: " << indpermut << " <--> " << k << " of [";
+ for(typename Vector::const_iterator refs = lignecourante.begin();
+ refs != lignecourante.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "]" << std::endl;
+#endif
+
+ // precondition indpermut != k
+ if (lignecourante.size () ) {
+ typename Vector::iterator kin_it=lignecourante.begin();
+ for (; kin_it != lignecourante.end(); ++kin_it)
+ if (*kin_it >= k) break;
+ if (kin_it != lignecourante.end()) {
+ typename Vector::iterator pin_it=kin_it;
+ for (; pin_it != lignecourante.end(); ++pin_it)
+ if (static_cast<long>(*pin_it) >= indpermut) break;
+ if ( *kin_it == k) {
+ if (pin_it != lignecourante.end()) {
+ if ( static_cast<long>(*pin_it) != indpermut) {
+ --pin_it;
+ // Only k there
+ *kin_it = indpermut;
+ typename Vector::value_type etmp = *kin_it;
+ typename Vector::iterator current = kin_it;
+ typename Vector::iterator next = kin_it; ++next;
+ for( ; current != pin_it; ++current, ++next)
+ *current = *next;
+ *pin_it = etmp;
+ }
+ }
+ else {
+ --pin_it;
+ // Only k there
+ *kin_it = indpermut;
+ typename Vector::value_type etmp = *kin_it;
+ typename Vector::iterator current = kin_it;
+ typename Vector::iterator next = kin_it; ++next;
+ for( ; current != pin_it; ++current, ++next)
+ *current = *next;
+ *pin_it = etmp;
+ }
+ }
+ else {
+ if (pin_it != lignecourante.end()) {
+ if ( static_cast<long>(*pin_it) == indpermut) {
+ // Only indpermut there
+ *pin_it = k;
+ typename Vector::value_type etmp = *pin_it;
+ typename Vector::iterator current = pin_it;
+ typename Vector::iterator prev = pin_it; --prev;
+ for( ; current != kin_it; --current, --prev)
+ *current = *prev;
+ *kin_it = etmp;
+ } // else Nobody
+ } // else Nobody
+ }
+ } // else rien de supérieur à k dans l
+ // donc rien à permuter
+ }
+
+#if 0
+ std::cerr << "E PERMUTE: " << indpermut << " <--> " << k << " of [";
+ for(typename Vector::const_iterator refs = lignecourante.begin();
+ refs != lignecourante.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "]" << std::endl;
+#endif
+ }
+
+
+ template <class Vector, class D> inline void
+ GaussDomain<GF2>::eliminateBinary (bool &headpivot,
+ Vector &lignecourante,
+ const Vector &lignepivot,
+ const unsigned long indcol,
+ const long indpermut,
+ const unsigned long npiv,
+ D &columns) const
+ {
+
+ typedef typename Vector::value_type E;
+
+ unsigned long k = indcol - 1;
+ unsigned long nj = lignecourante.size () ;
+#if 0
+ std::cerr << "BEGIN ELIMINATE, k: " << k << ", nj: " << nj << ", indpermut: " << indpermut << ", indcol: " << indcol << std::endl;
+ std::cerr << "lignepivot: [";
+ for(typename Vector::const_iterator refs = lignepivot.begin();
+ refs != lignepivot.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "], lignecour: [";
+ for(typename Vector::const_iterator refs = lignecourante.begin();
+ refs != lignecourante.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << ']' << std::endl;
+#endif
+ if (nj > 0) {
+ unsigned long j_head = 0;
+
+ for (; j_head < nj; ++j_head) {
+ if (static_cast<long>(lignecourante[j_head]) >= indpermut) break;
+#if 0
+ std::cerr << "ELIMINATE, j_head: " << j_head << std::endl;
+#endif
+ }
+
+ if (j_head < nj) {
+ if (static_cast<long>(lignecourante[j_head]) == indpermut) {
+ // -------------------------------------------
+ // Permutation
+ if ( indpermut != static_cast<long>(k)) {
+ if (lignecourante[0] != k) {
+ // zero <--> non zero
+ E tmp = lignecourante[j_head];
+ --columns[tmp];
+ ++columns[k];
+ tmp = k;
+
+ for (long l = j_head; l > 0; l--)
+ lignecourante[l] = lignecourante[l-1];
+
+ lignecourante[0] = tmp;
+ }
+ j_head = 0;
+ }
+ // -------------------------------------------
+ // Elimination
+ Vector construit (nj + npiv);
+
+ // construit : <-- j
+ // courante : <-- m
+ // pivot : <-- l
+ unsigned long j = 0;
+ unsigned long m = j_head + 1;
+
+ // A[i,k] <-- - A[i,k] / A[k,k]
+ headpivot = true;
+ --columns[lignecourante[j_head] ];
+
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ while (j < j_head) {
+ construit[j] = lignecourante[j];
+ ++j;
+ }
+
+ unsigned long j_piv;
+
+ unsigned long l = 0;
+
+ for (; l < npiv; ++l)
+ if (lignepivot[l] > k) break;
+
+ // for all j such that (j>k) and A[k,j]!=0
+ while (l < npiv) {
+ j_piv = lignepivot[l];
+
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ while ((m < nj) && (lignecourante[m] < j_piv))
+ construit[j++] = lignecourante[m++];
+
+ // if A[i,j]!=0, then A[i,j] <-- A[i,j] - A[i,k]*A[k,j]
+ if ((m < nj) && (lignecourante[m] == j_piv)) {
+ --columns[lignecourante[m++]];
+ }
+ else {
+ ++columns[j_piv];
+ construit[j++] = E (j_piv);
+ }
+
+ ++l;
+ }
+
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ while (m<nj)
+ construit[j++] = lignecourante[m++];
+
+ construit.resize (j);
+ lignecourante = construit;
+ }
+ else {
+ // -------------------------------------------
+ // j_head < nj but nothing under the pivot
+ // Permutation
+#if 0
+ std::cerr << "----------------------------------------------------------" << std::endl;
+ std::cerr << "j_head < nj" << std::endl;
+ std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
+ // << "lignepivot: " << lignepivot
+ // << ", lignecour: " << lignecourante
+ << std::endl;
+ std::cerr << "----------------------------------------------------------" << std::endl;
+#endif
+ if (indpermut != static_cast<long>(k)) {
+ if (j_head>0) {
+ unsigned long l = 0;
+
+ for (; l < nj; ++l)
+ if (lignecourante[l] >= k) break;
+
+ if ((l < nj) && (lignecourante[l] == k)) {
+ // non zero <--> zero
+ E tmp = lignecourante[l];
+ --columns[k];
+ ++columns[indpermut];
+ tmp = indpermut;
+
+ unsigned long bjh = j_head-1;
+ for (; l < bjh; ++l)
+ lignecourante[l] = lignecourante[l + 1];
+
+ lignecourante[bjh] = tmp;
+ } // else // zero <--> zero
+ } // else // zero <--> zero
+ }
+ }
+ }
+ else {
+ // -------------------------------------------
+ // j_head >= nj > 0
+#if 0
+ std::cerr << "----------------------------------------------------------" << std::endl;
+ std::cerr << "j_head >= nj > 0" << std::endl;
+ std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
+ // << "lignepivot: " << lignepivot
+ // << ", lignecour: " << lignecourante
+ << std::endl;
+ std::cerr << "----------------------------------------------------------" << std::endl;
+#endif
+ if (indpermut != static_cast<long>(k)) {
+ unsigned long l = 0;
+
+ for (; l < nj; ++l)
+ if (lignecourante[l] >= k) break;
+
+ if ((l < nj) && (lignecourante[l] == k)) {
+ // non zero <--> zero
+ E tmp = lignecourante[l];
+ --columns[k];
+ ++columns[indpermut];
+ tmp = indpermut;
+
+ unsigned long bjh = nj - 1;
+ for (; l < bjh; ++l)
+ lignecourante[l] = lignecourante[l + 1];
+
+ lignecourante[bjh] = tmp;
+ } // else
+ // zero <--> zero
+ }
+
+ }
+ }
+
+
+#if 0
+ std::cerr << "END ELIMINATE, k: " << k << ", nj: " << nj << ", indpermut: " << indpermut << ", indcol: " << indcol << std::endl;
+ std::cerr << "lignepivot: [";
+ for(typename Vector::const_iterator refs = lignepivot.begin();
+ refs != lignepivot.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "], lignecour: [";
+ for(typename Vector::const_iterator refs = lignecourante.begin();
+ refs != lignecourante.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << ']' << std::endl;
+#endif
+
+ }
+
+
+
+
+
+
+} // namespace LinBox
+
+#endif // __LINBOX_gauss_elim_gf2_INL
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/gauss/gauss-elim.inl b/linbox/algorithms/gauss/gauss-elim.inl
new file mode 100644
index 0000000..4f11f9d
--- /dev/null
+++ b/linbox/algorithms/gauss/gauss-elim.inl
@@ -0,0 +1,845 @@
+/* linbox/algorithms/gauss-elim.inl
+ * Copyright (C) 2009 The LinBox group
+ *
+ * Time-stamp: <21 Jan 10 15:06:11 Jean-Guillaume.Dumas at imag.fr>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ *
+ * SparseElimination elimination routines
+ */
+#ifndef __LINBOX_gauss_elim_INL
+#define __LINBOX_gauss_elim_INL
+
+namespace LinBox
+{
+ template <class _Field>
+ template <class Vector> inline void
+ GaussDomain<_Field>::permute (Vector &lignecourante,
+ const unsigned long &indcol,
+ const long &indpermut) const
+ {
+ const unsigned long k = indcol - 1;
+
+#if 0
+ std::cerr << "B PERMUTE: " << indpermut << " <--> " << k << " of [";
+ for(typename Vector::const_iterator refs = lignecourante.begin();
+ refs != lignecourante.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "]" << std::endl;
+#endif
+
+ // precondition indpermut != k
+ if (lignecourante.size () ) {
+ typename Vector::iterator kin_it=lignecourante.begin();
+ for (; kin_it != lignecourante.end(); ++kin_it)
+ if (kin_it->first >= k) break;
+ if (kin_it != lignecourante.end()) {
+ typename Vector::iterator pin_it=kin_it;
+ for (; pin_it != lignecourante.end(); ++pin_it)
+ if (static_cast<long>(pin_it->first) >= indpermut) break;
+ if ( kin_it->first == k) {
+ if (pin_it != lignecourante.end()) {
+ if ( static_cast<long>(pin_it->first) == indpermut) {
+ // Both there
+ std::swap( kin_it->second, pin_it->second);
+ }
+ else {
+ // Only k there
+ kin_it->first = (unsigned)indpermut;
+ typename Vector::value_type etmp = *kin_it;
+ --pin_it;
+ typename Vector::iterator current = kin_it;
+ typename Vector::iterator next = kin_it; ++next;
+ for( ; current != pin_it; ++current, ++next)
+ *current = *next;
+ *pin_it = etmp;
+ }
+ }
+ else {
+ --pin_it;
+ // Only k there
+ kin_it->first = (unsigned)indpermut;
+ typename Vector::value_type etmp = *kin_it;
+ typename Vector::iterator current = kin_it;
+ typename Vector::iterator next = kin_it; ++next;
+ for( ; current != pin_it; ++current, ++next)
+ *current = *next;
+ *pin_it = etmp;
+ }
+ }
+ else {
+ if (pin_it != lignecourante.end()) {
+ if ( static_cast<long>(pin_it->first) == indpermut) {
+ // Only indpermut there
+ pin_it->first = (unsigned)k;
+ typename Vector::value_type etmp = *pin_it;
+ typename Vector::iterator current = pin_it;
+ typename Vector::iterator prev = pin_it; --prev;
+ for( ; current != kin_it; --current, --prev)
+ *current = *prev;
+ *kin_it = etmp;
+ } // else Nobody
+ } // else Nobody
+ }
+ } // else rien de supérieur à k dans l
+ // donc rien à permuter
+ }
+
+#if 0
+ std::cerr << "E PERMUTE: " << indpermut << " <--> " << k << " of [";
+ for(typename Vector::const_iterator refs = lignecourante.begin();
+ refs != lignecourante.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "]" << std::endl;
+#endif
+ }
+
+
+
+
+ template <class _Field>
+ template <class Vector, class D> inline void
+ GaussDomain<_Field>::eliminate (Vector &lignecourante,
+ const Vector &lignepivot,
+ const unsigned long &indcol,
+ const long &indpermut,
+ D &columns) const
+ {
+
+ typedef typename Vector::value_type E;
+
+ unsigned long k = indcol - 1;
+ unsigned long nj = lignecourante.size () ;
+#if 0
+ std::cerr << "BEGIN ELIMINATE, k: " << k << ", nj: " << nj << ", indpermut: " << indpermut << ", indcol: " << indcol << std::endl;
+ std::cerr << "lignepivot: [";
+ for(typename Vector::const_iterator refs = lignepivot.begin();
+ refs != lignepivot.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "], lignecour: [";
+ for(typename Vector::const_iterator refs = lignecourante.begin();
+ refs != lignecourante.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << ']' << std::endl;
+#endif
+ if (nj > 0) {
+ unsigned long j_head = 0;
+
+ for (; j_head < nj; ++j_head) {
+ if (static_cast<long>(lignecourante[j_head].first) >= indpermut) break;
+#if 0
+ std::cerr << "ELIMINATE, j_head: " << j_head << std::endl;
+#endif
+ }
+
+ if (j_head < nj) {
+ if (static_cast<long>(lignecourante[j_head].first) == indpermut) {
+ // -------------------------------------------
+ // Permutation
+ if ( indpermut != static_cast<long>(k)) {
+ if (lignecourante[0].first == k) {
+ // non zero <--> non zero
+ std::swap( lignecourante[0].second, lignecourante[j_head].second);
+ }
+ else {
+ // zero <--> non zero
+ E tmp = lignecourante[j_head];
+ --columns[tmp.first];
+ ++columns[k];
+ tmp.first = (unsigned)k;
+
+ for (long l = (long)j_head; l > 0; --l)
+ lignecourante[l] = lignecourante[l-1];
+
+ lignecourante[0] = tmp;
+ }
+ j_head = 0;
+ }
+ // -------------------------------------------
+ // Elimination
+ unsigned long npiv = lignepivot.size ();
+ Vector construit (nj + npiv);
+
+ // construit : <-- j
+ // courante : <-- m
+ // pivot : <-- l
+ unsigned long j = 0;
+ unsigned long m = j_head + 1;
+
+ // A[i,k] <-- - A[i,k] / A[k,k]
+ Element headcoeff;
+ _field.divin (_field.neg (headcoeff, lignecourante[j_head].second),
+ lignepivot[0].second);
+
+ --columns[lignecourante[j_head].first];
+
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ while (j < j_head) {
+ construit[j] = lignecourante[j];
+ j++;
+ }
+
+ unsigned long j_piv;
+
+ unsigned long l = 0;
+
+ for (; l < npiv; l++)
+ if (lignepivot[l].first > k) break;
+
+ // for all j such that (j>k) and A[k,j]!=0
+ while (l < npiv) {
+ j_piv = lignepivot[l].first;
+
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ while ((m < nj) && (lignecourante[m].first < j_piv))
+ construit[j++] = lignecourante[m++];
+
+ // if A[i,j]!=0, then A[i,j] <-- A[i,j] - A[i,k]*A[k,j]
+ if ((m < nj) && (lignecourante[m].first == j_piv)) {
+ Element tmp;
+
+ _field.axpy (tmp, headcoeff, lignepivot[l].second,
+ lignecourante[m].second);
+
+ if (! _field.isZero (tmp)) {
+ _field.assign (lignecourante[m].second, tmp);
+ construit[j++] = lignecourante[m++];
+ }
+ else
+ --columns[lignecourante[m++].first];
+ }
+ else {
+ Element tmp;
+
+ _field.mul (tmp, headcoeff, lignepivot[l].second);
+
+ // if (! _field.isZero (tmp)) {
+ ++columns[j_piv];
+ construit[j++] = E ((unsigned)j_piv, tmp);
+ // }
+ // else
+ // std::cerr << "NEVER HAPPENED" << std::endl;
+
+ }
+
+ l++;
+ }
+
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ while (m<nj)
+ construit[j++] = lignecourante[m++];
+
+ construit.resize (j);
+ lignecourante = construit;
+ }
+ else {
+ // -------------------------------------------
+ // j_head < nj but nothing under the pivot
+ // Permutation
+#if 0
+ std::cerr << "----------------------------------------------------------" << std::endl;
+ std::cerr << "j_head < nj" << std::endl;
+ std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
+ // << "lignepivot: " << lignepivot
+ // << ", lignecour: " << lignecourante
+ << std::endl;
+ std::cerr << "----------------------------------------------------------" << std::endl;
+#endif
+ if (indpermut != static_cast<long>(k)) {
+ if (j_head>0) {
+ unsigned long l = 0;
+
+ for (; l < nj; ++l)
+ if (lignecourante[l].first >= k) break;
+
+ if ((l < nj) && (lignecourante[l].first == k)) {
+ // non zero <--> zero
+ E tmp = lignecourante[l];
+ --columns[k];
+ ++columns[indpermut];
+ tmp.first = (unsigned)indpermut;
+
+ unsigned long bjh = j_head-1;
+ for (; l < bjh; ++l)
+ lignecourante[l] = lignecourante[l + 1];
+
+ lignecourante[bjh] = tmp;
+ } // else // zero <--> zero
+ } // else // zero <--> zero
+ }
+ }
+ }
+ else {
+ // -------------------------------------------
+ // j_head >= nj > 0
+#if 0
+ std::cerr << "----------------------------------------------------------" << std::endl;
+ std::cerr << "j_head >= nj > 0" << std::endl;
+ std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
+ // << "lignepivot: " << lignepivot
+ // << ", lignecour: " << lignecourante
+ << std::endl;
+ std::cerr << "----------------------------------------------------------" << std::endl;
+#endif
+ if (indpermut != static_cast<long>(k)) {
+ unsigned long l = 0;
+
+ for (; l < nj; ++l)
+ if (lignecourante[l].first >= k) break;
+
+ if ((l < nj) && (lignecourante[l].first == k)) {
+ // non zero <--> zero
+ E tmp = lignecourante[l];
+ --columns[k];
+ ++columns[indpermut];
+ tmp.first = (unsigned)indpermut;
+
+ unsigned long bjh = nj - 1;
+ for (; l < bjh; ++l)
+ lignecourante[l] = lignecourante[l + 1];
+
+ lignecourante[bjh] = tmp;
+ } // else
+ // zero <--> zero
+ }
+
+ }
+ }
+
+
+#if 0
+ std::cerr << "END ELIMINATE, k: " << k << ", nj: " << nj << ", indpermut: " << indpermut << ", indcol: " << indcol << std::endl;
+ std::cerr << "lignepivot: [";
+ for(typename Vector::const_iterator refs = lignepivot.begin();
+ refs != lignepivot.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "], lignecour: [";
+ for(typename Vector::const_iterator refs = lignecourante.begin();
+ refs != lignecourante.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << ']' << std::endl;
+#endif
+ }
+
+
+ template <class _Field>
+ template <class Vector, class D> inline void
+ GaussDomain<_Field>::eliminate (Element &headpivot,
+ Vector &lignecourante,
+ const Vector &lignepivot,
+ const unsigned long indcol,
+ const long indpermut,
+ const unsigned long npiv,
+ D &columns) const
+ {
+
+ typedef typename Vector::value_type E;
+
+ unsigned long k = indcol - 1;
+ unsigned long nj = lignecourante.size () ;
+#if 0
+ std::cerr << "BEGIN ELIMINATE, k: " << k << ", nj: " << nj << ", indpermut: " << indpermut << ", indcol: " << indcol << std::endl;
+ std::cerr << "lignepivot: [";
+ for(typename Vector::const_iterator refs = lignepivot.begin();
+ refs != lignepivot.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "], lignecour: [";
+ for(typename Vector::const_iterator refs = lignecourante.begin();
+ refs != lignecourante.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << ']' << std::endl;
+#endif
+ if (nj > 0) {
+ unsigned long j_head = 0;
+
+ for (; j_head < nj; ++j_head) {
+ if (static_cast<long>(lignecourante[j_head].first) >= indpermut) break;
+#if 0
+ std::cerr << "ELIMINATE, j_head: " << j_head << std::endl;
+#endif
+ }
+
+ if (j_head < nj) {
+ if (static_cast<long>(lignecourante[j_head].first) == indpermut) {
+ // -------------------------------------------
+ // Permutation
+ if ( indpermut != static_cast<long>(k)) {
+ if (lignecourante[0].first == k) {
+ // non zero <--> non zero
+ std::swap( lignecourante[0].second, lignecourante[j_head].second);
+ }
+ else {
+ // zero <--> non zero
+ E tmp = lignecourante[j_head];
+ --columns[tmp.first];
+ ++columns[k];
+ tmp.first = (unsigned)k;
+
+ for (long l = (long)j_head; l > 0; --l)
+ lignecourante[l] = lignecourante[l-1];
+
+ lignecourante[0] = tmp;
+ }
+ j_head = 0;
+ }
+ // -------------------------------------------
+ // Elimination
+ Vector construit (nj + npiv);
+
+ // construit : <-- j
+ // courante : <-- m
+ // pivot : <-- l
+ unsigned long j = 0;
+ unsigned long m = j_head + 1;
+
+ // A[i,k] <-- - A[i,k] / A[k,k]
+ Element headcoeff;
+ _field.div( headpivot, lignecourante[j_head].second,
+ lignepivot[0].second);
+ _field.neg(headcoeff, headpivot);
+ // _field.divin (_field.neg (headcoeff, lignecourante[j_head].second),
+ // lignepivot[0].second);
+
+ --columns[lignecourante[j_head].first];
+
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ while (j < j_head) {
+ construit[j] = lignecourante[j];
+ j++;
+ }
+
+ unsigned long j_piv;
+
+ unsigned long l = 0;
+
+ for (; l < npiv; l++)
+ if (lignepivot[l].first > k) break;
+
+ // for all j such that (j>k) and A[k,j]!=0
+ while (l < npiv) {
+ j_piv = lignepivot[l].first;
+
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ while ((m < nj) && (lignecourante[m].first < j_piv))
+ construit[j++] = lignecourante[m++];
+
+ // if A[i,j]!=0, then A[i,j] <-- A[i,j] - A[i,k]*A[k,j]
+ if ((m < nj) && (lignecourante[m].first == j_piv)) {
+ Element tmp;
+
+ _field.axpy (tmp, headcoeff, lignepivot[l].second,
+ lignecourante[m].second);
+
+ if (! _field.isZero (tmp)) {
+ _field.assign (lignecourante[m].second, tmp);
+ construit[j++] = lignecourante[m++];
+ }
+ else
+ --columns[lignecourante[m++].first];
+ }
+ else {
+ Element tmp;
+
+ _field.mul (tmp, headcoeff, lignepivot[l].second);
+
+ // if (! _field.isZero (tmp)) {
+ ++columns[j_piv];
+ construit[j++] = E ((unsigned)j_piv, tmp);
+ // }
+ // else
+ // std::cerr << "NEVER HAPPENED" << std::endl;
+
+ }
+
+ l++;
+ }
+
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ while (m<nj)
+ construit[j++] = lignecourante[m++];
+
+ construit.resize (j);
+ lignecourante = construit;
+ }
+ else {
+ // -------------------------------------------
+ // j_head < nj but nothing under the pivot
+ // Permutation
+#if 0
+ std::cerr << "----------------------------------------------------------" << std::endl;
+ std::cerr << "j_head < nj" << std::endl;
+ std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
+ // << "lignepivot: " << lignepivot
+ // << ", lignecour: " << lignecourante
+ << std::endl;
+ std::cerr << "----------------------------------------------------------" << std::endl;
+#endif
+ if (indpermut != static_cast<long>(k)) {
+ if (j_head>0) {
+ unsigned long l = 0;
+
+ for (; l < nj; ++l)
+ if (lignecourante[l].first >= k) break;
+
+ if ((l < nj) && (lignecourante[l].first == k)) {
+ // non zero <--> zero
+ E tmp = lignecourante[l];
+ --columns[k];
+ ++columns[indpermut];
+ tmp.first = (unsigned)indpermut;
+
+ unsigned long bjh = j_head-1;
+ for (; l < bjh; ++l)
+ lignecourante[l] = lignecourante[l + 1];
+
+ lignecourante[bjh] = tmp;
+ } // else // zero <--> zero
+ } // else // zero <--> zero
+ }
+ }
+ }
+ else {
+ // -------------------------------------------
+ // j_head >= nj > 0
+#if 0
+ std::cerr << "----------------------------------------------------------" << std::endl;
+ std::cerr << "j_head >= nj > 0" << std::endl;
+ std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
+ // << "lignepivot: " << lignepivot
+ // << ", lignecour: " << lignecourante
+ << std::endl;
+ std::cerr << "----------------------------------------------------------" << std::endl;
+#endif
+ if (indpermut != static_cast<long>(k)) {
+ unsigned long l = 0;
+
+ for (; l < nj; ++l)
+ if (lignecourante[l].first >= k) break;
+
+ if ((l < nj) && (lignecourante[l].first == k)) {
+ // non zero <--> zero
+ E tmp = lignecourante[l];
+ --columns[k];
+ ++columns[indpermut];
+ tmp.first = (unsigned)indpermut;
+
+ unsigned long bjh = nj - 1;
+ for (; l < bjh; ++l)
+ lignecourante[l] = lignecourante[l + 1];
+
+ lignecourante[bjh] = tmp;
+ } // else
+ // zero <--> zero
+ }
+
+ }
+ }
+
+#if 0
+ std::cerr << "END ELIMINATE, k: " << k << ", nj: " << nj << ", indpermut: " << indpermut << ", indcol: " << indcol << std::endl;
+ std::cerr << "lignepivot: [";
+ for(typename Vector::const_iterator refs = lignepivot.begin();
+ refs != lignepivot.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "], lignecour: [";
+ for(typename Vector::const_iterator refs = lignecourante.begin();
+ refs != lignecourante.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << ']' << std::endl;
+#endif
+ }
+
+
+
+ template <class _Field>
+ template <class Vector> inline void
+ GaussDomain<_Field>::eliminate (Vector &lignecourante,
+ const Vector &lignepivot,
+ const unsigned long &indcol,
+ const long &indpermut) const
+ {
+ typedef typename Vector::value_type E;
+
+ unsigned long k = indcol - 1;
+ unsigned long nj = lignecourante.size () ;
+
+ if (nj > 0) {
+ unsigned long j_head = 0;
+
+ for (; j_head < nj; ++j_head)
+ if (static_cast<long>(lignecourante[j_head].first) >= indpermut) break;
+
+ if (j_head < nj) {
+ if (static_cast<long>(lignecourante[j_head].first) == indpermut) {
+ // -------------------------------------------
+ // Permutation
+ if (indpermut != static_cast<long>(k)) {
+ if (lignecourante[0].first == k) {
+ // non zero <--> non zero
+ std::swap( lignecourante[0].second, lignecourante[j_head].second);
+ }
+ else {
+ // zero <--> non zero
+ E tmp = lignecourante[j_head];
+ tmp.first = k;
+ for (long l = (long)j_head; l > 0; --l)
+ lignecourante[l] = lignecourante[l-1];
+ lignecourante[0] = tmp;
+ }
+
+ j_head = 0;
+ }
+ // -------------------------------------------
+ // Elimination
+ unsigned long npiv = lignepivot.size ();
+ Vector construit (nj + npiv);
+ // construit : <-- j
+ // courante : <-- m
+ // pivot : <-- l
+ unsigned long j = 0;
+ unsigned long m = j_head + 1;
+
+ // A[i,k] <-- - A[i,k] / A[k,k]
+
+ Element headcoeff;
+ _field.divin (_field.neg (headcoeff, lignecourante[j_head].second),
+ lignepivot[0].second);
+
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ while (j < j_head) {
+ construit[j] = lignecourante[j];
+ j++;
+ }
+
+ unsigned long j_piv;
+ unsigned long l = 0;
+
+ for (; l < npiv; l++)
+ if (lignepivot[l].first > k) break;
+
+ // for all j such that (j>k) and A[k,j]!=0
+ while (l < npiv) {
+ j_piv = lignepivot[l].first;
+
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ while ((m < nj) && (lignecourante[m].first < j_piv))
+ construit[j++] = lignecourante[m++];
+
+ // if A[i,j]!=0, then A[i,j] <-- A[i,j] - A[i,k]*A[k,j]
+ if ((m < nj) && (lignecourante[m].first == j_piv)) {
+ Element tmp;
+ _field.axpy (tmp, headcoeff, lignepivot[l].second,
+ lignecourante[m].second);
+
+ if (! _field.isZero (tmp)) {
+ _field.assign (lignecourante[m].second, tmp);
+ construit[j++] = lignecourante[m++];
+ }
+ else
+ ++m;
+
+ }
+ else {
+ Element tmp;
+ _field.mul (tmp, headcoeff, lignepivot[l].second);
+ // if (! _field.isZero (tmp))
+ construit[j++] = E (j_piv, tmp);
+ // else
+ // std::cerr << "NEVER HAPPENED" << std::endl;
+ }
+ l++;
+ }
+
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ while (m < nj)
+ construit[j++] = lignecourante[m++];
+
+ construit.resize (j);
+ lignecourante = construit;
+ }
+ else {
+ // -------------------------------------------
+ // j_head < nj but nothing under the pivot
+ // Permutation
+ if (indpermut != static_cast<long>(k)) {
+ if (j_head > 0) {
+ unsigned long l = 0;
+
+ for (; l < nj; ++l)
+ if (lignecourante[l].first >= k) break;
+
+ if ((l < nj) && (lignecourante[l].first == k)) {
+ // non zero <--> zero
+ E tmp = lignecourante[l];
+ tmp.first = indpermut;
+
+ unsigned long bjh = j_head -1;
+ for (; l < bjh; l++)
+ lignecourante[l] = lignecourante[l + 1];
+
+ lignecourante[bjh] = tmp;
+ } // else // zero <--> zero
+ } // else // zero <--> zero
+ }
+ }
+ }
+ else {
+ // -------------------------------------------
+ // -------------------------------------------
+ // j_head >= nj > 0
+#if 0
+ std::cerr << "----------------------------------------------------------" << std::endl;
+ std::cerr << "j_head >= nj > 0" << std::endl;
+ std::cerr << "j_head: " << j_head << ", nj: " << nj << ", k:" << k
+ // << "lignepivot: " << lignepivot
+ // << ", lignecour: " << lignecourante
+ << std::endl;
+ std::cerr << "----------------------------------------------------------" << std::endl;
+#endif
+ if (indpermut != static_cast<long>(k)) {
+ unsigned long l = 0;
+
+ for (; l < nj; ++l)
+ if (lignecourante[l].first >= k) break;
+
+ if ((l < nj) && (lignecourante[l].first == k)) {
+ // non zero <--> zero
+ E tmp = lignecourante[l];
+ tmp.first = indpermut;
+
+ unsigned long bjh = nj - 1;
+ for (; l < bjh; l++)
+ lignecourante[l] = lignecourante[l + 1];
+
+ lignecourante[bjh] = tmp;
+ } // else
+ // zero <--> zero
+ }
+ }
+ }
+ }
+
+
+} // namespace LinBox
+
+#endif // __LINBOX_gauss_elim_INL
+
+#if 0
+template <class _Field>
+template <class Vector>
+void GaussDomain<_Field>::permute (Vector &lignecourante,
+ const unsigned long &indcol,
+ const long &indpermut)
+{
+ const unsigned long k = indcol - 1;
+#if 0
+ std::cerr << "B PERMUTE: " << indpermut << " <--> " << k << " of [";
+ for(typename Vector::const_iterator refs = lignecourante.begin();
+ refs != lignecourante.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "]" << std::endl;
+#endif
+
+ // precondition indpermut != k
+ unsigned long nj = lignecourante.size () ;
+ if (nj > 0) {
+ Element tmp; _field.init(tmp);
+ unsigned long kin = 0;
+ for (; kin < nj; ++kin)
+ if (static_cast<long>(lignecourante[kin].first) >= k) break;
+ if (kin < nj) {
+ unsigned long pin = kin;
+ for (; pin < nj; ++pin)
+ if (static_cast<long>(lignecourante[pin].first) >= indpermut) break;
+ if ( static_cast<long>(lignecourante[kin].first) == k) {
+ if (pin < nj) {
+ if ( static_cast<long>(lignecourante[pin].first) == indpermut) {
+ // Both there
+ std::swap( lignecourante[kin].second, lignecourante[pin].second);
+ }
+ else {
+ // Only k there
+ lignecourante[kin].first = indpermut;
+ typename Vector::value_type etmp = lignecourante[kin];
+ --pin;
+ for(size_t i=kin; i<pin; ++i)
+ lignecourante[i] = lignecourante[i+1];
+ lignecourante[pin] = etmp;
+ }
+ }
+ else {
+ pin = nj-1;
+ // Only k there
+ lignecourante[kin].first = indpermut;
+ typename Vector::value_type etmp = lignecourante[kin];
+ for(size_t i=kin; i<pin; ++i)
+ lignecourante[i] = lignecourante[i+1];
+ lignecourante[pin] = etmp;
+
+ }
+ }
+ else {
+ if (pin < nj) {
+ if ( static_cast<long>(lignecourante[pin].first) == indpermut) {
+ // Only indpermut there
+ lignecourante[pin].first = k;
+ typename Vector::value_type etmp = lignecourante[pin];
+ for(size_t i = pin; i>kin; --i)
+ lignecourante[i] = lignecourante[i-1];
+ lignecourante[kin] = etmp;
+ } // else Nobody
+ } // else Nobody
+ }
+ } // else rien de supérieur à k dans l
+ // donc rien à permuter
+ }
+#if 0
+ std::cerr << "E PERMUTE: " << indpermut << " <--> " << k << " of [";
+ for(typename Vector::const_iterator refs = lignecourante.begin();
+ refs != lignecourante.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "]" << std::endl;
+#endif
+}
+#endif
+
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/gauss/gauss-gf2.inl b/linbox/algorithms/gauss/gauss-gf2.inl
new file mode 100644
index 0000000..68320d3
--- /dev/null
+++ b/linbox/algorithms/gauss/gauss-gf2.inl
@@ -0,0 +1,412 @@
+/* linbox/algorithms/gauss-gf2.inl
+ * Copyright (C) 2009 The LinBox group
+ *
+ * Time-stamp: <15 Jun 10 16:20:16 Jean-Guillaume.Dumas at imag.fr>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+#ifndef __LINBOX_gauss_gf2_INL
+#define __LINBOX_gauss_gf2_INL
+// SparseSeqMatrix is container< container< size_t > >
+
+#include "linbox/algorithms/gauss.h"
+#include "linbox/util/commentator.h"
+#include <utility>
+
+#ifdef __LINBOX_ALL__ //BB: ???
+#ifndef __LINBOX_COUNT__
+#define __LINBOX_COUNT__
+#endif
+#ifndef __LINBOX_OFTEN__
+#define __LINBOX_OFTEN__ __LINBOX_ALL__
+#endif
+#ifndef __LINBOX_FILLIN__
+#define __LINBOX_FILLIN__
+#endif
+#endif
+
+namespace LinBox
+{
+ // Specialization over GF2
+ template <class SparseSeqMatrix, class Perm>
+ inline unsigned long&
+ GaussDomain<GF2>::InPlaceLinearPivoting (unsigned long &Rank,
+ bool &determinant,
+ SparseSeqMatrix &LigneA,
+ Perm &P,
+ unsigned long Ni,
+ unsigned long Nj) const
+ {
+ // Requirements : LigneA is an array of sparse rows
+ // In place (LigneA is modified)
+ // With reordering (D is a density type. Density is allocated here)
+ // long Ni = LigneA.n_row (), Nj = LigneA.n_col ();
+ commentator().start ("Gaussian elimination with reordering over GF2",
+ "IPLRGF2", Ni);
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ << "Gaussian QLUP elimination on " << Ni << " x " << Nj << " matrix" << std::endl;
+
+#ifdef __LINBOX_COUNT__
+ long long nbelem = 0;
+#endif
+
+ determinant = true;
+ // allocation of the column density
+ std::vector<size_t> col_density (Nj);
+
+
+ // assignment of LigneA with the domain object
+ for (unsigned long jj = 0; jj < Ni; ++jj)
+ for (unsigned long k = 0; k < LigneA[jj].size (); k++)
+ ++col_density[LigneA[jj][k]];
+
+ long last = Ni - 1;
+ long c;
+ Rank = 0;
+
+#ifdef __LINBOX_OFTEN__
+ long sstep = last/40;
+ if (sstep > __LINBOX_OFTEN__) sstep = __LINBOX_OFTEN__;
+#else
+ long sstep = 1000;
+#endif
+ // Elimination steps with reordering
+
+ typename SparseSeqMatrix::iterator LigneA_k = LigneA.begin();
+ for (long k = 0; k < last; ++k, ++LigneA_k) {
+ long p = k, s = 0;
+
+#ifdef __LINBOX_FILLIN__
+ if ( ! (k % 100) )
+#else
+ if ( ! (k % sstep) )
+#endif
+ {
+ commentator().progress (k);
+#ifdef __LINBOX_FILLIN__
+ long sl(0);
+ for (size_t l = 0; l < Ni; ++l)
+ sl += LigneA[l].size ();
+
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Fillin (" << Rank << "/" << Ni << ") = "
+ << sl
+ << " (" << double(sl)*100.0/double(Ni-k)/double(Nj-k) << "%, "
+ << double(sl)/double(Ni-k) << " avg)"
+ << std::endl;
+#endif
+ }
+
+ long l;
+ for(l = k; l < static_cast<long>(Ni); ++l) {
+ if ( (s = LigneA[l].size()) != 0 ) {
+ p = l;
+ break;
+ }
+ }
+
+ if (s) {
+ long sl;
+ // Row permutation for the sparsest row
+ for (; l < static_cast<long>(Ni); ++l)
+ if (((sl = LigneA[l].size ()) < s) && (sl)) {
+ s = sl;
+ p = l;
+ }
+
+ if (p != k) {
+ // std::cerr << "Permuting rows: " << k << " <--> " << p << std::endl;
+ std::swap( *LigneA_k, LigneA[p]);
+ }
+
+
+ SparseFindPivotBinary (*LigneA_k, Rank, c, col_density, determinant);
+
+ if (c != -1) {
+ long ll;
+ if ( c != (static_cast<long>(Rank)-1) ) {
+ P.permute(Rank-1,c);
+ for (ll=0 ; ll < k ; ++ll)
+ permuteBinary( LigneA[ll], Rank, c);
+ }
+ long npiv=LigneA_k->size();
+ for (ll = k+1; ll < static_cast<long>(Ni); ++ll) {
+ bool elim=false;
+ eliminateBinary (elim, LigneA[ll], *LigneA_k, Rank, c, npiv, col_density);
+ }
+ }
+
+ // LigneA.write(std::cerr << "AFT " )<<std::endl;
+#ifdef __LINBOX_COUNT__
+ nbelem += LigneA_k->size ();
+#endif
+ }
+ // LigneA.write(rep << "U:= ", FORMAT_MAPLE) << std::endl;
+ }//for k
+
+ SparseFindPivotBinary ( LigneA[last], Rank, c, determinant);
+ if (c != -1) {
+ if ( c != (static_cast<long>(Rank)-1) ) {
+ P.permute(Rank-1,c);
+ for (long ll=0 ; ll < last ; ++ll)
+ permuteBinary( LigneA[ll], Rank, c);
+ }
+ }
+
+#ifdef __LINBOX_COUNT__
+ nbelem += LigneA[last].size ();
+ commentator().report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
+ << "Left elements : " << nbelem << std::endl;
+#endif
+
+#ifdef __LINBOX_FILLIN__
+ long sl(0);
+ for (size_t l=0; l < Ni; ++l)
+ sl += LigneA[l].size ();
+
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Fillin (" << Rank << "/" << Ni << ") = " << sl
+ << std::endl;
+#endif
+
+ if ((Rank < Ni) || (Rank < Nj) || (Ni == 0) || (Nj == 0))
+ determinant = false;
+
+ integer card;
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Determinant : " << determinant
+ << " over GF (2)" << std::endl;
+
+ // LigneA.write(rep << "U:= ", FORMAT_MAPLE) << ':' << std::endl;
+
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Rank : " << Rank
+ << " over GF (2)" << std::endl;
+ commentator().stop ("done", 0, "IPLRGF2");
+
+
+
+ return Rank;
+ }
+
+ // Specialization over GF2
+ template <class SparseSeqMatrix, class Perm> inline unsigned long&
+ GaussDomain<GF2>::QLUPin (unsigned long &Rank,
+ bool &determinant,
+ Perm &Q,
+ SparseSeqMatrix &LigneL,
+ SparseSeqMatrix &LigneA,
+ Perm &P,
+ unsigned long Ni,
+ unsigned long Nj) const
+ {
+ linbox_check( Q.coldim() == Q.rowdim() );
+ linbox_check( P.coldim() == P.rowdim() );
+ linbox_check( Q.coldim() == LigneL.size() );
+
+ typedef typename SparseSeqMatrix::value_type Vector;
+ typedef typename Vector::value_type E;
+
+ // Requirements : LigneA is an array of sparse rows
+ // In place (LigneA is modified)
+ // With reordering (D is a density type. Density is allocated here)
+ // long Ni = LigneA.n_row (), Nj = LigneA.n_col ();
+ commentator().start ("Gaussian elimination with reordering over GF2",
+ "IPLRGF2", Ni);
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ << "Gaussian QLUP elimination on " << Ni << " x " << Nj << " matrix" << std::endl;
+
+#ifdef __LINBOX_COUNT__
+ long long nbelem = 0;
+#endif
+
+ determinant = true;
+ // allocation of the column density
+ std::vector<size_t> col_density (Nj);
+
+
+ for(typename SparseSeqMatrix::iterator LigneL_it = LigneL.begin() ;
+ LigneL_it != LigneL.end(); ++LigneL_it)
+ LigneL_it->reserve(16);
+
+ std::deque<std::pair<size_t,size_t> > invQ;
+
+ // assignment of LigneA with the domain object
+ for (unsigned long jj = 0; jj < Ni; ++jj)
+ for (unsigned long k = 0; k < LigneA[jj].size (); k++)
+ ++col_density[LigneA[jj][k]];
+
+ long last = Ni - 1;
+ long c;
+ Rank = 0;
+
+#ifdef __LINBOX_OFTEN__
+ long sstep = last/40;
+ if (sstep > __LINBOX_OFTEN__) sstep = __LINBOX_OFTEN__;
+#else
+ long sstep = 1000;
+#endif
+ // Elimination steps with reordering
+
+ typename SparseSeqMatrix::iterator LigneA_k = LigneA.begin();
+ for (long k = 0; k < last; ++k, ++LigneA_k) {
+ long p = k, s = 0;
+
+#ifdef __LINBOX_FILLIN__
+ if ( ! (k % 100) )
+#else
+ if ( ! (k % sstep) )
+#endif
+ {
+ commentator().progress (k);
+#ifdef __LINBOX_FILLIN__
+ long sl(0);
+ for (size_t l = 0; l < Ni; ++l)
+ sl += LigneA[l].size ();
+
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Fillin (" << Rank << "/" << Ni << ") = "
+ << sl
+ << " (" << double(sl)*100.0/double(Ni-k)/double(Nj-k) << "%, "
+ << double(sl)/double(Ni-k) << " avg)"
+ << std::endl;
+#endif
+ }
+
+ long l;
+ for(l = k; l < static_cast<long>(Ni); ++l) {
+ if ( (s = LigneA[l].size()) ) {
+ p = l;
+ break;
+ }
+ }
+
+ if (s) {
+ long sl;
+ // Row permutation for the sparsest row
+ for (; l < static_cast<long>(Ni); ++l)
+ if (((sl = LigneA[l].size ()) < s) && (sl)) {
+ s = sl;
+ p = l;
+ }
+
+ if (p != k) {
+ // std::cerr << "Permuting rows: " << k << " <--> " << p << std::endl;
+ invQ.push_front( std::pair<size_t,size_t>(k,p) );
+ std::swap( *LigneA_k, LigneA[p]);
+ std::swap( LigneL[k], LigneL[p]);
+ }
+
+
+ SparseFindPivotBinary (*LigneA_k, Rank, c, col_density, determinant);
+
+ if (c != -1) {
+ long ll;
+ if ( c != (static_cast<long>(Rank)-1) ) {
+ P.permute(Rank-1,c);
+ for (ll=0 ; ll < k ; ++ll)
+ permuteBinary( LigneA[ll], Rank, c);
+ }
+ long npiv=LigneA_k->size();
+ for (ll = k+1; ll < static_cast<long>(Ni); ++ll) {
+ E hc; hc=Rank-1; bool elim=false;
+ eliminateBinary (elim, LigneA[ll], *LigneA_k, Rank, c, npiv, col_density);
+ if(elim) LigneL[ll].push_back(hc);
+ }
+ }
+
+ // LigneA.write(std::cerr << "AFT " )<<std::endl;
+#ifdef __LINBOX_COUNT__
+ nbelem += LigneA_k->size ();
+#endif
+ }
+ LigneL[k].push_back(k);
+ // LigneL.write(rep << "L:= ", FORMAT_MAPLE) << std::endl;
+ // LigneA.write(rep << "U:= ", FORMAT_MAPLE) << std::endl;
+ }//for k
+
+ SparseFindPivotBinary ( LigneA[last], Rank, c, determinant);
+ if (c != -1) {
+ if ( c != (static_cast<long>(Rank)-1) ) {
+ P.permute(Rank-1,c);
+ for (long ll=0 ; ll < last ; ++ll)
+ permuteBinary( LigneA[ll], Rank, c);
+ }
+ }
+
+ LigneL[last].push_back(last);
+
+#ifdef __LINBOX_COUNT__
+ nbelem += LigneA[last].size ();
+ commentator().report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
+ << "Left elements : " << nbelem << std::endl;
+#endif
+
+#ifdef __LINBOX_FILLIN__
+ long sl(0);
+ for (size_t l=0; l < Ni; ++l)
+ sl += LigneA[l].size ();
+
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Fillin (" << Rank << "/" << Ni << ") = " << sl
+ << std::endl;
+#endif
+
+ if ((Rank < Ni) || (Rank < Nj) || (Ni == 0) || (Nj == 0))
+ determinant = false;
+
+ integer card;
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Determinant : " << determinant
+ << " over GF (2)" << std::endl;
+
+ for(std::deque<std::pair<size_t,size_t> >::const_iterator it = invQ.begin(); it!=invQ.end();++it)
+ Q.permute( it->first, it->second );
+
+#if 0
+ Q.write(rep << "Q:= ", FORMAT_MAPLE) << ':' << std::endl;
+ LigneL.write(rep << "L:= ", FORMAT_MAPLE) << ':' << std::endl;
+ LigneA.write(rep << "U:= ", FORMAT_MAPLE) << ':' << std::endl;
+ P.write(rep << "P:= ", FORMAT_MAPLE) << ':' << std::endl;
+#endif
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Rank : " << Rank
+ << " over GF (2)" << std::endl;
+ commentator().stop ("done", 0, "IPLRGF2");
+
+
+
+ return Rank;
+ }
+
+
+} // namespace LinBox
+
+#endif // __LINBOX_gauss_gf2_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/gauss/gauss-nullspace.inl b/linbox/algorithms/gauss/gauss-nullspace.inl
new file mode 100644
index 0000000..4f072f6
--- /dev/null
+++ b/linbox/algorithms/gauss/gauss-nullspace.inl
@@ -0,0 +1,154 @@
+/* linbox/algorithms/gauss-solve.inl
+ * Copyright (C) LinBox 2008
+ *
+ * Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
+ * Time-stamp: <21 Jun 10 14:43:11 Jean-Guillaume.Dumas at imag.fr>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+#ifndef __LINBOX_gauss_nullspace_INL
+#define __LINBOX_gauss_nullspace_INL
+
+#include "linbox/blackbox/sparse.h"
+#include "linbox/algorithms/gauss.h"
+#include "linbox/algorithms/triangular-solve.h"
+#include "linbox/blackbox/permutation.h"
+#include "linbox/vector/sparse.h"
+
+namespace LinBox
+{
+
+
+
+ // U is supposed full Rank upper triangular
+ template <class _Field>
+ template <class Matrix, class Perm, class Block> inline Block&
+ GaussDomain<_Field>::nullspacebasis(Block& x, unsigned long Rank, const Matrix& U, const Perm& P) const
+ {
+ if (Rank == 0) {
+ for(size_t i=0; i<U.coldim(); ++i)
+ x.setEntry(i,i,_field.one);
+ }
+ else {
+ unsigned long nullity = U.coldim()-Rank;
+ if (nullity != 0) {
+ // compute U2T s.t. U = [ U1 | -U2T^T ]
+ Matrix U2T(_field,nullity,Rank);
+
+ for(typename Matrix::ConstIndexedIterator uit=U.IndexedBegin();
+ uit != U.IndexedEnd(); ++uit) {
+ if (uit.colIndex() >= Rank)
+ U2T.setEntry(uit.colIndex()-Rank,uit.rowIndex(),uit.value());
+ }
+ for(typename Matrix::Iterator u2it=U2T.Begin();
+ u2it != U2T.End(); ++u2it)
+ _field.negin(*u2it);
+
+
+ // Compute the basis vector by vector
+ typedef Sparse_Vector< typename _Field::Element > SparseVect;
+ for(size_t i=0; i<nullity; ++i) {
+ SparseVect W1Ti;
+ // Solve for upper part of basis
+ upperTriangularSparseSolve(W1Ti, Rank, U, U2T[i]);
+ // Add identity for lower part
+ W1Ti.push_back( typename SparseVect::Element((unsigned)(Rank+i), _field.one ) );
+
+ for(size_t j=0; j<W1Ti.size(); ++j) {
+ // P.applyTranspose(x[i],W1T[i]);
+ // Transposein(x)
+ x.setEntry( P.getStorage()[ W1Ti[j].first ], i, W1Ti[j].second );
+ }
+ }
+ }
+ }
+ // x.write( std::cerr << "X:=", FORMAT_MAPLE ) << ';' << std::endl;
+ return x;
+ }
+
+ template <class Matrix>
+ inline bool nextnonzero(size_t& k, size_t Ni, const Matrix& A)
+ {
+ for(++k; k<Ni; ++k)
+ if (A[k].size() > 0) return true;
+ return false;
+ }
+
+ // Matrix A is upper triangularized
+ template <class _Field>
+ template <class Matrix, class Block> inline Block&
+ GaussDomain<_Field>::nullspacebasisin(Block& x, Matrix& A) const
+ {
+ typename Field::Element Det;
+ unsigned long Rank;
+ size_t Ni(A.rowdim()),Nj(A.coldim());
+
+ Permutation<Field> P((int)Nj,_field);
+
+ // A.write( std::cerr << "A:=", FORMAT_MAPLE ) << ';' << std::endl;
+ this->InPlaceLinearPivoting(Rank, Det, A, P, Ni, Nj );
+
+ // P.write( std::cerr << "P:=", FORMAT_MAPLE ) << ';' << std::endl;
+ // A.write( std::cerr << "Ua:=", FORMAT_MAPLE ) << ';' << std::endl;
+
+ for(size_t i=0; i< Ni; ++i) {
+ if (A[i].size() == 0) {
+ size_t j(i);
+ if (nextnonzero(j,Ni,A)) {
+ A[i] = A[j];
+ A[j].resize(0);
+ }
+ else {
+ break;
+ }
+ }
+ }
+
+ // A.write( std::cerr << "Ub:=", FORMAT_MAPLE ) << ';' << std::endl;
+
+ return this->nullspacebasis(x, Rank, A, P);
+ }
+
+ template <class _Field>
+ template <class Matrix, class Block> inline Block&
+ GaussDomain<_Field>::nullspacebasis(Block& x, const Matrix& A) const
+ {
+ SparseMatrix<Field, typename LinBox::Vector<Field>::SparseSeq> A1 (A);
+ return this->nullspacebasisin(x, A1);
+ }
+
+
+
+
+} // namespace LinBox
+
+#endif // __LINBOX_gauss_nullspace_INL
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/gauss/gauss-pivot-gf2.inl b/linbox/algorithms/gauss/gauss-pivot-gf2.inl
new file mode 100644
index 0000000..c110120
--- /dev/null
+++ b/linbox/algorithms/gauss/gauss-pivot-gf2.inl
@@ -0,0 +1,132 @@
+/* linbox/algorithms/gauss-pivot-gf2.inl
+ * Copyright (C) 2009 The LinBox group
+ *
+ * Time-stamp: <21 Jan 10 15:08:59 Jean-Guillaume.Dumas at imag.fr>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ *
+ * SparseElimination search for pivots over GF2
+ */
+#ifndef __LINBOX_gauss_pivot_gf2_INL
+#define __LINBOX_gauss_pivot_gf2_INL
+
+namespace LinBox
+{
+ template <class Vector, class D> inline void
+ GaussDomain<GF2>::SparseFindPivotBinary (Vector &lignepivot,
+ unsigned long &indcol,
+ long &indpermut,
+ D &columns,
+ bool &) const //determinant
+ {
+
+#if 0
+ std::cerr << "SFP BEG : lignepivot: [";
+ for(typename Vector::const_iterator refs = lignepivot.begin();
+ refs != lignepivot.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "]" << std::endl;
+#endif
+ typedef typename Vector::value_type E;
+
+ long nj = lignepivot.size ();
+
+ if (nj > 0) {
+ indpermut = lignepivot.front();
+
+ long ds = --columns[indpermut], dl, p = 0;
+
+ for (long j = 1; j < nj; ++j) {
+ if ((dl = --columns[lignepivot[j]]) < ds) {
+ ds = dl;
+ p = j;
+ }
+ }
+
+ if (p != 0) {
+ if (indpermut == static_cast<long>(indcol)) {
+ indpermut = lignepivot[p];
+ }
+ else {
+ E ttm = lignepivot[p];
+ indpermut = ttm;
+
+ for (long m = p; m; --m)
+ lignepivot[m] = lignepivot[m-1];
+
+ lignepivot[0] = ttm;
+ }
+ }
+
+ if (indpermut != static_cast<long>(indcol)) {
+ // std::cerr << "Permuting col: " << indpermut << " <--> " << indcol << std::endl;
+ // no need to decrement/increment, already done during the search
+ lignepivot[0] = indcol;
+ }
+
+ ++indcol;
+ }
+ else
+ indpermut = -1;
+#if 0
+ std::cerr << "SFP END : lignepivot: [";
+ for(typename Vector::const_iterator refs = lignepivot.begin();
+ refs != lignepivot.end() ;
+ ++refs )
+ std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ std::cerr << "]" << std::endl;
+#endif
+ }
+
+ template <class Vector> inline void
+ GaussDomain<GF2>::SparseFindPivotBinary (Vector &lignepivot,
+ unsigned long &indcol,
+ long &indpermut,
+ bool& ) const // determinant
+ {
+ long nj = lignepivot.size ();
+
+ if (nj > 0) {
+ indpermut = lignepivot.front();
+ if (indpermut != static_cast<long>(indcol)){
+ lignepivot.front() = indcol;
+ }
+ ++indcol;
+ }
+ else
+ indpermut = -1;
+ }
+
+
+} // namespace LinBox
+
+#endif // __LINBOX_gauss_pivot_gf2_INL
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/gauss/gauss-pivot.inl b/linbox/algorithms/gauss/gauss-pivot.inl
new file mode 100644
index 0000000..579ca73
--- /dev/null
+++ b/linbox/algorithms/gauss/gauss-pivot.inl
@@ -0,0 +1,169 @@
+/* linbox/algorithms/gauss-pivot.inl
+ * Copyright (C) 2009,2010 The LinBox group
+ * Written by JG Dumas <Jean-Guillaume.Dumas at imag.fr>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ *
+ * SparseElimination search for pivots
+ */
+
+#ifndef __LINBOX_gauss_pivot_INL
+#define __LINBOX_gauss_pivot_INL
+
+namespace LinBox
+{
+
+ template <class _Field>
+ template <class Vector, class D> inline void
+ GaussDomain<_Field>::SparseFindPivot (Vector &lignepivot,
+ unsigned long &indcol,
+ long &indpermut,
+ D &columns,
+ Element &determinant) const
+ {
+
+ // std::cerr << "SFP BEG : lignepivot: [";
+ // for(typename Vector::const_iterator refs = lignepivot.begin();
+ // refs != lignepivot.end() ;
+ // ++refs )
+ // std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ // std::cerr << "]" << std::endl;
+ typedef typename Vector::value_type E;
+
+ long nj = lignepivot.size ();
+
+ bool pivoting = false;
+
+ if (nj > 0) {
+ indpermut = lignepivot[0].first;
+
+ long ds = --columns[indpermut], dl, p = 0;
+
+ for (long j = 1; j < nj; ++j) {
+ if ((dl = --columns[lignepivot[j].first]) < ds) {
+ ds = dl;
+ p = j;
+ }
+ }
+
+ if (p != 0) {
+ pivoting = true;
+ if (indpermut == static_cast<long>(indcol)) {
+ indpermut = lignepivot[p].first;
+ std::swap( lignepivot[p].second, lignepivot[0].second);
+ }
+ else {
+ E ttm = lignepivot[p];
+ indpermut = ttm.first;
+
+ for (long m = p; m; --m)
+ lignepivot[m] = lignepivot[m-1];
+
+ lignepivot[0] = ttm;
+ }
+ }
+
+ _field.mulin(determinant, lignepivot[0].second);
+ if (indpermut != static_cast<long>(indcol)) {
+ // std::cerr << "Permuting col: " << indpermut << " <--> " << indcol << std::endl;
+ // no need to decrement/increment, already done during the search
+ lignepivot[0].first = (unsigned)indcol;
+ pivoting = true;
+ }
+
+ if (pivoting) _field.negin(determinant);
+ ++indcol;
+ }
+ else
+ indpermut = -1;
+
+ // std::cerr << "SFP END : lignepivot: [";
+ // for(typename Vector::const_iterator refs = lignepivot.begin();
+ // refs != lignepivot.end() ;
+ // ++refs )
+ // std::cerr << '(' << refs->first << ';' << refs->second << ')';
+ // std::cerr << "]" << std::endl;
+ }
+
+
+ template <class _Field>
+ template <class Vector> inline void
+ GaussDomain<_Field>::SparseFindPivot (Vector &lignepivot,
+ unsigned long &indcol,
+ long &indpermut,
+ Element& determinant) const
+ {
+ long nj = lignepivot.size ();
+
+ if (nj > 0) {
+ indpermut = lignepivot[0].first;
+ _field.mulin(determinant, lignepivot[0].second);
+ if (indpermut != static_cast<long>(indcol)){
+ // std::cerr << "Permuting col: " << lignepivot[0].first << " <--> " << indcol << std::endl;
+ lignepivot[0].first = (unsigned)indcol;
+ _field.negin(determinant);
+ }
+ ++indcol;
+ }
+ else
+ indpermut = -1;
+ }
+
+ template <class _Field>
+ template <class Vector> inline void
+ GaussDomain<_Field>::FindPivot (Vector &lignepivot,
+ unsigned long &k,
+ long &indpermut) const
+ {
+ // Dense lignepivot
+ long n = lignepivot.size ();
+ long j = (long)k;
+
+ for (; j < n ; ++j )
+ if (!_field.isZero (lignepivot[j])) break ;
+
+ if (j == n )
+ indpermut = -1 ;
+ else {
+ indpermut = j ;
+ if (indpermut != (long)k) {
+ typename Vector::value_type tmp = lignepivot[k] ;
+ lignepivot[k] = lignepivot[j] ;
+ lignepivot[j] = tmp ;
+ }
+
+ ++k;
+ }
+ }
+
+} // namespace LinBox
+
+#endif // __LINBOX_gauss_pivot_INL
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/gauss/gauss-rank-gf2.inl b/linbox/algorithms/gauss/gauss-rank-gf2.inl
new file mode 100644
index 0000000..bba0d4e
--- /dev/null
+++ b/linbox/algorithms/gauss/gauss-rank-gf2.inl
@@ -0,0 +1,95 @@
+/* linbox/algorithms/gauss-rank-gf2.inl
+ * Copyright (C) 2009 The LinBox group
+ *
+ * Time-stamp: <14 Jun 10 15:26:01 Jean-Guillaume.Dumas at imag.fr>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ *
+ * SparseElimination rank calls over GF2
+ */
+
+// =================================================================== //
+// =================================================================== //
+#ifndef __LINBOX_gauss_rank_gf2_INL
+#define __LINBOX_gauss_rank_gf2_INL
+
+namespace LinBox
+{
+ template <class SparseSeqMatrix> unsigned long&
+ GaussDomain<GF2>::rankin(unsigned long &Rank,
+ SparseSeqMatrix &A,
+ unsigned long Ni,
+ unsigned long Nj,
+ SparseEliminationTraits::PivotStrategy reord) const
+ {
+ Element determinant;
+ const GF2 F2;
+ Permutation<GF2> P((int)A.coldim(),F2);
+
+ if (reord == SparseEliminationTraits::PIVOT_NONE)
+ return NoReordering(Rank, determinant, A, Ni, Nj);
+ else
+ return InPlaceLinearPivoting(Rank, determinant, A, P, Ni, Nj);
+ }
+
+
+ template <class SparseSeqMatrix> unsigned long&
+ GaussDomain<GF2>::rankin(unsigned long &Rank,
+ SparseSeqMatrix &A,
+ SparseEliminationTraits::PivotStrategy reord) const
+ {
+ return rankin(Rank, A, A.rowdim (), A.coldim (), reord);
+ }
+
+
+
+ template <class SparseSeqMatrix> unsigned long&
+ GaussDomain<GF2>::rank(unsigned long &rk,
+ const SparseSeqMatrix &A,
+ SparseEliminationTraits::PivotStrategy reord) const
+ {
+ return rank(rk, A, A.rowdim (), A.coldim (), reord);
+ }
+
+ template <class SparseSeqMatrix> unsigned long&
+ GaussDomain<GF2>::rank(unsigned long &Rank,
+ const SparseSeqMatrix &A,
+ unsigned long Ni,
+ unsigned long Nj,
+ SparseEliminationTraits::PivotStrategy reord) const
+ {
+ SparseSeqMatrix CopyA(Ni);
+ for(unsigned long i = 0; i < Ni; ++i)
+ CopyA[i] = A[i];
+ return rankin(Rank, CopyA, Ni, Nj, reord);
+ }
+} // namespace LinBox
+
+#endif // __LINBOX_gauss_rank_gf2_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/gauss/gauss-rank.inl b/linbox/algorithms/gauss/gauss-rank.inl
new file mode 100644
index 0000000..66438a9
--- /dev/null
+++ b/linbox/algorithms/gauss/gauss-rank.inl
@@ -0,0 +1,93 @@
+/* linbox/algorithms/gauss-rank.inl
+ * Copyright (C) 2009 The LinBox group
+ *
+ * Time-stamp: <15 Jun 10 17:20:20 Jean-Guillaume.Dumas at imag.fr>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ *
+ * SparseElimination rank calls
+ */
+#ifndef __LINBOX_gauss_rank_INL
+#define __LINBOX_gauss_rank_INL
+
+namespace LinBox
+{
+ template <class _Field>
+ template <class Matrix> unsigned long&
+ GaussDomain<_Field>::rankin(unsigned long &Rank,
+ Matrix &A,
+ unsigned long Ni,
+ unsigned long Nj,
+ SparseEliminationTraits::PivotStrategy reord) const
+ {
+ Element determinant;
+ if (reord == SparseEliminationTraits::PIVOT_NONE)
+ return NoReordering(Rank, determinant, A, Ni, Nj);
+ else
+ return InPlaceLinearPivoting(Rank, determinant, A, Ni, Nj);
+ }
+
+
+ template <class _Field>
+ template <class Matrix> unsigned long&
+ GaussDomain<_Field>::rankin(unsigned long &Rank,
+ Matrix &A,
+ SparseEliminationTraits::PivotStrategy reord) const
+ {
+ return rankin(Rank, A, A.rowdim (), A.coldim (), reord);
+ }
+
+
+
+ template <class _Field>
+ template <class Matrix> unsigned long&
+ GaussDomain<_Field>::rank(unsigned long &rk,
+ const Matrix &A,
+ SparseEliminationTraits::PivotStrategy reord) const
+ {
+ return rank(rk, A, A.rowdim (), A.coldim (), reord);
+ }
+
+ template <class _Field>
+ template <class Matrix> unsigned long&
+ GaussDomain<_Field>::rank(unsigned long &Rank,
+ const Matrix &A,
+ unsigned long Ni,
+ unsigned long Nj,
+ SparseEliminationTraits::PivotStrategy reord) const
+ {
+ Matrix CopyA(Ni);
+ for(unsigned long i = 0; i < Ni; ++i)
+ CopyA[i] = A[i];
+ return rankin(Rank, CopyA, Ni, Nj, reord);
+ }
+} // namespace LinBox
+
+#endif // __LINBOX_gauss_rank_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/gauss/gauss-solve-gf2.inl b/linbox/algorithms/gauss/gauss-solve-gf2.inl
new file mode 100644
index 0000000..31f7e91
--- /dev/null
+++ b/linbox/algorithms/gauss/gauss-solve-gf2.inl
@@ -0,0 +1,115 @@
+/* linbox/algorithms/gauss-solve-gf2.inl
+ * Copyright (C) LinBox 2009
+ *
+ * Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
+ * Time-stamp: <23 Mar 12 17:32:19 Jean-Guillaume.Dumas at imag.fr>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+#ifndef __LINBOX_gauss_solve_gf2_INL
+#define __LINBOX_gauss_solve_gf2_INL
+
+#include "linbox/algorithms/gauss-gf2.h"
+#include "linbox/algorithms/triangular-solve-gf2.h"
+#include "linbox/blackbox/permutation.h"
+
+namespace LinBox
+{
+
+
+ template <class SparseSeqMatrix, class Perm, class Vector1, class Vector2>
+ Vector1& GaussDomain<GF2>::solve(Vector1& x, Vector1& w, unsigned long Rank,
+ const Perm& Q, const SparseSeqMatrix& L,
+ const SparseSeqMatrix& U, const Perm& P,
+ const Vector2& b) const
+ {
+
+ Vector2 y(U.rowdim()), v(U.rowdim());
+
+ Q.applyTranspose(y, b);
+
+ lowerTriangularUnitarySolveBinary(v, L, y);
+
+ upperTriangularSolveBinary(w, U, v);
+
+ return P.applyTranspose(x, w);
+ }
+
+ template <class SparseSeqMatrix, class Vector1, class Vector2>
+ Vector1& GaussDomain<GF2>::solvein(Vector1& x,
+ SparseSeqMatrix &A,
+ const Vector2& b) const
+ {
+
+ typename GF2::Element Det;
+ unsigned long Rank;
+ const GF2 F2;
+ SparseSeqMatrix L(F2, A.rowdim(), A.rowdim());
+ Permutation<GF2> Q((int)A.rowdim(),F2);
+ Permutation<GF2> P((int)A.coldim(),F2);
+
+ this->QLUPin(Rank, Det, Q, L, A, P, A.rowdim(), A.coldim() );
+
+ Vector1 w(A.coldim());
+
+ for(typename Vector1::iterator it=w.begin()+Rank;it!=w.end();++it)
+ F2.init(*it,0);
+
+ return this->solve(x, w, Rank, Q, L, A, P, b);
+ }
+
+ template <class SparseSeqMatrix, class Vector1, class Vector2, class Random>
+ Vector1& GaussDomain<GF2>::solvein(Vector1& x,
+ SparseSeqMatrix &A,
+ const Vector2& b,
+ Random& generator) const
+ {
+
+ typename GF2::Element Det;
+ unsigned long Rank;
+ const GF2 F2;
+ SparseSeqMatrix L(F2, A.rowdim(), A.rowdim());
+ Permutation<GF2> Q((int)A.rowdim(),F2);
+ Permutation<GF2> P((int)A.coldim(),F2);
+
+ this->QLUPin(Rank, Det, Q, L, A, P, A.rowdim(), A.coldim() );
+
+ Vector1 w(A.coldim());
+
+ for(typename Vector1::iterator it=w.begin()+Rank;it!=w.end();++it)
+ generator.random( *it );
+
+ return this->solve(x, w, Rank, Q, L, A, P, b);
+ }
+
+} // namespace LinBox
+
+#endif // __LINBOX_gauss_solve_gf2_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/gauss/gauss-solve.inl b/linbox/algorithms/gauss/gauss-solve.inl
new file mode 100644
index 0000000..ea011a1
--- /dev/null
+++ b/linbox/algorithms/gauss/gauss-solve.inl
@@ -0,0 +1,127 @@
+/* linbox/algorithms/gauss-solve.inl
+ * Copyright (C) LinBox 2008
+ *
+ * Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
+ * Time-stamp: <23 Mar 12 17:33:46 Jean-Guillaume.Dumas at imag.fr>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+#ifndef __LINBOX_gauss_solve_INL
+#define __LINBOX_gauss_solve_INL
+
+// #include "linbox/algorithms/gauss.h"
+#include "linbox/algorithms/triangular-solve.h"
+#include "linbox/blackbox/permutation.h"
+
+namespace LinBox
+{
+
+
+ template <class _Field>
+ template <class Matrix, class Perm, class Vector1, class Vector2> inline Vector1&
+ GaussDomain<_Field>::solve(Vector1& x, Vector1& w, unsigned long Rank, const Perm& Q, const Matrix& L, const Matrix& U, const Perm& P, const Vector2& b) const
+ {
+
+ Vector2 y(U.rowdim()), v(U.rowdim());
+
+ Q.applyTranspose(y, b);
+
+ lowerTriangularUnitarySolve(v, L, y);
+
+ upperTriangularSolve(w, U, v);
+
+ return P.applyTranspose(x, w);
+ }
+
+ template <class _Field>
+ template <class Matrix, class Vector1, class Vector2> inline Vector1&
+ GaussDomain<_Field>::solvein(Vector1& x, Matrix& A, const Vector2& b) const
+ {
+
+ typename Field::Element Det;
+ unsigned long Rank;
+ Matrix L(_field, A.rowdim(), A.rowdim());
+ Permutation<Field> Q((int)A.rowdim(),_field);
+ Permutation<Field> P((int)A.coldim(),_field);
+
+ this->QLUPin(Rank, Det, Q, L, A, P, A.rowdim(), A.coldim() );
+
+ // Sets solution values to 0 for coldim()-Rank columns
+ // Therefore, prune unnecessary elements
+ // in those last columns of U
+ for(typename Matrix::RowIterator row=A.rowBegin();
+ row != A.rowEnd(); ++row) {
+ if (row->size()) {
+ size_t ns=0;
+ for(typename Matrix::Row::iterator it = row->begin();
+ it != row->end(); ++it, ++ns) {
+ if (it->first >= Rank) {
+ row->resize(ns);
+ break;
+ }
+ }
+ }
+ }
+
+ Vector1 w(A.coldim());
+
+ for(typename Vector1::iterator it=w.begin()+Rank;it!=w.end();++it)
+ _field.init(*it,0);
+
+ return this->solve(x, w, Rank, Q, L, A, P, b);
+ }
+
+ template <class _Field>
+ template <class Matrix, class Vector1, class Vector2, class Random> inline Vector1&
+ GaussDomain<_Field>::solvein(Vector1& x, Matrix& A, const Vector2& b, Random& generator) const
+ {
+ THIS_CODE_MAY_NOT_COMPILE_AND_IS_NOT_TESTED;
+
+ typename Field::Element Det;
+ unsigned long Rank;
+ Matrix L(_field, A.rowdim(), A.rowdim());
+ Permutation<Field> Q((int)A.rowdim(),_field);
+ Permutation<Field> P((int)A.coldim(),_field);
+
+ this->QLUPin(Rank, Det, Q, L, A, P, A.rowdim(), A.coldim() );
+
+ Vector1 w(A.coldim());
+ for(typename Vector1::iterator it=w.begin()+Rank;it!=w.end();++it)
+ generator.random( *it );
+
+ return this->solve(x, w, Rank, Q, L, A, P, b);
+ }
+
+
+} // namespace LinBox
+
+#endif // __LINBOX_gauss_solve_INL
+
+
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+
diff --git a/linbox/algorithms/gauss/gauss.inl b/linbox/algorithms/gauss/gauss.inl
new file mode 100644
index 0000000..137ef01
--- /dev/null
+++ b/linbox/algorithms/gauss/gauss.inl
@@ -0,0 +1,722 @@
+/* linbox/algorithms/gauss.inl
+ * Copyright (C) 1999 Jean-Guillaume Dumas
+ *
+ * Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
+ * Time-stamp: <18 Jun 10 15:48:38 Jean-Guillaume.Dumas at imag.fr>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+// ========================================================================= //
+// (C) The Linbox Group 1999
+// Calcul de rang par la méthode de Gauss pivot par ligne, sur matrice creuse
+// ========================================================================= //
+
+#ifndef __LINBOX_gauss_INL
+#define __LINBOX_gauss_INL
+
+#include "linbox/algorithms/gauss.h"
+#include "linbox/util/commentator.h"
+#include <utility>
+
+#ifdef __LINBOX_ALL__
+#define __LINBOX_COUNT__
+#define __LINBOX_OFTEN__ __LINBOX_ALL__ // BB: ???
+#define __LINBOX_FILLIN__
+#endif
+
+namespace LinBox
+{
+ template <class _Field>
+ template <class Matrix, class Perm> inline unsigned long&
+ GaussDomain<_Field>::QLUPin (unsigned long &Rank,
+ Element &determinant,
+ Perm &Q,
+ Matrix &LigneL,
+ Matrix &LigneA,
+ Perm &P,
+ unsigned long Ni,
+ unsigned long Nj) const
+ {
+ linbox_check( Q.coldim() == Q.rowdim() );
+ linbox_check( P.coldim() == P.rowdim() );
+ linbox_check( LigneL.coldim() == LigneL.rowdim() );
+ linbox_check( Q.coldim() == LigneL.rowdim() );
+ linbox_check( LigneL.coldim() == LigneA.rowdim() );
+ linbox_check( LigneA.coldim() == P.rowdim() );
+
+ typedef typename Matrix::Row Vector;
+ typedef typename Vector::value_type E;
+
+ // Requirements : LigneA is an array of sparse rows
+ // In place (LigneA is modified)
+ // With reordering (D is a density type. Density is allocated here)
+ // long Ni = LigneA.n_row (), Nj = LigneA.n_col ();
+ commentator().start ("Gaussian elimination with reordering",
+ "IPLR", Ni);
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ << "Gaussian QLUP elimination on " << Ni << " x " << Nj << " matrix" << std::endl;
+
+#ifdef __LINBOX_COUNT__
+ long long nbelem = 0;
+#endif
+
+ Element Eone; _field.init(Eone,1UL);
+ _field.init(determinant,1UL);
+ // allocation of the column density
+ std::vector<size_t> col_density (Nj);
+
+
+ for(typename Matrix::RowIterator LigneL_it = LigneL.rowBegin() ;
+ LigneL_it != LigneL.rowEnd(); ++LigneL_it)
+ LigneL_it->reserve(16);
+
+ std::deque<std::pair<size_t,size_t> > invQ;
+
+ // assignment of LigneA with the domain object
+ for (unsigned long jj = 0; jj < Ni; ++jj)
+ for (unsigned long k = 0; k < LigneA[jj].size (); k++)
+ ++col_density[LigneA[jj][k].first];
+
+ long last = (long)Ni - 1;
+ long c;
+ Rank = 0;
+
+#ifdef __LINBOX_OFTEN__
+ long sstep = last/40;
+ if (sstep > __LINBOX_OFTEN__) sstep = __LINBOX_OFTEN__;
+#else
+ long sstep = 1000;
+#endif
+ // Elimination steps with reordering
+
+ typename Matrix::RowIterator LigneA_k = LigneA.rowBegin(), LigneA_p;
+ for (long k = 0; k < last; ++k, ++LigneA_k) {
+ long p = k, s = 0;
+
+#ifdef __LINBOX_FILLIN__
+ if ( ! (k % 100) )
+#else
+ if ( ! (k % sstep) )
+#endif
+ {
+ commentator().progress (k);
+#ifdef __LINBOX_FILLIN__
+ long sl(0);
+ for (size_t l = 0; l < Ni; ++l)
+ sl += LigneA[l].size ();
+
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Fillin (" << Rank << "/" << Ni << ") = "
+ << sl
+ << " (" << double(sl)*100.0/double(Ni-k)/double(Nj-k) << "%, "
+ << double(sl)/double(Ni-k) << " avg)"
+ << std::endl;
+#endif
+ }
+
+ long l;
+ for(l = k; l < static_cast<long>(Ni); ++l) {
+ if ( (s = LigneA[l].size()) ) {
+ p = l;
+ break;
+ }
+ }
+
+ if (s) {
+ long sl;
+ // Row permutation for the sparsest row
+ for (; l < static_cast<long>(Ni); ++l)
+ if (((sl = LigneA[l].size ()) < s) && (sl)) {
+ s = sl;
+ p = l;
+ }
+
+ if (p != k) {
+ // std::cerr << "Permuting rows: " << k << " <--> " << p << std::endl;
+ invQ.push_front( std::pair<size_t,size_t>((size_t)k,(size_t)p) );
+ _field.negin(determinant);
+ std::swap( *LigneA_k, LigneA[p]);
+ std::swap( LigneL[k], LigneL[p]);
+ }
+
+
+ SparseFindPivot (*LigneA_k, Rank, c, col_density, determinant);
+
+ if (c != -1) {
+ long ll;
+ if ( c != (static_cast<long>(Rank)-1) ) {
+ P.permute(Rank-1,c);
+ for (ll=0 ; ll < k ; ++ll)
+ permute( LigneA[ll], Rank, c);
+ }
+ long npiv=LigneA_k->size();
+ for (ll = k+1; ll < static_cast<long>(Ni); ++ll) {
+ E hc;
+ hc.first=(unsigned)Rank-1;
+ eliminate (hc.second, LigneA[ll], *LigneA_k, Rank, c, npiv, col_density);
+ if(! _field.isZero(hc.second)) LigneL[ll].push_back(hc);
+ }
+ }
+
+ // LigneA.write(std::cerr << "AFT " )<<std::endl;
+#ifdef __LINBOX_COUNT__
+ nbelem += LigneA_k->size ();
+#endif
+ }
+ E one((unsigned)k,Eone);
+ LigneL[k].push_back(one);
+ // LigneL.write(rep << "L:= ", FORMAT_MAPLE) << std::endl;
+ // LigneA.write(rep << "U:= ", FORMAT_MAPLE) << std::endl;
+ }//for k
+
+ SparseFindPivot ( LigneA[last], Rank, c, determinant);
+ if (c != -1) {
+ if ( c != (static_cast<long>(Rank)-1) ) {
+ P.permute(Rank-1,c);
+ for (long ll=0 ; ll < last ; ++ll)
+ permute( LigneA[ll], Rank, c);
+ }
+ }
+
+ E one((unsigned)last,Eone);
+ LigneL[last].push_back(one);
+
+#ifdef __LINBOX_COUNT__
+ nbelem += LigneA[last].size ();
+ commentator().report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
+ << "Left elements : " << nbelem << std::endl;
+#endif
+
+#ifdef __LINBOX_FILLIN__
+ long sl(0);
+ for (size_t l=0; l < Ni; ++l)
+ sl += LigneA[l].size ();
+
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Fillin (" << Rank << "/" << Ni << ") = " << sl
+ << std::endl;
+#endif
+
+ if ((Rank < Ni) || (Rank < Nj) || (Ni == 0) || (Nj == 0))
+ _field.init(determinant,0UL);
+
+ integer card;
+ _field.write(commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Determinant : ", determinant)
+ << " over GF (" << _field.cardinality (card) << ")" << std::endl;
+
+ for(std::deque<std::pair<size_t,size_t> >::const_iterator it = invQ.begin(); it!=invQ.end();++it)
+ Q.permute( it->first, it->second );
+
+
+ // std::ostream& rep = commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT);
+ // Q.write(rep << "Q:= ", FORMAT_MAPLE) << ':' << std::endl;
+ // LigneL.write(rep << "L:= ", FORMAT_MAPLE) << ':' << std::endl;
+ // LigneA.write(rep << "U:= ", FORMAT_MAPLE) << ':' << std::endl;
+ // P.write(rep << "P:= ", FORMAT_MAPLE) << ':' << std::endl;
+
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Rank : " << Rank
+ << " over GF (" << card << ")" << std::endl;
+ commentator().stop ("done", 0, "IPLR");
+
+
+
+ return Rank;
+ }
+
+ template <class _Field>
+ template <class Matrix> inline unsigned long&
+ GaussDomain<_Field>::InPlaceLinearPivoting (unsigned long &Rank,
+ Element &determinant,
+ Matrix &LigneA,
+ unsigned long Ni,
+ unsigned long Nj) const
+ {
+ typedef typename Matrix::Row Vector;
+ typedef typename Vector::value_type E;
+
+ // Requirements : LigneA is an array of sparse rows
+ // In place (LigneA is modified)
+ // With reordering (D is a density type. Density is allocated here)
+ // long Ni = LigneA.n_row (), Nj = LigneA.n_col ();
+ commentator().start ("Gaussian elimination with reordering",
+ "IPLR", Ni);
+ _field.write( commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ << "Gaussian elimination on " << Ni << " x " << Nj << " matrix, over: ") << std::endl;
+
+#ifdef __LINBOX_COUNT__
+ long long nbelem = 0;
+#endif
+
+ _field.init(determinant,1UL);
+ Vector Vzer (0);
+ // allocation of the column density
+ std::vector<size_t> col_density (Nj);
+
+ // assignment of LigneA with the domain object
+ for (unsigned long jj = 0; jj < Ni; ++jj)
+ for (unsigned long k = 0; k < LigneA[jj].size (); k++)
+ ++col_density[LigneA[jj][k].first];
+
+ long last = (long)Ni - 1;
+ long c;
+ Rank = 0;
+
+#ifdef __LINBOX_OFTEN__
+ long sstep = last/40;
+ if (sstep > __LINBOX_OFTEN__) sstep = __LINBOX_OFTEN__;
+#else
+ long sstep = 1000;
+#endif
+ // Elimination steps with reordering
+ for (long k = 0; k < last; ++k) {
+ unsigned long l;
+ long p = k, s = LigneA[k].size (), sl;
+
+#ifdef __LINBOX_FILLIN__
+ if ( ! (k % 100) ) {
+#else
+ if ( ! (k % sstep) ) {
+#endif
+ commentator().progress (k);
+#ifdef __LINBOX_FILLIN__
+ for (sl = 0, l = 0; l < Ni; ++l)
+ sl += LigneA[l].size ();
+
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Fillin (" << Rank << "/" << Ni << ") = "
+ << sl
+ << " (" << double(sl)*100.0/double(Ni-k)/double(Nj-k) << "%, "
+ << double(sl)/double(Ni-k) << " avg)"
+ << std::endl;
+#endif
+ }
+
+ if (s) {
+ // Row permutation for the sparsest row
+ for (l = (unsigned long)k + 1; l < (unsigned long)Ni; ++l)
+ if (((sl = LigneA[l].size ()) < s) && (sl)) {
+ s = sl;
+ p = (long)l;
+ }
+
+ if (p != k) {
+ _field.negin(determinant);
+ Vector vtm = LigneA[k];
+ LigneA[k] = LigneA[p];
+ LigneA[p] = vtm;
+ }
+
+ // LigneA.write(std::cerr << "BEF, k:" << k << ", Rank:" << Rank << ", c:" << c)<<std::endl;
+
+ SparseFindPivot (LigneA[k], Rank, c, col_density, determinant);
+ // LigneA.write(std::cerr << "PIV, k:" << k << ", Rank:" << Rank << ", c:" << c)<<std::endl;
+ if (c != -1) {
+ for (l = (unsigned long)k + 1; l < (unsigned long)Ni; ++l)
+ eliminate (LigneA[l], LigneA[k], Rank, c, col_density);
+ }
+
+ // LigneA.write(std::cerr << "AFT " )<<std::endl;
+#ifdef __LINBOX_COUNT__
+ nbelem += LigneA[k].size ();
+#endif
+ LigneA[k] = Vzer;
+ }
+
+ }//for k
+
+ SparseFindPivot (LigneA[last], Rank, c, determinant);
+
+#ifdef __LINBOX_COUNT__
+ nbelem += LigneA[last].size ();
+ commentator().report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
+ << "Left elements : " << nbelem << std::endl;
+#endif
+
+#ifdef __LINBOX_FILLIN__
+ long sl(0);
+ for (size_t l=0; l < Ni; ++l)
+ sl += LigneA[l].size ();
+
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Fillin (" << Rank << "/" << Ni << ") = " << sl
+ << std::endl;
+#endif
+
+ integer card;
+
+ if ((Rank < Ni) || (Rank < Nj) || (Ni == 0) || (Nj == 0))
+ _field.init(determinant,0UL);
+
+ _field.write(commentator().report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
+ << "Determinant : ", determinant)
+ << " over GF (" << _field.cardinality (card) << ")" << std::endl;
+
+ commentator().report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
+ << "Rank : " << Rank
+ << " over GF (" << card << ")" << std::endl;
+ commentator().stop ("done", 0, "IPLR");
+ return Rank;
+ }
+
+ template <class _Field>
+ template <class Matrix, class Perm> inline unsigned long&
+ GaussDomain<_Field>::InPlaceLinearPivoting (unsigned long &Rank,
+ Element &determinant,
+ Matrix &LigneA,
+ Perm &P,
+ unsigned long Ni,
+ unsigned long Nj) const
+ {
+ typedef typename Matrix::Row Vector;
+ typedef typename Vector::value_type E;
+
+ // Requirements : LigneA is an array of sparse rows
+ // In place (LigneA is modified)
+ // With reordering (D is a density type. Density is allocated here)
+ // long Ni = LigneA.n_row (), Nj = LigneA.n_col ();
+ commentator().start ("Gaussian elimination with reordering",
+ "IPLR", Ni);
+ _field.write( commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ << "Gaussian elimination on " << Ni << " x " << Nj << " matrix, over: ") << std::endl;
+
+#ifdef __LINBOX_COUNT__
+ long long nbelem = 0;
+#endif
+
+ _field.init(determinant,1UL);
+ // allocation of the column density
+ std::vector<size_t> col_density (Nj);
+
+ // assignment of LigneA with the domain object
+ for (unsigned long jj = 0; jj < Ni; ++jj)
+ for (unsigned long k = 0; k < LigneA[jj].size (); k++)
+ ++col_density[LigneA[jj][k].first];
+
+ long last = (long)Ni - 1;
+ long c;
+ Rank = 0;
+
+#ifdef __LINBOX_OFTEN__
+ long sstep = last/40;
+ if (sstep > __LINBOX_OFTEN__) sstep = __LINBOX_OFTEN__;
+#else
+ long sstep = 1000;
+#endif
+ // Elimination steps with reordering
+ for (long k = 0; k < last; ++k) {
+ unsigned long l;
+ long p = k, s = LigneA[k].size (), sl;
+
+#ifdef __LINBOX_FILLIN__
+ if ( ! (k % 100) )
+#else
+ if ( ! (k % sstep) )
+#endif
+ {
+ commentator().progress (k);
+#ifdef __LINBOX_FILLIN__
+ for (sl = 0, l = 0; l < Ni; ++l)
+ sl += LigneA[l].size ();
+
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Fillin (" << Rank << "/" << Ni << ") = "
+ << sl
+ << " (" << double(sl)*100.0/double(Ni-k)/double(Nj-k) << "%, "
+ << double(sl)/double(Ni-k) << " avg)"
+ << std::endl;
+#endif
+ }
+
+ if (s) {
+ // Row permutation for the sparsest row
+ for (l = (unsigned long)k + 1; l < (unsigned long)Ni; ++l)
+ if (((sl = LigneA[l].size ()) < s) && (sl)) {
+ s = sl;
+ p = (long)l;
+ }
+
+ if (p != k) {
+ _field.negin(determinant);
+ Vector vtm = LigneA[k];
+ LigneA[k] = LigneA[p];
+ LigneA[p] = vtm;
+ }
+
+ // LigneA.write(std::cerr << "BEF, k:" << k << ", Rank:" << Rank << ", c:" << c)<<std::endl;
+
+ SparseFindPivot (LigneA[k], Rank, c, col_density, determinant);
+ // LigneA.write(std::cerr << "PIV, k:" << k << ", Rank:" << Rank << ", c:" << c)<<std::endl;
+ if (c != -1) {
+ if ( c != (static_cast<long>(Rank)-1) )
+ P.permute(Rank-1,c);
+ for (long ll=0; ll < k ; ++ll)
+ permute( LigneA[ll], Rank, c);
+
+ for (l = (unsigned long)k + 1; l < (unsigned long)Ni; ++l)
+ eliminate (LigneA[l], LigneA[k], Rank, c, col_density);
+ }
+
+ // LigneA.write(std::cerr << "AFT " )<<std::endl;
+#ifdef __LINBOX_COUNT__
+ nbelem += LigneA[k].size ();
+#endif
+ }
+
+ }//for k
+
+ SparseFindPivot (LigneA[last], Rank, c, determinant);
+ if ( (c != -1) && (c != (static_cast<long>(Rank)-1) ) ) {
+ P.permute(Rank-1,c);
+ for (long ll=0; ll < last ; ++ll)
+ permute( LigneA[ll], Rank, c);
+ }
+
+
+#ifdef __LINBOX_COUNT__
+ nbelem += LigneA[last].size ();
+ commentator().report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
+ << "Left elements : " << nbelem << std::endl;
+#endif
+
+#ifdef __LINBOX_FILLIN__
+ long sl(0);
+ for (size_t l=0; l < Ni; ++l)
+ sl += LigneA[l].size ();
+
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
+ << "Fillin (" << Rank << "/" << Ni << ") = " << sl
+ << std::endl;
+#endif
+
+ integer card;
+
+ if ((Rank < Ni) || (Rank < Nj) || (Ni == 0) || (Nj == 0))
+ _field.init(determinant,0UL);
+
+ _field.write(commentator().report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
+ << "Determinant : ", determinant)
+ << " over GF (" << _field.cardinality (card) << ")" << std::endl;
+
+ commentator().report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
+ << "Rank : " << Rank
+ << " over GF (" << card << ")" << std::endl;
+ commentator().stop ("done", 0, "IPLR");
+ return Rank;
+ }
+
+ template <class _Field>
+ template <class Matrix> inline unsigned long&
+ GaussDomain<_Field>::NoReordering (unsigned long &res,
+ Element &determinant,
+ Matrix &LigneA,
+ unsigned long Ni,
+ unsigned long Nj) const
+ {
+ // Requirements : SLA is an array of sparse rows
+ // IN PLACE.
+ // Without reordering (Pivot is first non-zero in row)
+ // long Ni = SLA.n_row (), Nj = SLA.n_col ();
+ // long Ni = LigneA.n_row (), Nj = LigneA.n_col ();
+ commentator().start ("Gaussian elimination (no reordering)",
+ "NoRe", Ni);
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ << "Gaussian elimination on " << Ni << " x " << Nj << " matrix" << std::endl;
+
+ typedef typename Matrix::Row Vector;
+ typedef typename Vector::value_type E;
+ // typedef typename Matrix::Element Elem;
+
+#ifdef __LINBOX_COUNT__
+ long long nbelem = 0;
+#endif
+ Vector Vzer (0);
+
+ _field.init(determinant,1UL);
+ long last = (long)Ni - 1;
+ long c;
+ unsigned long indcol (0);
+
+ for (long k = 0; k < last; ++k) {
+ if (!(k % 1000))
+ commentator().progress (k);
+
+ unsigned long l;
+
+ if (!LigneA[k].empty ()) {
+ SparseFindPivot (LigneA[k], indcol, c, determinant);
+ if (c != -1)
+ for (l = (unsigned long)k + 1; l < (unsigned long)Ni; ++l)
+ eliminate (LigneA[l], LigneA[k], indcol, c);
+
+#ifdef __LINBOX_COUNT__
+ nbelem += LigneA[k].size ();
+#endif
+ LigneA[k] = Vzer;
+ }
+ }
+
+ SparseFindPivot ( LigneA[last], indcol, c, determinant);
+
+#ifdef __LINBOX_COUNT__
+ nbelem += LigneA[last].size ();
+ commentator().report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
+ << "Left elements : " << nbelem << std::endl;
+#endif
+
+ res = indcol;
+
+ if ((res < Ni) || (res < Nj))
+ if ((res < Ni) || (res < Nj) || (Ni == 0) || (Nj == 0))
+ _field.init(determinant,0UL);
+
+ integer card;
+
+ _field.write(commentator().report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
+ << "Determinant : ", determinant)
+ << " over GF (" << _field.cardinality (card) << ")" << std::endl;
+
+ commentator().report (Commentator::LEVEL_NORMAL, PARTIAL_RESULT)
+ << "Rank : " << res
+ << " over GF (" << card << ")" << std::endl;
+ commentator().stop ("done", 0, "NoRe");
+ return res;
+ }
+
+
+ template <class _Field>
+ template<class Vector> inline void
+ GaussDomain<_Field>::Upper (Vector &lignecur,
+ const Vector &lignepivot,
+ unsigned long indcol,
+ long indpermut) const
+ {
+ static typename _Field::Element zero = _field.init(zero);
+
+ long n = lignecur.size () ;
+ long k = (long) indcol - 1 ;
+
+ // permutation if one has been performed to compute the pivot
+ if (indpermut != k) {
+ typename Vector::value_type tmp = lignecur[k];
+ lignecur[k] = lignecur[indpermut];
+ lignecur[indpermut] = tmp;
+ }
+
+ typename Vector::value_type headcoeff;
+ _field.divin (_field.neg (headcoeff, lignecur[k]), lignepivot[k]);
+
+
+
+ // LU in place
+ _field.assign (lignecur[k], zero);
+ for (long j = k; ++j < n;)
+ _field.axpyin (lignecur[j], headcoeff, lignepivot[j]) ;
+ }
+
+ template <class _Field>
+ template <class Vector> inline void
+ GaussDomain<_Field>::LU (Vector &lignecur,
+ const Vector &lignepivot,
+ unsigned long indcol,
+ long indpermut) const
+ {
+ long n = lignecur.size ();
+ long k = (long) indcol - 1;
+
+ // permutation if one has been performed to compute the pivot
+ if (indpermut != k) {
+ typename Vector::value_type tmp = lignecur[k];
+ lignecur[k] = lignecur[indpermut];
+ lignecur[indpermut] = tmp;
+ }
+
+ typename Vector::value_type headcoeff;
+ // LU in place
+ _field.div (headcoeff, lignecur[k], lignepivot[k]);
+ _field.assign (lignecur[k], headcoeff);
+ _field.negin (headcoeff);
+ for (long j = k; ++j < n;)
+ _field.axpyin (lignecur[j],headcoeff,lignepivot[j]);
+ }
+
+
+ template <class _Field>
+ template <class Matrix> inline unsigned long &
+ GaussDomain<_Field>::upperin (unsigned long &res, Matrix &A) const
+ {
+ // Requirements : A is an array of rows
+ // In place (A is modified)
+ // Without reordering (Pivot is first non-zero in row)
+ long Ni = A.rowdim ();
+ long last = Ni - 1;
+ long c;
+ unsigned long indcol = 0;
+
+ for (long k = 0; k < last; ++k) {
+ FindPivot (A[k], indcol, c);
+ if (c != -1)
+ for (long l = k + 1; l < Ni; ++l)
+ Upper (A[l], A[k], indcol, c);
+ }
+
+ FindPivot (A[last], indcol, c);
+ return res = indcol;
+ }
+
+ template <class _Field>
+ template <class Matrix> inline unsigned long &
+ GaussDomain<_Field>::LUin (unsigned long &res, Matrix &A) const
+ {
+ // Requirements : A is an array of rows
+ // In place (A is modified)
+ // Without reordering (Pivot is first non-zero in row)
+
+ long Ni = A.rowdim ();
+ long last = Ni - 1;
+ long c;
+ unsigned long indcol = 0;
+
+ for (long k = 0; k < last; ++k) {
+ FindPivot (A[k], indcol, c);
+ if (c != -1)
+ for (long l = k + 1; l < Ni; ++l)
+ LU (A[l], A[k], indcol, c);
+ }
+
+ FindPivot (A[last], indcol, c);
+ return res = indcol;
+ }
+
+
+ } // namespace LinBox
+
+#endif // __LINBOX_gauss_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/hybrid-det.h b/linbox/algorithms/hybrid-det.h
index 6dc3057..1376bbc 100644
--- a/linbox/algorithms/hybrid-det.h
+++ b/linbox/algorithms/hybrid-det.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/hybrid-det.h
* Copyright (C) 2005 Anna Urbanska
*
* Written by Anna Urbanska <aniau at astronet.pl>
* Modified by JGD <Jean-Guillaume.Dumas at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,50 +18,26 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_hybrid_det_H
#define __LINBOX_hybrid_det_H
-//#include "linbox/blackbox/diagonal.h"
-//#include "linbox/blackbox/compose.h"
-//#include "linbox/solutions/methods.h"
-#include "linbox/blackbox/dense.h"
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+
#include "linbox/blackbox/sparse.h"
-//#include "linbox/blackbox/blas-blackbox.h"
-//#include "linbox/matrix/blas-matrix.h"
-//#include "linbox/algorithms/blackbox-container.h"
-//#include "linbox/algorithms/blackbox-container-symmetric.h"
-//#include "linbox/algorithms/massey-domain.h"
-//#include "linbox/algorithms/blas-domain.h"
-//#include "linbox/vector/vector-traits.h"
-//#include "linbox/util/prime-stream.h"
-//#include "linbox/util/debug.h"
-
-//#include "linbox/solutions/solve.h"
-//#include "linbox/field/gmp-rational.h"
-//#include "linbox/field/gmp-integers.h"
#include "linbox/field/PID-integer.h"
#include "linbox/randiter/random-prime.h"
#include "linbox/algorithms/rational-solver.h"
#include "linbox/algorithms/last-invariant-factor.h"
-//#include "linbox/field/PIR-modular-int32.h"
-//#include "linbox/field/PIR-ntl-ZZ_p.h"
-//#include "linbox/field/ntl-ZZ_p.h"
-
-// Namespace in which all LinBox library code resides
-
-//#include "linbox/algorithms/cra.h"
-//#include "linbox/field/modular.h"
-#include "linbox/field/modular-double.h"
-//#include "linbox/field/givaro-zpz.h"
+#include "linbox/field/modular.h"
#include "linbox/algorithms/cra-domain.h"
#include "linbox/randiter/random-prime.h"
#include "linbox/algorithms/matrix-hom.h"
-
#include "linbox/solutions/det.h"
// #define _LB_H_DET_TIMING
@@ -177,25 +154,25 @@ namespace LinBox
const RingCategories::IntegerTag &tag,
const MyMethod &M)
{
- //commentator.setReportStream(std::cout);
+ //commentator().setReportStream(std::cout);
typedef Modular<double> myModular;
typedef typename Blackbox::Field Integers;
- typedef typename Integers::Element Integer;
+ typedef typename Integers::Element Integer_t;
- commentator.start ("Integer Determinant - hybrid version ", "det");
+ commentator().start ("Integer Determinant - hybrid version ", "det");
size_t myfactor=5;
size_t early_counter=0;
//double a = 0.0;//0.28;//0.0013//if time(lif)/time(10lu) < a * log(lif) then calculate bonus
- Integer lif = 1;
- Integer bonus = 1;
- Integer beta = 1;
+ Integer_t lif = 1;
+ Integer_t bonus = 1;
+ Integer_t beta = 1;
d=1;
double p_size = 26-(int)ceil(log((double)A.rowdim())*0.7213475205);
- RandomPrimeIterator genprime( (Integer)p_size );
+ RandomPrimeIterator genprime( (Integer_t)p_size );
//cout << "prime size: " << p_size << "\n";
EarlySingleCRA<myModular> cra(4UL);
IntegerModularDetReduced<Blackbox,MyMethod> iteration(A, M, beta,myfactor);
@@ -203,26 +180,28 @@ namespace LinBox
#if 0
if (A.rowdim() < 200 ) {
cra(d,iteration,genprime);
- commentator.stop ( "first step", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ( "first step", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations() << "\n";
}
else {}
#endif
- Integer res;
+ Integer_t res;
#ifdef _LB_H_DET_TIMING
Timer BT;
double time1, time2;
BT.start();
#endif
- ++genprime;
- myModular D(*genprime);
- iteration.primes[early_counter] = *genprime;
- myModular::Element r;
- D.init(r,0);
- cra.initialize( D, iteration(r, D));
- ++early_counter;
+ {
+ ++genprime;
+ myModular D(*genprime);
+ iteration.primes[early_counter] = *genprime;
+ myModular::Element r;
+ D.init(r,0);
+ cra.initialize( D, iteration(r, D));
+ ++early_counter;
+ }
while ( early_counter < myfactor && !cra.terminated() ) {
++genprime;
@@ -245,13 +224,13 @@ namespace LinBox
if (early_counter < myfactor) {
/* determinant found */
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION) << myfactor << "\n";
- commentator.stop ( "first step", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION) << myfactor << "\n";
+ commentator().stop ( "first step", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations()<< "\n";
return d=res;
}
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION) << "no very early termination \n";
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION) << "no very early termination \n";
/* turn to LU when matrix size small - not to be used at the moment */
#if 0
if (A.rowdim() < 50 ) {
@@ -265,8 +244,8 @@ namespace LinBox
cra.progress( D, iteration(r, D));
++early_counter;
}
- commentator.stop ( "zero step", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ( "zero step", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations() << "\n";
return d;
}
@@ -286,7 +265,7 @@ namespace LinBox
if (LIF.lastInvariantFactor1(lif, r_num1, A)==0) {
//if (lif==0)
d = 0;
- commentator.stop ("is 0", NULL, "det");
+ commentator().stop ("is 0", NULL, "det");
return d;
}
#ifdef _LB_H_DET_TIMING
@@ -295,21 +274,21 @@ namespace LinBox
if (time2 < 0) time2 =0;
#endif
- //commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ //commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
// << "5 LU time: " << time1 << " LIF time: " << time2 << ")\n";
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION) << "lif calculated\n";
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION) << "lif calculated\n";
#if 0
LIF.lastInvariantFactor_Bonus(lif, bonus, A);
if (lif==0) {
d = 0;
- commentator.stop ("done", NULL, "det");
+ commentator().stop ("done", NULL, "det");
return d;
}
if (bonus == 1) {
d = lif;
- commentator.stop ("done", NULL, "det");
+ commentator().stop ("done", NULL, "det");
return d;
}
#endif
@@ -319,7 +298,7 @@ namespace LinBox
//RandomPrime genprime2( 26-(int)ceil(log((double)A.rowdim())*0.7213475205));
EarlySingleCRA< Modular<double> > cra2(4UL);
- Integer k = 1;
+ Integer_t k = 1;
early_counter = 0;
while ( early_counter < myfactor && !cra2.terminated() ) {
@@ -333,14 +312,14 @@ namespace LinBox
if (early_counter < myfactor) {
/* determinant found */
k = cra2.result(res);
- commentator.stop ("second step ", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ("second step ", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations()<< "(" << iteration.iterations2() << ")\n";
}
else if (0/* time2 < a*log2(lif)*time1/p_size*/) {
typename Vector<Integers>:: Dense r_num2 (A. coldim());
- Integer lif2=1;
+ Integer_t lif2=1;
LIF.lastInvariantFactor1(lif2,r_num2,A);
LIF.bonus(bonus,lif, lif2, r_num1,r_num2);
@@ -370,8 +349,8 @@ namespace LinBox
if (early_counter < myfactor) {
/* determinant found based on the initial LU */
cra3.result(k);
- commentator.stop ("third step - recalc", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ("third step - recalc", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations()<<"(" << iteration.iterations2() << ")\n";
//<< "bonus size " << log2(bonus) << "\n";
@@ -388,8 +367,8 @@ namespace LinBox
cra3.progress( D, iteration(r, D));
}
cra3.result(k);
- commentator.stop ("third step, bonus > 1", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ("third step, bonus > 1", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations()<< "(" << iteration.iterations2() << ")\n";
//<< "bonus size " << log2(bonus) << "\n";
}
@@ -405,8 +384,8 @@ namespace LinBox
cra2.progress( D, iteration(r, D));
}
cra2.result(k);
- commentator.stop ("third step, bonus = 1", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ("third step, bonus = 1", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations()<< "(" << iteration.iterations2() << ")\n";
}
}
@@ -420,29 +399,29 @@ namespace LinBox
cra2.progress( D, iteration(r, D));
}
cra2.result(k);
- commentator.stop ("second step+", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ("second step+", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations()<< "(" << iteration.iterations2() << ")\n";
/* enter the cra loop */
//cra2(k,iteration, genprime);
}
- //commentator.stop ("second step", NULL, "det");
- //commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ //commentator().stop ("second step", NULL, "det");
+ //commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
// << "Iterations done " << iteration.iterations() << "("
// << iteration.iterations2() << " )\n";
d = k*beta;
- Integer tmp;
+ Integer_t tmp;
#ifdef _LB_H_DET_TIMING
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "1 LU time: " << time1 << " LIF time: " << time2 << ")\n";
#endif
- commentator.report(Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report(Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "det/lif " << k<< "\n";
- //commentator.report(Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ //commentator().report(Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
// << "determinant size " << Integers::log2(tmp,abs(d))<< " lif size "<< Integers::log2(tmp,beta) << "\n";
return d ;
@@ -457,12 +436,12 @@ namespace LinBox
const MyMethod &M)
{
- //commentator.setReportStream(std::cout);
+ //commentator().setReportStream(std::cout);
typedef Modular<double> myModular;
//typedef PID_integer Integers;
typedef typename Integers::Element Integer;
- commentator.start ("Integer Determinant - hybrid version for sparse matrices", "det");
+ commentator().start ("Integer Determinant - hybrid version for sparse matrices", "det");
size_t myfactor=5;
size_t early_counter=0;
@@ -476,14 +455,14 @@ namespace LinBox
double p_size = 26-(int)ceil(log((double)A.rowdim())*0.7213475205);
RandomPrime genprime( (Integer)p_size );
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION) << "prime size: " << p_size << "\n";
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION) << "prime size: " << p_size << "\n";
ChineseRemainder< myModular > cra(3UL);
IntegerModularDetReduced<SparseMatrix<Integers >,MyMethod> iteration(A, M, beta,myfactor);
#if 0
if (A.rowdim() < 200 ) {
cra(d,iteration,genprime);
- commentator.stop ( "first step", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ( "first step", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations() << "\n";
}
else
@@ -522,8 +501,8 @@ namespace LinBox
if (early_counter < myfactor) {
//determinant found
- commentator.stop ( "first step", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ( "first step", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations()<< "\n";
return d=res;
}
@@ -541,8 +520,8 @@ namespace LinBox
cra.progress( D, iteration(r, D));
++early_counter;
}
- commentator.stop ( "zero step", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ( "zero step", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations() << "\n";
return d;
}
@@ -561,27 +540,27 @@ namespace LinBox
if (LIF.lastInvariantFactor1(lif, r_num1, A)==0) {
//if (lif==0)
d = 0;
- commentator.stop ("is 0", NULL, "det");
+ commentator().stop ("is 0", NULL, "det");
return d;
}
BT.stop();
time2 = BT.usertime();
if (time2 < 0) time2 =0;
#if 0
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "5 LU time: " << time1 << " LIF time: " << time2 << ")\n";
cout << "lif calculated\n";
LIF.lastInvariantFactor_Bonus(lif, bonus, A);
if (lif==0) {
d = 0;
- commentator.stop ("done", NULL, "det");
+ commentator().stop ("done", NULL, "det");
return d;
}
if (bonus == 1) {
d = lif;
- commentator.stop ("done", NULL, "det");
+ commentator().stop ("done", NULL, "det");
return d;
}
#endif
@@ -604,8 +583,8 @@ namespace LinBox
if (early_counter < myfactor) {
// determinant found
k = cra2.result(res);
- commentator.stop ("second step ", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ("second step ", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations()<< "(" << iteration.iterations2() << ")\n";
}
@@ -641,8 +620,8 @@ namespace LinBox
if (early_counter < myfactor) {
// determinant found based on the initial LU
cra3.result(k);
- commentator.stop ("third step - recalc", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ("third step - recalc", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations()<<"(" << iteration.iterations2() << ")\n";
//<< "bonus size " << log2(bonus) << "\n";
@@ -659,8 +638,8 @@ namespace LinBox
cra3.progress( D, iteration(r, D));
}
cra3.result(k);
- commentator.stop ("third step, bonus > 1", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ("third step, bonus > 1", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations()<< "(" << iteration.iterations2() << ")\n";
//<< "bonus size " << log2(bonus) << "\n";
}
@@ -676,8 +655,8 @@ namespace LinBox
cra2.progress( D, iteration(r, D));
}
cra2.result(k);
- commentator.stop ("third step, bonus = 1", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ("third step, bonus = 1", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations()<< "(" << iteration.iterations2() << ")\n";
}
}
@@ -691,27 +670,27 @@ namespace LinBox
cra2.progress( D, iteration(r, D));
}
cra2.result(k);
- commentator.stop ("second step+", NULL, "det");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().stop ("second step+", NULL, "det");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Iterations done " << iteration.iterations()<< "(" << iteration.iterations2() << ")\n";
// enter the cra loop
//cra2(k,iteration, genprime);
}
- //commentator.stop ("second step", NULL, "det");
- //commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ //commentator().stop ("second step", NULL, "det");
+ //commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
// << "Iterations done " << iteration.iterations() << "("
// << iteration.iterations2() << " )\n";
d = k*beta;
Integer tmp;
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "1 LU time: " << time1 << " LIF time: " << time2 << ")\n";
- commentator.report(Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report(Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "det/lif " << k<< "\n";
- //commentator.report(Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ //commentator().report(Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
// << "determinant size " << Integers::log2(tmp,abs(d))<< " lif size "<< Integers::log2(tmp,beta) << "\n";
return d ;
@@ -729,3 +708,12 @@ namespace LinBox
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/la-block-lanczos.h b/linbox/algorithms/la-block-lanczos.h
index 44ca489..8221a25 100644
--- a/linbox/algorithms/la-block-lanczos.h
+++ b/linbox/algorithms/la-block-lanczos.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/la-block-lanczos.h
* Copyright 2002-2004 Bradford Hovinen
*
@@ -7,9 +5,25 @@
*
* --------------------------------------------
*
- * Licensed under the GNU Lesser General Public License. See COPYING for
* details.
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
* Class definitions for block Lanczos iteration
*/
@@ -24,19 +38,9 @@
#include "linbox/field/archetype.h"
#include "linbox/vector/vector-domain.h"
#include "linbox/blackbox/archetype.h"
-#include "linbox/blackbox/dense.h"
-#include "linbox/matrix/dense-submatrix.h"
#include "linbox/solutions/methods.h"
#include "linbox/algorithms/eliminator.h"
-// Fix for Solaris wierdness
-#undef _N
-#undef _I
-#undef _C
-#undef _W
-#undef _P
-#undef _Q
-
namespace LinBox
{
@@ -48,7 +52,7 @@ namespace LinBox
* mutual orthogonality properties. This algorithm was proposed by
* Bradford Hovinen.
*/
- template <class Field, class Matrix = DenseMatrixBase<typename Field::Element> >
+ template <class Field, class Matrix = BlasMatrix<typename Field::Element> >
class LABlockLanczosSolver {
public:
@@ -61,7 +65,7 @@ namespace LinBox
*/
LABlockLanczosSolver (const Field &F,
const BlockLanczosTraits &traits) :
- _traits (traits), _F (F), _VD (F), _MD (F), _randiter (F),
+ _traits (traits), _field (F), _VD (F), _MD (F), _randiter (F),
_uAv (this), _eliminator (F, _traits.blockingFactor ())
{ init_temps (); }
@@ -74,8 +78,9 @@ namespace LinBox
LABlockLanczosSolver (const Field &F,
const BlockLanczosTraits &traits,
typename Field::RandIter r) :
- _traits (traits), _F (F), _VD (F), _MD (F), _randiter (r),
- _uAv (this), _eliminator (F, _traits.blockingFactor ())
+ _traits (traits), _field (F), _VD (F), _MD (F), _randiter (r),
+ _uAv (this),
+ _eliminator (F, (unsigned int) _traits.blockingFactor ())
{ init_temps (); }
/** Destructor
@@ -120,12 +125,12 @@ namespace LinBox
class BasisTransformation {
LABlockLanczosSolver &_solver;
- std::vector<Permutation> _P;
- std::vector<Matrix *> _T;
+ std::vector<Permutation> _permP;
+ std::vector<Matrix *> _multiMat;
std::vector<unsigned int> _rho;
std::vector<unsigned int> _s;
- unsigned int _N;
+ unsigned int _number;
template <class Matrix1>
void applyOne (Matrix1 &M, Permutation &P, Matrix *T, unsigned int rho, unsigned int s, bool left);
@@ -149,7 +154,7 @@ namespace LinBox
void report (std::ostream &out);
BasisTransformation (LABlockLanczosSolver<Field, Matrix> &solver, unsigned int N) :
- _solver (solver), _N (N)
+ _solver (solver), _number (N)
{ reset (); }
~BasisTransformation ();
@@ -205,7 +210,8 @@ namespace LinBox
Iterate (LABlockLanczosSolver &solver, size_t n, size_t N, unsigned int iter) :
_udotAvbarinv (N, N), _ubarAvdotinv (N, N),
_u (n, N), _v (n, N), _udot (n, N), _vdot (n, N),
- _sigma_u (solver, N), _sigma_v (solver, N),
+ _sigma_u (solver, (unsigned int) N),
+ _sigma_v (solver, (unsigned int) N),
_udotAv (N, N), _uAvdot (N, N)
{ init (iter); }
@@ -310,7 +316,7 @@ namespace LinBox
// Private variables
const BlockLanczosTraits _traits;
- const Field &_F;
+ const Field &_field;
VectorDomain<Field> _VD;
MatrixDomain<Field> _MD;
typename Field::RandIter _randiter;
@@ -322,7 +328,7 @@ namespace LinBox
mutable Matrix _T3; // N x N
mutable Matrix _T4; // N x N
mutable Matrix _T5; // N x N
- mutable Matrix _W; // N x N
+ mutable Matrix _matW; // N x N
Matrix _ATu; // n x N
Matrix _Av; // n x N
@@ -330,8 +336,8 @@ namespace LinBox
Matrix _Cu; // N x N
Matrix _Cv; // N x N
- Permutation _P;
- Permutation _Q;
+ Permutation _permP;
+ Permutation _permQ;
Matrix _v0; // n x N
Matrix _b; // n x <=N
@@ -370,3 +376,12 @@ namespace LinBox
#endif // __LINBOX_la_block_lanczos_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/la-block-lanczos.inl b/linbox/algorithms/la-block-lanczos.inl
index 17050c6..c94bfe8 100644
--- a/linbox/algorithms/la-block-lanczos.inl
+++ b/linbox/algorithms/la-block-lanczos.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/la-block-lanczos.inl
* Copyright 2002-2004 Bradford Hovinen
@@ -8,9 +6,24 @@
*
* --------------------------------------------
*
- * Licensed under the GNU Lesser General Public License. See COPYING for
- * details.
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
* Function definitions for block Lanczos iteration
*/
@@ -26,7 +39,6 @@
#include "linbox/util/debug.h"
#include "linbox/solutions/methods.h"
-#include "linbox/matrix/dense-submatrix.h"
#include "linbox/blackbox/diagonal.h"
#include "linbox/blackbox/compose.h"
#include "linbox/blackbox/transpose.h"
@@ -84,7 +96,7 @@ namespace LinBox
# define TIMER_START(part) part##_timer.start ()
# define TIMER_STOP(part) part##_timer.stop (); part##_time += part##_timer.time ()
# define TIMER_REPORT(part) \
- commentator.report (Commentator::LEVEL_NORMAL, TIMING_MEASURE) \
+ commentator().report (Commentator::LEVEL_NORMAL, TIMING_MEASURE) \
<< "Total " #part " time: " << part##_time << "s" << std::endl;
#else
# define TIMER_DECLARE(part)
@@ -120,10 +132,10 @@ namespace LinBox
linbox_check (b.size () == A.rowdim ());
linbox_check (A.rowdim () == A.coldim ());
- commentator.start ("Solving linear system (Biorthogonalising block Lanczos)",
+ commentator().start ("Solving linear system (Biorthogonalising block Lanczos)",
"LABlockLanczosSolver::solve");
- std::ostream &reportU = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &reportU = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
Vector Ax;
bool success = false;
@@ -141,7 +153,7 @@ namespace LinBox
_VD.copy (*(_v0.colBegin ()), b);
// Fill the remaining columns of _v0 with random data
- RandomDenseStream<Field, typename Matrix::Col> stream (_F, _randiter, A.coldim ());
+ RandomDenseStream<Field, typename Matrix::Col> stream (_field, _randiter, A.coldim ());
typename Matrix::ColIterator iter = _v0.colBegin ();
for (++iter; iter != _v0.colEnd (); ++iter)
@@ -156,16 +168,16 @@ namespace LinBox
VectorWrapper::ensureDim (Ax, A.rowdim ());
if (_traits.checkResult ()) {
- commentator.start ("Checking whether Ax=b");
+ commentator().start ("Checking whether Ax=b");
A.apply (Ax, x);
if (_VD.areEqual (Ax, b)) {
- commentator.stop ("passed");
+ commentator().stop ("passed");
success = true;
}
else {
- commentator.stop ("FAILED");
+ commentator().stop ("FAILED");
success = false;
reportU << "Ax = ";
@@ -191,7 +203,7 @@ namespace LinBox
_uAv.reset ();
- commentator.stop ("done", (success ? "Solve successful" : "Solve failed"), "LABlockLanczosSolver::solve");
+ commentator().stop ("done", (success ? "Solve successful" : "Solve failed"), "LABlockLanczosSolver::solve");
return success;
}
@@ -205,7 +217,7 @@ namespace LinBox
linbox_check (x.coldim () == _traits.blockingFactor ());
linbox_check (A.rowdim () == A.coldim ());
- commentator.start ("Sampling from nullspace (Lookahead-based block Lanczos)",
+ commentator().start ("Sampling from nullspace (Lookahead-based block Lanczos)",
"LABlockLanczosSolver::sampleNullspace");
// Get the temporaries into the right sizes
@@ -218,7 +230,7 @@ namespace LinBox
_Av.resize (A.coldim (), _traits.blockingFactor ());
// Fill y with random data
- RandomDenseStream<Field, typename Matrix::Col> stream (_F, _randiter, A.coldim ());
+ RandomDenseStream<Field, typename Matrix::Col> stream (_field, _randiter, A.coldim ());
typename Matrix::ColIterator iter;
for (iter = _y.colBegin (); iter != _y.colEnd (); ++iter)
@@ -265,7 +277,7 @@ namespace LinBox
_uAv.reset ();
- commentator.stop ("done", NULL, "LABlockLanczosSolver::sampleNullspace");
+ commentator().stop ("done", NULL, "LABlockLanczosSolver::sampleNullspace");
return number;
}
@@ -276,7 +288,7 @@ namespace LinBox
{
linbox_check (A.rowdim () == A.coldim ());
- commentator.start ("Rank (Lookahead-based block Lanczos)",
+ commentator().start ("Rank (Lookahead-based block Lanczos)",
"LABlockLanczosSolver::rank");
// Get the temporaries into the right sizes
@@ -289,7 +301,7 @@ namespace LinBox
_Av.resize (A.coldim (), _traits.blockingFactor ());
// Fill v0 with random data
- RandomDenseStream<Field, typename Matrix::Col> stream (_F, _randiter, A.coldim ());
+ RandomDenseStream<Field, typename Matrix::Col> stream (_field, _randiter, A.coldim ());
typename Matrix::ColIterator iter;
for (iter = _y.colBegin (); iter != _y.colEnd (); ++iter)
@@ -313,7 +325,7 @@ namespace LinBox
_uAv.reset ();
- commentator.stop ("done", NULL, "LABlockLanczosSolver::rank");
+ commentator().stop ("done", NULL, "LABlockLanczosSolver::rank");
return _rank;
}
@@ -325,22 +337,22 @@ namespace LinBox
{
linbox_check (_history.empty ());
- commentator.start ("Lookahead-based block Lanczos iteration",
+ commentator().start ("Lookahead-based block Lanczos iteration",
"LABlockLanczosSolver::iterate", A.rowdim ());
typename std::list<Iterate *>::iterator j;
- Iterate *iterate, *next_iterate;
+ Iterate *iterate_here, *next_iterate;
_iter = 0;
_total_dim = 0;
_rank = 0;
- const unsigned int N = _traits.blockingFactor ();
+ const unsigned int N = (unsigned int) _traits.blockingFactor ();
unsigned int dead_iters = 0;
Integer c;
- _F.characteristic (c);
+ _field.characteristic (c);
double logc = log (double (c));
unsigned int max_dead_iters = (unsigned int) ceil (3 * log (double (A.rowdim ())) / (N * logc)) + 2;
@@ -361,24 +373,24 @@ namespace LinBox
unsigned int history_total = 0, history_max = 0;
// How many iterations between each progress update
- unsigned int progress_interval = A.rowdim () / _traits.blockingFactor () / 100;
+ unsigned int progress_interval = (unsigned int) ( A.rowdim () / _traits.blockingFactor () / 100);
// Make sure there are a minimum of ten
if (progress_interval == 0)
progress_interval = 1;
- std::ostream &reportI = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
- std::ostream &reportU = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &reportI = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &reportU = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
#ifdef LABL_DETAILED_TRACE
- std::ostream &reportN = commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
+ std::ostream &reportN = commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
#endif
// Prepare the first iterate
next_iterate = getNextIterate (0);
- // Get a random fat vectors _V[0] and _U[0]
- RandomDenseStream<Field, typename Matrix::Col> stream (_F, _randiter, A.coldim ());
+ // Get a random fat vectors _blockV[0] and _blockU[0]
+ RandomDenseStream<Field, typename Matrix::Col> stream (_field, _randiter, A.coldim ());
typename Matrix::ColIterator u_iter;
for (u_iter = next_iterate->_u.colBegin (); u_iter != next_iterate->_u.colEnd (); ++u_iter)
@@ -390,8 +402,8 @@ namespace LinBox
Matrix u0 (A.rowdim (), _traits.blockingFactor ());
Matrix v0 (A.rowdim (), _traits.blockingFactor ());
#else // Give those variables something just to satisfy the compiler
-# define AU0 iterate->_u
-# define AV0 iterate->_v
+# define AU0 iterate_here->_u
+# define AV0 iterate_here->_v
#endif
#ifdef LABL_DETAILED_TRACE
@@ -412,12 +424,12 @@ namespace LinBox
TIMER_STOP(terminationCheck);
// Step 1: Obtain an iterate structure
- iterate = next_iterate;
+ iterate_here = next_iterate;
next_iterate = getNextIterate (_iter + 1);
_uAv.extend ();
- LABLTraceReport (reportU, _MD, "u", _iter, iterate->_u);
- LABLTraceReport (reportU, _MD, "v", _iter, iterate->_v);
+ LABLTraceReport (reportU, _MD, "u", _iter, iterate_here->_u);
+ LABLTraceReport (reportU, _MD, "v", _iter, iterate_here->_v);
LABLTraceReport (reportU, _MD, "x", _iter, _x);
@@ -425,12 +437,12 @@ namespace LinBox
TransposeMatrix<Matrix> uTA (_ATu);
TIMER_START(AV);
- _MD.blackboxMulRight (uTA, transpose (iterate->_u), A);
- _MD.blackboxMulLeft (_Av, A, iterate->_v);
+ _MD.blackboxMulRight (uTA, transpose (iterate_here->_u), A);
+ _MD.blackboxMulLeft (_Av, A, iterate_here->_v);
TIMER_STOP(AV);
TIMER_START(innerProducts);
- _MD.mul (*_uAv.get (_iter, _iter), transpose (iterate->_u), _Av);
+ _MD.mul (*_uAv.get (_iter, _iter), transpose (iterate_here->_u), _Av);
_MD.mul (*_uAv.get (_iter + 1, _iter), uTA, _Av);
TIMER_STOP(innerProducts);
@@ -442,7 +454,7 @@ namespace LinBox
TIMER_START(updateInnerProducts);
_MD.copy (*_uAv.get (_iter, _iter + 1), *_uAv.get (_iter + 1, _iter));
- for (j = _history.begin (); j != _history.end () && *j != iterate; ++j) {
+ for (j = _history.begin (); j != _history.end () && *j != iterate_here; ++j) {
_MD.copy (*_uAv.get (_iter + 1, (*j)->_iter), *_uAv.get (_iter, (*j)->_iter + 1));
_MD.copy (*_uAv.get ((*j)->_iter, _iter + 1), *_uAv.get ((*j)->_iter + 1, _iter));
compute_alphaAvip1 (j, _iter);
@@ -458,24 +470,24 @@ namespace LinBox
for (j = _history.begin (); j != _history.end (); ++j) {
TIMER_START(tailDecomp);
- tailDecomp (j, iterate, A);
+ tailDecomp (j, iterate_here, A);
TIMER_STOP(tailDecomp);
// Step 6: Compute projection coefficients
TIMER_START(projectionCoeff);
- DenseSubmatrix<Element> Cu (_Cu, 0, 0, N, (*j)->_rho_v);
- DenseSubmatrix<Element> Cv (_Cv, 0, 0, (*j)->_rho_u, N);
+ BlasMatrix<Field> Cu (_Cu, 0, 0, N, (*j)->_rho_v);
+ BlasMatrix<Field> Cv (_Cv, 0, 0, (*j)->_rho_u, N);
- DenseSubmatrix<Element> udotAvbarinv ((*j)->_udotAvbarinv, 0, 0, (*j)->_rho_v, (*j)->_rho_v);
- DenseSubmatrix<Element> ubarAvdotinv ((*j)->_ubarAvdotinv, 0, 0, (*j)->_rho_u, (*j)->_rho_u);
+ BlasMatrix<Field> udotAvbarinv ((*j)->_udotAvbarinv, 0, 0, (*j)->_rho_v, (*j)->_rho_v);
+ BlasMatrix<Field> ubarAvdotinv ((*j)->_ubarAvdotinv, 0, 0, (*j)->_rho_u, (*j)->_rho_u);
- DenseSubmatrix<Element> udot ((*j)->_udot, 0, 0, A.rowdim (), (*j)->_rho_v);
- DenseSubmatrix<Element> vdot ((*j)->_vdot, 0, 0, A.rowdim (), (*j)->_rho_u);
+ BlasMatrix<Field> udot ((*j)->_udot, 0, 0, A.rowdim (), (*j)->_rho_v);
+ BlasMatrix<Field> vdot ((*j)->_vdot, 0, 0, A.rowdim (), (*j)->_rho_u);
_MD.copy (_T1, *_uAv.get (_iter + 1, (*j)->_iter));
(*j)->_sigma_v.apply (_T1, false);
- DenseSubmatrix<Element> uip1Avbarj (_T1, 0, 0, N, (*j)->_rho_v);
+ BlasMatrix<Field> uip1Avbarj (_T1, 0, 0, N, (*j)->_rho_v);
_MD.mul (Cu, uip1Avbarj, udotAvbarinv);
_MD.negin (Cu);
@@ -491,7 +503,7 @@ namespace LinBox
_MD.copy (_T1, *_uAv.get ((*j)->_iter, _iter + 1));
(*j)->_sigma_u.apply (_T1, true);
- DenseSubmatrix<Element> ubarjAvip1 (_T1, 0, 0, (*j)->_rho_u, N);
+ BlasMatrix<Field> ubarjAvip1 (_T1, 0, 0, (*j)->_rho_u, N);
_MD.mul (Cv, ubarAvdotinv, ubarjAvip1);
_MD.negin (Cv);
@@ -524,8 +536,8 @@ namespace LinBox
checkAConjugacy (u0, next_iterate->_v, A, 0, _iter + 1, rho_u_0, N);
checkAConjugacy (next_iterate->_u, v0, A, _iter + 1, 0, N, rho_v_0);
- checkAConjugacy (iterate->_u, next_iterate->_v, A, _iter, _iter + 1, iterate->_rho_u, N);
- checkAConjugacy (next_iterate->_u, iterate->_v, A, _iter + 1, _iter, N, iterate->_rho_v);
+ checkAConjugacy (iterate_here->_u, next_iterate->_v, A, _iter, _iter + 1, iterate_here->_rho_u, N);
+ checkAConjugacy (next_iterate->_u, iterate_here->_v, A, _iter + 1, _iter, N, iterate_here->_rho_v);
#endif
// Step 9: Throw away unneeded iterates and update solution
@@ -534,19 +546,19 @@ namespace LinBox
TIMER_STOP(cleanup);
// Step 10: Prepare for the next iteration
- history_total += _history.size ();
- history_max = max ((size_t) history_max, _history.size ());
- _total_dim += iterate->_rho_u;
+ history_total += (unsigned int) _history.size ();
+ history_max = (unsigned int) std::max ((size_t) history_max, _history.size ());
+ _total_dim += iterate_here->_rho_u;
_history.push_back (next_iterate);
++_iter;
checkInnerProducts (A);
if (!(_iter % progress_interval))
- commentator.progress (_total_dim);
+ commentator().progress (_total_dim);
if (_total_dim > A.rowdim ()) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Maximum number of iterations passed without termination" << std::endl;
error = true;
break;
@@ -575,11 +587,11 @@ namespace LinBox
reportI << "Number of iterations: " << _iter << std::endl;
if (error)
- commentator.stop ("ERROR", NULL, "LABlockLanczosSolver::iterate");
+ commentator().stop ("ERROR", NULL, "LABlockLanczosSolver::iterate");
else if (dead_iters >= max_dead_iters)
- commentator.stop ("breakdown", NULL, "LABlockLanczosSolver::iterate");
+ commentator().stop ("breakdown", NULL, "LABlockLanczosSolver::iterate");
else
- commentator.stop ("done", NULL, "LABlockLanczosSolver::iterate");
+ commentator().stop ("done", NULL, "LABlockLanczosSolver::iterate");
}
template <class Field, class Matrix>
@@ -590,15 +602,15 @@ namespace LinBox
const Matrix1 &Cv,
unsigned int iter)
{
- const unsigned int N = _traits.blockingFactor ();
+ const unsigned int N = (unsigned int) _traits.blockingFactor ();
- DenseSubmatrix<Element> udotAv ((*l)->_udotAv, 0, 0, Cu.coldim (), N);
- DenseSubmatrix<Element> uAvdot ((*l)->_uAvdot, 0, 0, N, Cv.rowdim ());
+ BlasMatrix<Field> udotAv ((*l)->_udotAv, 0, 0, Cu.coldim (), N);
+ BlasMatrix<Field> uAvdot ((*l)->_uAvdot, 0, 0, N, Cv.rowdim ());
_MD.axpyin (*_uAv.get (iter + 1, (*l)->_iter), Cu, udotAv);
_MD.axpyin (*_uAv.get ((*l)->_iter, iter + 1), uAvdot, Cv);
#ifdef LABL_DETAILED_TRACE
- std::ostream &reportN = commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
+ std::ostream &reportN = commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
reportN << "fixInnerProducts: udot_" << (*l)->_iter << "^TAv_" << (*l)->_iter << ":" << std::endl;
_MD.write (reportN, udotAv);
@@ -616,15 +628,15 @@ namespace LinBox
(typename std::list<Iterate *>::iterator l, Iterate *i, const Blackbox &A)
{
#ifdef LABL_DETAILED_TRACE
- commentator.start ("Tail decomposition", "LABlockLanczosSolver::tailDecomp");
- std::ostream &reportI = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
- std::ostream &reportN = commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
- std::ostream &reportU = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ commentator().start ("Tail decomposition", "LABlockLanczosSolver::tailDecomp");
+ std::ostream &reportI = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &reportN = commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
+ std::ostream &reportU = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
#endif
typename std::list<Iterate *>::iterator j;
- const unsigned int N = _traits.blockingFactor ();
+ const unsigned int N = (unsigned int) _traits.blockingFactor ();
unsigned int rho_u = 0, rho_v = 0;
typename Field::Element d;
@@ -639,8 +651,8 @@ namespace LinBox
(*l)->_sigma_u.apply (_T1, true);
i->_sigma_v.apply (_T1, false);
- DenseSubmatrix<Element> uhatAvhat (_T1, (*l)->_rho_u, i->_rho_v, N - (*l)->_rho_u, N - i->_rho_v);
- DenseSubmatrix<Element> uhatAvhatinv (_W, 0, 0, N - (*l)->_rho_u, N - (*l)->_rho_u);
+ BlasMatrix<Field> uhatAvhat (_T1, (*l)->_rho_u, i->_rho_v, N - (*l)->_rho_u, N - i->_rho_v);
+ BlasMatrix<Field> uhatAvhatinv (_matW, 0, 0, N - (*l)->_rho_u, N - (*l)->_rho_u);
#ifdef LABL_DETAILED_TRACE
reportN << "ucheck_" << (*l)->_iter << "^TAvcheck_" << i->_iter << ":" << std::endl;
@@ -650,21 +662,21 @@ namespace LinBox
_MD.write (reportN, uhatAvhat);
#endif
- _eliminator.gaussJordan (uhatAvhatinv, _profile, _P, _T2, _Q, _T3, rho_u, d, uhatAvhat);
+ _eliminator.gaussJordan (uhatAvhatinv, _profile, _permP, _T2, _permQ, _T3, rho_u, d, uhatAvhat);
- DenseSubmatrix<Element> mu (uhatAvhatinv, 0, 0, rho_u, rho_u);
- DenseSubmatrix<Element> Tu (_T2, rho_u, 0, N - (*l)->_rho_u - rho_u, rho_u);
- DenseSubmatrix<Element> Tv (_T3, 0, rho_u, rho_u, N - i->_rho_v - rho_u);
+ BlasMatrix<Field> mu (uhatAvhatinv, 0, 0, rho_u, rho_u);
+ BlasMatrix<Field> Tu (_T2, rho_u, 0, N - (*l)->_rho_u - rho_u, rho_u);
+ BlasMatrix<Field> Tv (_T3, 0, rho_u, rho_u, N - i->_rho_v - rho_u);
- TransposeMatrix<DenseSubmatrix<Element> > TuT (Tu);
+ TransposeMatrix<BlasMatrix<Field> > TuT (Tu);
- (*l)->_sigma_u.append (_P, TuT, rho_u);
+ (*l)->_sigma_u.append (_permP, TuT, rho_u);
(*l)->_sigma_u.applyLast ((*l)->_u, false);
- i->_sigma_v.append (_Q, Tv, rho_u);
+ i->_sigma_v.append (_permQ, Tv, rho_u);
i->_sigma_v.applyLast (i->_v, false);
- DenseSubmatrix<Element> utildel ((*l)->_u, 0, (*l)->_rho_u, (*l)->_u.rowdim (), rho_u);
+ BlasMatrix<Field> utildel ((*l)->_u, 0, (*l)->_rho_u, (*l)->_u.rowdim (), rho_u);
for (j = l, ++j; j != _history.end (); ++j) {
#ifdef LABL_DETAILED_TRACE
@@ -674,17 +686,17 @@ namespace LinBox
_MD.write (reportN, *_uAv.get ((*j)->_iter, i->_iter + 1));
#endif
- DenseSubmatrix<Element> uhatj ((*j)->_u, 0, (*j)->_rho_u, (*j)->_u.rowdim (), N - (*j)->_rho_u);
+ BlasMatrix<Field> uhatj ((*j)->_u, 0, (*j)->_rho_u, (*j)->_u.rowdim (), N - (*j)->_rho_u);
_MD.copy (_T2, *_uAv.get ((*j)->_iter, i->_iter));
i->_sigma_v.apply (_T2, false);
_MD.copy (_T5, _T2);
(*j)->_sigma_u.apply (_T2, true);
- DenseSubmatrix<Element> ujhatAvieta (_T2, (*j)->_rho_u, i->_rho_v, N - (*j)->_rho_u, rho_u);
+ BlasMatrix<Field> ujhatAvieta (_T2, (*j)->_rho_u, i->_rho_v, N - (*j)->_rho_u, rho_u);
if (!_MD.isZero (ujhatAvieta)) {
- DenseSubmatrix<Element> ujhatAvietamu (_T3, 0, 0, N - (*j)->_rho_u, rho_u);
+ BlasMatrix<Field> ujhatAvietamu (_T3, 0, 0, N - (*j)->_rho_u, rho_u);
_MD.mul (ujhatAvietamu, ujhatAvieta, mu);
_MD.negin (ujhatAvietamu);
_MD.axpyin (uhatj, utildel, transpose (ujhatAvietamu));
@@ -701,9 +713,9 @@ namespace LinBox
(*j)->_steps.back ()._rho = (*l)->_rho_u;
(*j)->_steps.back ()._rhop = rho_u;
- DenseSubmatrix<Element> ultildeAvi (_T4, (*l)->_rho_u, 0, rho_u, N);
- DenseSubmatrix<Element> ujAvieta (_T5, 0, i->_rho_v, N, rho_u);
- DenseSubmatrix<Element> ujAvietamu (*ujAvietamu_block, 0, 0, N, rho_u);
+ BlasMatrix<Field> ultildeAvi (_T4, (*l)->_rho_u, 0, rho_u, N);
+ BlasMatrix<Field> ujAvieta (_T5, 0, i->_rho_v, N, rho_u);
+ BlasMatrix<Field> ujAvietamu (*ujAvietamu_block, 0, 0, N, rho_u);
_MD.mul (ujAvietamu, ujAvieta, mu);
_MD.negin (ujAvietamu);
_MD.axpyin (*_uAv.get ((*j)->_iter, i->_iter), ujAvietamu, ultildeAvi);
@@ -712,9 +724,9 @@ namespace LinBox
}
if (*l != i) {
- DenseSubmatrix<Element> zeta ((*l)->_vdot, 0, (*l)->_rho_u, (*l)->_vdot.rowdim (), rho_u);
- DenseSubmatrix<Element> zeta_src (i->_v, 0, i->_rho_v, i->_v.rowdim (), rho_u);
- DenseSubmatrix<Element> mu_dest ((*l)->_ubarAvdotinv, (*l)->_rho_u, (*l)->_rho_u, rho_u, rho_u);
+ BlasMatrix<Field> zeta ((*l)->_vdot, 0, (*l)->_rho_u, (*l)->_vdot.rowdim (), rho_u);
+ BlasMatrix<Field> zeta_src (i->_v, 0, i->_rho_v, i->_v.rowdim (), rho_u);
+ BlasMatrix<Field> mu_dest ((*l)->_ubarAvdotinv, (*l)->_rho_u, (*l)->_rho_u, rho_u, rho_u);
_MD.copy (zeta, zeta_src);
_MD.copy (mu_dest, mu);
@@ -722,14 +734,14 @@ namespace LinBox
augmentuAvldot (*l, i, _profile, rho_u);
}
- DenseSubmatrix<Element> utildei ((*l)->_u, 0, (*l)->_rho_u, (*l)->_u.rowdim (), rho_u);
- DenseSubmatrix<Element> utildei_dest (i->_udot, 0, i->_rho_v, i->_udot.rowdim (), rho_u);
+ BlasMatrix<Field> utildei ((*l)->_u, 0, (*l)->_rho_u, (*l)->_u.rowdim (), rho_u);
+ BlasMatrix<Field> utildei_dest (i->_udot, 0, i->_rho_v, i->_udot.rowdim (), rho_u);
_MD.copy (utildei_dest, utildei);
augmentuidotAv (i, *l, rho_u);
- DenseSubmatrix<Element> mu_dest (i->_udotAvbarinv, i->_rho_v, i->_rho_v, rho_u, rho_u);
+ BlasMatrix<Field> mu_dest (i->_udotAvbarinv, i->_rho_v, i->_rho_v, rho_u, rho_u);
_MD.copy (mu_dest, mu);
@@ -762,7 +774,7 @@ namespace LinBox
i->_sigma_u.apply (_T1, true);
(*l)->_sigma_v.apply (_T1, false);
- DenseSubmatrix<Element> uhatAvhat (_T1, i->_rho_u, (*l)->_rho_v, N - i->_rho_u, N - (*l)->_rho_v);
+ BlasMatrix<Field> uhatAvhat (_T1, i->_rho_u, (*l)->_rho_v, N - i->_rho_u, N - (*l)->_rho_v);
#ifdef LABL_DETAILED_TRACE
reportN << "ucheck_" << i->_iter << "^TAvcheck_" << (*l)->_iter << ":" << std::endl;
@@ -772,23 +784,23 @@ namespace LinBox
_MD.write (reportN, uhatAvhat);
#endif
- DenseSubmatrix<Element> uhatAvhatinvT (_W, 0, 0, N - (*l)->_rho_v, N - (*l)->_rho_v);
+ BlasMatrix<Field> uhatAvhatinvT (_matW, 0, 0, N - (*l)->_rho_v, N - (*l)->_rho_v);
- _eliminator.gaussJordan (uhatAvhatinvT, _profile, _P, _T2, _Q, _T3, rho_v, d, transpose (uhatAvhat));
+ _eliminator.gaussJordan (uhatAvhatinvT, _profile, _permP, _T2, _permQ, _T3, rho_v, d, transpose (uhatAvhat));
- DenseSubmatrix<Element> nu (uhatAvhatinvT, 0, 0, rho_v, rho_v);
- DenseSubmatrix<Element> TuT (_T3, 0, rho_v, rho_v, N - i->_rho_u - rho_v);
- DenseSubmatrix<Element> TvT (_T2, rho_v, 0, N - (*l)->_rho_v - rho_v, rho_v);
+ BlasMatrix<Field> nu (uhatAvhatinvT, 0, 0, rho_v, rho_v);
+ BlasMatrix<Field> TuT (_T3, 0, rho_v, rho_v, N - i->_rho_u - rho_v);
+ BlasMatrix<Field> TvT (_T2, rho_v, 0, N - (*l)->_rho_v - rho_v, rho_v);
- TransposeMatrix<DenseSubmatrix<Element> > Tv (TvT);
+ TransposeMatrix<BlasMatrix<Field> > Tv (TvT);
- (*l)->_sigma_v.append (_P, Tv, rho_v);
+ (*l)->_sigma_v.append (_permP, Tv, rho_v);
(*l)->_sigma_v.applyLast ((*l)->_v, false);
- i->_sigma_u.append (_Q, TuT, rho_v);
+ i->_sigma_u.append (_permQ, TuT, rho_v);
i->_sigma_u.applyLast (i->_u, false);
- DenseSubmatrix<Element> vtildel ((*l)->_v, 0, (*l)->_rho_v, (*l)->_v.rowdim (), rho_v);
+ BlasMatrix<Field> vtildel ((*l)->_v, 0, (*l)->_rho_v, (*l)->_v.rowdim (), rho_v);
for (j = l, ++j; j != _history.end (); ++j) {
#ifdef LABL_DETAILED_TRACE
@@ -798,17 +810,17 @@ namespace LinBox
_MD.write (reportN, *_uAv.get (i->_iter + 1, (*j)->_iter));
#endif
- DenseSubmatrix<Element> vhatj ((*j)->_v, 0, (*j)->_rho_v, (*j)->_v.rowdim (), N - (*j)->_rho_v);
+ BlasMatrix<Field> vhatj ((*j)->_v, 0, (*j)->_rho_v, (*j)->_v.rowdim (), N - (*j)->_rho_v);
_MD.copy (_T2, *_uAv.get (i->_iter, (*j)->_iter));
i->_sigma_u.apply (_T2, true);
_MD.copy (_T5, _T2);
(*j)->_sigma_v.apply (_T2, false);
- DenseSubmatrix<Element> uizetaAjhat (_T2, i->_rho_u, (*j)->_rho_v, rho_v, N - (*j)->_rho_v);
+ BlasMatrix<Field> uizetaAjhat (_T2, i->_rho_u, (*j)->_rho_v, rho_v, N - (*j)->_rho_v);
if (!_MD.isZero (uizetaAjhat)) {
- DenseSubmatrix<Element> nuTuizetaAjhat (_T3, 0, 0, rho_v, N - (*j)->_rho_v);
+ BlasMatrix<Field> nuTuizetaAjhat (_T3, 0, 0, rho_v, N - (*j)->_rho_v);
_MD.mul (nuTuizetaAjhat, transpose (nu), uizetaAjhat);
_MD.negin (nuTuizetaAjhat);
_MD.axpyin (vhatj, vtildel, nuTuizetaAjhat);
@@ -825,9 +837,9 @@ namespace LinBox
(*j)->_steps.back ()._rho = (*l)->_rho_v;
(*j)->_steps.back ()._rhop = rho_v;
- DenseSubmatrix<Element> uiAvltilde (_T4, 0, (*l)->_rho_v, N, rho_v);
- DenseSubmatrix<Element> uizetaAvj (_T5, i->_rho_u, 0, rho_v, N);
- DenseSubmatrix<Element> nuTuizetaAvj (*nuukAvj_block, 0, 0, rho_v, N);
+ BlasMatrix<Field> uiAvltilde (_T4, 0, (*l)->_rho_v, N, rho_v);
+ BlasMatrix<Field> uizetaAvj (_T5, i->_rho_u, 0, rho_v, N);
+ BlasMatrix<Field> nuTuizetaAvj (*nuukAvj_block, 0, 0, rho_v, N);
_MD.mul (nuTuizetaAvj, transpose (nu), uizetaAvj);
_MD.negin (nuTuizetaAvj);
_MD.axpyin (*_uAv.get (i->_iter, (*j)->_iter), uiAvltilde, nuTuizetaAvj);
@@ -836,9 +848,9 @@ namespace LinBox
}
if (*l != i) {
- DenseSubmatrix<Element> eta ((*l)->_udot, 0, (*l)->_rho_v, (*l)->_udot.rowdim (), rho_v);
- DenseSubmatrix<Element> eta_src (i->_u, 0, i->_rho_u, i->_u.rowdim (), rho_v);
- DenseSubmatrix<Element> nu_dest ((*l)->_udotAvbarinv, (*l)->_rho_v, (*l)->_rho_v, rho_v, rho_v);
+ BlasMatrix<Field> eta ((*l)->_udot, 0, (*l)->_rho_v, (*l)->_udot.rowdim (), rho_v);
+ BlasMatrix<Field> eta_src (i->_u, 0, i->_rho_u, i->_u.rowdim (), rho_v);
+ BlasMatrix<Field> nu_dest ((*l)->_udotAvbarinv, (*l)->_rho_v, (*l)->_rho_v, rho_v, rho_v);
_MD.copy (eta, eta_src);
_MD.copy (nu_dest, transpose (nu));
@@ -846,14 +858,14 @@ namespace LinBox
augmentuldotAv (*l, i, _profile, rho_v);
}
- DenseSubmatrix<Element> vtildei ((*l)->_v, 0, (*l)->_rho_v, (*l)->_v.rowdim (), rho_v);
- DenseSubmatrix<Element> vtildei_dest (i->_vdot, 0, i->_rho_u, i->_vdot.rowdim (), rho_v);
+ BlasMatrix<Field> vtildei ((*l)->_v, 0, (*l)->_rho_v, (*l)->_v.rowdim (), rho_v);
+ BlasMatrix<Field> vtildei_dest (i->_vdot, 0, i->_rho_u, i->_vdot.rowdim (), rho_v);
_MD.copy (vtildei_dest, vtildei);
augmentuAvidot (i, *l, rho_v);
- DenseSubmatrix<Element> nu_dest (i->_ubarAvdotinv, i->_rho_u, i->_rho_u, rho_v, rho_v);
+ BlasMatrix<Field> nu_dest (i->_ubarAvdotinv, i->_rho_u, i->_rho_u, rho_v, rho_v);
_MD.copy (nu_dest, transpose (nu));
@@ -885,7 +897,7 @@ namespace LinBox
i->_rho_u += rho_v;
#ifdef LABL_DETAILED_TRACE
- commentator.stop ("done", NULL, "LABlockLanczosSolver::tailDecomp");
+ commentator().stop ("done", NULL, "LABlockLanczosSolver::tailDecomp");
#endif
}
@@ -896,13 +908,13 @@ namespace LinBox
{
typename std::list<Iterate *>::iterator l = _history.begin (), second;
- const unsigned int N = _traits.blockingFactor ();
+ const unsigned int N = (unsigned int) _traits.blockingFactor ();
#ifdef LABL_DETAILED_TRACE
int discard_count = 0;
- std::ostream &reportI = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
- // std::ostream &reportU = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &reportI = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ // std::ostream &reportU = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
#endif
if ((*l)->_rho_u < N || (*l)->_rho_v < N)
@@ -914,8 +926,8 @@ namespace LinBox
(second != _history.end () && (*second)->_rho_u == N && (*second)->_rho_v == N))
{
// Step 4: Update solution x
- DenseSubmatrix<Element> T1 (_T1, 0, 0, N, _b.coldim ());
- DenseSubmatrix<Element> T2 (_T2, 0, 0, N, _b.coldim ());
+ BlasMatrix<Field> T1 (_T1, 0, 0, N, _b.coldim ());
+ BlasMatrix<Field> T2 (_T2, 0, 0, N, _b.coldim ());
_MD.mul (T1, transpose ((*l)->_u), _b);
_MD.mul (T2, (*l)->_ubarAvdotinv, T1);
@@ -968,7 +980,7 @@ namespace LinBox
if (_it_trashcan.empty ()) {
#ifdef LABL_DETAILED_TRACE
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Allocating new iterate structure..." << std::endl;
#endif
ret = new Iterate (*this, _x.rowdim (), _traits.blockingFactor (), iter);
@@ -976,7 +988,7 @@ namespace LinBox
}
else {
#ifdef LABL_DETAILED_TRACE
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Taking iterate structure from trash can..." << std::endl;
#endif
ret = _it_trashcan.top ();
@@ -996,13 +1008,13 @@ namespace LinBox
ElimStep &step,
unsigned int iter)
{
- const unsigned int N = _traits.blockingFactor ();
+ const unsigned int N = (unsigned int) _traits.blockingFactor ();
if (step._nuukAvj == NULL || step._l_iter < _history.front ()->_iter)
return;
#ifdef LABL_DETAILED_TRACE
- std::ostream &report = commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
report << "Adjustment from iterate " << step._l->_iter << " for iterate " << (*j)->_iter << std::endl;
report << "Block is: " << std::endl;
_MD.write (report, *step._nuukAvj);
@@ -1010,12 +1022,12 @@ namespace LinBox
report << "Length: " << step._rhop << std::endl;
#endif
- DenseSubmatrix<Element> nuukAvj (*step._nuukAvj, 0, 0, step._rhop, N);
+ BlasMatrix<Field> nuukAvj (*step._nuukAvj, 0, 0, step._rhop, N);
_MD.copy (_T1, *_uAv.get (iter + 1, step._l->_iter));
step._l->_sigma_v.apply (_T1, false);
- DenseSubmatrix<Element> uip1Avltilde (_T1, 0, step._rho, N, step._rhop);
+ BlasMatrix<Field> uip1Avltilde (_T1, 0, step._rho, N, step._rhop);
_MD.axpyin (*_uAv.get (iter + 1, (*j)->_iter), uip1Avltilde, nuukAvj);
}
@@ -1024,7 +1036,7 @@ namespace LinBox
void LABlockLanczosSolver<Field, Matrix>::compute_uip1Abeta (typename std::list<Iterate *>::iterator j, unsigned int iter)
{
#ifdef LABL_DETAILED_TRACE
- commentator.start ("Applying history to u_{i+1}^TAv_j", "compute_uip1Abeta");
+ commentator().start ("Applying history to u_{i+1}^TAv_j", "compute_uip1Abeta");
#endif
typename std::list<ElimStep>::iterator l;
@@ -1033,7 +1045,7 @@ namespace LinBox
adjust_uip1Abeta (j, *l, iter);
#ifdef LABL_DETAILED_TRACE
- commentator.stop ("done", NULL, "compute_uip1Abeta");
+ commentator().stop ("done", NULL, "compute_uip1Abeta");
#endif
}
@@ -1043,13 +1055,13 @@ namespace LinBox
ElimStep &step,
unsigned int iter)
{
- const unsigned int N = _traits.blockingFactor ();
+ const unsigned int N = (unsigned int) _traits.blockingFactor ();
if (step._ujAvkmu == NULL || step._l_iter < _history.front ()->_iter)
return;
#ifdef LABL_DETAILED_TRACE
- std::ostream &report = commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
report << "Adjustment from iterate " << step._l->_iter << " for iterate " << (*j)->_iter << std::endl;
report << "Block is: " << std::endl;
_MD.write (report, *step._ujAvkmu);
@@ -1057,12 +1069,12 @@ namespace LinBox
report << "Length: " << step._rhop << std::endl;
#endif
- DenseSubmatrix<Element> ujAvkmu (*step._ujAvkmu, 0, 0, N, step._rhop);
+ BlasMatrix<Field> ujAvkmu (*step._ujAvkmu, 0, 0, N, step._rhop);
_MD.copy (_T1, *_uAv.get (step._l->_iter, iter + 1));
step._l->_sigma_u.apply (_T1, true);
- DenseSubmatrix<Element> ultildeAvip1 (_T1, step._rho, 0, step._rhop, N);
+ BlasMatrix<Field> ultildeAvip1 (_T1, step._rho, 0, step._rhop, N);
_MD.axpyin (*_uAv.get ((*j)->_iter, iter + 1), ujAvkmu, ultildeAvip1);
}
@@ -1071,7 +1083,7 @@ namespace LinBox
void LABlockLanczosSolver<Field, Matrix>::compute_alphaAvip1 (typename std::list<Iterate *>::iterator j, unsigned int iter)
{
#ifdef LABL_DETAILED_TRACE
- commentator.start ("Applying history to u_j^TAv_{i+1}", "compute_alphaAvip1");
+ commentator().start ("Applying history to u_j^TAv_{i+1}", "compute_alphaAvip1");
#endif
typename std::list<ElimStep>::iterator l;
@@ -1080,7 +1092,7 @@ namespace LinBox
adjust_alphaAvip1 (j, *l, iter);
#ifdef LABL_DETAILED_TRACE
- commentator.stop ("done", NULL, "compute_alphaAvip1");
+ commentator().stop ("done", NULL, "compute_alphaAvip1");
#endif
}
@@ -1092,13 +1104,13 @@ namespace LinBox
Iterate *l,
unsigned int rho)
{
- const unsigned int N = _traits.blockingFactor ();
+ const unsigned int N = (unsigned int) _traits.blockingFactor ();
_MD.copy (_T1, *_uAv.get (l->_iter, i->_iter));
l->_sigma_u.apply (_T1, true);
- DenseSubmatrix<Element> utildeAv (_T1, l->_rho_u, 0, rho, N);
- DenseSubmatrix<Element> utildeAv_dest (i->_udotAv, i->_rho_v, 0, rho, N);
+ BlasMatrix<Field> utildeAv (_T1, l->_rho_u, 0, rho, N);
+ BlasMatrix<Field> utildeAv_dest (i->_udotAv, i->_rho_v, 0, rho, N);
_MD.copy (utildeAv_dest, utildeAv);
}
@@ -1109,13 +1121,13 @@ namespace LinBox
Iterate *l,
unsigned int rho)
{
- const unsigned int N = _traits.blockingFactor ();
+ const unsigned int N = (unsigned int) _traits.blockingFactor ();
_MD.copy (_T1, *_uAv.get (i->_iter, l->_iter));
l->_sigma_v.apply (_T1, false);
- DenseSubmatrix<Element> uAvtilde (_T1, 0, l->_rho_v, N, rho);
- DenseSubmatrix<Element> uAvtilde_dest (i->_uAvdot, 0, i->_rho_u, N, rho);
+ BlasMatrix<Field> uAvtilde (_T1, 0, l->_rho_v, N, rho);
+ BlasMatrix<Field> uAvtilde_dest (i->_uAvdot, 0, i->_rho_u, N, rho);
_MD.copy (uAvtilde_dest, uAvtilde);
}
@@ -1127,10 +1139,10 @@ namespace LinBox
std::vector<unsigned int> &profile,
unsigned int rho)
{
- DenseSubmatrix<Element> zeta (l->_udotAv, l->_rho_v, 0, rho, l->_v.coldim ());
+ BlasMatrix<Field> zeta (l->_udotAv, l->_rho_v, 0, rho, l->_v.coldim ());
_MD.copy (_T1, *_uAv.get (i->_iter, l->_iter));
i->_sigma_u.apply (_T1, true);
- DenseSubmatrix<Element> zeta_src (_T1, i->_rho_u, 0, rho, _T1.coldim ());
+ BlasMatrix<Field> zeta_src (_T1, i->_rho_u, 0, rho, _T1.coldim ());
_MD.copy (zeta, zeta_src);
}
@@ -1141,10 +1153,10 @@ namespace LinBox
std::vector<unsigned int> &profile,
unsigned int rho)
{
- DenseSubmatrix<Element> zeta (l->_uAvdot, 0, l->_rho_u, l->_u.coldim (), rho);
+ BlasMatrix<Field> zeta (l->_uAvdot, 0, l->_rho_u, l->_u.coldim (), rho);
_MD.copy (_T1, *_uAv.get (l->_iter, i->_iter));
i->_sigma_v.apply (_T1, false);
- DenseSubmatrix<Element> zeta_src (_T1, 0, i->_rho_v, _T1.coldim (), rho);
+ BlasMatrix<Field> zeta_src (_T1, 0, i->_rho_v, _T1.coldim (), rho);
_MD.copy (zeta, zeta_src);
}
@@ -1173,26 +1185,26 @@ namespace LinBox
(Matrix1 &M, Permutation &P, Matrix *T, unsigned int rho, unsigned int s, bool left)
{
if (left) {
- DenseSubmatrix<Element> Mcheck (M, s, 0, _N - s, M.coldim ());
+ BlasMatrix<Field> Mcheck (M, s, 0, _number - s, M.coldim ());
_solver._MD.permuteRows (Mcheck, P.begin (), P.end ());
- DenseSubmatrix<Element> Mbar (M, s, 0, rho, M.coldim ());
- DenseSubmatrix<Element> Mhat (M, s + rho, 0, _N - s - rho, M.coldim ());
+ BlasMatrix<Field> Mbar (M, s, 0, rho, M.coldim ());
+ BlasMatrix<Field> Mhat (M, s + rho, 0, _number - s - rho, M.coldim ());
- DenseSubmatrix<Element> That (*T, _N - rho, s + rho, rho, _N - s - rho);
+ BlasMatrix<Field> That (*T, _number - rho, s + rho, rho, _number - s - rho);
_solver._MD.axpyin (Mhat, transpose (That), Mbar);
}
else {
- DenseSubmatrix<Element> Mcheck (M, 0, s, M.rowdim (), _N - s);
+ BlasMatrix<Field> Mcheck (M, 0, s, M.rowdim (), _number - s);
_solver._MD.permuteColumns (Mcheck, P.begin (), P.end ());
- DenseSubmatrix<Element> Mbar (M, 0, s, M.rowdim (), rho);
- DenseSubmatrix<Element> Mhat (M, 0, s + rho, M.rowdim (), _N - s - rho);
+ BlasMatrix<Field> Mbar (M, 0, s, M.rowdim (), rho);
+ BlasMatrix<Field> Mhat (M, 0, s + rho, M.rowdim (), _number - s - rho);
- DenseSubmatrix<Element> That (*T, _N - rho, s + rho, rho, _N - s - rho);
+ BlasMatrix<Field> That (*T, _number - rho, s + rho, rho, _number - s - rho);
_solver._MD.axpyin (Mhat, Mbar, That);
}
@@ -1202,14 +1214,14 @@ namespace LinBox
template <class Matrix1>
Matrix1 &LABlockLanczosSolver<Field, Matrix>::BasisTransformation::apply (Matrix1 &M, bool left)
{
- linbox_check (M.coldim () == _N);
+ linbox_check (M.coldim () == _number);
- typename std::vector<Permutation>::iterator Pi = _P.begin ();
- typename std::vector<Matrix *>::iterator Ti = _T.begin ();
+ typename std::vector<Permutation>::iterator Pi = _permP.begin ();
+ typename std::vector<Matrix *>::iterator Ti = _multiMat.begin ();
typename std::vector<unsigned int>::iterator rhoi = _rho.begin ();
typename std::vector<unsigned int>::iterator si = _s.begin ();
- while (Ti != _T.end ()) {
+ while (Ti != _multiMat.end ()) {
applyOne (M, *Pi, *Ti, *rhoi, *si, left);
++Pi; ++Ti; ++rhoi; ++si;
}
@@ -1221,20 +1233,20 @@ namespace LinBox
template <class Matrix1>
Matrix1 &LABlockLanczosSolver<Field, Matrix>::BasisTransformation::applyPermutation (Matrix1 &M, bool left)
{
- linbox_check (M.coldim () == _N);
+ linbox_check (M.coldim () == _number);
typename std::vector<unsigned int>::iterator si;
typename std::vector<Permutation>::iterator Pi;
if (left) {
- for (Pi = _P.begin (), si = _s.begin (); Pi != _P.end (); ++Pi, ++si) {
- DenseSubmatrix<Element> Mcheck (M, *si, 0, _N - *si, M.coldim ());
+ for (Pi = _permP.begin (), si = _s.begin (); Pi != _permP.end (); ++Pi, ++si) {
+ BlasMatrix<Field> Mcheck (M, *si, 0, _number - *si, M.coldim ());
_solver._MD.permuteRows (Mcheck, Pi->begin (), Pi->end ());
}
}
else {
- for (Pi = _P.begin (), si = _s.begin (); Pi != _P.end (); ++Pi, ++si) {
- DenseSubmatrix<Element> Mcheck (M, 0, *si, M.rowdim (), _N - *si);
+ for (Pi = _permP.begin (), si = _s.begin (); Pi != _permP.end (); ++Pi, ++si) {
+ BlasMatrix<Field> Mcheck (M, 0, *si, M.rowdim (), _number - *si);
_solver._MD.permuteColumns (Mcheck, Pi->begin (), Pi->end ());
}
}
@@ -1246,9 +1258,9 @@ namespace LinBox
template <class Matrix1>
Matrix1 &LABlockLanczosSolver<Field, Matrix>::BasisTransformation::applyLast (Matrix1 &M, bool left)
{
- linbox_check (M.coldim () == _N);
+ linbox_check (M.coldim () == _number);
- applyOne (M, _P.back (), _T.back (), _rho.back (), _s.back (), left);
+ applyOne (M, _permP.back (), _multiMat.back (), _rho.back (), _s.back (), left);
return M;
}
@@ -1259,30 +1271,30 @@ namespace LinBox
Matrix1 &T,
unsigned int rho)
{
- linbox_check (T.rowdim () <= _N);
- linbox_check (T.coldim () <= _N);
- linbox_check (rho + T.coldim () <= _N);
+ linbox_check (T.rowdim () <= _number);
+ linbox_check (T.coldim () <= _number);
+ linbox_check (rho + T.coldim () <= _number);
Matrix *Tnew = _solver.newBlock ();
_solver._MD.subin (*Tnew, *Tnew);
- DenseSubmatrix<Element> Tnewhat (*Tnew, _N - T.rowdim (), _N - T.coldim (), T.rowdim (), T.coldim ());
+ BlasMatrix<Field> Tnewhat (*Tnew, _number - T.rowdim (), _number - T.coldim (), T.rowdim (), T.coldim ());
_solver._MD.copy (Tnewhat, T);
- _P.push_back (Permutation (P));
- _T.push_back (Tnew);
+ _permP.push_back (Permutation (P));
+ _multiMat.push_back (Tnew);
_rho.push_back (rho);
- _s.push_back (_N - rho - T.coldim ());
+ _s.push_back (_number - rho - (unsigned int) T.coldim ());
}
template <class Field, class Matrix>
void LABlockLanczosSolver<Field, Matrix>::BasisTransformation::reset ()
{
- for (typename std::vector<Matrix *>::iterator i = _T.begin (); i != _T.end (); ++i)
+ for (typename std::vector<Matrix *>::iterator i = _multiMat.begin (); i != _multiMat.end (); ++i)
_solver._ip_trashcan.push (*i);
- _P.clear ();
- _T.clear ();
+ _permP.clear ();
+ _multiMat.clear ();
_rho.clear ();
_s.clear ();
}
@@ -1293,11 +1305,11 @@ namespace LinBox
typename Matrix::RowIterator i;
unsigned int idx;
- Matrix T (_N, _N);
+ Matrix T (_number, _number);
for (i = T.rowBegin (), idx = 0; i != T.rowEnd (); ++i, ++idx) {
_solver._VD.subin (*i, *i);
- _solver._F.assign ((*i)[idx], _solver._one);
+ _solver._field.assign ((*i)[idx], _solver._one);
}
apply (T, false);
@@ -1308,12 +1320,12 @@ namespace LinBox
template <class Field, class Matrix>
void LABlockLanczosSolver<Field, Matrix>::BasisTransformation::reportComplete (std::ostream &out)
{
- typename std::vector<Permutation>::iterator Pi = _P.begin ();
- typename std::vector<Matrix *>::iterator Ti = _T.begin ();
+ typename std::vector<Permutation>::iterator Pi = _permP.begin ();
+ typename std::vector<Matrix *>::iterator Ti = _multiMat.begin ();
typename std::vector<unsigned int>::iterator rhoi = _rho.begin ();
typename std::vector<unsigned int>::iterator si = _s.begin ();
- while (Pi != _P.end ()) {
+ while (Pi != _permP.end ()) {
out << "Permutation: ";
_solver._eliminator.writePermutation (out, *Pi) << std::endl;
@@ -1332,7 +1344,7 @@ namespace LinBox
{
typename std::vector<Matrix *>::iterator Ti;
- for (Ti = _T.begin (); Ti != _T.end (); ++Ti) {
+ for (Ti = _multiMat.begin (); Ti != _multiMat.end (); ++Ti) {
_solver._ip_trashcan.push (*Ti);
}
}
@@ -1437,11 +1449,11 @@ namespace LinBox
size_t rho_u,
size_t rho_v)
{
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Checking whether u_" << u_iter << " is A-conjugate to v_" << v_iter << "...";
- DenseSubmatrix<Element> T1p (_T1, 0, 0, rho_u, rho_v);
+ BlasMatrix<Field> T1p (_T1, 0, 0, rho_u, rho_v);
Matrix Av (A.rowdim (), _traits.blockingFactor ());
@@ -1453,7 +1465,7 @@ namespace LinBox
else {
report << "no" << std::endl;
- std::ostream &err_report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR);
+ std::ostream &err_report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR);
err_report << "ERROR: u_" << u_iter << " is not A-conjugate to v_" << v_iter << std::endl;
err_report << "Computed u_" << u_iter << "^T Av_" << v_iter << ":" << std::endl;
_MD.write (report, _T1);
@@ -1464,9 +1476,9 @@ namespace LinBox
template <class Blackbox>
void LABlockLanczosSolver<Field, Matrix>::checkInnerProducts (const Blackbox &A)
{
- commentator.start ("Checking cached inner products", "LABlockLanczosSolver::checkInnerProducts");
+ commentator().start ("Checking cached inner products", "LABlockLanczosSolver::checkInnerProducts");
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
typename std::list<Iterate *>::const_iterator i, j;
@@ -1498,7 +1510,7 @@ namespace LinBox
}
}
- commentator.stop ("done", NULL, "LABlockLanczosSolver::checkInnerProducts");
+ commentator().stop ("done", NULL, "LABlockLanczosSolver::checkInnerProducts");
}
#else // LABL_DETAILED_TRACE
@@ -1532,13 +1544,22 @@ namespace LinBox
_T3.resize (_traits.blockingFactor (), _traits.blockingFactor ());
_T4.resize (_traits.blockingFactor (), _traits.blockingFactor ());
_T5.resize (_traits.blockingFactor (), _traits.blockingFactor ());
- _W.resize (_traits.blockingFactor (), _traits.blockingFactor ());
+ _matW.resize (_traits.blockingFactor (), _traits.blockingFactor ());
_Cu.resize (_traits.blockingFactor (), _traits.blockingFactor ());
_Cv.resize (_traits.blockingFactor (), _traits.blockingFactor ());
- _F.init (_one, 1);
+ _field.init (_one, 1);
}
} // namespace LinBox
#endif // __LINBOX_la_block_lanczos_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/lanczos.doxy b/linbox/algorithms/lanczos.doxy
index fbf1517..882310c 100644
--- a/linbox/algorithms/lanczos.doxy
+++ b/linbox/algorithms/lanczos.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** @ingroup algorithms
@defgroup lanczos Lanczos
diff --git a/linbox/algorithms/lanczos.h b/linbox/algorithms/lanczos.h
index 6c9e145..e80cfd2 100644
--- a/linbox/algorithms/lanczos.h
+++ b/linbox/algorithms/lanczos.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/lanczos.h
* Copyright (C) 2002 LinBox
*
@@ -7,7 +5,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_lanczos_H
@@ -41,7 +57,7 @@ namespace LinBox
* options for the solver
*/
LanczosSolver (const Field &F, const LanczosTraits &traits) :
- _traits (traits), _F (F), _randiter (F), _VD (F)
+ _traits (traits), _field (F), _randiter (F), _VD (F)
{}
/** @brief Constructor with a random iterator
@@ -51,7 +67,7 @@ namespace LinBox
* @param r Random iterator to use for randomization
*/
LanczosSolver (const Field &F, const LanczosTraits &traits, typename Field::RandIter r) :
- _traits (traits), _F (F), _randiter (r), _VD (F)
+ _traits (traits), _field (F), _randiter (r), _VD (F)
{}
/** Solve the linear system Ax = b.
@@ -82,7 +98,7 @@ namespace LinBox
bool iterate (const Blackbox &A, Vector &x, const Vector &b);
const LanczosTraits &_traits;
- const Field &_F;
+ const Field &_field;
typename Field::RandIter _randiter;
VectorDomain<Field> _VD;
@@ -95,3 +111,12 @@ namespace LinBox
#endif // __LINBOX_lanczos_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/lanczos.inl b/linbox/algorithms/lanczos.inl
index 580f6f4..e4509b5 100644
--- a/linbox/algorithms/lanczos.inl
+++ b/linbox/algorithms/lanczos.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/lanczos.inl
* Copyright (C) 2002 Bradford Hovinen
*
@@ -7,7 +5,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_lanczos_INL
@@ -61,7 +77,7 @@ namespace LinBox
linbox_check ((x.size () == A.coldim ()) &&
(b.size () == A.rowdim ()));
- commentator.start ("Solving linear system (Lanczos)", "LanczosSolver::solve");
+ commentator().start ("Solving linear system (Lanczos)", "LanczosSolver::solve");
bool success = false;
LVector d1, d2, b1, b2, bp, y, Ax, ATAx, ATb;
@@ -70,11 +86,11 @@ namespace LinBox
VectorWrapper::ensureDim (_w[1], A.coldim ());
VectorWrapper::ensureDim (_Aw, A.coldim ());
- NonzeroRandIter<Field> real_ri (_F, _randiter);
- RandomDenseStream<Field, LVector, NonzeroRandIter<Field> > stream (_F, real_ri, A.coldim ());
+ NonzeroRandIter<Field> real_ri (_field, _randiter);
+ RandomDenseStream<Field, LVector, NonzeroRandIter<Field> > stream (_field, real_ri, A.coldim ());
for (unsigned int i = 0; !success && i < _traits.maxTries (); ++i) {
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
switch (_traits.preconditioner ()) {
case LanczosTraits::NO_PRECONDITIONER:
@@ -101,7 +117,7 @@ namespace LinBox
VectorWrapper::ensureDim (y, A.coldim ());
stream >> d1;
- Diagonal<Field, typename VectorTraits<LVector>::VectorCategory> D (_F, d1);
+ Diagonal<Field, typename VectorTraits<LVector>::VectorCategory> D (_field, d1);
Compose<Blackbox, Diagonal<Field, typename VectorTraits<LVector>::VectorCategory> > B (&A, &D);
report << "Random D: ";
@@ -120,7 +136,7 @@ namespace LinBox
VectorWrapper::ensureDim (bp, A.coldim ());
stream >> d1;
- Diagonal<Field, typename VectorTraits<LVector>::VectorCategory> D (_F, d1);
+ Diagonal<Field, typename VectorTraits<LVector>::VectorCategory> D (_field, d1);
Transpose<Blackbox> AT (&A);
Compose<Diagonal<Field, typename VectorTraits<LVector>::VectorCategory>, Blackbox> B1 (&D, &A);
Compose<Transpose<Blackbox>, Compose<Diagonal<Field, typename VectorTraits<LVector>::VectorCategory>, Blackbox> > B (&AT, &B1);
@@ -146,8 +162,8 @@ namespace LinBox
VectorWrapper::ensureDim (y, A.coldim ());
stream >> d1 >> d2;
- Diagonal<Field, typename VectorTraits<LVector>::VectorCategory> D1 (_F, d1);
- Diagonal<Field, typename VectorTraits<LVector>::VectorCategory> D2 (_F, d2);
+ Diagonal<Field, typename VectorTraits<LVector>::VectorCategory> D1 (_field, d1);
+ Diagonal<Field, typename VectorTraits<LVector>::VectorCategory> D2 (_field, d2);
Transpose<Blackbox> AT (&A);
Compose<Blackbox,
@@ -201,28 +217,28 @@ namespace LinBox
VectorWrapper::ensureDim (ATAx, A.coldim ());
VectorWrapper::ensureDim (ATb, A.coldim ());
- commentator.start ("Checking whether A^T Ax = A^T b");
+ commentator().start ("Checking whether A^T Ax = A^T b");
A.apply (Ax, x);
A.applyTranspose (ATAx, Ax);
A.applyTranspose (ATb, b);
if (_VD.areEqual (ATAx, ATb))
- commentator.stop ("passed");
+ commentator().stop ("passed");
else {
- commentator.stop ("FAILED");
+ commentator().stop ("FAILED");
success = false;
}
}
else if (_traits.checkResult ()) {
- commentator.start ("Checking whether Ax=b");
+ commentator().start ("Checking whether Ax=b");
A.apply (Ax, x);
if (_VD.areEqual (Ax, b))
- commentator.stop ("passed");
+ commentator().stop ("passed");
else {
- commentator.stop ("FAILED");
+ commentator().stop ("FAILED");
success = false;
}
}
@@ -230,11 +246,11 @@ namespace LinBox
}
if (success) {
- commentator.stop ("done", "Solve successful", "BlockLanczosSolver::solve");
+ commentator().stop ("done", "Solve successful", "BlockLanczosSolver::solve");
return x;
}
else {
- commentator.stop ("done", "Solve failed", "BlockLanczosSolver::solve");
+ commentator().stop ("done", "Solve failed", "BlockLanczosSolver::solve");
throw SolveFailed ();
}
}
@@ -243,7 +259,7 @@ namespace LinBox
template<class Blackbox>
bool LanczosSolver<Field, LVector>::iterate (const Blackbox &A, LVector &x, const LVector &b)
{
- commentator.start ("Lanczos iteration", "LanczosSolver::iterate", A.coldim ());
+ commentator().start ("Lanczos iteration", "LanczosSolver::iterate", A.coldim ());
// j is really a flip-flop: 0 means "even" and 1 means "odd". So "j" and
// "j-2" are accessed with [j], while "j-1" and "j+1" are accessed via
@@ -262,38 +278,38 @@ namespace LinBox
_VD.subin (_w[0], _w[0]);
// Get a random vector _w[1]
- RandomDenseStream<Field, LVector> stream (_F, _randiter, A.coldim ());
+ RandomDenseStream<Field, LVector> stream (_field, _randiter, A.coldim ());
stream >> _w[1];
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
traceReport (report, _VD, "w", 1, _w[1]);
A.apply (_Aw, _w[j]); // Aw_j
_VD.dot (delta[j], _w[j], _Aw); // delta_j <- <w_j, Aw_j>
- if (_F.isZero (delta[j])) {
- commentator.stop ("FAILED", "<w_1, Aw_1> = 0", "LanczosSolver::iterate");
+ if (_field.isZero (delta[j])) {
+ commentator().stop ("FAILED", "<w_1, Aw_1> = 0", "LanczosSolver::iterate");
return false;
}
_VD.dot (alpha, _Aw, _Aw); // alpha <- -<Aw_j, Aw_j> / delta_j
- _F.divin (alpha, delta[j]);
- _F.negin (alpha);
+ _field.divin (alpha, delta[j]);
+ _field.negin (alpha);
- _F.subin (beta, beta); // beta <- 0
+ _field.subin (beta, beta); // beta <- 0
_VD.dot (wb, _w[j], b); // x <- <w_j, b> / delta_j w_j
- _F.divin (wb, delta[j]);
+ _field.divin (wb, delta[j]);
_VD.mul (x, _w[j], wb);
- while (!_F.isZero (delta[j])) {
- commentator.progress ();
+ while (!_field.isZero (delta[j])) {
+ commentator().progress ();
report << "Total matrix-vector products so far: " << prods << std::endl;
- // traceReport (report, _F, "alpha", iter, alpha);
- // traceReport (report, _F, "beta", iter, alpha);
+ // traceReport (report, _field, "alpha", iter, alpha);
+ // traceReport (report, _field, "beta", iter, alpha);
traceReport (report, _VD, "w", iter - 1, _w[1 - j]);
traceReport (report, _VD, "w", iter, _w[j]);
@@ -310,19 +326,19 @@ namespace LinBox
_VD.dot (delta[j], _w[j], _Aw); // delta_j <- <w_j, Aw_j>
- // traceReport (report, _F, "delta", iter - 1, delta[1 - j]);
- // traceReport (report, _F, "delta", iter, delta[j]);
+ // traceReport (report, _field, "delta", iter - 1, delta[1 - j]);
+ // traceReport (report, _field, "delta", iter, delta[j]);
- if (!_F.isZero (delta[j])) {
+ if (!_field.isZero (delta[j])) {
_VD.dot (alpha, _Aw, _Aw); // alpha <- -<Aw_j, Aw_j> / delta_j
- _F.divin (alpha, delta[j]);
- _F.negin (alpha);
+ _field.divin (alpha, delta[j]);
+ _field.negin (alpha);
- _F.div (beta, delta[j], delta[1 - j]); // beta <- -delta_j / delta_j-1
- _F.negin (beta);
+ _field.div (beta, delta[j], delta[1 - j]); // beta <- -delta_j / delta_j-1
+ _field.negin (beta);
_VD.dot (wb, _w[j], b); // x <- x + <w_j, b> / delta_j w_j
- _F.divin (wb, delta[j]);
+ _field.divin (wb, delta[j]);
_VD.axpyin (x, wb, _w[j]);
}
@@ -330,13 +346,22 @@ namespace LinBox
++iter;
}
- commentator.indent (report);
+ commentator().indent (report);
report << "Total matrix-vector products: " << prods << std::endl;
- commentator.stop ("done", "delta_j = 0", "LanczosSolver::iterate");
+ commentator().stop ("done", "delta_j = 0", "LanczosSolver::iterate");
return true;
}
} // namespace LinBox
#endif // __LINBOX_lanczos_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/last-invariant-factor.h b/linbox/algorithms/last-invariant-factor.h
index 68d78d2..3b0916c 100644
--- a/linbox/algorithms/last-invariant-factor.h
+++ b/linbox/algorithms/last-invariant-factor.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Author: Zhendong Wan
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,17 +17,17 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_last_invariant_factor_H
#define __LINBOX_last_invariant_factor_H
-#include <linbox/util/debug.h>
-#include <linbox/algorithms/default.h>
-#include <linbox/algorithms/rational-solver.h>
+#include "linbox/util/debug.h"
+#include "linbox/algorithms/default.h"
+#include "linbox/algorithms/rational-solver.h"
#include <utility>
namespace LinBox
@@ -134,7 +135,7 @@ namespace LinBox
for ( Prime_p = PrimeL.begin();
Prime_p != PrimeL.end();
++ Prime_p) {
- r.init (pri, *Prime_p);
+ r.init (pri, (unsigned long) *Prime_p);
do {
r.quoRem(quo,rem,lif,pri);
if (r.isZero(rem)) r.assign(lif,quo);
@@ -149,15 +150,15 @@ namespace LinBox
/** \brief Compute the last invariant factor of an integer matrix,
* by solving linear system,
* ignoring these factors of primes in list PrimeL
- * Implement the bonus in ref{....}
+ * Implement the Bonus in ref{....}
*/
template<class IMatrix, class Vector>
- Integer& lastInvariantFactor_Bonus(Integer& lif, Integer& bonus, const IMatrix& A,
+ Integer& lastInvariantFactor_Bonus(Integer& lif, Integer& Bonus, const IMatrix& A,
const Vector& PrimeL) const
{
r. init(lif, 1);
- r. init (bonus, 1);
+ r. init (Bonus, 1);
int count = 0;
SolverReturnStatus tmp1, tmp2;
// Storage of rational solution
@@ -190,7 +191,7 @@ namespace LinBox
r. lcm (lif, lif, r1_den);
r. lcm (lif, lif, r2_den);
- // compute the bonus
+ // compute the Bonus
Integer g, d, a11, a12, a21, a22, l, c_bonus, c_l;
typename std::vector<Integer>::iterator num1_p, num2_p;
std::vector<Integer> r1 (A. rowdim());
@@ -226,7 +227,7 @@ namespace LinBox
r. divin (c_bonus, l);
}
- r. lcmin (bonus, c_bonus);
+ r. lcmin (Bonus, c_bonus);
}
// filter out primes in PRIMEL from lif.
@@ -239,12 +240,12 @@ namespace LinBox
else break;
} while (true);
}
- r. gcdin (bonus, lif);
- if (!r. isZero (bonus))
+ r. gcdin (Bonus, lif);
+ if (!r. isZero (Bonus))
for ( Prime_p = PrimeL.begin(); Prime_p != PrimeL.end(); ++ Prime_p) {
r.init (pri, *Prime_p);
do {
- r.quoRem(quo,rem,bonus,pri);
+ r.quoRem(quo,rem,Bonus,pri);
if (r.isZero(rem)) r.assign(lif,quo);
else break;
} while (true);
@@ -299,10 +300,10 @@ namespace LinBox
}
template<class Vector>
- Integer& bonus(Integer& bonus, const Integer r1_den,const Integer r2_den, Vector& r1_num, Vector& r2_num) const
+ Integer& bonus(Integer& Bonus, const Integer r1_den,const Integer r2_den, Vector& r1_num, Vector& r2_num) const
{
- if (bonus==0) bonus=1;
- if (r1_num.size() != r2_num.size()) return bonus=0;
+ if (Bonus==0) Bonus=1;
+ if (r1_num.size() != r2_num.size()) return Bonus=0;
Integer g, d, a11, a12, a21, a22, c_bonus, l, c_l;
typename std::vector<Integer>::iterator num1_p, num2_p;
std::vector<Integer> r1 (r1_num. size());
@@ -337,8 +338,8 @@ namespace LinBox
r. divin (c_bonus, l);
}
- r. lcmin (bonus, c_bonus);
- return bonus;
+ r. lcmin (Bonus, c_bonus);
+ return Bonus;
}
@@ -353,14 +354,14 @@ namespace LinBox
return lif;
}
- /** \brief Compute the last invariant factor with bonus
+ /** \brief Compute the last invariant factor with Bonus
*/
template<class IMatrix>
- Integer& lastInvariantFactor_Bonus(Integer& lif, Integer& bonus, const IMatrix& A) const
+ Integer& lastInvariantFactor_Bonus(Integer& lif, Integer& Bonus, const IMatrix& A) const
{
std::vector<Integer> empty_v;
- lastInvariantFactor_Bonus (lif, bonus, A, empty_v);
+ lastInvariantFactor_Bonus (lif, Bonus, A, empty_v);
return lif;
}
@@ -370,3 +371,12 @@ namespace LinBox
#endif //__LINBOX_last_invariant_factor_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/lattice.doxy b/linbox/algorithms/lattice.doxy
new file mode 100644
index 0000000..760d636
--- /dev/null
+++ b/linbox/algorithms/lattice.doxy
@@ -0,0 +1,37 @@
+// Copyright (C) 2011 Brice Boyer, part of LinBox, GNU LGPL, see COPYING
+/*
+ * Coypright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
+
+
+/*!
+\ingroup algorithms
+\defgroup lattice Lattice reductions
+
+ at brief Lattice reduction (LLL) in LinBox.
+
+This is an interface to fplll/NTL.
+
+NO DOC
+
+*/
+
+// vim:syntax=doxygen
diff --git a/linbox/algorithms/lattice.h b/linbox/algorithms/lattice.h
new file mode 100644
index 0000000..3585d0f
--- /dev/null
+++ b/linbox/algorithms/lattice.h
@@ -0,0 +1,339 @@
+/* linbox/algorithms/lattice.h
+ * Copyright (C) 2011 The LinBox group
+ * Written by Brice Boyer <bboyer at imag.fr>
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+#ifndef __LINBOX_algorithms_lattice_H
+#define __LINBOX_algorithms_lattice_H
+
+
+/*! @file algorithms/lattice.h
+ * @brief LLL reduction
+ * @ingroup algorithms
+ * @ingroup lattice
+ *
+ * This is an interface to NTL/FPLLL.
+ *
+ * @todo Create a BlasMatrix<NTL_ZZ> that is just like a mat_ZZ !
+ * @todo Create a BlasMatrix<FPLLL_ZZ> that is just like a IntMatrix !
+ * @todo This will avoid copy back/forth a BlasMatrix<PID_integer>
+ */
+
+#if !defined(__LINBOX_HAVE_FPLLL) && !defined(__LINBOX_HAVE_NTL)
+#error "you need either FPLLL or NTL here"
+#endif
+
+
+#ifdef __LINBOX_HAVE_NTL
+#include <NTL/LLL.h>
+#endif
+
+
+
+#ifdef __LINBOX_HAVE_FPLLL
+// this is a damn FPLLL bug !!!
+namespace FPLLL {
+#define round
+#define trunc
+#include <fplll/fplll.h>
+#include <fplll/heuristic.h>
+#include <fplll/proved.h>
+#include <fplll/wrapper.h>
+#undef round
+#undef trunc
+}
+
+#endif
+
+
+namespace LinBox
+{ /* Methods */
+
+ /*! NTL methods.
+ *
+ * This lists the methods implemented.
+ */
+ class latticeMethod {
+ public:
+ struct genericMethod {};
+#ifdef __LINBOX_HAVE_NTL
+ /*! NTL_LLL.
+ * This is NTL's LLL
+ * The Defaults are NTL's
+ */
+ struct latticeNTL_LLL : public virtual genericMethod {
+ public :
+ enum localMeth { FP , XD , QP, RR } ;
+ private :
+ double _delta ;
+ long _deep ;
+ // LLLCheckFct
+ enum localMeth _met ;
+ bool _givens ; // true for Givens
+ public :
+ latticeNTL_LLL() :
+ _delta(0.99),
+ _deep(0),
+ _met(XD),
+ _givens(false)
+ {}
+ void setDelta(const double & delta)
+ {
+ _delta = delta ;
+ }
+ void setDepth(const long & deep)
+ {
+ _deep = deep ;
+ }
+ void setMet( enum localMeth met )
+ {
+ _met = met ;
+ }
+ void setGivens (bool giv )
+ {
+ _givens = giv ;
+ }
+ double getDelta() const
+ {
+ return _delta ;
+ }
+ long getDepth() const
+ {
+ return _deep ;
+ }
+ enum localMeth getMeth() const
+ {
+ return _met ;
+ }
+ bool givens() const
+ {
+ return _givens ;
+ }
+
+ };
+
+ /*! NTL_BKZ.
+ * This is NTL's BKZ.
+ * The Defaults are NTL's
+ */
+ struct latticeNTL_BKZ : public virtual genericMethod {
+ enum localMeth { FP , XD , QP, RR } ;
+ private :
+ double _delta ;
+ long _bsize ;
+ long _prune ;
+ // LLLCheckFct
+ enum localMeth _met ;
+ bool _givens ;
+ public :
+ latticeNTL_BKZ() :
+ _delta(0.99),
+ _bsize(10),
+ _prune(0),
+ _met(XD),
+ _givens(false)
+ {}
+ void setDelta(const double & delta)
+ {
+ _delta = delta ;
+ }
+ void setBlockSize(const long & bsize)
+ {
+ _bsize = bsize ;
+ }
+ void setPrune( const long & prune)
+ {
+ _prune = prune ;
+ }
+ void setMet( enum localMeth met )
+ {
+ _met = met ;
+ }
+ void setGivens (bool giv )
+ {
+ _givens = giv ;
+ }
+ double getDelta() const
+ {
+ return _delta ;
+ }
+ long getBlockSize() const
+ {
+ return _bsize ;
+ }
+ long getPrune() const
+ {
+ return _prune ;
+ }
+ enum localMeth getMeth() const
+ {
+ return _met ;
+ }
+ bool givens() const
+ {
+ return _givens ;
+ }
+
+ };
+#endif // __LINBOX_HAVE_NTL
+
+#ifdef __LINBOX_HAVE_FPLLL
+
+ /*! FPLLL LLL.
+ * Wrapper to fplll
+ * Babai,GetBase not implemented,
+ * so class is not stored there yet.
+ */
+ // template<class ZT, class FT>
+ struct latticeFPLLL : public virtual genericMethod {
+ enum localMeth {
+ P //!< proved
+ , H //!< heuristic
+ , W //!< wrapper
+ } ;
+ private :
+ int _pres ;
+ double _eta ;
+ double _delta ;
+ int _siegel ;
+ enum localMeth _met;
+ // proved<ZT,FT> * _meth1 ;
+ // heuristic<ZT,FT> * _meth2 ;
+ // wrapper * _meth3 ;
+ public :
+ latticeFPLLL() :
+ _pres (0),
+ _eta(0.51),
+ _delta(0.99),
+ _siegel(0),
+ _met(P)
+ {}
+ void setPrecision(int pres)
+ {
+ _pres = pres ;
+ }
+ void setEta(double eta)
+ {
+ _eta = eta ;
+ }
+ void setDelta(double delta)
+ {
+ _delta = delta ;
+ }
+ void setSiegel(int siegel)
+ {
+ _siegel = siegel ;
+ }
+ void setMeth(enum localMeth met)
+ {
+ _met = met ;
+ }
+ int getPrecision() const
+ {
+ return _pres;
+ }
+ double getEta() const
+ {
+ return _eta;
+ }
+ double getDelta() const
+ {
+ return _delta;
+ }
+ int getSiegel() const
+ {
+ return _siegel;
+ }
+ enum localMeth getMeth() const
+ {
+ return _met;
+ }
+ };
+#endif // __LINBOX_HAVE_FPLLL
+
+
+ };
+
+} // LinBox
+
+#include "linbox/algorithms/lattice.inl"
+
+
+#ifdef __LINBOX_HAVE_FPLLL
+#define defaultLllMeth latticeMethod::latticeFPLLL
+#else
+#define defaultLllMeth latticeMethod::latticeNTL_LLL
+#endif
+
+namespace LinBox
+{
+ template<class Ring, class myMethod>
+ void lllReduceIn(BlasMatrix<Ring> & H,
+ const myMethod & meth = defaultLllMeth())
+ {
+ Ring Z ;
+ BlasMatrix<Ring> U(Z,0,0);
+ const bool withU = false;
+ lllReduceInBase<Ring,withU>(H,U,meth);
+
+ }
+
+ template<class Ring, class myMethod>
+ void lllReduceIn(BlasMatrix<Ring> & H,
+ BlasMatrix<Ring> & U,
+ const myMethod & meth = defaultLllMeth())
+ {
+ const bool withU = true;
+ lllReduceInBase<Ring,withU>(H,U,meth);
+ }
+
+ template<class Ring, class myMethod>
+ void lllReduce(BlasMatrix<Ring> & H,
+ const BlasMatrix<Ring> & A,
+ const myMethod & meth = defaultLllMeth())
+ {
+ H = A ;
+ lllReduceIn<Ring>(H,meth);
+ }
+
+ template<class Ring, class myMethod>
+ void lllReduce(BlasMatrix<Ring> & H,
+ BlasMatrix<Ring> & U,
+ const BlasMatrix<Ring> & A,
+ const myMethod & meth = defaultLllMeth())
+ {
+ H = A ;
+ lllReduceIn<Ring>(H,U,meth);
+ }
+
+}
+
+#undef defaultLllMeth
+
+#endif // __LINBOX_algorithms_lattice_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/lattice.inl b/linbox/algorithms/lattice.inl
new file mode 100644
index 0000000..820a308
--- /dev/null
+++ b/linbox/algorithms/lattice.inl
@@ -0,0 +1,394 @@
+/* linbox/algorithms/lattice.inl
+ * Copyright (C) 2011 The LinBox group
+ * Written by Brice Boyer <bboyer at imag.fr>
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+#ifndef __LINBOX_algorithms_lattice_INL
+#define __LINBOX_algorithms_lattice_INL
+
+
+/*!@internal
+ * @file algorithms/lattice.inl
+ * @brief LLL reduction
+ * @ingroup algorithms
+ * @ingroup lattice
+ *
+ * Implements the various wrappers
+ */
+
+/* Interface to NTL LLL */
+namespace LinBox
+{
+#ifdef __LINBOX_HAVE_NTL
+
+ //! @todo we should use mat_ZZ here instead of BlasMatrix<Ring>
+ template<class Ring, bool withU>
+ void
+ lllReduceInBase(BlasMatrix<Ring> & H,
+ BlasMatrix<Ring> & UU,
+ const latticeMethod::latticeNTL_LLL & meth)
+ {
+ // convert to mat_ZZ
+ NTL::mat_ZZ B ;
+ NTL::mat_ZZ U ;
+ B.SetDims(H.rowdim(),H.coldim());
+ NTL::clear(B);
+ // XXX Maybe Bij, maybe Bji...
+ NTL_ZZ Ints ;
+ NTL_ZZ::Element Bij ;
+ for (size_t i = 0 ; i < H.rowdim(); ++i) {
+ for (size_t j = 0 ; j < H.coldim() ; ++j) {
+ Ints.init(Bij,H.getEntry(i,j));
+ B[(long)i][(long)j] = Bij ;
+ }
+ }
+ if (withU) {
+ U.SetDims(UU.rowdim(),UU.coldim());
+ NTL::clear(U);
+ }
+ // do NTL's LLL
+ if (withU) {
+ switch (meth.getMeth()) {
+ case (latticeMethod::latticeNTL_LLL::FP) :
+ {
+ if (meth.givens()) {
+ G_LLL_FP(B,U,meth.getDelta(),meth.getDepth());
+ }
+ else {
+ LLL_FP(B,U,meth.getDelta(),meth.getDepth());
+ }
+ }
+ break;
+ case (latticeMethod::latticeNTL_LLL::RR) :
+ {
+ if (meth.givens()) {
+ G_LLL_RR(B,U,meth.getDelta(),meth.getDepth());
+ }
+ else {
+ LLL_RR(B,U,meth.getDelta(),meth.getDepth());
+ }
+ }
+ break;
+ case (latticeMethod::latticeNTL_LLL::XD) :
+ {
+ if (meth.givens()) {
+ G_LLL_XD(B,U,meth.getDelta(),meth.getDepth());
+ }
+ else {
+ LLL_XD(B,U,meth.getDelta(),meth.getDepth());
+ }
+ }
+ break;
+ case (latticeMethod::latticeNTL_LLL::QP) :
+ {
+ if (meth.givens()) {
+ G_LLL_QP(B,U,meth.getDelta(),meth.getDepth());
+ }
+ else {
+ LLL_QP(B,U,meth.getDelta(),meth.getDepth());
+ }
+ }
+ break;
+
+ }
+ }
+ else {
+ switch (meth.getMeth()) {
+ case (latticeMethod::latticeNTL_LLL::FP) :
+ {
+ if (meth.givens()) {
+ G_LLL_FP(B,meth.getDelta(),meth.getDepth());
+ }
+ else {
+ LLL_FP(B,meth.getDelta(),meth.getDepth());
+ }
+ }
+ break;
+ case (latticeMethod::latticeNTL_LLL::RR) :
+ {
+ if (meth.givens()) {
+ G_LLL_RR(B,meth.getDelta(),meth.getDepth());
+ }
+ else {
+ LLL_RR(B,meth.getDelta(),meth.getDepth());
+ }
+ }
+ break;
+ case (latticeMethod::latticeNTL_LLL::XD) :
+ {
+ if (meth.givens()) {
+ G_LLL_XD(B,meth.getDelta(),meth.getDepth());
+ }
+ else {
+ LLL_XD(B,meth.getDelta(),meth.getDepth());
+ }
+ }
+ break;
+ case (latticeMethod::latticeNTL_LLL::QP) :
+ {
+ if (meth.givens()) {
+ G_LLL_QP(B,meth.getDelta(),meth.getDepth());
+ }
+ else {
+ LLL_QP(B,meth.getDelta(),meth.getDepth());
+ }
+ }
+ break;
+
+ }
+ }
+ // convert from mat_ZZ
+ Integer Hij;
+ for (size_t i = 0 ; i < H.rowdim(); ++i) {
+ for (size_t j = 0 ; j < H.coldim() ; ++j) {
+ Ints.convert(Hij,B[(long)i][(long)j]);
+ H.setEntry( i,j,Hij );
+ }
+ }
+ if (withU) {
+ Integer Uij;
+ for (size_t i = 0 ; i < H.rowdim(); ++i) {
+ for (size_t j = 0 ; j < H.coldim() ; ++j) {
+ Ints.convert(Uij,U[(long)i][(long)j]);
+ UU.setEntry(i,j,Uij );
+ }
+ }
+ }
+
+ }
+#endif // __LINBOX_HAVE_NTL
+}
+
+/* Interface to NTL BKZ */
+namespace LinBox
+{
+#ifdef __LINBOX_HAVE_NTL
+
+ //! @todo we should use mat_ZZ here instead of BlasMatrix<Ring>
+ template<class Ring, bool withU>
+ void
+ lllReduceInBase(BlasMatrix<Ring> & H,
+ BlasMatrix<Ring> & UU,
+ const latticeMethod::latticeNTL_BKZ & meth)
+ {
+ // convert to mat_ZZ
+ NTL::mat_ZZ B ;
+ NTL::mat_ZZ U ;
+ B.SetDims(H.rowdim(),H.coldim());
+ NTL::clear(B);
+ // XXX Maybe Bij, maybe Bji...
+ NTL_ZZ Ints ;
+ NTL_ZZ::Element Bij ;
+ for (size_t i = 0 ; i < H.rowdim(); ++i) {
+ for (size_t j = 0 ; j < H.coldim() ; ++j) {
+ Ints.init(Bij, H.getEntry(i,j));
+ B[(long)i][(long)j] = Bij ;
+ }
+ }
+ if (withU) {
+ U.SetDims(UU.rowdim(),UU.coldim());
+ NTL::clear(U);
+ }
+ // do NTL's BKZ
+ if (withU) {
+ switch (meth.getMeth()) {
+ case (latticeMethod::latticeNTL_BKZ::FP) :
+ {
+ if (meth.givens()) {
+ G_BKZ_FP(B,U,meth.getBlockSize(),meth.getPrune());
+ }
+ else {
+ BKZ_FP(B,U,meth.getBlockSize(),meth.getPrune());
+ }
+ }
+ break;
+ case (latticeMethod::latticeNTL_BKZ::RR) :
+ {
+ if (meth.givens()) {
+ G_BKZ_RR(B,U,meth.getBlockSize(),meth.getPrune());
+ }
+ else {
+ BKZ_RR(B,U,meth.getBlockSize(),meth.getPrune());
+ }
+ }
+ break;
+ case (latticeMethod::latticeNTL_BKZ::XD) :
+ {
+ if (meth.givens()) {
+ G_BKZ_XD(B,U,meth.getBlockSize(),meth.getPrune());
+ }
+ else {
+ BKZ_XD(B,U,meth.getBlockSize(),meth.getPrune());
+ }
+ }
+ break;
+ case (latticeMethod::latticeNTL_BKZ::QP) :
+ {
+ if (meth.givens()) {
+ G_BKZ_QP(B,U,meth.getBlockSize(),meth.getPrune());
+ }
+ else {
+ BKZ_QP(B,U,meth.getBlockSize(),meth.getPrune());
+ }
+ }
+ break;
+
+ }
+ }
+ else {
+ switch (meth.getMeth()) {
+ case (latticeMethod::latticeNTL_BKZ::FP) :
+ {
+ if (meth.givens()) {
+ G_BKZ_FP(B,meth.getBlockSize(),meth.getPrune());
+ }
+ else {
+ BKZ_FP(B,meth.getBlockSize(),meth.getPrune());
+ }
+ }
+ break;
+ case (latticeMethod::latticeNTL_BKZ::RR) :
+ {
+ if (meth.givens()) {
+ G_BKZ_RR(B,meth.getBlockSize(),meth.getPrune());
+ }
+ else {
+ BKZ_RR(B,meth.getBlockSize(),meth.getPrune());
+ }
+ }
+ break;
+ case (latticeMethod::latticeNTL_BKZ::XD) :
+ {
+ if (meth.givens()) {
+ G_BKZ_XD(B,meth.getBlockSize(),meth.getPrune());
+ }
+ else {
+ BKZ_XD(B,meth.getBlockSize(),meth.getPrune());
+ }
+ }
+ break;
+ case (latticeMethod::latticeNTL_BKZ::QP) :
+ {
+ if (meth.givens()) {
+ G_BKZ_QP(B,meth.getBlockSize(),meth.getPrune());
+ }
+ else {
+ BKZ_QP(B,meth.getBlockSize(),meth.getPrune());
+ }
+ }
+ break;
+
+ }
+ }
+ // convert from mat_ZZ
+ Integer Hij;
+ for (size_t i = 0 ; i < H.rowdim(); ++i) {
+ for (size_t j = 0 ; j < H.coldim() ; ++j) {
+ Ints.convert(Hij,B[(long)i][(long)j]);
+ H.setEntry( i,j,Hij );
+ }
+ }
+ if (withU) {
+ Integer Uij;
+ for (size_t i = 0 ; i < H.rowdim(); ++i) {
+ for (size_t j = 0 ; j < H.coldim() ; ++j) {
+ Ints.convert(Uij,U[(long)i][(long)j]);
+ UU.setEntry(i,j,Uij );
+ }
+ }
+ }
+
+ }
+#endif // __LINBOX_HAVE_NTL
+
+}
+
+/* Interface to FPLLL */
+namespace LinBox
+{
+#ifdef __LINBOX_HAVE_FPLLL
+ //! @bug we suppose Ring and mpz_t understand eachother...
+ template<class Ring, bool withU>
+ void
+ lllReduceInBase(BlasMatrix<Ring> & H,
+ BlasMatrix<Ring> & UU,
+ const latticeMethod::latticeFPLLL & meth)
+ {
+ typedef mpz_t ZT ;
+ if (withU)
+ throw NotImplementedYet("not U");
+ // Convert H
+ FPLLL::ZZ_mat<ZT> B(H.rowdim(),H.coldim()) ;
+ for (size_t i = 0 ; i < H.rowdim() ; ++i) {
+ for (size_t j = 0 ; j < H.coldim() ; ++j) {
+ B.Set(i,j,FPLLL::Z_NR<ZT>(H.getEntry(i,j)) );
+ }
+ }
+ // LLL()
+ switch (meth.getMeth()) {
+ case (latticeMethod::latticeFPLLL::P) :
+ {
+ FPLLL::proved<ZT,double> lllMethod(&B,meth.getPrecision(),
+ meth.getEta(),meth.getDelta());
+ lllMethod.LLL();
+ }
+ break;
+ case (latticeMethod::latticeFPLLL::W) :
+ {
+ FPLLL::wrapper lllMethod(&B,meth.getPrecision(),
+ meth.getEta(),meth.getDelta());
+ lllMethod.LLL();
+ }
+ break;
+ case (latticeMethod::latticeFPLLL::H) :
+ {
+ FPLLL::heuristic<ZT,double> lllMethod(&B,meth.getPrecision(),
+ meth.getEta(),meth.getDelta(),
+ meth.getSiegel());
+ lllMethod.LLL();
+ }
+ break;
+ }
+
+
+
+ // Convert back H
+ for (size_t i = 0 ; i < H.rowdim() ; ++i) {
+ for (size_t j = 0 ; j < H.coldim() ; ++j) {
+ H.setEntry(i,j, B.Get(i,j) );
+ }
+ }
+
+ }
+#endif // __LINBOX_HAVE_FPLLL
+
+
+}
+
+#endif // __LINBOX_algorithms_lattice_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/lazy-product.h b/linbox/algorithms/lazy-product.h
index 77e669e..6fa64af 100644
--- a/linbox/algorithms/lazy-product.h
+++ b/linbox/algorithms/lazy-product.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2007 LinBox
* Written by JG Dumas
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -109,3 +110,12 @@ namespace LinBox
#endif //__LINBOX_lazy_product_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/lifting-container.h b/linbox/algorithms/lifting-container.h
index fbb3e3f..e30449b 100644
--- a/linbox/algorithms/lifting-container.h
+++ b/linbox/algorithms/lifting-container.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/lifting-container.h
* Copyright (C) 2004 Pascal Giorgi
*
* Written by Pascal Giorgi pascal.giorgi at ens-lyon.fr
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/lifting-container.h
@@ -32,23 +33,23 @@
#include <vector>
-#include <linbox/linbox-config.h>
-#include <linbox/util/debug.h>
-#include <linbox/blackbox/apply.h>
-#include <linbox/algorithms/blackbox-container.h>
-#include <linbox/algorithms/massey-domain.h>
-#include <linbox/algorithms/blackbox-block-container.h>
-#include <linbox/algorithms/block-massey-domain.h>
-#include <linbox/algorithms/gauss.h>
-#include <linbox/blackbox/blas-blackbox.h>
-#include <linbox/vector/vector-domain.h>
-#include <linbox/blackbox/compose.h>
-#include <linbox/blackbox/block-hankel-inverse.h>
-#include <linbox/algorithms/blas-domain.h>
-#include <linbox/field/hom.h>
-#include <linbox/matrix/transpose-matrix.h>
-#include <linbox/blackbox/transpose.h>
-//#include <linbox/algorithms/vector-hom.h>
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+
+#include "linbox/blackbox/apply.h"
+#include "linbox/algorithms/blackbox-container.h"
+#include "linbox/algorithms/massey-domain.h"
+#include "linbox/algorithms/blackbox-block-container.h"
+#include "linbox/algorithms/block-massey-domain.h"
+#include "linbox/algorithms/gauss.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/blackbox/compose.h"
+#include "linbox/blackbox/block-hankel-inverse.h"
+#include "linbox/algorithms/blas-domain.h"
+#include "linbox/field/hom.h"
+#include "linbox/matrix/transpose-matrix.h"
+#include "linbox/blackbox/transpose.h"
+//#include "linbox/algorithms/vector-hom.h"
namespace LinBox
{
@@ -66,17 +67,17 @@ namespace LinBox
typename Ring::Element& short_col_sqr, const ItMatrix& A)
{
- typedef typename Ring::Element Integer;
- //Integer sqsum;
+ typedef typename Ring::Element Integer_t;
+ //Integer_t sqsum;
//size_t m, n, col=0;
//n=A.coldim();
//m=A.rowdim();
R.init(H_col_sqr, 1);
- Integer zero;
+ Integer_t zero;
R.init(zero,0UL);
typename ItMatrix::ConstRowIterator row= A.rowBegin();
- std::vector<Integer> tmp(A.coldim(), zero);
+ std::vector<Integer_t> tmp(A.coldim(), zero);
for (; row != A.rowEnd(); row++){
typename ItMatrix::ConstRow::const_iterator elm= row->begin();
for (size_t i=0; elm != row->end(); elm++, ++i)
@@ -104,25 +105,19 @@ namespace LinBox
}
- // in solveNonsingular, we may work with something that inherits from DenseMatrixBase
- template <class Ring>
- void BoundBlackbox(const Ring& R, typename Ring::Element& H_col_sqr,
- typename Ring::Element& short_col_sqr, const DenseMatrixBase<typename Ring::Element>& A)
- {
- SpecialBound(R, H_col_sqr, short_col_sqr, A);
- }
-
template <class Ring>
void BoundBlackbox(const Ring& R, typename Ring::Element& H_col_sqr,
- typename Ring::Element& short_col_sqr, const BlasBlackbox<Ring>& A)
+ typename Ring::Element& short_col_sqr,
+ const BlasMatrix<Ring>& A)
{
SpecialBound(R, H_col_sqr, short_col_sqr, A);
}
- // in other solvers we generally use BlasBlackbox which inherits from DenseSubmatrix
+ // in other solvers we generally use BlasMatrix which inherits from BlasSubmatrix
template <class Ring>
void BoundBlackbox(const Ring& R, typename Ring::Element& H_col_sqr,
- typename Ring::Element& short_col_sqr, const DenseSubmatrix<typename Ring::Element>& A)
+ typename Ring::Element& short_col_sqr,
+ const BlasSubmatrix<Ring>& A)
{
SpecialBound(R, H_col_sqr, short_col_sqr, A);
}
@@ -130,19 +125,20 @@ namespace LinBox
template < class Ring, class Blackbox>
void BoundBlackbox (const Ring& R, typename Ring::Element& H_col_sqr,
- typename Ring::Element& short_col_sqr, const Blackbox& A)
+ typename Ring::Element& short_col_sqr,
+ const Blackbox& A)
{
- typedef typename Ring::Element Integer;
- Integer one,zero,sqsum;
+ typedef typename Ring::Element Integer_t;
+ Integer_t one,zero,sqsum;
size_t m,n;
n=A.coldim();
m=A.rowdim();
R.init(one,1);
R.init(zero,0);
R.init(H_col_sqr, 1);
- typename std::vector<Integer>::const_iterator iter;
- std::vector<Integer> e(n,zero),tmp(m);
+ typename std::vector<Integer_t>::const_iterator iter;
+ std::vector<Integer_t> e(n,zero),tmp(m);
for (size_t i=0;i<n;i++){
e[i]=one;
@@ -160,18 +156,19 @@ namespace LinBox
template < class Ring, class Matrix1, class Matrix2>
void BoundBlackbox (const Ring& R, typename Ring::Element& H_col_sqr,
- typename Ring::Element& short_col_sqr, const Compose<Matrix1,Matrix2> & A)
+ typename Ring::Element& short_col_sqr,
+ const Compose<Matrix1,Matrix2> & A)
{
- typedef typename Ring::Element Integer;
- Integer one,zero,sqsum;
+ typedef typename Ring::Element Integer_t;
+ Integer_t one,zero,sqsum;
size_t m,n;
n=A.coldim();
m=A.rowdim();
R.init(one,1);
R.init(zero,0);
R.init(H_col_sqr, 1);
- typename std::vector<Integer>::const_iterator iter;
- std::vector<Integer> e(n,zero),tmp(m);
+ typename std::vector<Integer_t>::const_iterator iter;
+ std::vector<Integer_t> e(n,zero),tmp(m);
for (size_t i=0;i<n;i++){
e[i]=one;
A.apply(tmp,e);
@@ -187,18 +184,19 @@ namespace LinBox
template < class Ring, class Matrix>
void BoundBlackbox (const Ring& R, typename Ring::Element& H_col_sqr,
- typename Ring::Element& short_col_sqr, const Transpose<Matrix> & A)
+ typename Ring::Element& short_col_sqr,
+ const Transpose<Matrix> & A)
{
- typedef typename Ring::Element Integer;
- Integer one,zero,sqsum;
+ typedef typename Ring::Element Integer_t;
+ Integer_t one,zero,sqsum;
size_t m,n;
n=A.coldim();
m=A.rowdim();
R.init(one,1);
R.init(zero,0);
R.init(H_col_sqr, 1);
- typename std::vector<Integer>::const_iterator iter;
- std::vector<Integer> e(n,zero),tmp(m);
+ typename std::vector<Integer_t>::const_iterator iter;
+ std::vector<Integer_t> e(n,zero),tmp(m);
for (size_t i=0;i<n;i++){
e[i]=one;
A.applyTranspose(tmp,e);
@@ -224,16 +222,16 @@ namespace LinBox
template < class Ring, class IMatrix>
void BoundBlackbox (const Ring& R, typename Ring::Element& H_col_sqr,
typename Ring::Element& short_col_sqr, const IMatrix& A) {
- typedef typename Ring::Element Integer;
- Integer one,zero,sqsum;
+ typedef typename Ring::Element Integer_t;
+ Integer_t one,zero,sqsum;
size_t m,n;
n=A.coldim();
m=A.rowdim();
R.init(one,1);
R.init(zero,0);
R.init(H_col_sqr, 1);
- typename std::vector<Integer>::const_iterator iter;
- std::vector<Integer> e(n,zero),tmp(m);
+ typename std::vector<Integer_t>::const_iterator iter;
+ std::vector<Integer_t> e(n,zero),tmp(m);
for (size_t i=0;i<n;i++){
e[i]=one;
A.apply(tmp,e);
@@ -258,8 +256,8 @@ namespace LinBox
template <class Ring, class ItMatrix> //iterable matrix
void ApplyBound(const Ring& R, typename Ring::Element& bound_A, const ItMatrix& A)
{
- typedef typename Ring::Element Integer;
- Integer possum, negsum, zero;
+ typedef typename Ring::Element Integer_t;
+ Integer_t possum, negsum, zero;
R.init(bound_A, 0);
R.init(zero, 0);
@@ -287,7 +285,7 @@ namespace LinBox
class LiftingContainer {
public:
typedef _Ring Ring;
- typedef typename Ring::Element Integer;
+ typedef typename Ring::Element Integer_t;
// return the length of container
virtual size_t length() const =0;
@@ -299,7 +297,7 @@ namespace LinBox
virtual const Ring& ring() const = 0;
// return the prime
- virtual const Integer& prime () const = 0;
+ virtual const Integer_t& prime () const = 0;
virtual ~LiftingContainer () {}
@@ -311,40 +309,40 @@ namespace LinBox
public:
typedef _IMatrix IMatrix;
typedef _Ring Ring;
- typedef typename _Ring::Element Integer;
- typedef std::vector<Integer> IVector;
+ typedef typename _Ring::Element Integer_t;
+ typedef std::vector<Integer_t> IVector;
#ifdef RSTIMING
mutable Timer ttSetup, tRingApply, tRingOther, ttRingOther, ttRingApply;
#endif
protected:
- const IMatrix& _A;
- Ring _R;
- Integer _p;
+ const IMatrix& _matA;
+ Ring _intRing;
+ Integer_t _p;
IVector _b;
VectorDomain<Ring> _VDR;
size_t _length;
- Integer _numbound;
- Integer _denbound;
+ Integer_t _numbound;
+ Integer_t _denbound;
MatrixApplyDomain<Ring,IMatrix> _MAD;
//BlasApply<Ring> _BA;
- void convertPrime(Integer& e, const integer& p)
+ void convertPrime(Integer_t& e, const integer& p)
{
- _R.init(e,p);
+ _intRing.init(e,p);
}
- void convertPrime(Integer& e, const std::vector<integer>& p)
+ void convertPrime(Integer_t& e, const std::vector<integer>& p)
{
integer tmp=1;
for (size_t i=0;i<p.size();++i)
tmp*=integer(p[i]);
- _R.init(e,tmp);
+ _intRing.init(e,tmp);
}
@@ -352,21 +350,23 @@ namespace LinBox
template <class Prime_Type, class Vector1>
LiftingContainerBase (const Ring& R, const IMatrix& A, const Vector1& b, const Prime_Type& p):
- _A(A), _R(R), _VDR(R), _MAD(R,A)
+ _matA(A), _intRing(R), _VDR(R), _MAD(R,A)
{
#ifdef RSTIMING
ttSetup.start();
#endif
linbox_check(A.rowdim() == b.size());
+#ifdef DEBUG
int n,m;
- n=A.rowdim();
- m=A.coldim();
+ n=(int)A.rowdim();
+ m=(int)A.coldim();
//assert(m == n); //logic may not work otherwise
linbox_check( m == n );
- // initialise the prime as an Integer
- //this->_R.init(_p,p);
+#endif
+ // initialise the prime as an Integer_t
+ //this->_intRing.init(_p,p);
this->convertPrime(_p, p);
//std::cout<<"padic base= "<<_p<<std::endl;
@@ -374,41 +374,41 @@ namespace LinBox
// initialize res = b
_b.resize(b.size());
typename Vector1::const_iterator b_iter = b.begin();
- typename std::vector<Integer>::iterator res_iter = _b.begin() ;
+ typename std::vector<Integer_t>::iterator res_iter = _b.begin() ;
for (; b_iter != b.end(); ++res_iter, ++b_iter)
- this->_R.init(*res_iter, *b_iter);
+ this->_intRing.init(*res_iter, *b_iter);
- Integer had_sq, short_sq;
- BoundBlackbox(this->_R, had_sq, short_sq, A);
+ Integer_t had_sq, short_sq;
+ BoundBlackbox(this->_intRing, had_sq, short_sq, A);
- typename std::vector<Integer>::const_iterator iterb = _b.begin();
- Integer normb_sq;
- this->_R.init(normb_sq, 0);
+ typename std::vector<Integer_t>::const_iterator iterb = _b.begin();
+ Integer_t normb_sq;
+ this->_intRing.init(normb_sq, 0);
for (;iterb!=_b.end();++iterb)
normb_sq += (*iterb)*(*iterb);
- LinBox::integer had_sqi, short_sqi, normb_sqi, N, D, L, prime;
- this->_R.convert(had_sqi, had_sq);
- this->_R.convert(short_sqi, short_sq);
- this->_R.convert(normb_sqi, normb_sq);
- this->_R.convert(prime,_p);
+ LinBox::integer had_sqi, short_sqi, normb_sqi, N, D, L, Prime;
+ this->_intRing.convert(had_sqi, had_sq);
+ this->_intRing.convert(short_sqi, short_sq);
+ this->_intRing.convert(normb_sqi, normb_sq);
+ this->_intRing.convert(Prime,_p);
D = sqrt(had_sqi) + 1;
N = sqrt(had_sqi * normb_sqi / short_sqi) + 1;
L = N * D * 2;
- _length = logp(L,prime) + 1; // round up instead of down
+ _length = logp(L,Prime) + 1; // round up instead of down
#ifdef DEBUG_LC
std::cout<<" norms computed, p = "<<_p<<"\n";
std::cout<<" N = "<<N<<", D = "<<D<<", length = "<<_length<<"\n";
std::cout<<"A:=\n";
- //_A.write(std::cout);
+ //_matA.write(std::cout);
std::cout<<"b:=\n";
for (size_t i=0;i<_b.size();++i) std::cout<<_b[i]<<" , ";
std::cout<<std::endl;
#endif
- this->_R.init(_numbound,N);
- this->_R.init(_denbound,D);
+ this->_intRing.init(_numbound,N);
+ this->_intRing.init(_denbound,D);
- _MAD.setup( prime );
+ _MAD.setup( Prime );
#ifdef DEBUG_LC
std::cout<<"lifting container initialized\n";
@@ -424,7 +424,7 @@ namespace LinBox
class const_iterator {
private:
- std::vector<Integer> _res;
+ std::vector<Integer_t> _res;
const LiftingContainerBase &_lc;
size_t _position;
public:
@@ -439,7 +439,7 @@ namespace LinBox
bool next (IVector& digit)
{
- linbox_check (digit.size() == _lc._A.rowdim());
+ linbox_check (digit.size() == _lc._matA.rowdim());
// compute next p-adic digit
_lc.nextdigit(digit,_res);
#ifdef RSTIMING
@@ -457,13 +457,13 @@ namespace LinBox
#endif
/* prepare for updating residu */
- // compute v2 = _A * digit
- IVector v2 (_lc._A.coldim());
+ // compute v2 = _matA * digit
+ IVector v2 (_lc._matA.coldim());
_lc._MAD.applyV(v2,digit, _res);
#ifdef DEBUG_LC
- //_A.write(std::cout<<"\n _A :\n");
+ //_matA.write(std::cout<<"\n _matA :\n");
std::cout<<"\n A * digit "<<_position<<": ";
for (size_t i=0;i<v2.size();++i)
std::cout<<v2[i]<<",";
@@ -477,18 +477,18 @@ namespace LinBox
// update _res -= v2
_lc._VDR.subin (_res, v2);
- typename std::vector<Integer>::iterator p0;
+ typename std::vector<Integer_t>::iterator p0;
// update _res = _res / p
int index=0;
for ( p0 = _res.begin(); p0 != _res.end(); ++ p0, ++index){
#ifdef LC_CHECK_DIVISION
- if (! _lc._R.isDivisor(*p0,_lc._p)) {
+ if (! _lc._intRing.isDivisor(*p0,_lc._p)) {
std::cout<<"residue "<<*p0<<" not divisible by modulus "<<_lc._p<<std::endl;
std::cout<<"residue "<<*p0<<" not divisible by modulus "<<_lc._p<<std::endl;
return false;
}
#endif
- _lc._R.divin(*p0, _lc._p);
+ _lc._intRing.divin(*p0, _lc._p);
}
// increase position of the iterator
@@ -564,29 +564,29 @@ namespace LinBox
// return the size of the solution
virtual size_t size() const
{
- return _A.coldim();
+ return _matA.coldim();
}
// return the ring
virtual const Ring& ring() const
{
- return this->_R;
+ return this->_intRing;
}
// return the prime
- virtual const Integer& prime () const
+ virtual const Integer_t& prime () const
{
return _p;
}
// return the bound for the numerator
- const Integer numbound() const
+ const Integer_t numbound() const
{
return _numbound;
}
// return the bound for the denominator
- const Integer denbound() const
+ const Integer_t denbound() const
{
return _denbound;
}
@@ -594,7 +594,7 @@ namespace LinBox
// return the matrix
const IMatrix& getMatrix() const
{
- return _A;
+ return _matA;
}
// return the right hand side
@@ -615,14 +615,14 @@ namespace LinBox
typedef _IMatrix IMatrix;
typedef _FMatrix FMatrix;
typedef typename Field::Element Element;
- typedef typename IMatrix::Element Integer;
- typedef std::vector<Integer> IVector;
+ typedef typename IMatrix::Element Integer_t;
+ typedef std::vector<Integer_t> IVector;
typedef std::vector<Element> FVector;
protected:
const FMatrix& _Ap;
- Field _F;
+ Field _field;
const VectorDomain<Field> _VDF;
mutable FVector _res_p;
mutable FVector _digit_p;
@@ -640,14 +640,14 @@ namespace LinBox
const FMatrix& Ap,
const VectorIn& b,
const Prime_Type& p) :
- LiftingContainerBase<Ring,IMatrix> (R,A,b,p), _Ap(Ap), _F(F), _VDF(F),
+ LiftingContainerBase<Ring,IMatrix> (R,A,b,p), _Ap(Ap), _field(F), _VDF(F),
_res_p(b.size()), _digit_p(A.coldim()), _BA(F)
{
for (size_t i=0; i< _res_p.size(); ++i)
- _F.init(_res_p[i]);
+ _field.init(_res_p[i]);
for (size_t i=0; i< _digit_p.size(); ++i)
- _F.init(_digit_p[i]);
+ _field.init(_digit_p[i]);
//
#ifdef RSTIMING
@@ -656,13 +656,13 @@ namespace LinBox
#endif
#ifdef DEBUG_LC
std::cout<<"Primes: ";
- _F.write(std::cout);
+ _field.write(std::cout);
std::cout<<"\n Matrix: \n";
A.write(std::cout);
std::cout<<"\n Matrix mod p: \n";
Ap.write(std::cout);
std::cout<<"\n Matrix LCBASE: \n";
- LiftingContainerBase<Ring,IMatrix>::_A.write(std::cout);
+ LiftingContainerBase<Ring,IMatrix>::_matA.write(std::cout);
#endif
}
@@ -673,7 +673,7 @@ namespace LinBox
// return the field
const Field& field() const
{
- return _F;
+ return _field;
}
protected:
@@ -685,14 +685,14 @@ namespace LinBox
#endif
LinBox::integer tmp;
- Hom<Ring, Field> hom(this->_R, _F);
+ Hom<Ring, Field> hom(this->_intRing, _field);
// res_p = residu mod p
- //VectorHom::map (_res_p, residu, _F, this->_R);
+ //VectorHom::map (_res_p, residu, _field, this->_intRing);
{
typename FVector::iterator iter_p = _res_p.begin();
typename IVector::const_iterator iter = residu.begin();
for ( ;iter != residu. end(); ++iter, ++iter_p)
- //_F. init (*iter_p, this->_R.convert(tmp,*iter));
+ //_field. init (*iter_p, this->_intRing.convert(tmp,*iter));
hom.image(*iter_p, *iter);//std::cout<<*iter_p<<"= "<< *iter<<" mod "<<this->_p<<"\n";
}
#ifdef RSTIMING
@@ -710,13 +710,13 @@ namespace LinBox
tGetDigitConvert.start();
#endif
// digit = digit_p
- //VectorHom::map(digit, _digit_p, this->_R, _F);
+ //VectorHom::map(digit, _digit_p, this->_intRing, _field);
{
typename FVector::const_iterator iter_p = _digit_p.begin();
typename IVector::iterator iter = digit.begin();
for ( ; iter_p!= _digit_p.end(); ++iter_p, ++iter)
- //this->_R.init(*iter, _F.convert(tmp,*iter_p));
+ //this->_intRing.init(*iter, _field.convert(tmp,*iter_p));
hom.preimage(*iter, *iter_p);
}
@@ -739,8 +739,8 @@ namespace LinBox
typedef _IMatrix IMatrix;
typedef _FMatrix FMatrix;
typedef typename Field::Element Element;
- typedef typename Ring::Element Integer;
- typedef std::vector<Integer> IVector;
+ typedef typename Ring::Element Integer_t;
+ typedef std::vector<Integer_t> IVector;
typedef std::vector<Element> FVector;
typedef _FPolynomial FPolynomial;
typedef typename FPolynomial::iterator FPolyIterator;
@@ -749,7 +749,7 @@ namespace LinBox
const FMatrix &_Ap;
mutable FPolynomial _MinPoly;
- Field _F;
+ Field _field;
const VectorDomain<Field> _VDF;
mutable FVector _res_p;
mutable FVector _digit_p;
@@ -768,14 +768,14 @@ namespace LinBox
const FPolynomial& MinPoly,
const VectorIn& b,
const Prime_Type& p) :
- LiftingContainerBase<Ring,IMatrix> (R,A,b,p), _Ap(Ap), _MinPoly(MinPoly), _F(F), _VDF(F), _res_p(b.size()), _digit_p(A.coldim()), _rand(F)
+ LiftingContainerBase<Ring,IMatrix> (R,A,b,p), _Ap(Ap), _MinPoly(MinPoly), _field(F), _VDF(F), _res_p(b.size()), _digit_p(A.coldim()), _rand(F)
{
// Normalize the minimal polynomial as f(x)=1- a1/a0 x - a2/a0 x^2 - ...
FPolyIterator iter=_MinPoly.begin();
while(++iter != _MinPoly.end ()){
- _F.divin (*iter, _MinPoly.front ());
- _F.negin (*iter);
+ _field.divin (*iter, _MinPoly.front ());
+ _field.negin (*iter);
}
#ifdef RSTIMING
ttGetDigit.clear();
@@ -788,7 +788,7 @@ namespace LinBox
// return the field
const Field& field() const
{
- return _F;
+ return _field;
}
protected:
@@ -805,7 +805,7 @@ namespace LinBox
typename FVector::iterator iter_p = _res_p.begin();
typename IVector::const_iterator iter = residu.begin();
for ( ;iter != residu. end(); ++iter, ++iter_p)
- _F. init (*iter_p, this->_R.convert(tmp,*iter));
+ _field. init (*iter_p, this->_intRing.convert(tmp,*iter));
}
#ifdef RSTIMING
tGetDigitConvert.stop();
@@ -837,10 +837,10 @@ namespace LinBox
FPolynomial Poly;
unsigned long deg;
unsigned long size= (_Ap.rowdim() - _MinPoly.size())<<1 ;
- BlackboxContainer<Field, FMatrix > Sequence(&_Ap,_F,error,size);
+ BlackboxContainer<Field, FMatrix > Sequence(&_Ap,_field,error,size);
MasseyDomain<Field,BlackboxContainer<Field, FMatrix > > MD(&Sequence);
MD.minpoly(Poly,deg);
- if (_F.isZero(Poly.front())) {
+ if (_field.isZero(Poly.front())) {
// here we should stop the execution but not yet implemented
std::cout<<" the prime was not good \n, result will be wrong";
break;
@@ -849,17 +849,17 @@ namespace LinBox
// denormalize the minimal polynomial
FPolyIterator iter=_MinPoly.begin();
while (++iter != _MinPoly.end()) {
- _F.mulin (*iter, _MinPoly.front());
- _F.negin (*iter);
+ _field.mulin (*iter, _MinPoly.front());
+ _field.negin (*iter);
}
// update the minimal polynomial
Element zero;
- _F.init(zero,0);
+ _field.init(zero,0);
FPolynomial newMinPoly(_MinPoly.size()+Poly.size()-1,zero);
for (size_t i=0; i < _MinPoly.size(); i++)
for (size_t j=0 ; j < Poly.size(); j++)
- _F.axpyin(newMinPoly[i+j],_MinPoly[i],Poly[j]);
+ _field.axpyin(newMinPoly[i+j],_MinPoly[i],Poly[j]);
_MinPoly.clear();
Poly.clear();
_MinPoly=newMinPoly;
@@ -867,15 +867,15 @@ namespace LinBox
// normalize the new minimal polynomial
iter=_MinPoly.begin ();
while (++iter != _MinPoly.end ()) {
- _F.divin (*iter, _MinPoly.front ());
- _F.negin (*iter);
+ _field.divin (*iter, _MinPoly.front ());
+ _field.negin (*iter);
}
_VDF.mul (_digit_p, _res_p, _MinPoly.back ());
- FVector z(_Ap.rowdim ());
+ FVector zz(_Ap.rowdim ());
for (size_t i = _MinPoly.size () - 1; --i > 0;) {
- _Ap.apply (z, _digit_p);
- _VDF.axpy (_digit_p, _MinPoly[i], _res_p, z);
+ _Ap.apply (zz, _digit_p);
+ _VDF.axpy (_digit_p, _MinPoly[i], _res_p, zz);
}
_Ap.apply(error,_digit_p);
@@ -901,7 +901,7 @@ namespace LinBox
typename FVector::const_iterator iter_p = _digit_p.begin();
typename IVector::iterator iter = digit.begin();
for ( ; iter_p!= _digit_p.end(); ++iter_p, ++iter)
- this->_R.init(*iter, _F.convert(tmp,*iter_p));
+ this->_intRing.init(*iter, _field.convert(tmp,*iter_p));
}
#ifdef RSTIMING
@@ -925,11 +925,11 @@ namespace LinBox
typedef _IMatrix IMatrix;
typedef _FMatrix FMatrix;
typedef typename Field::Element Element;
- typedef typename Ring::Element Integer;
- typedef std::vector<Integer> IVector;
+ typedef typename Ring::Element Integer_t;
+ typedef std::vector<Integer_t> IVector;
typedef std::vector<Element> FVector;
- typedef BlasMatrix<Element> Coefficient;
- typedef BlasMatrix<Element> Block;
+ typedef BlasMatrix<Field> Coefficient;
+ typedef BlasMatrix<Field> Block;
typedef std::vector<Coefficient> FBlockPolynomial;
typedef BlackboxBlockContainerRecord<Field, FMatrix> Sequence;
@@ -937,7 +937,7 @@ namespace LinBox
protected:
const FMatrix &_Ap;
- Field _F;
+ Field _field;
const VectorDomain<Field> _VDF;
mutable FVector _res_p;
mutable FVector _digit_p;
@@ -966,7 +966,7 @@ namespace LinBox
const size_t m,
const size_t n) :
LiftingContainerBase<Ring,IMatrix> (R,A,b,p), _Ap(Ap),
- _F(F),
+ _field(F),
_VDF(F),
_res_p(b.size()),
_digit_p(A.coldim()),
@@ -993,10 +993,10 @@ namespace LinBox
std::cout<<"U:\n";
- UU.write(std::cout, _F);
+ UU.write(std::cout, _field);
std::cout<<"V:\n";
- V.write(std::cout, _F);
+ V.write(std::cout, _field);
Block UAp(_m, _row);
@@ -1010,10 +1010,10 @@ namespace LinBox
_rand.random(UAp.refEntry(0,i));
- _Seq = new Sequence (&Ap, _F, UAp,V);
+ _Seq = new Sequence (&Ap, _field, UAp,V);
std::cout<<"Sequence:\n";
for (size_t i=0;i<_Seq->getRep().size();++i)
- _Seq->getRep()[i].write(std::cout,_F)<<"\n";
+ _Seq->getRep()[i].write(std::cout,_field)<<"\n";
std::cout<<"\n";
@@ -1040,7 +1040,7 @@ namespace LinBox
}
// return the field
- const Field& field() const { return _F; }
+ const Field& field() const { return _field; }
protected:
@@ -1056,7 +1056,7 @@ namespace LinBox
typename FVector::iterator iter_p = _res_p.begin();
typename IVector::const_iterator iter = residu.begin();
for ( ;iter != residu. end(); ++iter, ++iter_p)
- _F. init (*iter_p, this->_R.convert(tmp,*iter));
+ _field. init (*iter_p, this->_intRing.convert(tmp,*iter));
}
#ifdef RSTIMING
tGetDigitConvert.stop();
@@ -1066,7 +1066,7 @@ namespace LinBox
std::cout<<"residue:\n";
for (size_t i=0;i<_res_p.size();++i)
- _F.write(std::cout,_res_p[i])<<",";
+ _field.write(std::cout,_res_p[i])<<",";
std::cout<<"\n";
@@ -1076,7 +1076,7 @@ namespace LinBox
_Seq->recompute();
std::cout<<"Modified Sequence:\n";
for (size_t i=0;i<_Seq->getRep().size();++i)
- _Seq->getRep()[i].write(std::cout,_F)<<"\n";
+ _Seq->getRep()[i].write(std::cout,_field)<<"\n";
std::cout<<"\n";
FBlockPolynomial minpoly;
@@ -1092,13 +1092,13 @@ namespace LinBox
#endif
std::cout<<"Block Minpoly:\n";
for (size_t i=0;i<minpoly.size();++i)
- minpoly[i].write(std::cout,_F)<<"\n";
+ minpoly[i].write(std::cout,_field)<<"\n";
std::cout<<"\n";
size_t idx=0;
- if ( _F.isZero(minpoly[0].getEntry(0,0))) {
+ if ( _field.isZero(minpoly[0].getEntry(0,0))) {
size_t i=1;
- while ( _F.isZero(minpoly[0].getEntry(i,0)))
+ while ( _field.isZero(minpoly[0].getEntry(i,0)))
++i;
if (i == _m)
throw LinboxError(" block minpoly: matrix seems to be singular - abort");
@@ -1107,12 +1107,12 @@ namespace LinBox
}
size_t deg = degree[idx];
- BlasMatrix<Element> idx_poly(deg+1,_m-1);
+ BlasMatrix<Field> idx_poly(_field,deg+1,_m-1);
for (size_t i=0;i<deg+1;++i)
for (size_t j=0;j<_m-1;++j)
idx_poly.setEntry(i,j,minpoly[i].getEntry(idx,j+1));
- BlasMatrix<Element> Combi(deg+1,_row);
+ BlasMatrix<Field> Combi(_field,deg+1,_row);
_BMD.mul(Combi,idx_poly,UU);
@@ -1122,7 +1122,7 @@ namespace LinBox
_Ap.applyTranspose(lhs,row);
FVector lhsbis(lhs);
- for (int i = deg-1 ; i >= 0;--i) {
+ for (int i = (int)deg-1 ; i >= 0;--i) {
for (size_t j=0;j<_row;++j)
row[j]= Combi.getEntry(i,j);
_VDF.add (lhs,row,lhsbis);
@@ -1140,9 +1140,9 @@ namespace LinBox
_VDF.addin(accu,lhs);
Element scaling;
- _F.init(scaling);
- _F.neg(scaling,minpoly[0].getEntry(idx,0));
- _F.invin(scaling);
+ _field.init(scaling);
+ _field.neg(scaling,minpoly[0].getEntry(idx,0));
+ _field.invin(scaling);
_VDF.mul(_digit_p,accu,scaling);
@@ -1165,7 +1165,7 @@ namespace LinBox
typename FVector::const_iterator iter_p = _digit_p.begin();
typename IVector::iterator iter = digit.begin();
for ( ; iter_p!= _digit_p.end(); ++iter_p, ++iter)
- this->_R.init(*iter, _F.convert(tmp,*iter_p));
+ this->_intRing.init(*iter, _field.convert(tmp,*iter_p));
}
#ifdef RSTIMING
@@ -1189,17 +1189,17 @@ namespace LinBox
typedef _IMatrix IMatrix;
typedef _FMatrix FMatrix;
typedef typename Field::Element Element;
- typedef typename IMatrix::Element Integer;
- typedef std::vector<Integer> IVector;
+ typedef typename IMatrix::Element Integer_t;
+ typedef std::vector<Integer_t> IVector;
typedef std::vector<Element> FVector;
typedef _Block Block;
protected:
const FMatrix& _Ap;
- const Diagonal<Field> &_D;
+ const Diagonal<Field> &_diagMat;
const BlockHankelInverse<Field> &_Hinv;
- Field _F;
+ Field _field;
mutable FVector _res_p;
mutable FVector _digit_p;
std::vector<std::vector<Element> > _u;
@@ -1214,7 +1214,7 @@ namespace LinBox
#ifdef RSTIMING
mutable Timer tGetDigit, ttGetDigit, tGetDigitConvert, ttGetDigitConvert;
#endif
- mutable Timer tApplyU, tApplyV, tApplyH, tAcc;;
+ mutable Timer tApplyU, tApplyV, tApplyH, tAcc;
template <class Prime_Type, class VectorIn>
@@ -1228,28 +1228,28 @@ namespace LinBox
const Block& V,
const VectorIn& b,
const Prime_Type& p) :
- LiftingContainerBase<Ring,IMatrix> (R,A,b,p), _Ap(Ap), _Hinv(Hinv), _F(F),
- _res_p(b.size()), _digit_p(A.coldim()), _block(U.rowdim()), _numblock(A.coldim()/_block) , _VD(F), _BMD(F), _D(D)
+ LiftingContainerBase<Ring,IMatrix> (R,A,b,p), _Ap(Ap), _Hinv(Hinv), _field(F),
+ _res_p(b.size()), _digit_p(A.coldim()), _block(U.rowdim()), _numblock(A.coldim()/_block) , _VD(F), _BMD(F), _diagMat(D)
{
tApplyU.clear();
tApplyH.clear();
tApplyV.clear();
for (size_t i=0; i< _res_p.size(); ++i)
- _F.init(_res_p[i]);
+ _field.init(_res_p[i]);
for (size_t i=0; i< _digit_p.size(); ++i)
- _F.init(_digit_p[i]);
+ _field.init(_digit_p[i]);
- size_t block= U.rowdim();
+ // size_t block= U.rowdim();
_u.resize(_block, std::vector<Element>(_numblock));
_v.resize(_block, std::vector<Element>(_numblock));
for (size_t i=0;i<_block;++i)
for (size_t j=0;j<_numblock;++j){
- _F.assign(_u[i][j], U.getEntry(0, i*_numblock+j));
- _F.assign(_v[i][j], V.getEntry(i*_numblock+j, i));
+ _field.assign(_u[i][j], U.getEntry(0, i*_numblock+j));
+ _field.assign(_v[i][j], V.getEntry(i*_numblock+j, i));
}
- _F.init(_zero,0);
+ _field.init(_zero,0);
//Ap.write(std::cout,F);
#ifdef RSTIMING
@@ -1258,7 +1258,7 @@ namespace LinBox
#endif
#ifdef DEBUG_LC
std::cout<<"Primes: ";
- _F.write(std::cout);
+ _field.write(std::cout);
#endif
}
@@ -1276,7 +1276,7 @@ namespace LinBox
// return the field
const Field& field() const
{
- return _F;
+ return _field;
}
protected:
@@ -1288,14 +1288,14 @@ namespace LinBox
#endif
//LinBox::integer tmp;
- Hom<Ring, Field> hom(this->_R, _F);
+ Hom<Ring, Field> hom(this->_intRing, _field);
// res_p = residu mod p
- //VectorHom::map (_res_p, residu, _F, this->_R);
+ //VectorHom::map (_res_p, residu, _field, this->_intRing);
{
typename FVector::iterator iter_p = _res_p.begin();
typename IVector::const_iterator iter = residu.begin();
for ( ;iter != residu. end(); ++iter, ++iter_p)
- //_F. init (*iter_p, this->_R.convert(tmp,*iter));
+ //_field. init (*iter_p, this->_intRing.convert(tmp,*iter));
hom.image(*iter_p, *iter);
}
#ifdef RSTIMING
@@ -1317,18 +1317,18 @@ namespace LinBox
#if 0
std::cout<<"b:=<";
for (size_t i=0;i<_res_p.size()-1;++i)
- _F.write(std::cout,_res_p[i])<<",";
- _F.write(std::cout,_res_p[_res_p.size()-1])<<">;\n";
+ _field.write(std::cout,_res_p[i])<<",";
+ _field.write(std::cout,_res_p[_res_p.size()-1])<<">;\n";
#endif
size_t n = _Ap.coldim();
// compute z0 = [U^T U^T Ap^T ... U^T Ap^k]^T . residue mod p
FVector z0(n), b0(n), b1(n);
- _D.apply(b0, _res_p);
+ _diagMat.apply(b0, _res_p);
_res_p=b0;
- BlasMatrix<Element> Apib(n, _numblock);
+ BlasMatrix<Field> Apib(_field,n, _numblock);
for (size_t i=0;i<n;++i){
- _F.assign(Apib.refEntry(i,0), _res_p[i]);
+ _field.assign(Apib.refEntry(i,0), _res_p[i]);
}
int swi=1;
@@ -1336,22 +1336,22 @@ namespace LinBox
if (swi){
_Ap.apply(b1, b0);
for (size_t i=0;i<n;++i)
- _F.assign(Apib.refEntry(i,j), b1[i]);
+ _field.assign(Apib.refEntry(i,j), b1[i]);
swi=0;
}
else{
_Ap.apply(b0, b1);
for (size_t i=0;i<n;++i)
- _F.assign(Apib.refEntry(i,j), b0[i]);
+ _field.assign(Apib.refEntry(i,j), b0[i]);
swi=1;
}
FVector tmp(_numblock);
for (size_t i=0; i<_block; ++i){
- BlasMatrix<Element> T(Apib, i*_numblock, 0, _numblock, _numblock);
+ BlasMatrix<Field> T(_field,Apib, i*_numblock, 0, _numblock, _numblock);
_BMD.mul(tmp, _u[i], T);
for (size_t j=0;j<_numblock;++j){
- this->_F.assign(z0[j*_block+i], tmp[j]);
+ this->_field.assign(z0[j*_block+i], tmp[j]);
}
}
#ifdef RSTIMING
@@ -1374,14 +1374,14 @@ namespace LinBox
std::cout<<" Hinv U b mod p done\n";
std::cout<<"\n y:=<";
for (size_t i=0;i<_digit_p.size()-1;++i)
- _F.write(std::cout,z1[i])<<",";
- _F.write(std::cout,z1[_digit_p.size()-1])<<">;\n";
+ _field.write(std::cout,z1[i])<<",";
+ _field.write(std::cout,z1[_digit_p.size()-1])<<">;\n";
#endif
// compute digit_p = [V^T AV^T ... A^k]^T.z1
FVector b_bar(n), b_hat(_numblock);
for (size_t i=0;i<n;++i)
- _F.assign(_digit_p[i], _zero);
+ _field.assign(_digit_p[i], _zero);
for (int i= _numblock-1;i>=0; --i){
_Ap.apply(b1, _digit_p);
@@ -1389,7 +1389,7 @@ namespace LinBox
for (size_t j=0;j<_block;++j){
_VD.mul(b_hat, _v[j], z1[i*_block+j]);
for (size_t k=0;k<_numblock;++k)
- _F.assign(b_bar[j*_numblock+k], b_hat[k]);
+ _field.assign(b_bar[j*_numblock+k], b_hat[k]);
}
_VD.addin(_digit_p, b_bar);
}
@@ -1402,8 +1402,8 @@ namespace LinBox
std::cout<<" V Hinv U b mod p done\n";
std::cout<<"\n x:=<";
for (size_t i=0;i<_digit_p.size()-1;++i)
- _F.write(std::cout,_digit_p[i])<<",";
- _F.write(std::cout,_digit_p[_digit_p.size()-1])<<">;\n";
+ _field.write(std::cout,_digit_p[i])<<",";
+ _field.write(std::cout,_digit_p[_digit_p.size()-1])<<">;\n";
#endif
#ifdef RSTIMING
@@ -1412,12 +1412,12 @@ namespace LinBox
tGetDigitConvert.start();
#endif
// digit = digit_p
- //VectorHom::map(digit, _digit_p, this->_R, _F);
+ //VectorHom::map(digit, _digit_p, this->_intRing, _field);
{
typename FVector::const_iterator iter_p = _digit_p.begin();
typename IVector::iterator iter = digit.begin();
for ( ; iter_p!= _digit_p.end(); ++iter_p, ++iter)
- //this->_R.init(*iter, _F.convert(tmp,*iter_p));
+ //this->_intRing.init(*iter, _field.convert(tmp,*iter_p));
hom.preimage(*iter, *iter_p);
}
@@ -1441,8 +1441,8 @@ namespace LinBox
typedef _IMatrix IMatrix;
typedef _FMatrix FMatrix;
typedef typename Field::Element Element;
- typedef typename IMatrix::Element Integer;
- typedef std::vector<Integer> IVector;
+ typedef typename IMatrix::Element Integer_t;
+ typedef std::vector<Integer_t> IVector;
typedef std::vector<Element> FVector;
protected:
@@ -1452,7 +1452,7 @@ namespace LinBox
const Permutation<_Field>& QQ;
const Permutation<_Field>& PP;
unsigned long _rank;
- Field _F;
+ Field _field;
mutable FVector _res_p;
mutable FVector _digit_p;
GaussDomain<Field> _GD;
@@ -1473,19 +1473,19 @@ namespace LinBox
const VectorIn& b,
const Prime_Type& p) :
LiftingContainerBase<Ring,IMatrix> (R,A,b,p), LL(L),QQ(Q),UU(U), PP(P), _rank(rank),
- _F(F), _res_p(b.size()), _digit_p(A.coldim()), _GD(F)
+ _field(F), _res_p(b.size()), _digit_p(A.coldim()), _GD(F)
{
for (size_t i=0; i< _res_p.size(); ++i)
- _F.init(_res_p[i]);
+ _field.init(_res_p[i]);
for (size_t i=0; i< _digit_p.size(); ++i)
- _F.init(_digit_p[i]);
+ _field.init(_digit_p[i]);
}
virtual ~SparseLULiftingContainer() {}
// return the field
- const Field& field() const { return _F; }
+ const Field& field() const { return _field; }
protected:
@@ -1493,7 +1493,7 @@ namespace LinBox
{
// compute residu mod p
- Hom<Ring, Field> hom(this->_R, _F);
+ Hom<Ring, Field> hom(this->_intRing, _field);
{
typename FVector::iterator iter_p = _res_p.begin();
typename IVector::const_iterator iter = residu.begin();
@@ -1510,7 +1510,7 @@ namespace LinBox
typename FVector::const_iterator iter_p = _digit_p.begin();
typename IVector::iterator iter = digit.begin();
for ( ; iter_p!= _digit_p.end(); ++iter_p, ++iter)
- //this->_R.init(*iter, _F.convert(tmp,*iter_p));
+ //this->_intRing.init(*iter, _field.convert(tmp,*iter_p));
hom.preimage(*iter, *iter_p);
}
@@ -1524,3 +1524,12 @@ namespace LinBox
} // end of namespace LinBox
#endif //__LINBOX_lifting_container_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/linbox-tags.h b/linbox/algorithms/linbox-tags.h
index 6df1c80..e5133cb 100644
--- a/linbox/algorithms/linbox-tags.h
+++ b/linbox/algorithms/linbox-tags.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* Copyright (C) 2010 LinBox
+/* Copyright (C) 2010,2011,2012 LinBox
* Written by <brice.boyer at imag.fr>
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,14 +17,22 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file algorithms/linbox-tags.h
+ * @ingroup algorithms
+ * @brief Provides tags for various algorithms/solutions, Ã la \c FFLAS.
+ * This is a subset of Fflas* enums.
*/
#ifndef __LINBOX_linbox_tags_H
#define __LINBOX_linbox_tags_H
+#include <fflas-ffpack/fflas/fflas.h>
+
namespace LinBox
{
@@ -31,21 +40,56 @@ namespace LinBox
* Tags are simple enums that set a choice in a routine.
* For instance, if the user wants a <i>right</i> nullspace,
* she will use a \c LinBoxTag::Right parameter.
+ *
+ * There it total compatiblity with \c FFLAS tags (cross link)
+ * For instance, in LinBox, it is similar to use \c LinBoxTag::Upper and
+ * <code>(LinBoxTag::Shape) FFLAS::FflasUpper</code>.
+ *
* @note Tags are not Methods.
*/
struct LinBoxTag {
//! Left/Right Tag
enum Side {
- Left = 1000, //!< Left
- Right = 1001 //!< Right
+ Left = FFLAS::FflasLeft, //!< Left
+ Right = FFLAS::FflasRight //!< Right
};
+ //! (No)Transpose Tag
enum Transpose {
- Trans = 1010,
- NoTrans = 1011
+ NoTrans = FFLAS::FflasNoTrans,
+ Trans = FFLAS::FflasTrans
};
+
+ //! (Upp/Low)er Tag
+ enum Shape {
+ Upper = FFLAS::FflasUpper,
+ Lower = FFLAS::FflasLower
+ } ;
+
+ //! (Non)Unit Diagonal Tag
+ enum Diag {
+ NonUnit = FFLAS::FflasNonUnit,
+ Unit = FFLAS::FflasUnit
+ } ;
+
+ //! Dense format (table) output Tag
+ enum Format {
+ FormatPlain = 0,
+ FormatMaple = 1,
+ FormatHTML = 2,
+ FormatLaTeX = 3
+ } ;
} ;
}
#endif // __LINBOX_linbox_tags_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/massey-domain.h b/linbox/algorithms/massey-domain.h
index dcef1b2..decfec7 100644
--- a/linbox/algorithms/massey-domain.h
+++ b/linbox/algorithms/massey-domain.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/massey-domain.h
* Copyright (C) 1999, 2001 Jean-Guillaume Dumas, Bradford Hovinen
*
@@ -14,7 +12,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_massey_domain_H
#define __LINBOX_massey_domain_H
@@ -65,7 +81,7 @@ namespace LinBox
class MasseyDomain {
private:
Sequence *_container;
- Field _F;
+ Field _field;
VectorDomain<Field> _VD;
unsigned long EARLY_TERM_THRESHOLD;
@@ -81,28 +97,28 @@ namespace LinBox
//-- Constructors
MasseyDomain (unsigned long ett_default = DEFAULT_EARLY_TERM_THRESHOLD) :
_container (),
- _F (),
- _VD (_F),
+ _field (),
+ _VD (_field),
EARLY_TERM_THRESHOLD (ett_default)
{}
- MasseyDomain (const MasseyDomain<Field, Sequence> &M, unsigned long ett_default = DEFAULT_EARLY_TERM_THRESHOLD) :
- _container (M._container),
- _F (M._F),
- _VD (M._F),
+ MasseyDomain (const MasseyDomain<Field, Sequence> &Mat, unsigned long ett_default = DEFAULT_EARLY_TERM_THRESHOLD) :
+ _container (Mat._container),
+ _field (Mat._field),
+ _VD (Mat._field),
EARLY_TERM_THRESHOLD (ett_default)
{}
MasseyDomain (Sequence *D, unsigned long ett_default = DEFAULT_EARLY_TERM_THRESHOLD) :
_container (D),
- _F (D->getField ()),
+ _field (D->getField ()),
_VD (D->getField ()),
EARLY_TERM_THRESHOLD (ett_default)
{}
MasseyDomain (Sequence *MD, const Field &F, unsigned long ett_default = DEFAULT_EARLY_TERM_THRESHOLD) :
_container (MD),
- _F (F),
+ _field (F),
_VD (F),
EARLY_TERM_THRESHOLD (ett_default)
{}
@@ -115,7 +131,7 @@ namespace LinBox
}
//-- Domains access
- const Field &getField () const { return _F; }
+ const Field &getField () const { return _field; }
Sequence *getSequence () const { return _container; }
#ifdef INCLUDE_TIMING
@@ -139,12 +155,12 @@ namespace LinBox
if (i == _DEGINFTY_)
return _DEGINFTY_;
- else if (!_F.isZero (v[i]))
+ else if (!_field.isZero (v[i]))
return i;
// We must re-compute the degree :
for (long j = i - 1; j >= 0; j--) {
- if (!_F.isZero (v[j])) {
+ if (!_field.isZero (v[j])) {
v.resize (j + 1);
return j;
}
@@ -162,12 +178,12 @@ namespace LinBox
if (i == _DEGINFTY_)
return _DEGINFTY_;
- else if (!_F.isZero (v[0]))
+ else if (!_field.isZero (v[0]))
return 0;
// We must compute the valuation :
for (long j = 1; j <= i; j++)
- if (!_F.isZero ((v)[j])) return j ;
+ if (!_field.isZero ((v)[j])) return j ;
return _DEGINFTY_ ;
}
@@ -192,7 +208,7 @@ namespace LinBox
integer card;
- commentator.start ("Massey", "masseyd", END);
+ commentator().start ("Massey", "masseyd", END);
// ====================================================
// Sequence and iterator initialization
@@ -200,34 +216,30 @@ namespace LinBox
typename Sequence::const_iterator _iter (_container->begin ());
Polynomial S (END + 1);
- Element Zero, One;
- _F.init(Zero, 0);
- _F.init(One, 1);
-
// -----------------------------------------------
// Preallocation. No further allocation.
//
- C.reserve (n + 1); C.resize (1); _F.assign (C[0], One);
- Polynomial B (n + 1); B.resize (1); _F.assign (B[0], One);
+ C.reserve (n + 1); C.resize (1); _field.assign (C[0], _field.one);
+ Polynomial B (n + 1); B.resize (1); _field.assign (B[0], _field.one);
long L = 0;
Element b, d, Ds;
long x = 1, b_deg = 0, c_deg = 0, l_deg;
long COMMOD = (END > 40) ? (END / 20) : 2;
- _F.assign (b, One);
+ _field.assign (b, _field.one);
- for (long N = 0; N < END && x < (long) EARLY_TERM_THRESHOLD; ++N, ++_iter) {
+ for (long NN = 0; NN < END && x < (long) EARLY_TERM_THRESHOLD; ++NN, ++_iter) {
- if (!(N % COMMOD))
- commentator.progress (N);
+ if (!(NN % COMMOD))
+ commentator().progress (NN);
// ====================================================
// Next coefficient in the sequence
// Discrepancy computation
//
- S[N] = *_iter;
+ S[NN] = *_iter;
//
#ifdef INCLUDE_TIMING
@@ -236,11 +248,11 @@ namespace LinBox
long poly_len = MIN (L, c_deg);
Subvector<typename Polynomial::iterator> Cp (C.begin () + 1, C.begin () + poly_len + 1);
- Subvector<typename Polynomial::iterator> Sp (S.begin () + (N - poly_len), S.begin () + N);
+ Subvector<typename Polynomial::iterator> Sp (S.begin () + (NN - poly_len), S.begin () + NN);
ReverseVector<Subvector<typename Polynomial::iterator> > Spp (Sp);
_VD.dot (d, Cp, Spp);
- _F.addin (d, S[N]);
+ _field.addin (d, S[NN]);
#ifdef INCLUDE_TIMING
timer.stop ();
@@ -250,34 +262,34 @@ namespace LinBox
timer.start ();
#endif // INCLUDE_TIMING
- if (_F.isZero (d)) {
+ if (_field.isZero (d)) {
++x;
}
else {
- if (L > (N >> 1)) {
+ if (L > (NN >> 1)) {
// -----------------------------------------------
// C = C + (Polynome(X,x,-d/b) * B);
//
- _F.divin (_F.neg (Ds, d), b);
+ _field.divin (_field.neg (Ds, d), b);
long i = l_deg = (x + b_deg);
if (l_deg > c_deg) {
C.resize (l_deg + 1);
if (x > c_deg) {
for (; i >= x; --i)
- _F.mul (C[i], Ds, B[i-x]);
+ _field.mul (C[i], Ds, B[i-x]);
for (; i > c_deg; --i)
- _F.assign (C[i], Zero);
+ _field.assign (C[i], _field.zero);
}
else {
for (; i > c_deg; --i)
- _F.mul (C[i], Ds, B[i-x]);
+ _field.mul (C[i], Ds, B[i-x]);
for (; i >= x; --i)
- _F.axpyin (C[i], Ds, B[i-x]);
+ _field.axpyin (C[i], Ds, B[i-x]);
}
}
else {
for (; i >= x; --i)
- _F.axpyin (C[i], Ds, B[i-x]);
+ _field.axpyin (C[i], Ds, B[i-x]);
}
// -----------------------------------------------
c_deg = v_degree(C);
@@ -286,35 +298,35 @@ namespace LinBox
else {
// -----------------------------------------------
// C = C + (Polynome(X,x,-d/b) * B); //
- _F.divin (_F.neg (Ds, d), b);
+ _field.divin (_field.neg (Ds, d), b);
long i = l_deg = x + b_deg;
B.resize (C.size ());
if (l_deg > c_deg) {
C.resize (l_deg+1);
if (x > c_deg) {
for (; i >= x; --i)
- _F.mul (C[i], Ds, B[i-x]);
+ _field.mul (C[i], Ds, B[i-x]);
for (; i > c_deg; --i)
- _F.assign (C[i], Zero);
+ _field.assign (C[i], _field.zero);
}
else {
for (; i > c_deg; --i)
- _F.mul (C[i], Ds, B[i-x]);
+ _field.mul (C[i], Ds, B[i-x]);
for (; i >= x; --i)
- _F.axpy (C[i], Ds, B[i-x], B[i] = C[i]);
+ _field.axpy (C[i], Ds, B[i-x], _field.assign(B[i],C[i]) );
}
}
else {
for (i = c_deg; i > l_deg; --i)
- B[i] = C[i];
+ _field.assign(B[i],C[i]);
for (; i >= x; --i)
- _F.axpy (C[i], Ds, B[i-x], B[i] = C[i] );
+ _field.axpy (C[i], Ds, B[i-x], _field.assign(B[i],C[i]) );
}
- for (; i >= 0; --i) B[i] = C[i];
+ for (; i >= 0; --i) _field.assign(B[i],C[i]);
// -----------------------------------------------
- L = N+1-L;
+ L = NN+1-L;
b_deg = c_deg;
c_deg = v_degree (C);
b = d;
@@ -330,8 +342,8 @@ namespace LinBox
#endif // INCLUDE_TIMING
}
- commentator.stop ("done", NULL, "masseyd");
- // commentator.stop ("Done", "Done", "LinBox::MasseyDomain::massey");
+ commentator().stop ("done", NULL, "masseyd");
+ // commentator().stop ("Done", "Done", "LinBox::MasseyDomain::massey");
return L;
}
@@ -347,16 +359,16 @@ namespace LinBox
rank = v_degree (phi) - v_val (phi);
}
- void valence (Element &valence, unsigned long &rank)
+ void valence (Element &Valence, unsigned long &rank)
{
- commentator.start ("Valence", "LinBox::MasseyDomain::valence");
+ commentator().start ("Valence", "LinBox::MasseyDomain::valence");
std::vector<Element> phi;
massey (phi, 1);
rank = v_degree (phi) - v_val (phi);
- valence = phi[v_degree (phi)];
+ Valence = phi[v_degree (phi)];
- commentator.stop ("Done", "Done", "LinBox::MasseyDomain::valence");
+ commentator().stop ("Done", "Done", "LinBox::MasseyDomain::valence");
}
template<class Polynomial>
@@ -372,7 +384,8 @@ namespace LinBox
phi[dp-i] = phi[0];
}
phi[0] = phi[dp];
- _F.init (phi[dp], 1UL);
+// _field.init (phi[dp], 1UL);
+ _field.assign (phi[dp], _field.one);
}
return L;
}
@@ -387,7 +400,8 @@ namespace LinBox
for (long i = dp >> 1; i > 0; --i)
std::swap (phi[i], phi[dp-i]);
phi[0] = phi[dp];
- _F.init (phi[dp], 1UL);
+// _field.init (phi[dp], 1UL);
+ _field.assign(phi[dp], _field.one);
}
}
};
@@ -396,3 +410,12 @@ namespace LinBox
#endif // __LINBOX_massey_domain_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/matpoly-mult.h b/linbox/algorithms/matpoly-mult.h
index 9464ad0..e63d52f 100644
--- a/linbox/algorithms/matpoly-mult.h
+++ b/linbox/algorithms/matpoly-mult.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,21 +17,21 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_matpoly_mult_H
#define __LINBOX_matpoly_mult_H
-#include <linbox/randiter/random-fftprime.h>
-#include <linbox/algorithms/blas-domain.h>
-#include <linbox/matrix/matrix-domain.h>
-#include <linbox/util/error.h>
-#include <linbox/util/debug.h>
-#include <linbox/util/timer.h>
+#include "linbox/randiter/random-fftprime.h"
+#include "linbox/algorithms/blas-domain.h"
+#include "linbox/matrix/matrix-domain.h"
+#include "linbox/util/error.h"
+#include "linbox/util/debug.h"
+#include "linbox/util/timer.h"
#include <vector>
#ifdef __LINBOX_HAVE_OPENMP
#include <omp.h>
@@ -153,14 +154,14 @@ namespace LinBox
template <class Field>
class ClassicMulDomain {
private:
- Field _F;
+ Field _field;
BlasMatrixDomain<Field> _BMD;
MatrixDomain<Field> _MD;
public:
ClassicMulDomain(const Field &F) :
- _F(F), _BMD(F), _MD(F)
+ _field(F), _BMD(F), _MD(F)
{}
template< class Polynomial1, class Polynomial2, class Polynomial3>
@@ -208,14 +209,14 @@ namespace LinBox
public:
typedef _Field Field;
private:
- Field _F;
+ Field _field;
BlasMatrixDomain<Field> _BMD;
MatrixDomain<Field> _MD;
size_t _mul;
public:
KaratsubaMulDomain(const Field &F) :
- _F(F), _BMD(F), _MD(F)
+ _field(F), _BMD(F), _MD(F)
{_mul=0;}
template< class Polynomial1, class Polynomial2, class Polynomial3>
@@ -462,17 +463,17 @@ namespace LinBox
typedef SpecialFFTMulDomain<Field> FFTDomainBase;
private:
- Field _F;
+ Field _field;
integer _p;
size_t _fftsize;
public:
FFTMulDomain (const Field &F) :
- _F(F)
+ _field(F)
{
- _F.characteristic(_p);
+ _field.characteristic(_p);
_fftsize=0;
//check if field is based on fft prime
@@ -497,17 +498,17 @@ namespace LinBox
// check if fft prime and good enough
if (lpts < _fftsize){
- FFTDomainBase fftdomain(_F);
+ FFTDomainBase fftdomain(_field);
fftdomain.mul(a, b, c);
}
else {
// computation done using CRT and few fft primes
// get number of bits of feasible fft prime
- int k= b[0].coldim();
+ size_t k= b[0].coldim();
size_t n=k;
size_t ln=0;
- while ( k>0) {k>>=1; ln++;}
+ while ( k ) {k>>=1; ++ln;}
// taking primes greater than current prime
size_t bit = std::max((53-ln)>>1, _p.bitsize());
@@ -515,7 +516,7 @@ namespace LinBox
// get number of necessary primes
integer ibound = n * _p * _p * std::max(b.size(), c.size());
integer primesprod=1; size_t nbrprimes=1;
- RandomFFTPrime fftprime(bit, FFT_PRIME_SEED);
+ RandomFFTPrime fftprime((int)bit, FFT_PRIME_SEED);
std::vector<integer> lprimes(10); lprimes.resize(nbrprimes);
lprimes[0] = fftprime.randomPrime();
primesprod = lprimes[0];
@@ -547,10 +548,10 @@ namespace LinBox
chrono.start();
// reconstruct the solution modulo the original prime
if (nbrprimes < 2) {
- for (size_t k=0;k<a.size();++k)
+ for (size_t kk=0;kk<a.size();++kk)
for (size_t i=0;i<a[0].rowdim();++i)
for (size_t j=0;j<a[0].coldim();++j){
- _F.init(a[k].refEntry(i,j), a_i[0][k].getEntry(i,j));
+ _field.init(a[kk].refEntry(i,j), a_i[0][kk].getEntry(i,j));
}
}
else {
@@ -564,18 +565,18 @@ namespace LinBox
}
integer res,acc;
- for (size_t k=0;k<deg;++k)
+ for (size_t kk=0;kk<deg;++kk)
for (size_t i=0;i<a[0].rowdim();++i)
for (size_t j=0;j<a[0].coldim();++j){
acc= integer(0);
for (size_t l=0;l<nbrprimes; ++l){
- f_i[l].mul(tmp, a_i[l][k].getEntry(i,j), crt_inv[l]);
+ f_i[l].mul(tmp, a_i[l][kk].getEntry(i,j), crt_inv[l]);
res= f_i[l].convert(res,tmp);
acc+= res*crt[l];
if (acc > primesprod)
acc-= primesprod;
}
- _F.init(a[k].refEntry(i,j), acc);
+ _field.init(a[kk].refEntry(i,j), acc);
}
#ifdef FFT_TIMING
chrono.stop();std::cout<<"reconstruction time: "<<chrono<<"\n";
@@ -594,12 +595,12 @@ namespace LinBox
linbox_check(2*b.size() == c.size()+1 );
linbox_check(b[0].coldim() == c[0].rowdim());
- size_t m = b[0].rowdim();
- size_t k = b[0].coldim();
- size_t n = c[0].coldim();
+ size_t mm = b[0].rowdim();
+ size_t kk = b[0].coldim();
+ size_t nn = c[0].coldim();
typedef typename Polynomial1::value_type Coefficient;
- const Coefficient ZeroA(m,n), ZeroB(m,k), ZeroC(k,n);
+ const Coefficient ZeroA(mm,nn), ZeroB(mm,kk), ZeroC(kk,nn);
size_t deg = c.size()+1;
size_t lpts = 0;
@@ -607,17 +608,21 @@ namespace LinBox
// check if fft prime and good enough
if (lpts < _fftsize){
- FFTDomainBase fftdomain(_F);
+ FFTDomainBase fftdomain(_field);
fftdomain.midproduct(a, b, c);
}
else {
// computation done using CRT and few fft primes
// get number of bits of feasible fft prime
- int k= b[0].coldim();
- size_t n=k;
size_t ln=0;
- while ( k>0) {k>>=1; ln++;}
+ // XXX int -> size_t
+ size_t kkk= b[0].coldim();
+ size_t n=kkk;
+ while ( kkk ) {
+ kkk>>=1;
+ ln++;
+ }
// taking primes greater than current prime
size_t bit = std::max((53-ln)>>1, _p.bitsize());
@@ -625,7 +630,7 @@ namespace LinBox
// get number of necessary primes
integer ibound = n * _p * _p * std::max(b.size(), c.size());
integer primesprod=1; size_t nbrprimes=1;
- RandomFFTPrime fftprime(bit, FFT_PRIME_SEED);
+ RandomFFTPrime fftprime((int)bit, FFT_PRIME_SEED);
std::vector<integer> lprimes(10); lprimes.resize(nbrprimes);
lprimes[0] = fftprime.randomPrime();
primesprod = lprimes[0];
@@ -662,7 +667,7 @@ namespace LinBox
for (size_t k=0;k<a.size();++k)
for (size_t i=0;i<a[0].rowdim();++i)
for (size_t j=0;j<a[0].coldim();++j){
- _F.init(a[k].refEntry(i,j), a_i[0][k].getEntry(i,j));
+ _field.init(a[k].refEntry(i,j), a_i[0][k].getEntry(i,j));
}
}
else {
@@ -687,7 +692,7 @@ namespace LinBox
if (acc > primesprod)
acc-= primesprod;
}
- _F.init(a[k].refEntry(i,j), acc);
+ _field.init(a[k].refEntry(i,j), acc);
}
delete [] crt;
delete [] crt_inv;
@@ -715,15 +720,15 @@ namespace LinBox
typedef SpecialFFTMulDomain<ModularField> FFTDomainBase;
private:
- Field _F;
+ Field _field;
integer _p;
size_t _fftsize;
public:
- FFTMulDomain (const Field &F) : _F(F){
+ FFTMulDomain (const Field &F) : _field(F){
- _F.characteristic(_p);
+ _field.characteristic(_p);
_fftsize=0;
//check if field is based on fft prime
@@ -802,7 +807,7 @@ namespace LinBox
for (size_t k=0;k<a.size();++k)
for (size_t i=0;i<a[0].rowdim();++i)
for (size_t j=0;j<a[0].coldim();++j){
- _F.init(a[k].refEntry(i,j), a_i[0][k].getEntry(i,j));
+ _field.init(a[k].refEntry(i,j), a_i[0][k].getEntry(i,j));
}
}
else {
@@ -827,7 +832,7 @@ namespace LinBox
if (acc > primesprod)
acc-= primesprod;
}
- _F.init(a[k].refEntry(i,j), acc);
+ _field.init(a[k].refEntry(i,j), acc);
}
#ifdef FFT_TIMING
chrono.stop();std::cout<<"reconstruction time: "<<chrono<<"\n";
@@ -859,7 +864,7 @@ namespace LinBox
// check if fft prime and good enough
if (lpts < _fftsize){
- FFTDomainBase fftdomain(_F);
+ FFTDomainBase fftdomain(_field);
fftdomain.midproduct(a, b, c);
}
else {
@@ -914,7 +919,7 @@ namespace LinBox
for (size_t k=0;k<a.size();++k)
for (size_t i=0;i<a[0].rowdim();++i)
for (size_t j=0;j<a[0].coldim();++j){
- _F.init(a[k].refEntry(i,j), a_i[0][k].getEntry(i,j));
+ _field.init(a[k].refEntry(i,j), a_i[0][k].getEntry(i,j));
}
}
else {
@@ -939,7 +944,7 @@ namespace LinBox
if (acc > primesprod)
acc-= primesprod;
}
- _F.init(a[k].refEntry(i,j), acc);
+ _field.init(a[k].refEntry(i,j), acc);
}
delete [] crt;
delete [] crt_inv;
@@ -964,7 +969,7 @@ namespace LinBox
typedef typename Field::Element Element;
private:
- Field _F;
+ Field _field;
integer _p;
long _pl;
MatrixDomain<Field> _MD;
@@ -974,7 +979,7 @@ namespace LinBox
public:
SpecialFFTMulDomain(const Field &F) :
- _F(F), _MD(F), _BMD(F)
+ _field(F), _MD(F), _BMD(F)
{
F.characteristic(_p);
_pl = _p;
@@ -982,7 +987,8 @@ namespace LinBox
// find a pseudo primitive element of the multiplicative group _p -1
long m = _pl - 1;
- long k = 0;srand(time(NULL));
+ long k = 0;
+ srand((unsigned int)time(NULL));
while ((m & 1) == 0) {
m = m >> 1;
k++;
@@ -1038,13 +1044,14 @@ namespace LinBox
// find a pseudo nth primitive root of unity
for (;;) {
// compute the nth primitive root
- w= (long) ::Givaro::powmod(_gen, _pl>>lpts, _p);
+ w= (long) Givaro::powmod(_gen, _pl>>lpts, _p);
if ((w !=1) && (w != _pl-1))
break;
// find a pseudo primitive element of the multiplicative group _p-1
long mm = _pl - 1;
- long kk = 0;srand(time(NULL));
+ long kk = 0;
+ srand((unsigned int)time(NULL));
while ((mm & 1) == 0) {
mm = mm >> 1;
kk++;
@@ -1086,8 +1093,8 @@ namespace LinBox
Element _w, _inv_w;
- _F.init(_w, w);
- _F.init(_inv_w, inv_w);
+ _field.init(_w, w);
+ _field.init(_inv_w, inv_w);
std::vector<Element> pow_w(pts);
std::vector<Element> pow_inv_w(pts);
@@ -1095,17 +1102,18 @@ namespace LinBox
//std::cout<<"degree: "<<pts<<"\n";
// compute power of w and w^(-1)
- _F.init(pow_w[0],1);
- _F.init(pow_inv_w[0],1);
+ _field.init(pow_w[0],1);
+ _field.init(pow_inv_w[0],1);
for (size_t i=1;i<pts;++i){
- _F.mul(pow_w[i], pow_w[i-1], _w);
- _F.mul(pow_inv_w[i], pow_inv_w[i-1], _inv_w);
+ _field.mul(pow_w[i], pow_w[i-1], _w);
+ _field.mul(pow_inv_w[i], pow_inv_w[i-1], _inv_w);
}
// compute reverse bit ordering
- size_t revbit[pts];
+ // size_t revbit[pts];
+ std::vector<size_t> revbit(pts);
for (long i = 0, j = 0; i < static_cast<long>(pts); i++, j = RevInc(j, lpts))
- revbit[i]=j;
+ revbit[(size_t)i]=(size_t)j;
// set the data
std::vector<Coefficient> fft_a(pts, ZeroA), fft_b(pts, ZeroB), fft_c(pts,ZeroC);
@@ -1175,12 +1183,12 @@ namespace LinBox
// #endif
for (size_t i=0; i< pts; ++i){
if (revbit[i]>i){
- typename Coefficient::RawIterator it_a1=fft_a[i].rawBegin();
- typename Coefficient::RawIterator it_a2=fft_a[revbit[i]].rawBegin();
- for (; it_a1 != fft_a[i].rawEnd(); ++it_a1, ++it_a2){
- _F.assign(swapping,*it_a1);
- _F.assign(*it_a1, *it_a2);
- _F.assign(*it_a2,swapping);
+ typename Coefficient::Iterator it_a1=fft_a[i].Begin();
+ typename Coefficient::Iterator it_a2=fft_a[revbit[i]].Begin();
+ for (; it_a1 != fft_a[i].End(); ++it_a1, ++it_a2){
+ _field.assign(swapping,*it_a1);
+ _field.assign(*it_a1, *it_a2);
+ _field.assign(*it_a2,swapping);
}
}
}
@@ -1208,8 +1216,8 @@ namespace LinBox
// set the result according to bitreverse ordering and multiply by 1/pts
Element inv_pts;
- _F.init(inv_pts, pts);
- _F.invin(inv_pts);
+ _field.init(inv_pts, pts);
+ _field.invin(inv_pts);
// #ifdef __LINBOX_HAVE_OPENMP
// #pragma omp parallel for shared(a,fft_a,revbit,inv_pts) schedule(stati
@@ -1255,7 +1263,7 @@ namespace LinBox
for (;;) {
// compute the nth primitive root
- w= (long) ::Givaro::powmod(_gen, _pl>>lpts, _p);
+ w= (long) Givaro::powmod(_gen, _pl>>lpts, _p);
//std::cout<<w<<" : "<<_gen<<"\n"<<(_pl>>lpts)<<"\n";
if ((w !=1) && (w != _pl-1))
@@ -1263,7 +1271,8 @@ namespace LinBox
// find a pseudo primitive element of the multiplicative group _p-1
long mm = _pl - 1;
- long kk = 0;srand(time(NULL));
+ long kk = 0;
+ srand((unsigned int)time(NULL));
while ((mm & 1) == 0) {
mm = mm >> 1;
kk++;
@@ -1305,23 +1314,25 @@ namespace LinBox
Element _w, _inv_w;
- _F.init(_w,w);
- _F.init(_inv_w, inv_w);
+ _field.init(_w,w);
+ _field.init(_inv_w, inv_w);
std::vector<Element> pow_w(pts);
std::vector<Element> pow_inv_w(pts);
// compute power of w and w^(-1)
- _F.init(pow_w[0],1);
- _F.init(pow_inv_w[0],1);
+ _field.init(pow_w[0],1);
+ _field.init(pow_inv_w[0],1);
for (size_t i=1;i<pts;++i){
- _F.mul(pow_w[i], pow_w[i-1], _w);
- _F.mul(pow_inv_w[i], pow_inv_w[i-1], _inv_w);
+ _field.mul(pow_w[i], pow_w[i-1], _w);
+ _field.mul(pow_inv_w[i], pow_inv_w[i-1], _inv_w);
}
// compute reverse bit ordering
- size_t revbit[pts];
+ // XXX this is C99 extension
+ // size_t revbit[pts];
+ std::vector<size_t> revbit(pts);
for (long i = 0, j = 0; i < static_cast<long>(pts); i++, j = RevInc(j, lpts))
- revbit[i]=j;
+ revbit[(size_t)i]=(size_t)j;
// set the data
std::vector<Coefficient> fft_a(pts, ZeroA), fft_b(pts, ZeroB), fft_c(pts, ZeroC);
@@ -1355,12 +1366,12 @@ namespace LinBox
// #endif
for (size_t i=0; i< pts; ++i){
if (revbit[i]>i){
- typename Coefficient::RawIterator it_a1=fft_a[i].rawBegin();
- typename Coefficient::RawIterator it_a2=fft_a[revbit[i]].rawBegin();
- for (; it_a1 != fft_a[i].rawEnd(); ++it_a1, ++it_a2){
- _F.assign(swapping,*it_a1);
- _F.assign(*it_a1, *it_a2);
- _F.assign(*it_a2,swapping);
+ typename Coefficient::Iterator it_a1=fft_a[i].Begin();
+ typename Coefficient::Iterator it_a2=fft_a[revbit[i]].Begin();
+ for (; it_a1 != fft_a[i].End(); ++it_a1, ++it_a2){
+ _field.assign(swapping,*it_a1);
+ _field.assign(*it_a1, *it_a2);
+ _field.assign(*it_a2,swapping);
}
}
}
@@ -1371,8 +1382,8 @@ namespace LinBox
// set the result according to bitreverse ordering and multiply by 1/pts
Element inv_pts;
- _F.init(inv_pts, pts);
- _F.invin(inv_pts);
+ _field.init(inv_pts, pts);
+ _field.invin(inv_pts);
// #ifdef __LINBOX_HAVE_OPENMP
// #pragma omp parallel for shared(fft_a,revbit,inv_pts) schedule(static)
// #endif
@@ -1410,7 +1421,7 @@ namespace LinBox
for (;;) {
// compute the nth primitive root
- w= (long) ::Givaro::powmod(_gen, _pl>>lpts, _p);
+ w= (long) Givaro::powmod(_gen, _pl>>lpts, _p);
//std::cout<<w<<" : "<<_gen<<"\n"<<(_pl>>lpts)<<"\n";
if ((w !=1) && (w != _pl-1))
@@ -1418,7 +1429,8 @@ namespace LinBox
// find a pseudo primitive element of the multiplicative group _p-1
long mm = _pl - 1;
- long kk = 0;srand(time(NULL));
+ long kk = 0;
+ srand((unsigned int)time(NULL));
while ((mm & 1) == 0) {
mm = mm >> 1;
kk++;
@@ -1460,23 +1472,24 @@ namespace LinBox
Element _w, _inv_w;
- _F.init(_w,w);
- _F.init(_inv_w, inv_w);
+ _field.init(_w,w);
+ _field.init(_inv_w, inv_w);
std::vector<Element> pow_w(pts);
std::vector<Element> pow_inv_w(pts);
// compute power of w and w^(-1)
- _F.init(pow_w[0],1);
- _F.init(pow_inv_w[0],1);
+ _field.init(pow_w[0],1);
+ _field.init(pow_inv_w[0],1);
for (size_t i=1;i<pts;++i){
- _F.mul(pow_w[i], pow_w[i-1], _w);
- _F.mul(pow_inv_w[i], pow_inv_w[i-1], _inv_w);
+ _field.mul(pow_w[i], pow_w[i-1], _w);
+ _field.mul(pow_inv_w[i], pow_inv_w[i-1], _inv_w);
}
// compute reverse bit ordering
- size_t revbit[pts];
+ // size_t revbit[pts];
+ std::vector<size_t> revbit(pts);
for (long i = 0, j = 0; i < static_cast<long>(pts); i++, j = RevInc(j, lpts))
- revbit[i]=j;
+ revbit[(size_t)i]=(size_t)j;
// set the data
std::vector<Coefficient> fft_a(pts, ZeroA), fft_b(pts, ZeroB), fft_c(pts, ZeroC);
@@ -1501,7 +1514,7 @@ namespace LinBox
#pragma omp parallel for shared(fft_a,fft_b,fft_c) schedule(dynamic)
#endif
- for (long i=0;i<pts;++i)
+ for (long i=0;i<(long)pts;++i)
_BMD.mul(fft_a[i], fft_b[i], fft_c[i]);
Element swapping;
@@ -1511,12 +1524,12 @@ namespace LinBox
// #endif
for (size_t i=0; i< pts; ++i){
if (revbit[i]>i){
- typename Coefficient::RawIterator it_a1=fft_a[i].rawBegin();
- typename Coefficient::RawIterator it_a2=fft_a[revbit[i]].rawBegin();
- for (; it_a1 != fft_a[i].rawEnd(); ++it_a1, ++it_a2){
- _F.assign(swapping,*it_a1);
- _F.assign(*it_a1, *it_a2);
- _F.assign(*it_a2,swapping);
+ typename Coefficient::Iterator it_a1=fft_a[i].Begin();
+ typename Coefficient::Iterator it_a2=fft_a[revbit[i]].Begin();
+ for (; it_a1 != fft_a[i].End(); ++it_a1, ++it_a2){
+ _field.assign(swapping,*it_a1);
+ _field.assign(*it_a1, *it_a2);
+ _field.assign(*it_a2,swapping);
}
}
}
@@ -1527,8 +1540,8 @@ namespace LinBox
// set the result according to bitreverse ordering and multiply by 1/pts
Element inv_pts;
- _F.init(inv_pts, pts);
- _F.invin(inv_pts);
+ _field.init(inv_pts, pts);
+ _field.invin(inv_pts);
// #ifdef __LINBOX_HAVE_OPENMP
// #pragma omp parallel for shared(fft_a,revbit,inv_pts) schedule(static)
// #endif
@@ -1558,14 +1571,14 @@ namespace LinBox
template<class Coeff>
inline void Butterfly (Coeff &A, Coeff &B, const Element &alpha) {
- typename Coeff::RawIterator it_a= A.rawBegin();
- typename Coeff::RawIterator it_b= B.rawBegin();
+ typename Coeff::Iterator it_a= A.Begin();
+ typename Coeff::Iterator it_b= B.Begin();
Element tmp;
- for (; it_a != A.rawEnd(); ++it_a, ++it_b){
- _F.assign(tmp,*it_a);
- _F.addin(*it_a, *it_b);
- _F.sub(*it_b, tmp, *it_b);
- _F.mulin(*it_b, alpha);
+ for (; it_a != A.End(); ++it_a, ++it_b){
+ _field.assign(tmp,*it_a);
+ _field.addin(*it_a, *it_b);
+ _field.sub(*it_b, tmp, *it_b);
+ _field.mulin(*it_b, alpha);
}
}
@@ -1588,8 +1601,8 @@ namespace LinBox
Element tmp;
for (size_t i=0;i<n2;++i){
tmp = aptr[i];
- _F.addin(aptr[i],bptr[i]);
- _F.sub(bptr[i], tmp, bptr[i]);
+ _field.addin(aptr[i],bptr[i]);
+ _field.sub(bptr[i], tmp, bptr[i]);
}
}
@@ -1614,7 +1627,7 @@ namespace LinBox
Timer chrono1,chrono2;
chrono1.start();
#endif
- std::vector<DenseSubmatrix<Element> > block(fft.size());
+ std::vector<BlasMatrix<Field> > block(fft.size());
int row_idx,row_size;
if (i>=nb_bsize) {
row_size=lbsize;
@@ -1626,7 +1639,7 @@ namespace LinBox
}
for (size_t j=0;j<fft.size();j++)
- block[j]=DenseSubmatrix<Element>(fft[j],row_idx,0,row_size,n);
+ block[j]=BlasMatrix<Field>(fft[j],row_idx,0,row_size,n);
#ifdef FFT_TIMING
chrono1.stop();
@@ -1658,7 +1671,7 @@ namespace LinBox
//_MD.addin(fft[shift],fft[shift+n2]);
//_MD.sub(fft[shift+n2], tmp, fft[shift+n2]);
//myAddSub(fft[shift],fft[shift+n2]);
- Element one;_F.init(one,integer(1));
+ Element one;_field.init(one,integer(1));
Butterfly(fft[shift],fft[shift+n2],one);
for (size_t i=1; i< n2; ++i){
@@ -1670,7 +1683,7 @@ namespace LinBox
//myAddSub(fft[shift+i],fft[shift+i+n2]);
//_MD.mulin(fft[shift+i+n2], pow_w[idx_w*i]);
- //FFLAS::fscal(_F, mn, pow_w[idx_w*i], fft[shift+i+n2].getPointer(), 1);
+ //FFLAS::fscal(_field, mn, pow_w[idx_w*i], fft[shift+i+n2].getPointer(), 1);
}
FFT(fft, n2, pow_w, idx_w<<1, shift);
FFT(fft, n2, pow_w, idx_w<<1, shift+n2);
@@ -1783,3 +1796,12 @@ namespace LinBox
} // end of namespace LinBox
#endif //__LINBOX_matpoly_mult_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/matrix-blas3/Makefile.am b/linbox/algorithms/matrix-blas3/Makefile.am
new file mode 100644
index 0000000..9d9c538
--- /dev/null
+++ b/linbox/algorithms/matrix-blas3/Makefile.am
@@ -0,0 +1,35 @@
+# Copyright (c) 2010 the LinBox group
+# written by bb <bboyer at imag.fr>
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
+pkgincludesubdir=$(pkgincludedir)/algorithms/matrix-blas3
+
+
+pkgincludesub_HEADERS = mul.h \
+ mul-naive.inl \
+ mul-toomcook.inl
+
+EXTRA_DIST = \
+ blas3.doxy
+
+
+
+
diff --git a/linbox/algorithms/matrix-blas3/Makefile.in b/linbox/algorithms/matrix-blas3/Makefile.in
new file mode 100644
index 0000000..fd9dadc
--- /dev/null
+++ b/linbox/algorithms/matrix-blas3/Makefile.in
@@ -0,0 +1,579 @@
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Copyright (c) 2010 the LinBox group
+# written by bb <bboyer at imag.fr>
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = linbox/algorithms/matrix-blas3
+DIST_COMMON = $(pkgincludesub_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
+ $(top_srcdir)/macros/config-header.m4 \
+ $(top_srcdir)/macros/debug.m4 \
+ $(top_srcdir)/macros/expat-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
+ $(top_srcdir)/macros/givaro-check.m4 \
+ $(top_srcdir)/macros/gmp-check.m4 \
+ $(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
+ $(top_srcdir)/macros/libtool.m4 \
+ $(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
+ $(top_srcdir)/macros/linbox-doc.m4 \
+ $(top_srcdir)/macros/linbox-misc.m4 \
+ $(top_srcdir)/macros/linbox-opt.m4 \
+ $(top_srcdir)/macros/ltoptions.m4 \
+ $(top_srcdir)/macros/ltsugar.m4 \
+ $(top_srcdir)/macros/ltversion.m4 \
+ $(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
+ $(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
+ $(top_srcdir)/macros/ntl-check.m4 \
+ $(top_srcdir)/macros/saclib-check.m4 \
+ $(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
+HEADERS = $(pkgincludesub_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
+BLAS_LIBS = @BLAS_LIBS@
+CC = @CC@
+CCNAM = @CCNAM@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DBG = @DBG@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
+DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
+DEFS = @DEFS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXPAT_CFLAGS = @EXPAT_CFLAGS@
+EXPAT_LIBS = @EXPAT_LIBS@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
+FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
+GIVARO_CFLAGS = @GIVARO_CFLAGS@
+GIVARO_LIBS = @GIVARO_LIBS@
+GMP_CFLAGS = @GMP_CFLAGS@
+GMP_LIBS = @GMP_LIBS@
+GMP_VERSION = @GMP_VERSION@
+GREP = @GREP@
+IML_CFLAGS = @IML_CFLAGS@
+IML_LIBS = @IML_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIDIA_CFLAGS = @LIDIA_CFLAGS@
+LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
+LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MAPLE_CFLAGS = @MAPLE_CFLAGS@
+MAPLE_HOME = @MAPLE_HOME@
+MAPLE_LIBS = @MAPLE_LIBS@
+MAPLE_VERSION = @MAPLE_VERSION@
+MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NTL_CFLAGS = @NTL_CFLAGS@
+NTL_LIBS = @NTL_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
+RANLIB = @RANLIB@
+RM = @RM@
+SACLIB_CFLAGS = @SACLIB_CFLAGS@
+SACLIB_LIBS = @SACLIB_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TESTS_CFLAGS = @TESTS_CFLAGS@
+VERSION = @VERSION@
+WARN = @WARN@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+pkgincludesubdir = $(pkgincludedir)/algorithms/matrix-blas3
+pkgincludesub_HEADERS = mul.h \
+ mul-naive.inl \
+ mul-toomcook.inl
+
+EXTRA_DIST = \
+ blas3.doxy
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/algorithms/matrix-blas3/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/algorithms/matrix-blas3/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
+ @$(NORMAL_INSTALL)
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
+ done
+
+uninstall-pkgincludesubHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+ for dir in "$(DESTDIR)$(pkgincludesubdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgincludesubHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgincludesubHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool ctags distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkgincludesubHEADERS install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/linbox/algorithms/matrix-blas3/blas3.doxy b/linbox/algorithms/matrix-blas3/blas3.doxy
new file mode 100644
index 0000000..2a69597
--- /dev/null
+++ b/linbox/algorithms/matrix-blas3/blas3.doxy
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2012 LinBox
+ * written by bb <bboyer at imag.fr>
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/** @ingroup algorithms
+ * @defgroup blas3
+ * @brief BLAS level 3 (matrix-matrix) operations.
+ * We provide algorithms for :
+ * - mul
+ * .
+ * We provide all kind of algorithms to be used as building blocks for mul and
+ * other solutions.
+ */
+
+
+// vim:syn=doxygen
diff --git a/linbox/algorithms/matrix-blas3/mul-naive.inl b/linbox/algorithms/matrix-blas3/mul-naive.inl
new file mode 100644
index 0000000..49ab820
--- /dev/null
+++ b/linbox/algorithms/matrix-blas3/mul-naive.inl
@@ -0,0 +1,64 @@
+/* Copyright (C) 2012 the members of the LinBox group
+ * Written by B. Boyer < bboyer at imag.fr >
+ *
+ * This file is part of the LinBox library.
+ *
+ * ========LICENCE========
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * LinBox is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
+
+#ifndef __LINBOX_matrix_blas3_mul_naive_INL
+#define __LINBOX_matrix_blas3_mul_naive_INL
+
+
+namespace LinBox {
+ namespace BLAS3 {
+ template<class _anyMatrix, class _otherMatrix1, class _otherMatrix2>
+ _anyMatrix & mul (_anyMatrix& C,
+ const _otherMatrix1& A,
+ const _otherMatrix2& B,
+ const mulMethod::naive &)
+ {
+ // TODO check sizes
+ // TODO check fields
+ // TODO check get/set Entry
+ typedef typename _anyMatrix::Field Field;
+ const Field &F = B.field();
+ for (size_t i = 0 ; i <C.rowdim(); ++i)
+ for (size_t j = 0 ; j <C.coldim(); ++j) {
+ C.setEntry(i,j,F.zero);
+ for (size_t k = 0 ; k <B.rowdim(); ++k)
+ F.axpyin(C.refEntry(i,j),
+ A.getEntry(i, k),
+ B.getEntry(k, j));
+ }
+ return C;
+ }
+ }
+}
+
+
+#endif // __LINBOX_matrix_blas3_mul_naive_INL
+
+//Local Variables:
+//mode: C++
+//tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+
diff --git a/linbox/algorithms/matrix-blas3/mul-toomcook.inl b/linbox/algorithms/matrix-blas3/mul-toomcook.inl
new file mode 100644
index 0000000..e252b9a
--- /dev/null
+++ b/linbox/algorithms/matrix-blas3/mul-toomcook.inl
@@ -0,0 +1,345 @@
+/* Copyright (C) 2012 the members of the LinBox group
+ * Written by B. Boyer < bboyer at imag.fr >
+ *
+ * This file is part of the LinBox library.
+ *
+ * ========LICENCE========
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * LinBox is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
+
+/*! @internal
+ * @file matrix-blas3/mul-toomcook.inl
+ * @ingroup algorithm
+ * @ingroup blas
+ * @brief Implementation of Toom-Cook.
+ */
+
+#ifndef __LINBOX_matrix_blas3_mul_toomcook_INL
+#define __LINBOX_matrix_blas3_mul_toomcook_INL
+
+
+
+#include <fflas-ffpack/fflas/fflas.h>
+#include <fflas-ffpack/ffpack/ffpack.h>
+
+namespace LinBox {
+ namespace BLAS3 {
+
+ template<class Zpz>
+ BlasMatrix<Zpz>& ToomCook(BlasMatrix<Zpz>& TC, BlasMatrix<Zpz>& iTC)
+ {
+ linbox_check(TC.rowdim() == TC.coldim());
+ size_t l = TC.rowdim();
+
+ for (size_t i = 0 ; i < l ; ++i)
+ for (size_t j = 0 ; j < l ; ++j) {
+ TC.field().init(TC.refEntry(i,j), pow((Integer)i,j));
+ }
+ BlasMatrixDomain<Zpz> BMD(TC.field()) ;
+ // TC.write(std::cout << "TC ") << std::endl;
+ // BMD.invert(iTC, TC);
+ int null;
+ FFPACK::Invert(TC.field(),l,TC.getPointer(),l,iTC.getWritePointer(),l,null);
+ // iTC.write(std::cout << "TC^(-1) ") << std::endl;
+ // TC.write(std::cout << "TC ") << std::endl;
+ return TC;
+ }
+
+ namespace Protected {
+
+
+ template<class Zpz, class GFpe>
+ BlasMatrix<Zpz >& mul (BlasMatrix<Zpz> & CMatBloc,
+ const BlasMatrix<Zpz>& AMatBloc,
+ const BlasMatrix<Zpz>& BMatBloc,
+ const size_t m,
+ const size_t k,
+ const size_t n,
+ const mulMethod::ToomCook<GFpe> & T)
+ {
+#if (__LINBOX_FFLAS_FFPACK_VERSION < 10501)
+#warning "Invert is buggy in your fflas-ffpack version. please consider upgrading to >=1.5.1."
+#endif
+ const Zpz & F = CMatBloc.field();
+ const GFpe& GF = T._myF ;
+ // linbox_check(T._myF.characacteristic() == F.characteristic());
+ // TODO si e = 1 on matmul !
+ size_t e = (size_t) GF.exponent() ; // extension degree
+ size_t l = 2*e - 1 ; // sure ?
+
+ BlasMatrix<Zpz> TC (F,l,l);
+ BlasMatrix<Zpz> iTC (F,l,l);
+ BlasMatrix<Zpz> iEval (F,l,l);
+ // FWD = Matrix(K, l, l, [K(i**j) for i in range(l) for j in range(l)])
+ ToomCook(TC,iTC);
+ // each row is a result matrix
+ BlasMatrix<Zpz> TMatBloc( F, l, m*n);
+
+
+ // AY = [sum(FWD[i,j]*A[j] for j in range(len(A))) for i in range(l)]
+ // BY = [sum(FWD[i,j]*B[j] for j in range(len(B))) for i in range(l)]
+ if (!T.memory_unlimited) { /* space efficient */
+ BlasMatrix<Zpz> AEval( F , m, k);
+ BlasMatrix<Zpz> BEval( F , k, n);
+
+
+ for (size_t i = 0 ; i < l ; ++i) {
+ FFLAS::fgemv(F, FFLAS::FflasTrans,
+ e, m*k,
+ F.one,
+ AMatBloc.getPointer(), m*k,
+ TC.getPointer()+ i*l, 1,
+ F.zero,
+ AEval.getWritePointer(), 1);
+
+ FFLAS::fgemv(F, FFLAS::FflasTrans,
+ e, k*n,
+ F.one,
+ BMatBloc.getPointer(), k*n,
+ TC.getPointer()+ i*l, 1,
+ F.zero,
+ BEval.getWritePointer(), 1);
+
+ FFLAS::fgemm(F,
+ FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
+ // m, k , n,
+ m,n,k,
+ F.one,
+ AEval.getPointer(), AEval.coldim(), //lda
+ BEval.getPointer(), BEval.coldim(), //ldb
+ F.zero,
+ TMatBloc.getWritePointer()+i*m*n, n);
+ }
+ }
+ else { /* time efficient (matmul) */
+ BlasMatrix<Zpz> AEval( F , l, m*k);
+ BlasMatrix<Zpz> BEval( F , l, k*n);
+
+
+ FFLAS::fgemm(F,
+ FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
+ // m, k , n,
+ l,m*k,e,
+ F.one,
+ // AEval.getPointer(), AEval.coldim(), //lda
+ TC.getPointer(),l,
+ AMatBloc.getPointer(), m*k,
+ F.zero,
+ AEval.getWritePointer(), m*k);
+ // TMatBloc.getWritePointer()+i*m*n, n);
+
+ FFLAS::fgemm(F,
+ FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
+ // m, k , n,
+ l,n*k,e,
+ F.one,
+ // AEval.getPointer(), AEval.coldim(), //lda
+ TC.getPointer(),l,
+ BMatBloc.getPointer(), n*k,
+ F.zero,
+ BEval.getWritePointer(), n*k);
+
+ for (size_t i = 0 ; i < l ; ++i) {
+
+ FFLAS::fgemm(F,
+ FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
+ // m, k , n,
+ m,n,k,
+ F.one,
+ AEval.getPointer()+i*m*k, k, //lda
+ BEval.getPointer()+i*n*k, n, //ldb
+ F.zero,
+ TMatBloc.getWritePointer()+i*m*n, n);
+ }
+ }
+
+ std::vector<double> minpoly_vector = GF.irreducible() ;
+ for (size_t i = 0 ; i < minpoly_vector.size(); ++i)
+ F.negin(minpoly_vector[i]);
+
+ // BlasSubmatrix<Zpz> CompMat(CMatBloc,0,0,l,l);
+ BlasMatrix<Zpz> CompMat(F,l,l);
+ for (size_t i = 0 ; i < e ; ++i) { // degree == l ?
+ CompMat.setEntry(i,i,F.one);
+ }
+ for (size_t j = 0 ; j < e-1 ; ++j) {
+ CompMat.setEntry(j,e,minpoly_vector[j]);
+ }
+ typename Zpz::Element coeff ;
+ typename Zpz::Element tmp_coeff, tmp_coeff2 ;
+ F.init(tmp_coeff);
+ for (size_t i = 1 ; i < e-1 ; ++i){
+ for (size_t j = 1 ; j < e+1 ; ++j) {
+ CompMat.setEntry(j, i + e, CompMat.getEntry((j-1),i - 1 + e) ) ;
+ }
+ if (!F.isZero(CompMat.getEntry(e,i+e))){
+ F.init(coeff, CompMat.getEntry( e, i + e) );
+ for(size_t j = 0 ; j < e-1 ; ++j){
+ F.mul(tmp_coeff, coeff,minpoly_vector[j]);
+ F.init(tmp_coeff2,CompMat.getEntry(j,i+e));
+ F.addin(tmp_coeff2, tmp_coeff);
+ CompMat.setEntry(j,i+e, tmp_coeff2 );
+ }
+ }
+ }
+
+ // BCK = ~FWD
+ // XXX some stuff here
+ FFLAS::fgemm(F,
+ FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
+ l, l, l, F.one,
+ CompMat.getPointer(), l,
+ iTC.getPointer(), l,
+ F.zero,
+ iEval.getWritePointer(), l);
+
+
+ // Y = [sum(BCK[i,j]*Y[j] for j in range(l)) for i in range(l)]
+ FFLAS::fgemm(F,
+ FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
+ e,m*n,l,
+ F.one,
+ iEval.getPointer(), l,
+ TMatBloc.getPointer(), m*n,
+ F.zero,
+ CMatBloc.getWritePointer(), m*n);
+ return CMatBloc;
+
+ }
+ }
+
+ template<class Zpz, class GF>
+ std::vector<BlasMatrix<Zpz> >& mul (std::vector<BlasMatrix<Zpz> >& C,
+ const std::vector<BlasMatrix<Zpz> >& A,
+ const std::vector<BlasMatrix<Zpz> >& B,
+ const mulMethod::ToomCook<GF> & T)
+ {
+ size_t m = C[0].rowdim();
+ size_t k = B[0].rowdim();
+ size_t n = C[0].coldim();
+ const Zpz & F = C[0].field();
+ BlasMatrix<Zpz> Cbloc(F,C.size(),m*n);
+ BlasMatrix<Zpz> Abloc(F,C.size(),m*k);
+ BlasMatrix<Zpz> Bbloc(F,C.size(),k*n);
+ // convert
+ for (size_t l = 0 ; l < C.size() ; ++l){
+ for (size_t i = 0 ; i < m ; ++i) {
+ for (size_t j = 0 ; j < k ; ++j) {
+ Abloc.setEntry(l,i*k+j,A[l].getEntry(i,j));
+ }
+ }
+ }
+
+ for (size_t l = 0 ; l < C.size() ; ++l){
+ for (size_t i = 0 ; i < k ; ++i) {
+ for (size_t j = 0 ; j < n ; ++j) {
+ Bbloc.setEntry(l,i*n+j,B[l].getEntry(i,j));
+ }
+ }
+ }
+
+
+ Protected::mul(Cbloc,Abloc,Bbloc,m,k,n,T);
+
+ for (size_t l = 0 ; l < C.size() ; ++l){
+ for (size_t i = 0 ; i < m ; ++i) {
+ for (size_t j = 0 ; j < n ; ++j) {
+ C[l].setEntry(i,j,Cbloc.getEntry(l,i*n+j));
+ }
+ }
+ }
+ // convert back
+ }
+
+ template<class Zpz>
+ BlasMatrix<GivaroExtension<Zpz> >&
+ mul (BlasMatrix<GivaroExtension<Zpz> >& C,
+ const BlasMatrix<GivaroExtension<Zpz> >& A,
+ const BlasMatrix<GivaroExtension<Zpz> >& B,
+ const mulMethod::ToomCook<GivaroExtension<Zpz> > & T)
+ {
+ size_t m = C.rowdim();
+ size_t k = B.rowdim();
+ size_t n = C.coldim();
+ Zpz F ( A.field().characteristic() ); // BaseField ?
+ size_t e = (size_t) A.field().exponent();
+ BlasMatrix<Zpz> Cbloc(F,e,m*n);
+ BlasMatrix<Zpz> Abloc(F,e,m*k);
+ BlasMatrix<Zpz> Bbloc(F,e,k*n);
+
+
+ for (size_t l = 0 ; l < e ; ++l){
+ for (size_t i = 0 ; i < m ; ++i) {
+ for (size_t j = 0 ; j < k ; ++j) {
+ if (l< A.getEntry(i,j).size())
+ Abloc.setEntry(l,i*k+j,
+ A.getEntry(i,j)[l]);
+ }
+ }
+ }
+ // for (size_t l = 0 ; l < e ; ++l){
+ // std::cout << Abloc.getEntry(l,0) << ';';
+ // }
+ // std::cout << std::endl;
+
+ for (size_t l = 0 ; l < e ; ++l){
+ for (size_t i = 0 ; i < k ; ++i) {
+ for (size_t j = 0 ; j < n ; ++j) {
+ if (l< B.getEntry(i,j).size())
+ Bbloc.setEntry(l,i*n+j,B.getEntry(i,j)[l]);
+ }
+ }
+ }
+
+ // C.field().init(C.refEntry(0,0));
+
+ Protected::mul(Cbloc,Abloc,Bbloc,m,k,n,T);
+ // convert back
+
+ typedef typename GivaroExtension<Zpz>::Element Element ;
+ for (size_t i = 0 ; i < m ; ++i) {
+ for (size_t j = 0 ; j < n ; ++j) {
+ Element x(e) ;
+ for (size_t l = 0 ; l < e ; ++l){
+ x[l] = Cbloc.getEntry(l,i*n+j);
+ }
+ C.field().polynomial_domain().modin(x,C.field().irreducible());
+ // A.field().convert((Element&)C.refEntry(i,j),x);
+ // A.field().init(x);
+ C.setEntry(i,j,x);
+ }
+ }
+ // for (size_t l = 0 ; l < e ; ++l){
+ // std::cout << Cbloc.getEntry(l,0) << ';';
+ // }
+ // std::cout << std::endl;
+
+ }
+
+ }
+}
+
+#endif // __LINBOX_matrix_blas3_mul_toomcook_INL
+
+//Local Variables:
+//mode: C++
+//tab-width: 4
+// indent-tabs-mode: nil
+// c-basic-offset: 4
+// End:
+// vim:sts=4:sw=4:ts=4:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+
diff --git a/linbox/algorithms/matrix-blas3/mul.h b/linbox/algorithms/matrix-blas3/mul.h
new file mode 100644
index 0000000..a65914d
--- /dev/null
+++ b/linbox/algorithms/matrix-blas3/mul.h
@@ -0,0 +1,162 @@
+/* Copyright (C) 2012 the members of the LinBox group
+ * Written by B. Boyer < bboyer at imag.fr >
+ *
+ * This file is part of the LinBox library.
+ *
+ * ========LICENCE========
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * LinBox is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
+
+/*! @file matrix-blas3/mul.h
+ * @ingroup algorithm
+ * @ingroup blas
+ * @brief BLAS3 multiplication algorithms.
+ */
+
+#ifndef __LINBOX_matrix_blas3_mul_H
+#define __LINBOX_matrix_blas3_mul_H
+
+#include <vector>
+#include "linbox/integer.h"
+#include <linbox/field/givaro.h>
+#include <linbox/matrix/blas-matrix.h>
+
+
+// Methods
+namespace LinBox {
+ namespace BLAS3 {
+
+ //! BLAS3 Multiplication methods
+ namespace mulMethod {
+ template<class Field>
+ struct ToomCook {
+ const Field & _myF;
+ bool memory_unlimited ;
+ ToomCook(Field & myF, bool mem = false) :
+ _myF(myF),
+ memory_unlimited(mem)
+ {};
+ // this is the place for the helper/caching (TC,iTC).
+ } ; //! Toom-Cook method.
+
+ struct naive {};
+ }
+ }
+}
+
+// ToomCook
+namespace LinBox {
+ namespace BLAS3 {
+
+ /** @brief Build the Toom-Cook matrix helper.
+ * We only provide this function for dense matrices (Blas for
+ * the moment) over Z/pZ.
+ * @param [out] TC matrix of Fp(i^j)
+ * @param [out] iTC inverse of TC
+ * @return \p TC
+ */
+ template<class Zpz>
+ BlasMatrix<Zpz>& ToomCook(BlasMatrix<Zpz>& TC, BlasMatrix<Zpz>& iTC);
+
+ /** @brief Toom-Cook multiplication for GF(p^e)
+ * A matrix over GF(p^e) is represented by a polynomial of Z/pZ matrices.
+ * @tparam Zpz is some modular field, GFq is GivaroExtension (or the like)
+ * @param [out] C result
+ * @param A matrix
+ * @param B matrix
+ * @return C=AB
+ * @warning p should not be too small, and e>1 (you've been warned...)
+ */
+ template<class Zpz, class GFq>
+ std::vector<BlasMatrix<Zpz> >& mul (std::vector<BlasMatrix<Zpz> >& C,
+ const std::vector<BlasMatrix<Zpz> >&A,
+ const std::vector<BlasMatrix<Zpz> >&B,
+ const mulMethod::ToomCook<GFq>& T);
+
+ /** @brief Toom-Cook multiplication for GF(p^e)
+ *
+ * @tparam Zpz is some modular field, GFq is GivaroExtension (or the like)
+ * @param [out] C result
+ * @param A matrix
+ * @param B matrix
+ * @return C=AB
+ * @warning p should not be too small, and e>1 (you've been warned...)
+ */
+ template<class Zpz>
+ BlasMatrix<GivaroExtension<Zpz> >&
+ mul (BlasMatrix<GivaroExtension<Zpz> >& C,
+ const BlasMatrix<GivaroExtension<Zpz> >& A,
+ const BlasMatrix<GivaroExtension<Zpz> >& B,
+ const mulMethod::ToomCook<GivaroExtension<Zpz> > & T);
+
+#if 0 /* Generic method */
+ template<class ZpzMatrix>
+ std::vector<ZpzMatrix >& mul (std::vector<ZpzMatrix >& C,
+ std::vector<ZpzMatrix >&A,
+ std::vector<ZpzMatrix >&B,
+ const mulMethod::ToomCook &);
+#endif
+
+
+
+ } // BLAS3
+}
+
+
+#include "linbox/algorithms/matrix-blas3/mul-toomcook.inl"
+
+// naive
+namespace LinBox {
+ namespace BLAS3 {
+
+ /** @brief Triple loop !
+ * just a simple triple loop
+ * @pre works if _anyMatrix has setEntry and _otherMatrix has getEntry
+ * @param [out] C result
+ * @param [in] A matrix
+ * @param [in] B matrix
+ * @return C=AB
+ */
+ template<class _anyMatrix, class _otherMatrix1, class _otherMatrix2>
+ _anyMatrix & mul (_anyMatrix& C,
+ const _otherMatrix1& A,
+ const _otherMatrix2& B,
+ const mulMethod::naive &);
+
+
+ }
+}
+#include "linbox/algorithms/matrix-blas3/mul-naive.inl"
+
+// <+other algo+>
+namespace LinBox {
+ namespace BLAS3 {
+
+ }
+}
+//#include "linbox/algorithms/matrix-blas3/mul-<+other algo+>.inl"
+
+#endif // __LINBOX_matrix_blas3_mul_H
+
+//Local Variables:
+//mode: C++
+//tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+
diff --git a/linbox/algorithms/matrix-hom.h b/linbox/algorithms/matrix-hom.h
index e8a61f2..d0cb9b0 100644
--- a/linbox/algorithms/matrix-hom.h
+++ b/linbox/algorithms/matrix-hom.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by JG Dumas
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/matrix-hom.h
@@ -33,17 +34,13 @@
#ifndef __LINBOX_matrix_hom_H
#define __LINBOX_matrix_hom_H
-#include <linbox/blackbox/blas-blackbox.h>
-#include <linbox/blackbox/sparse.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/blackbox/compose.h>
-#include <linbox/blackbox/polynomial.h>
-#include <linbox/blackbox/scalar-matrix.h>
-#include <linbox/integer.h>
-#include <linbox/field/hom.h>
-#include <linbox/field/multimod-field.h>
-#include <linbox/matrix/dense.h>
-#include <linbox/matrix/matrix-category.h>
+#include "linbox/integer.h"
+#include "linbox/blackbox/sparse.h"
+#include "linbox/blackbox/compose.h"
+#include "linbox/blackbox/polynomial.h"
+#include "linbox/blackbox/scalar-matrix.h"
+#include "linbox/field/hom.h"
+#include "linbox/matrix/matrix-category.h"
namespace LinBox
@@ -66,11 +63,6 @@ namespace LinBox
};
#endif
- template <class RingElement, class Field>
- struct MatrixHomTrait<DenseMatrixBase<RingElement>, Field> {
- typedef DenseMatrixBase<typename Field::Element> value_type;
- };
-
template <class Ring, class Field>
struct MatrixHomTrait<SparseMatrix<Ring, typename Vector<Ring>::SparseSeq>, Field> {
typedef SparseMatrix<Field, typename Vector<Field>::SparseSeq> value_type;
@@ -87,13 +79,8 @@ namespace LinBox
};
template <class Ring, class Field>
- struct MatrixHomTrait<DenseMatrix<Ring>, Field> {
- typedef DenseMatrix<Field> value_type;
- };
-
- template <class Ring, class Field>
- struct MatrixHomTrait<BlasBlackbox<Ring>, Field> {
- typedef BlasBlackbox<Field> value_type;
+ struct MatrixHomTrait<BlasMatrix<Ring>, Field> {
+ typedef BlasMatrix<Field> value_type;
};
/// \brief Limited doc so far. Used in RationalSolver.
@@ -102,71 +89,50 @@ namespace LinBox
//public:
- template<class FMatrix, class IMatrix, class Field>
- void map (FMatrix & Ap, const IMatrix& A, const Field& F)
+ template<class FMatrix, class IMatrix>
+ void map (FMatrix & Ap, const IMatrix& A)
{
- typename IMatrix::template rebind<Field>()( Ap, A, F);
- }
-
- // construct a dense matrix over finite field, such that Ap = A mod p, where F = Ring / <p>
- template<class Field, class IMatrix>
- void map (DenseMatrix<Field> &Ap, const IMatrix& A, const Field& F);
-
- // construct a dense matrix over finite field, such that Ap = A mod p, where F = Ring / <p>
- template<class Ring, class Field>
- void map (DenseMatrixBase<typename Field::Element> &Ap, const DenseMatrixBase<typename Ring::Element>& A, const Field& F)
- {
- typename DenseMatrixBase<typename Ring::Element>::template rebind<Field>()( Ap, A, F);
+ typename IMatrix::template rebind<typename FMatrix::Field>()( Ap, A);
}
// construct a sparse matrix over finite field, such that Ap = A mod p, where F = Ring / <p>
template<class Field, class Vect, class IMatrix>
void map (SparseMatrix<Field, Vect> &Ap, const IMatrix& A, const Field &F);
- // construct a dense matrix over finite field, such that Ap = A mod p, where F = Ring / <p>
- template<class Ring, class Field>
- void map (DenseMatrix<Field> &Ap, const DenseMatrix<Ring>& A, const Field &F)
- {
- typename DenseMatrix<Ring>::template rebind<Field>()( Ap, A, F);
- }
-
- // construct a dense matrix over finite field, such that Ap = A mod p, where F = Ring / <p>
- template<class Ring, class Vect, class Field>
- void map (DenseMatrix<Field> &Ap, const SparseMatrix<Ring, Vect>& A, const Field &F);
-
// construct a sparse matrix over finite field, such that Ap = A mod p, where F = Ring / <p>
template<class Ring, class Vect1, class Field, class Vect2>
- void map (SparseMatrix<Field, Vect2>& Ap, const SparseMatrix<Ring, Vect1>& A, const Field& F)
+ void map (SparseMatrix<Field, Vect2>& Ap, const SparseMatrix<Ring, Vect1>& A)
{
- typename SparseMatrix<Ring,Vect1>::template rebind<Field,Vect2>()( Ap, A, F);
+ typename SparseMatrix<Ring,Vect1>::template rebind<Field,Vect2>()( Ap, A);
}
- // function class to hanle map to BlasBlackbox (needed to allow partial specialization)
+ // function class to hanle map to BlasMatrix (needed to allow partial specialization)
template< class Field, class IMatrix, class Type>
- class BlasBlackboxMAP {
+ class BlasMatrixMAP {
public:
- void operator() (BlasBlackbox<Field> &Ap, const IMatrix& A, const Field& F, Type type);
+ void operator() (BlasMatrix<Field> &Ap, const IMatrix& A, const Field& F, Type type);
};
- // construct a BlasBlackbox over finite fiel, such that Ap - A mod p, where F = Ring / <p>
+ // construct a BlasMatrix over finite fiel, such that Ap - A mod p, where F = Ring / <p>
template<class Ring, class Field>
- void map (BlasBlackbox<Field> &Ap, const BlasBlackbox<Ring>& A, const Field &F)
+ void map (BlasMatrix<Field> &Ap, const BlasMatrix<Ring>& A )
{
- typename BlasBlackbox<Ring>::template rebind<Field>()( Ap, A, F);
+ typename BlasMatrix<Ring>::template rebind<Field>()( Ap, A);
}
template <class Field, class IMatrix>
- void map (BlasBlackbox<Field> &Ap, const IMatrix &A, const Field &F)
+ void map (BlasMatrix<Field> &Ap, const IMatrix &A, const Field &F)
{
- BlasBlackboxMAP<Field, IMatrix, typename MatrixContainerTrait<IMatrix>::Type> ()(Ap, A, F, typename MatrixContainerTrait<IMatrix>::Type());
+ BlasMatrixMAP<Field, IMatrix, typename MatrixContainerTrait<IMatrix>::Type> ()(Ap, A, F, typename MatrixContainerTrait<IMatrix>::Type());
}
template <class Field, class IPoly, class IMatrix>
- void map (PolynomialBB< typename IMatrix::template rebind<Field>::other, typename IPoly::template rebind<Field>::other> &Ap,
+ void map (PolynomialBB< typename IMatrix::template rebind<Field>::other,
+ typename IPoly::template rebind<Field>::other> &Ap,
const PolynomialBB<IMatrix, IPoly> &A, const Field & F)
{
typename PolynomialBB<IMatrix,IPoly>::template rebind<Field>() (Ap, A, F);
@@ -174,57 +140,13 @@ namespace LinBox
template <class Field, class Ring>
void map (ScalarMatrix<Field> &Ap,
- const ScalarMatrix<Ring> &A,
- const Field & F)
+ const ScalarMatrix<Ring> &A)
{
- typename ScalarMatrix<Ring>::template rebind<Field>() (Ap, A, F);
+ typename ScalarMatrix<Ring>::template rebind<Field>() (Ap, A);
}
}
- template <class Field, class IMatrix>
- void MatrixHom::map (DenseMatrix<Field>&Ap, const IMatrix& A, const Field &F)
- {
-
- // Ap = new DenseMatrix<Field>(F, A.rowdim(), A.coldim());
-
- typedef typename IMatrix::Field Ring;
-
- Ring r = A.field();
-
- typename Ring::Element one, zero;
-
- r. init(one, 1);
-
- r. init(zero, 0);
-
- std::vector<typename Ring::Element> e(A.coldim(), zero), tmp(A.rowdim());
-
- typename DenseMatrix<Field>::ColIterator col_p;
-
- typename DenseMatrix<Field>::Col::iterator elt_p;
-
- typename std::vector<typename Ring::Element>::iterator e_p, tmp_p;
-
- Hom<Ring, Field> hom(A. field(), F);
-
- for (col_p = Ap.colBegin(), e_p = e.begin();
- e_p != e.end(); ++ col_p, ++ e_p) {
-
- r.assign(*e_p, one);
-
- A.apply (tmp, e);
-
- for (tmp_p = tmp.begin(), elt_p = col_p -> begin();
- tmp_p != tmp.end(); ++ tmp_p, ++ elt_p)
-
- hom.image (*elt_p, *tmp_p);
-
- r.assign(*e_p, zero);
- }
- }
-
-
template <class Field, class Vect, class IMatrix>
void MatrixHom::map (SparseMatrix<Field, Vect> &Ap, const IMatrix& A, const Field &F)
{
@@ -266,60 +188,16 @@ namespace LinBox
}
- template <class Ring, class Vect, class Field>
- void MatrixHom::map (DenseMatrix<Field>& Ap, const SparseMatrix<Ring, Vect>& A, const Field &F)
- {
-
- // Ap = new DenseMatrix<Field>(F, A.rowdim(), A.coldim());
-
- typename DenseMatrix<Field>::Element zero; F. init (zero, 0);
- typename DenseMatrix<Field>::RawIterator raw_p;
- for (raw_p = Ap.rawBegin(); raw_p != Ap.rawEnd(); ++ raw_p)
- F. assign (*raw_p, zero);
-
- Hom<Ring, Field> hom(A. field(), F);
-
- for( typename SparseMatrix<Ring, Vect>::ConstRawIndexedIterator
- indices = A.rawIndexedBegin();
- (indices != A.rawIndexedEnd()) ;
- ++indices ) {
- typename Field::Element e;
- hom. image (e, indices.value() );
- if (!F.isZero(e))
- Ap.setEntry (indices.rowIndex(),
- indices.colIndex(), e);
- }
- /*
- typename Field::Element e;
- typename SparseMatrix<Ring, Vect>::ConstRowIterator row_p;
- std::vector<size_t>::const_iterator j_p;
- typename std::vector<typename Ring::Element>::const_iterator e_p;
- int i = 0;
-
- for (row_p = A.rowBegin(); row_p != A.rowEnd(); ++ row_p, ++ i)
- for (j_p = row_p -> first. begin(), e_p = row_p -> second. begin();
- j_p != row_p -> first. end(); ++ e_p, ++ j_p) {
-
- //F.init (e, *e_p);
- hom. image (e, *e_p);
-
- if (!F.isZero(e))
- Ap.setEntry (i, *j_p, e);
-
- }
- */
- }
-
namespace MatrixHom
{
template<class Field, class IMatrix>
- class BlasBlackboxMAP<Field, IMatrix, MatrixContainerCategory::Blackbox> {
+ class BlasMatrixMAP<Field, IMatrix, MatrixContainerCategory::Blackbox> {
public:
- void operator() (BlasBlackbox<Field> &Ap, const IMatrix &A, const Field &F, MatrixContainerCategory::Blackbox type)
+ void operator() (BlasMatrix<Field> &Ap, const IMatrix &A, const Field &F, MatrixContainerCategory::Blackbox type)
{
- // Ap = new BlasBlackbox<Field>(F, A.rowdim(), A.coldim());
+ // Ap = new BlasMatrix<Field>(F, A.rowdim(), A.coldim());
typedef typename IMatrix::Field Ring;
Ring r = A.field();
@@ -330,9 +208,9 @@ namespace LinBox
std::vector<typename Ring::Element> e(A.coldim(), zero), tmp(A.rowdim());
- typename BlasBlackbox<Field>::ColIterator col_p;
+ typename BlasMatrix<Field>::ColIterator col_p;
- typename BlasBlackbox<Field>::Col::iterator elt_p;
+ typename BlasMatrix<Field>::Col::iterator elt_p;
typename std::vector<typename Ring::Element>::iterator e_p, tmp_p;
@@ -354,16 +232,16 @@ namespace LinBox
template<class Field, class IMatrix>
- class BlasBlackboxMAP<Field, IMatrix, MatrixContainerCategory::Container> {
+ class BlasMatrixMAP<Field, IMatrix, MatrixContainerCategory::Container> {
public:
- void operator() (BlasBlackbox<Field> &Ap, const IMatrix &A, const Field &F, MatrixContainerCategory::Container type)
+ void operator() (BlasMatrix<Field> &Ap, const IMatrix &A, const Field &F, MatrixContainerCategory::Container type)
{
- // Ap = new BlasBlackbox<Field>(F, A.rowdim(), A.coldim());
+ // Ap = new BlasMatrix<Field>(F, A.rowdim(), A.coldim());
Hom<typename IMatrix::Field , Field> hom(A.field(), F);
typename Field::Element e, zero;
F.init(zero,0UL);
- for( typename IMatrix::ConstRawIndexedIterator indices = A.rawIndexedBegin();
- (indices != A.rawIndexedEnd()) ;
+ for( typename IMatrix::ConstIndexedIterator indices = A.IndexedBegin();
+ (indices != A.IndexedEnd()) ;
++indices ) {
hom. image (e, A.getEntry(indices.rowIndex(),indices.colIndex()) );
@@ -380,71 +258,82 @@ namespace LinBox
};
template<class Field, class IMatrix>
- class BlasBlackboxMAP<Field, IMatrix, MatrixContainerCategory::BlasContainer> {
+ class BlasMatrixMAP<Field, IMatrix, MatrixContainerCategory::BlasContainer> {
public:
- void operator() (BlasBlackbox<Field> &Ap, const IMatrix &A, const Field &F, MatrixContainerCategory::BlasContainer type)
+ void operator() (BlasMatrix<Field> &Ap, const IMatrix &A, const Field &F, MatrixContainerCategory::BlasContainer type)
{
- //Ap = new BlasBlackbox<Field>(F, A.rowdim(), A.coldim());
+ //Ap = new BlasMatrix<Field>(F, A.rowdim(), A.coldim());
Hom<typename IMatrix::Field , Field> hom(A.field(), F);
- typename IMatrix::ConstRawIterator iterA = A.rawBegin();
- typename BlasBlackbox<Field>::RawIterator iterAp = Ap.rawBegin();
+ typename IMatrix::ConstIterator iterA = A.Begin();
+ typename BlasMatrix<Field>::Iterator iterAp = Ap.Begin();
- for(; iterA != A.rawEnd(); iterA++, iterAp++)
+ for(; iterA != A.End(); iterA++, iterAp++)
hom. image (*iterAp, *iterA);
}
};
template<class Field>
- class BlasBlackboxMAP<Field, BlasMatrix<integer>, MatrixContainerCategory::BlasContainer> {
+ class BlasMatrixMAP<Field, BlasMatrix<PID_integer>, MatrixContainerCategory::BlasContainer> {
public:
- void operator() (BlasBlackbox<Field> &Ap, const BlasMatrix<integer> &A, const Field &F, MatrixContainerCategory::BlasContainer type)
+ void operator() (BlasMatrix<Field> &Ap, const BlasMatrix<PID_integer> &A, const Field &F, MatrixContainerCategory::BlasContainer type)
{
- //Ap = new BlasBlackbox<Field>(F, A.rowdim(), A.coldim());
+ //Ap = new BlasMatrix<Field>(F, A.rowdim(), A.coldim());
PID_integer ZZ ;
Hom<PID_integer , Field> hom(ZZ, F);
- typename BlasMatrix<integer>::ConstRawIterator iterA = A.rawBegin();
- typename BlasBlackbox<Field>::RawIterator iterAp = Ap.rawBegin();
+ typename BlasMatrix<PID_integer>::ConstIterator iterA = A.Begin();
+ typename BlasMatrix<Field>::Iterator iterAp = Ap.Begin();
- for(; iterA != A.rawEnd(); iterA++, iterAp++)
+ for(; iterA != A.End(); iterA++, iterAp++)
hom. image (*iterAp, *iterA);
}
};
+#ifdef __LINBOX_blas_matrix_multimod_H
template< class IMatrix>
- class BlasBlackboxMAP<MultiModDouble, IMatrix, MatrixContainerCategory::BlasContainer > {
+ class BlasMatrixMAP<MultiModDouble, IMatrix, MatrixContainerCategory::BlasContainer > {
public:
- void operator() (BlasBlackbox<MultiModDouble> &Ap, const IMatrix &A, const MultiModDouble &F, MatrixContainerCategory::BlasContainer type)
+ void operator() (BlasMatrix<MultiModDouble> &Ap, const IMatrix &A, const MultiModDouble &F, MatrixContainerCategory::BlasContainer type)
{
- //Ap = new BlasBlackbox<MultiModDouble>(F, A.rowdim(), A.coldim());
+ // Ap = new BlasMatrix<MultiModDouble>(F, A.rowdim(), A.coldim());
for (size_t i=0; i<F.size();++i)
MatrixHom::map(Ap.getMatrix(i), A, F.getBase(i));
}
};
template< class IMatrix>
- class BlasBlackboxMAP<MultiModDouble, IMatrix, MatrixContainerCategory::Container > {
+ class BlasMatrixMAP<MultiModDouble, IMatrix, MatrixContainerCategory::Container > {
public:
- void operator() (BlasBlackbox<MultiModDouble> &Ap, const IMatrix &A, const MultiModDouble &F, MatrixContainerCategory::Container type)
+ void operator() (BlasMatrix<MultiModDouble> &Ap, const IMatrix &A, const MultiModDouble &F, MatrixContainerCategory::Container type)
{
- // Ap = new BlasBlackbox<MultiModDouble>(F, A.rowdim(), A.coldim());
+ // Ap = new BlasMatrix<MultiModDouble>(F, A.rowdim(), A.coldim());
for (size_t i=0; i<F.size();++i)
MatrixHom::map(Ap.getMatrix(i), A, F.getBase(i));
}
};
template< class IMatrix>
- class BlasBlackboxMAP<MultiModDouble, IMatrix, MatrixContainerCategory::Blackbox > {
+ class BlasMatrixMAP<MultiModDouble, IMatrix, MatrixContainerCategory::Blackbox > {
public:
- void operator() (BlasBlackbox<MultiModDouble> &Ap, const IMatrix &A, const MultiModDouble &F, MatrixContainerCategory::Blackbox type)
+ void operator() (BlasMatrix<MultiModDouble> &Ap, const IMatrix &A, const MultiModDouble &F, MatrixContainerCategory::Blackbox type)
{
- // Ap = new BlasBlackbox<MultiModDouble>(F, A.rowdim(), A.coldim());
+ // Ap = new BlasMatrix<MultiModDouble>(F, A.rowdim(), A.coldim());
for (size_t i=0; i<F.size();++i)
MatrixHom::map(Ap.getMatrix(i), A, F.getBase(i));
}
};
+#endif
}
}
#endif //__LINBOX_matrix_hom_H
+
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+
diff --git a/linbox/algorithms/matrix-inverse.h b/linbox/algorithms/matrix-inverse.h
index 70c3969..9d537d6 100644
--- a/linbox/algorithms/matrix-inverse.h
+++ b/linbox/algorithms/matrix-inverse.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2003 LinBox
* Written by Zhendong Wan
*
@@ -7,10 +5,13 @@
* put the Field as template parameter
* and add Field F as a parameter
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,17 +19,17 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_matrix_inverse_H
#define __LINBOX_matrix_inverse_H
-#include <linbox/util/debug.h>
-#include <linbox/util/error.h>
+#include "linbox/util/debug.h"
+#include "linbox/util/error.h"
#include <vector>
#include <algorithm>
@@ -43,24 +44,24 @@ namespace LinBox
* It returns 0, if an inverse is found, and
* returns 1, otherwise.
*/
- template<class Field, class DenseMatrix>
- static long matrixInverseIn(const Field& F, DenseMatrix& A)
+ template<class Field, class AnyDenseMatrix>
+ static long matrixInverseIn(const Field& F, AnyDenseMatrix& A)
{
// check if A is a square matrix
linbox_check(A.rowdim() == A. coldim());
// PG 1/07/04
- //typedef typename DenseMatrix::Field Field;
+ //typedef typename AnyDenseMatrix::Field Field;
// step1 PLU Inplcae, actually, LPA = U.
std::vector<std::pair<int,int> > P;
P.reserve (A.rowdim());
- typename DenseMatrix::RowIterator cur_r, tmp_r;
- typename DenseMatrix::ColIterator cur_c, tmp_c;
- typename DenseMatrix::Row::iterator cur_rp, tmp_rp;
- typename DenseMatrix::Col::iterator cur_cp, tmp_cp;
+ typename AnyDenseMatrix::RowIterator cur_r, tmp_r;
+ typename AnyDenseMatrix::ColIterator cur_c, tmp_c;
+ typename AnyDenseMatrix::Row::iterator cur_rp, tmp_rp;
+ typename AnyDenseMatrix::Col::iterator cur_cp, tmp_cp;
std::vector<typename Field::Element> tmp_v (A.rowdim());
@@ -123,7 +124,7 @@ namespace LinBox
//second compute inverse of A.
- DenseMatrix tmp(A);
+ AnyDenseMatrix tmp(A);
//2a compute inverse of PA, by solving upper-triangeular system, PA = U^{-1} L.
@@ -146,8 +147,10 @@ namespace LinBox
//matrix is indexed by 0, instead of 1.
- for (cur_cp = cur_c -> begin() + (A.rowdim() - 1), tmp_r = tmp.rowBegin() + ( A.rowdim() - 1);
- cur_cp != cur_c -> begin() - 1; -- cur_cp, -- tmp_r) {
+ for (cur_cp = cur_c -> begin() + (A.rowdim() - 1),
+ tmp_r = tmp.rowBegin() + ( (int)A.rowdim() - 1);
+ cur_cp != cur_c -> begin() - 1;
+ -- cur_cp, -- tmp_r) {
F.assign (tmp_e, *cur_cp);
@@ -188,7 +191,7 @@ namespace LinBox
};
template<>
- inline long MatrixInverse::matrixInverseIn(const MultiModDouble& F, BlasBlackbox<MultiModDouble>& A) {
+ inline long MatrixInverse::matrixInverseIn(const MultiModDouble& F, BlasMatrix<MultiModDouble>& A) {
throw LinboxError("LinBox ERROR: use of MultiModDouble with too large moduli is not allowed at this time\n");
return 0;
}
@@ -197,3 +200,12 @@ namespace LinBox
#endif //__LINBOX_matrix_inverse_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/matrix-rank.h b/linbox/algorithms/matrix-rank.h
index 8069756..359adf9 100644
--- a/linbox/algorithms/matrix-rank.h
+++ b/linbox/algorithms/matrix-rank.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2003 LinBox
* Author: Zhendong Wan
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,55 +17,69 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
+/*! @file algorithms/matrix-rank.h
+ * @ingroup algorithms
+ * @ingroup rank
+ * @brief Computes the rank of a matrix by Gaussian Elimination, in place.
+ * @details NO DOC
+ */
#ifndef __LINBOX_matrix_rank_H
#define __LINBOX_matrix_rank_H
-#include <linbox/util/debug.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/blackbox/sparse.h>
-#include <linbox/solutions/rank.h>
+#include "linbox/util/debug.h"
+#include "linbox/blackbox/sparse.h"
+#include "linbox/solutions/rank.h"
-#include <linbox/algorithms/matrix-hom.h>
+#include "linbox/algorithms/matrix-hom.h"
#include <vector>
#include <algorithm>
-#include <linbox/randiter/random-prime.h>
+#include "linbox/randiter/random-prime.h"
namespace LinBox
{
/** Compute the rank of an integer matrix in place over a finite field by Gaussian elimination.
+ * @bug there is no generic \c rankIn method.
*/
template<class _Ring, class _Field, class _RandomPrime = RandomPrimeIterator>
class MatrixRank {
public:
- typedef _Ring Ring;
- typedef _Field Field;
+ typedef _Ring Ring; //!< Ring ?
+ typedef _Field Field; //!< Field ?
- Ring r;
+ Ring r; //!< Ring ?
- mutable _RandomPrime rp;
+ mutable _RandomPrime rp; //!< Holds the random prime for Monte-Carlo rank
+ /*! Constructor.
+ * @param _r ring (default is Ring)
+ * @param _rp random prime generator (default is template provided)
+ */
MatrixRank(const Ring& _r = Ring(), const _RandomPrime& _rp = _RandomPrime() ) :
r(_r), rp (_rp)
{}
~MatrixRank() {}
- //compute the integer matrix A by modulo a random prime, Monto-Carlo
+ /*!compute the integer matrix A by modulo a random prime, Monto-Carlo.
+ * This is the generic method (mapping to a random modular matrix).
+ * @param A Any matrix
+ * @return the rank of A.
+ */
template<class IMatrix>
long rank(const IMatrix& A) const
{
- Field F (*rp);
+ Field F ((unsigned long)*rp);
- DenseMatrix<Field> Ap(F, A.rowdim(), A.coldim());
+ BlasMatrix<Field> Ap(F, A.rowdim(), A.coldim());
MatrixHom::map(Ap, A, F);
@@ -75,41 +90,66 @@ namespace LinBox
return result;
}
- template <class Row>
- long rank(const SparseMatrix<Ring, Row>& A) const
+ /*!Specialisation for BlasMatrix.
+ * Computation done by mapping to a random modular matrix.
+ * @param A Any dense matrix
+ * @return the rank of A.
+ * @bug we suppose we can map IRing to Field...
+ */
+ template<class IRing>
+ long rank(const BlasMatrix<IRing>& A) const
{
- Field F (*rp);
- typename SparseMatrix<Ring, Row>::template rebind<Field>::other Ap(A, F);
+ Field F ((unsigned long)*rp);
+ //! bug the following should work :
+ // BlasMatrix<Field> Ap(F,A);
+ BlasMatrix<Field> Ap(F, A.rowdim(), A.coldim());
+
+ MatrixHom::map(Ap, A, F);
+
+
long result;
- result = rankIn (Ap);
+
+ result = rankIn(Ap);
+
return result;
}
- template<class Field, class Row>
- long rankIn(SparseMatrix<Field, Row>& A) const
+ /*! Specialisation for SparseMatrix
+ * Computation done by mapping to a random modular matrix.
+ * @param A Any sparse matrix
+ * @return the rank of A.
+ * @bug we suppose we can map IRing to Field...
+ */
+ template <class Row>
+ long rank(const SparseMatrix<Ring, Row>& A) const
{
- unsigned long result;
-
- LinBox::rank(result, A, A.field());
-
+ Field F (*rp);
+ typename SparseMatrix<Ring, Row>::template rebind<Field>::other Ap(A, F);
+ long result;
+ result = rankIn (Ap);
return result;
}
- // compute rank by Gauss Elimination
- long rankIn(DenseMatrix<Field>& Ap) const
+ /*! Specialisation for BlasMatrix (in place).
+ * Generic (slow) elimination code.
+ * @param A a dense matrix
+ * @return its rank
+ * @warning The matrix is on the Field !!!!!!!
+ */
+ long rankIn(BlasMatrix<Field>& Ap) const
{
typedef typename Field::Element Element;
Field F = Ap.field();
- typename DenseMatrix<Field>::RowIterator cur_r, tmp_r;
- typename DenseMatrix<Field>::ColIterator cur_c, tmp_c;
- typename DenseMatrix<Field>::Row::iterator cur_rp, tmp_rp;
- typename DenseMatrix<Field>::Col::iterator tmp_cp;
+ typename BlasMatrix<Field>::RowIterator cur_r, tmp_r;
+ typename BlasMatrix<Field>::ColIterator cur_c, tmp_c;
+ typename BlasMatrix<Field>::Row::iterator cur_rp, tmp_rp;
+ typename BlasMatrix<Field>::Col::iterator tmp_cp;
Element tmp_e;
@@ -119,7 +159,7 @@ namespace LinBox
int offset_c = 0;
- int r = 0;
+ int R = 0;
for(cur_r = Ap. rowBegin(), cur_c = Ap. colBegin(); (cur_r != Ap. rowEnd())&&(cur_c != Ap.colEnd());) {
@@ -172,11 +212,28 @@ namespace LinBox
++ cur_c;
++ offset_r;
++ offset_c;
- ++ r;
+ ++ R;
}
- return r;
+ return R;
+ }
+
+ /** Specialisation for SparseMatrix, in place.
+ * solution rank is called. (is Elimination guaranteed as the doc says above ?)
+ * @param A a sparse matrix
+ * @return its rank
+ */
+ template<class Field, class Row>
+ long rankIn(SparseMatrix<Field, Row>& A) const
+ {
+
+ unsigned long result;
+
+ LinBox::rank(result, A, A.field());
+
+ return result;
}
+
};
@@ -185,3 +242,12 @@ namespace LinBox
#endif //__LINBOX_matrix_rank_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/mg-block-lanczos.h b/linbox/algorithms/mg-block-lanczos.h
index b75b094..c65b900 100644
--- a/linbox/algorithms/mg-block-lanczos.h
+++ b/linbox/algorithms/mg-block-lanczos.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/mg-block-lanczos.h
* Copyright (C) 2002 Bradford Hovinen
@@ -8,9 +6,24 @@
*
* --------------------------------------------
*
- * Licensed under the GNU Lesser General Public License. See COPYING for
- * details.
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
* Class definitions for block Lanczos iteration
*/
@@ -18,25 +31,18 @@
#define __LINBOX_mg_block_lanczos_H
#include "linbox/linbox-config.h"
-#undef _T
+#undef _matT
#include <vector>
#include "linbox/field/archetype.h"
#include "linbox/vector/vector-domain.h"
#include "linbox/blackbox/archetype.h"
-#include "linbox/blackbox/dense.h"
-#include "linbox/matrix/dense-submatrix.h"
#include "linbox/solutions/methods.h"
// I'm putting everything inside the LinBox namespace so that I can drop all of
// this in to LinBox easily at a later date, without any messy porting.
-// Fix for Solaris wierdness
-#undef _S
-#undef _M
-#undef _N
-
namespace LinBox
{
@@ -56,7 +62,7 @@ namespace LinBox
* Currently, only dense vectors are supported for this iteration, and it is
* unlikely any other vector archetypes will be supported in the future.
*/
- template <class Field, class Matrix = DenseMatrixBase<typename Field::Element> >
+ template <class Field, class Matrix = BlasMatrix<typename Field::Element> >
class MGBlockLanczosSolver {
public:
@@ -68,10 +74,10 @@ namespace LinBox
* options for the solver
*/
MGBlockLanczosSolver (const Field &F, const BlockLanczosTraits &traits) :
- _traits (traits), _F (F), _VD (F), _MD (F), _randiter (F), _N (traits.blockingFactor ())
+ _traits (traits), _field (F), _VD (F), _MD (F), _randiter (F), _block (traits.blockingFactor ())
{
init_temps ();
- _F.init (_one, 1);
+ _field.init (_one, 1);
}
/** Constructor with a random iterator
@@ -81,10 +87,10 @@ namespace LinBox
* @param r Random iterator to use for randomization
*/
MGBlockLanczosSolver (const Field &F, const BlockLanczosTraits &traits, typename Field::RandIter r) :
- _traits (traits), _F (F), _VD (F), _MD (F), _randiter (r), _N (traits.blockingFactor ())
+ _traits (traits), _field (F), _VD (F), _MD (F), _randiter (r), _block (traits.blockingFactor ())
{
init_temps ();
- _F.init (_one, 1);
+ _field.init (_one, 1);
}
/** Solve the linear system Ax = b.
@@ -215,21 +221,21 @@ namespace LinBox
// Private variables
const BlockLanczosTraits _traits;
- const Field &_F;
+ const Field &_field;
VectorDomain<Field> _VD;
MatrixDomain<Field> _MD;
typename Field::RandIter _randiter;
// Temporaries used in the computation
- Matrix _V[3]; // n x N
+ Matrix _matV[3]; // n x N
Matrix _AV; // n x N
Matrix _VTAV; // N x N
Matrix _Winv[2]; // N x N
Matrix _AVTAVSST_VTAV; // N x N
- Matrix _T; // N x N
+ Matrix _matT; // N x N
Matrix _DEF; // N x N
- std::vector<bool> _S; // N-vector of bools
+ std::vector<bool> _vecS; // N-vector of bools
Matrix _x; // n x <=N
Matrix _y; // n x <=N
@@ -242,11 +248,11 @@ namespace LinBox
std::vector<size_t> _indices; // N
- mutable Matrix _M; // N x 2N
+ mutable Matrix _matM; // N x 2N
// Blocking factor
- size_t _N;
+ size_t _block;
// Construct a transpose matrix on the fly
template <class Matrix1>
@@ -279,3 +285,12 @@ namespace LinBox
#include "linbox/algorithms/mg-block-lanczos.inl"
#endif // __LINBOX_mg_block_lanczos_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/mg-block-lanczos.inl b/linbox/algorithms/mg-block-lanczos.inl
index 3df6297..8a5566a 100644
--- a/linbox/algorithms/mg-block-lanczos.inl
+++ b/linbox/algorithms/mg-block-lanczos.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/mg-block-lanczos.inl
* Copyright (C) 2002 Bradford Hovinen
@@ -7,9 +5,23 @@
* Written by Bradford Hovinen <bghovinen at math.waterloo.ca>
*
* --------------------------------------------
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * Licensed under the GNU Lesser General Public License. See COPYING for
- * details.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*
* Function definitions for block Lanczos iteration
*/
@@ -18,13 +30,11 @@
#define __LINBOX_mg_block_lanczos_INL
#include "linbox/linbox-config.h"
-#undef _T
#include <iostream>
#include "linbox/util/debug.h"
#include "linbox/solutions/methods.h"
-#include "linbox/matrix/dense-submatrix.h"
#include "linbox/blackbox/diagonal.h"
#include "linbox/blackbox/compose.h"
#include "linbox/blackbox/transpose.h"
@@ -66,7 +76,7 @@ namespace LinBox
void checkAConjugacy (const MatrixDomain<Field> &MD, const Matrix &AV, const Matrix &V, Matrix &T,
size_t AV_iter, size_t V_iter)
{
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Checking whether V_" << V_iter << " is A-conjugate to V_" << AV_iter << "...";
@@ -77,7 +87,7 @@ namespace LinBox
else {
report << "no" << std::endl;
- std::ostream &err_report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR);
+ std::ostream &err_report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR);
err_report << "ERROR: V_" << V_iter << " is not A-conjugate to V_" << AV_iter << std::endl;
err_report << "Computed V_" << V_iter << "^T AV_" << AV_iter << ":" << std::endl;
MD.write (report, T);
@@ -105,7 +115,7 @@ namespace LinBox
# define TIMER_START(part) part##_timer.start ()
# define TIMER_STOP(part) part##_timer.stop (); part##_time += part##_timer.time ()
# define TIMER_REPORT(part) \
- commentator.report (Commentator::LEVEL_NORMAL, TIMING_MEASURE) \
+ commentator().report (Commentator::LEVEL_NORMAL, TIMING_MEASURE) \
<< "Total " #part " time: " << part##_time << "s" << std::endl;
#else
# define TIMER_DECLARE(part)
@@ -123,7 +133,7 @@ namespace LinBox
linbox_check ((x.size () == A.coldim ()) &&
(b.size () == A.rowdim ()));
- commentator.start ("Solving linear system (Montgomery's block Lanczos)", "MGBlockLanczosSolver::solve");
+ commentator().start ("Solving linear system (Montgomery's block Lanczos)", "MGBlockLanczosSolver::solve");
bool success = false;
Vector d1, d2, b1, b2, bp, y, Ax, ATAx, ATb;
@@ -132,19 +142,19 @@ namespace LinBox
_b.resize (b.size (), 1);
_x.resize (x.size (), 1);
- _tmp.resize (_N, 1);
- _tmp1.resize (_N, 1);
+ _tmp.resize (_block, 1);
+ _tmp1.resize (_block, 1);
- _V[0].resize (A.coldim (), _N);
- _V[1].resize (A.coldim (), _N);
- _V[2].resize (A.coldim (), _N);
- _AV.resize (A.coldim (), _N);
+ _matV[0].resize (A.coldim (), _block);
+ _matV[1].resize (A.coldim (), _block);
+ _matV[2].resize (A.coldim (), _block);
+ _AV.resize (A.coldim (), _block);
- NonzeroRandIter<Field> real_ri (_F, _randiter);
- RandomDenseStream<Field, Vector, NonzeroRandIter<Field> > stream (_F, real_ri, A.coldim ());
+ NonzeroRandIter<Field> real_ri (_field, _randiter);
+ RandomDenseStream<Field, Vector, NonzeroRandIter<Field> > stream (_field, real_ri, A.coldim ());
for (unsigned int i = 0; !success && i < _traits.maxTries (); ++i) {
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "In try: " << i << std::endl;
switch (_traits.preconditioner ()) {
@@ -178,7 +188,7 @@ namespace LinBox
VectorWrapper::ensureDim (y, A.coldim ());
stream >> d1;
- Diagonal<Field> D (_F, d1);
+ Diagonal<Field> D (_field, d1);
Compose<Blackbox, Diagonal<Field> > B (&A, &D);
report << "Random D: ";
@@ -205,7 +215,7 @@ namespace LinBox
typedef Compose<PC2, CO1> CO2;
stream >> d1;
- PC1 D (_F, d1);
+ PC1 D (_field, d1);
PC2 AT (&A);
CO1 B1 (&D, &A);
CO2 B (&AT, &B1);
@@ -240,8 +250,8 @@ namespace LinBox
typedef Compose<PC1, CO3> CO4;
stream >> d1 >> d2;
- PC1 D1 (_F, d1);
- PC1 D2 (_F, d2);
+ PC1 D1 (_field, d1);
+ PC1 D2 (_field, d2);
PC2 AT (&A);
CO1 B1 (&A, &D1);
CO2 B2 (&D2, &B1);
@@ -282,39 +292,39 @@ namespace LinBox
VectorWrapper::ensureDim (ATAx, A.coldim ());
VectorWrapper::ensureDim (ATb, A.coldim ());
- commentator.start ("Checking whether A^T Ax = A^T b");
+ commentator().start ("Checking whether A^T Ax = A^T b");
A.apply (Ax, x);
A.applyTranspose (ATAx, Ax);
A.applyTranspose (ATb, b);
if (_VD.areEqual (ATAx, ATb)) {
- commentator.stop ("passed");
+ commentator().stop ("passed");
success = true;
}
else {
- commentator.stop ("FAILED");
+ commentator().stop ("FAILED");
success = false;
}
}
else if (_traits.checkResult ()) {
- commentator.start ("Checking whether Ax=b");
+ commentator().start ("Checking whether Ax=b");
A.apply (Ax, x);
if (_VD.areEqual (Ax, b)) {
- commentator.stop ("passed");
+ commentator().stop ("passed");
success = true;
}
else {
- commentator.stop ("FAILED");
+ commentator().stop ("FAILED");
success = false;
}
}
}
}
- commentator.stop ("done", (success ? "Solve successful" : "Solve failed"), "MGBlockLanczosSolver::solve");
+ commentator().stop ("done", (success ? "Solve successful" : "Solve failed"), "MGBlockLanczosSolver::solve");
return success;
}
@@ -325,7 +335,7 @@ namespace LinBox
{
linbox_check (x.rowdim () == A.coldim ());
- commentator.start ("Sampling from nullspace (Montgomery's block Lanczos)", "MGBlockLanczosSolver::sampleNullspace");
+ commentator().start ("Sampling from nullspace (Montgomery's block Lanczos)", "MGBlockLanczosSolver::sampleNullspace");
unsigned int number = 0;
@@ -338,28 +348,28 @@ namespace LinBox
_x.resize (x.rowdim (), x.coldim ());
_y.resize (x.rowdim (), x.coldim ());
- _tmp.resize (_N, x.coldim ());
- _tmp1.resize (_N, x.coldim ());
+ _tmp.resize (_block, x.coldim ());
+ _tmp1.resize (_block, x.coldim ());
- _V[0].resize (A.coldim (), _N);
- _V[1].resize (A.coldim (), _N);
- _V[2].resize (A.coldim (), _N);
- _AV.resize (A.coldim (), _N);
+ _matV[0].resize (A.coldim (), _block);
+ _matV[1].resize (A.coldim (), _block);
+ _matV[2].resize (A.coldim (), _block);
+ _AV.resize (A.coldim (), _block);
typename Matrix::ColIterator xi = x.colBegin ();
- NonzeroRandIter<Field> real_ri (_F, _randiter);
- RandomDenseStream<Field, typename LinBox::Vector<Field>::Dense, NonzeroRandIter<Field> > d_stream (_F, real_ri, A.coldim ());
+ NonzeroRandIter<Field> real_ri (_field, _randiter);
+ RandomDenseStream<Field, typename LinBox::Vector<Field>::Dense, NonzeroRandIter<Field> > d_stream (_field, real_ri, A.coldim ());
TransposeMatrix<Matrix> bT (_b);
TransposeMatrix<Matrix> xT (_x);
for ( unsigned int i = 0; number < x.coldim () && i < _traits.maxTries (); ++i) {
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "in try: " << i << std::endl;
// Fill y with random data
- RandomDenseStream<Field, typename Matrix::Col> stream (_F, _randiter, A.coldim ());
+ RandomDenseStream<Field, typename Matrix::Col> stream (_field, _randiter, A.coldim ());
typename Matrix::ColIterator iter;
for (iter = _y.colBegin (); iter != _y.colEnd (); ++iter)
@@ -390,7 +400,7 @@ namespace LinBox
VectorWrapper::ensureDim (d1, A.coldim ());
d_stream >> d1;
- Diagonal<Field> D (_F, d1);
+ Diagonal<Field> D (_field, d1);
Compose<Blackbox, Diagonal<Field> > B (&A, &D);
report << "Random D: ";
@@ -414,7 +424,7 @@ namespace LinBox
typedef Compose<PC2, CO1> CO2;
d_stream >> d1;
- PC1 D (_F, d1);
+ PC1 D (_field, d1);
PC2 AT (&A);
CO1 B1 (&D, &A);
CO2 B (&AT, &B1);
@@ -443,8 +453,8 @@ namespace LinBox
typedef Compose<PC1, CO3> CO4;
d_stream >> d1 >> d2;
- PC1 D1 (_F, d1);
- PC1 D2 (_F, d2);
+ PC1 D1 (_field, d1);
+ PC1 D2 (_field, d2);
PC2 AT (&A);
CO1 B1 (&A, &D1);
CO2 B2 (&D2, &B1);
@@ -492,7 +502,7 @@ namespace LinBox
}
}
- commentator.stop ("done", NULL, "MGBlockLanczosSolver::sampleNullspace");
+ commentator().stop ("done", NULL, "MGBlockLanczosSolver::sampleNullspace");
return number;
}
@@ -501,13 +511,13 @@ namespace LinBox
template <class Blackbox>
inline bool MGBlockLanczosSolver<Field, Matrix>::iterate (const Blackbox &A)
{
- linbox_check (_V[0].rowdim () == A.rowdim ());
- linbox_check (_V[1].rowdim () == A.rowdim ());
- linbox_check (_V[2].rowdim () == A.rowdim ());
- linbox_check (_V[0].coldim () == _V[1].coldim ());
- linbox_check (_V[0].coldim () == _V[2].coldim ());
+ linbox_check (_matV[0].rowdim () == A.rowdim ());
+ linbox_check (_matV[1].rowdim () == A.rowdim ());
+ linbox_check (_matV[2].rowdim () == A.rowdim ());
+ linbox_check (_matV[0].coldim () == _matV[1].coldim ());
+ linbox_check (_matV[0].coldim () == _matV[2].coldim ());
- commentator.start ("Block Lanczos iteration", "MGBlockLanczosSolver::iterate", A.rowdim ());
+ commentator().start ("Block Lanczos iteration", "MGBlockLanczosSolver::iterate", A.rowdim ());
size_t Ni;
size_t total_dim = 0;
@@ -515,7 +525,7 @@ namespace LinBox
bool ret = true, done = false;
// How many iterations between each progress update
- unsigned int progress_interval = A.rowdim () / _traits.blockingFactor () / 100;
+ unsigned int progress_interval = (unsigned int) (A.rowdim () / _traits.blockingFactor () / 100);
// Make sure there are a minimum of ten
if (progress_interval == 0)
@@ -534,33 +544,33 @@ namespace LinBox
TIMER_DECLARE(orthogonalization);
TIMER_DECLARE(terminationCheck);
- // Get a random fat vector _V[0]
- RandomDenseStream<Field, typename Matrix::Col> stream (_F, _randiter, A.coldim ());
+ // Get a random fat vector _matV[0]
+ RandomDenseStream<Field, typename Matrix::Col> stream (_field, _randiter, A.coldim ());
- for (k = _V[0].colBegin (); k != _V[0].colEnd (); ++k)
+ for (k = _matV[0].colBegin (); k != _matV[0].colEnd (); ++k)
stream >> *k;
TIMER_START(AV);
- _MD.blackboxMulLeft (_AV, A, _V[0]);
+ _MD.blackboxMulLeft (_AV, A, _matV[0]);
TIMER_STOP(AV);
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
// Initialize S_-1 to IN
- std::fill (_S.begin (), _S.end (), true);
+ std::fill (_vecS.begin (), _vecS.end (), true);
// Iteration 1
TIMER_START(innerProducts);
- _MD.mul (_VTAV, transpose (_V[0]), _AV);
+ _MD.mul (_VTAV, transpose (_matV[0]), _AV);
TIMER_STOP(innerProducts);
TIMER_START(Winv);
- Ni = compute_Winv_S (_Winv[0], _S, _VTAV);
+ Ni = compute_Winv_S (_Winv[0], _vecS, _VTAV);
TIMER_STOP(Winv);
// Check for catastrophic breakdown
if (Ni == 0) {
- commentator.stop ("breakdown", NULL, "MGBlockLanczosSolver::iterate");
+ commentator().stop ("breakdown", NULL, "MGBlockLanczosSolver::iterate");
return false;
}
@@ -575,27 +585,27 @@ namespace LinBox
TransposeMatrix<Matrix> tmp1T (_tmp1);
TIMER_START(solution);
- mul (tmpT, transpose (_b), _V[0], _S);
+ mul (tmpT, transpose (_b), _matV[0], _vecS);
_MD.mul (_tmp1, _Winv[0], _tmp);
- mul_SST (tmp1T, tmp1T, _S);
- _MD.mul (_x, _V[0], _tmp1);
+ mul_SST (tmp1T, tmp1T, _vecS);
+ _MD.mul (_x, _matV[0], _tmp1);
TIMER_STOP(solution);
TIMER_START(Vnext);
- mul_SST (_V[1], _AV, _S);
+ mul_SST (_matV[1], _AV, _vecS);
TIMER_STOP(Vnext);
TIMER_START(innerProducts);
- mul (_AVTAVSST_VTAV, transpose (_AV), _AV, _S);
+ mul (_AVTAVSST_VTAV, transpose (_AV), _AV, _vecS);
TIMER_STOP(innerProducts);
- // MGBLTraceReport (report, _MD, "V", 0, _V[0]);
+ // MGBLTraceReport (report, _MD, "V", 0, _matV[0]);
// MGBLTraceReport (report, _MD, "AV", 0, _AV);
MGBLTraceReport (report, _MD, "V^T A V", 0, _VTAV);
MGBLTraceReport (report, _MD, "Winv", 0, _Winv[0]);
- reportS (report, _S, 0);
+ reportS (report, _vecS, 0);
// MGBLTraceReport (report, _MD, "x", 0, _x);
- MGBLTraceReport (report, _MD, "AVSS^T", 0, _V[1]);
+ MGBLTraceReport (report, _MD, "AVSS^T", 0, _matV[1]);
MGBLTraceReport (report, _MD, "V^T A^2 V", 0, _AVTAVSST_VTAV);
TIMER_START(orthogonalization);
@@ -603,26 +613,26 @@ namespace LinBox
_MD.mul (_DEF, _Winv[0], _AVTAVSST_VTAV);
addIN (_DEF);
- _MD.axpyin (_V[1], _V[0], _DEF);
+ _MD.axpyin (_matV[1], _matV[0], _DEF);
TIMER_START(orthogonalization);
MGBLTraceReport (report, _MD, "D", 1, _DEF);
- // MGBLTraceReport (report, _MD, "V", 1, _V[1]);
- checkAConjugacy (_MD, _AV, _V[1], _DEF, 0, 1);
+ // MGBLTraceReport (report, _MD, "V", 1, _matV[1]);
+ checkAConjugacy (_MD, _AV, _matV[1], _DEF, 0, 1);
TIMER_START(terminationCheck);
- done = _MD.isZero (_V[1]);
+ done = _MD.isZero (_matV[1]);
TIMER_STOP(terminationCheck);
if (done) {
- commentator.stop ("done", NULL, "MGBlockLanczosSolver::iterate");
+ commentator().stop ("done", NULL, "MGBlockLanczosSolver::iterate");
return true;
}
// Iteration 2
TIMER_START(AV);
- _MD.blackboxMulLeft (_AV, A, _V[1]);
+ _MD.blackboxMulLeft (_AV, A, _matV[1]);
TIMER_STOP(AV);
#ifdef MGBL_DETAILED_TRACE
@@ -632,16 +642,16 @@ namespace LinBox
#endif
TIMER_START(innerProducts);
- _MD.mul (_VTAV, transpose (_V[1]), _AV);
+ _MD.mul (_VTAV, transpose (_matV[1]), _AV);
TIMER_STOP(innerProducts);
TIMER_START(Winv);
- Ni = compute_Winv_S (_Winv[1], _S, _VTAV);
+ Ni = compute_Winv_S (_Winv[1], _vecS, _VTAV);
TIMER_STOP(Winv);
// Check for catastrophic breakdown
if (Ni == 0) {
- commentator.stop ("breakdown", NULL, "MGBlockLanczosSolver::iterate");
+ commentator().stop ("breakdown", NULL, "MGBlockLanczosSolver::iterate");
return false;
}
@@ -653,24 +663,24 @@ namespace LinBox
#endif
TIMER_START(solution);
- mul (tmpT, transpose (_b), _V[1], _S);
+ mul (tmpT, transpose (_b), _matV[1], _vecS);
_MD.mul (_tmp1, _Winv[1], _tmp);
- mul_SST (tmp1T, tmp1T, _S);
- _MD.axpyin (_x, _V[1], _tmp1);
+ mul_SST (tmp1T, tmp1T, _vecS);
+ _MD.axpyin (_x, _matV[1], _tmp1);
TIMER_STOP(solution);
TIMER_START(Vnext);
- mul_SST (_V[2], _AV, _S);
+ mul_SST (_matV[2], _AV, _vecS);
TIMER_STOP(Vnext);
TIMER_START(innerProducts);
- mul (_AVTAVSST_VTAV, transpose (_AV), _AV, _S);
+ mul (_AVTAVSST_VTAV, transpose (_AV), _AV, _vecS);
TIMER_STOP(innerProducts);
// MGBLTraceReport (report, _MD, "AV", 1, _AV);
MGBLTraceReport (report, _MD, "V^T A V", 1, _VTAV);
MGBLTraceReport (report, _MD, "Winv", 1, _Winv[1]);
- reportS (report, _S, 1);
+ reportS (report, _vecS, 1);
// MGBLTraceReport (report, _MD, "x", 1, _x);
MGBLTraceReport (report, _MD, "V^T A^2 V", 1, _AVTAVSST_VTAV);
@@ -678,23 +688,23 @@ namespace LinBox
_MD.addin (_AVTAVSST_VTAV, _VTAV);
_MD.mul (_DEF, _Winv[1], _AVTAVSST_VTAV);
addIN (_DEF);
- _MD.axpyin (_V[2], _V[1], _DEF);
+ _MD.axpyin (_matV[2], _matV[1], _DEF);
MGBLTraceReport (report, _MD, "D", 2, _DEF);
- mul (_DEF, _Winv[0], _VTAV, _S);
- _MD.axpyin (_V[2], _V[0], _DEF);
+ mul (_DEF, _Winv[0], _VTAV, _vecS);
+ _MD.axpyin (_matV[2], _matV[0], _DEF);
TIMER_STOP(orthogonalization);
MGBLTraceReport (report, _MD, "E", 2, _DEF);
- // MGBLTraceReport (report, _MD, "V", 2, _V[2]);
+ // MGBLTraceReport (report, _MD, "V", 2, _matV[2]);
- checkAConjugacy (_MD, _AV, _V[2], _DEF, 1, 2);
+ checkAConjugacy (_MD, _AV, _matV[2], _DEF, 1, 2);
// Now we're ready to begin the real iteration
while (1) {
TIMER_START(terminationCheck);
- done = _MD.isZero (_V[j]);
+ done = _MD.isZero (_matV[j]);
TIMER_STOP(terminationCheck);
if (done) break;
@@ -703,7 +713,7 @@ namespace LinBox
if (next_j > 2) next_j = 0;
TIMER_START(AV);
- _MD.blackboxMulLeft (_AV, A, _V[j]);
+ _MD.blackboxMulLeft (_AV, A, _matV[j]);
TIMER_STOP(AV);
// First compute F_i+1, where we use Winv_i-2; then Winv_i and
@@ -712,19 +722,19 @@ namespace LinBox
// _DEF
TIMER_START(orthogonalization);
- _MD.mul (_T, _VTAV, _Winv[1 - i]);
- addIN (_T);
- _MD.mul (_DEF, _Winv[i], _T);
+ _MD.mul (_matT, _VTAV, _Winv[1 - i]);
+ addIN (_matT);
+ _MD.mul (_DEF, _Winv[i], _matT);
_MD.mulin (_DEF, _AVTAVSST_VTAV);
TIMER_STOP(orthogonalization);
// Now get the next VTAV, Winv, and S_i
TIMER_START(innerProducts);
- _MD.mul (_VTAV, transpose (_V[j]), _AV);
+ _MD.mul (_VTAV, transpose (_matV[j]), _AV);
TIMER_STOP(innerProducts);
TIMER_START(Winv);
- Ni = compute_Winv_S (_Winv[i], _S, _VTAV);
+ Ni = compute_Winv_S (_Winv[i], _vecS, _VTAV);
TIMER_STOP(Winv);
// Check for catastrophic breakdown
@@ -744,26 +754,26 @@ namespace LinBox
MGBLTraceReport (report, _MD, "F", iter + 1, _DEF);
MGBLTraceReport (report, _MD, "V^T AV", iter, _VTAV);
MGBLTraceReport (report, _MD, "Winv", iter, _Winv[i]);
- reportS (report, _S, iter);
+ reportS (report, _vecS, iter);
// Now that we have S_i, finish off with F_i+1
TIMER_START(orthogonalization);
- mulin (_V[next_j], _DEF, _S);
+ mulin (_matV[next_j], _DEF, _vecS);
TIMER_STOP(orthogonalization);
// Update x
TIMER_START(solution);
- mul (tmpT, transpose (_b), _V[j], _S);
+ mul (tmpT, transpose (_b), _matV[j], _vecS);
_MD.mul (_tmp1, _Winv[i], _tmp);
- mul_SST (tmp1T, tmp1T, _S);
- _MD.axpyin (_x, _V[j], _tmp1);
+ mul_SST (tmp1T, tmp1T, _vecS);
+ _MD.axpyin (_x, _matV[j], _tmp1);
TIMER_STOP(solution);
// MGBLTraceReport (report, _MD, "x", iter, _x);
// Compute the next _AVTAVSST_VTAV
TIMER_START(innerProducts);
- mul (_AVTAVSST_VTAV, transpose (_AV), _AV, _S);
+ mul (_AVTAVSST_VTAV, transpose (_AV), _AV, _vecS);
TIMER_STOP(innerProducts);
MGBLTraceReport (report, _MD, "V^T A^2 V", iter, _AVTAVSST_VTAV);
@@ -774,27 +784,27 @@ namespace LinBox
// Compute D and update V_i+1
_MD.mul (_DEF, _Winv[i], _AVTAVSST_VTAV);
addIN (_DEF);
- _MD.axpyin (_V[next_j], _V[j], _DEF);
+ _MD.axpyin (_matV[next_j], _matV[j], _DEF);
MGBLTraceReport (report, _MD, "D", iter + 1, _DEF);
// Compute E and update V_i+1
- mul (_DEF, _Winv[1 - i], _VTAV, _S);
- _MD.axpyin (_V[next_j], _V[prev_j], _DEF);
+ mul (_DEF, _Winv[1 - i], _VTAV, _vecS);
+ _MD.axpyin (_matV[next_j], _matV[prev_j], _DEF);
TIMER_STOP(orthogonalization);
MGBLTraceReport (report, _MD, "E", iter + 1, _DEF);
// Add AV_i S_i S_i^T
TIMER_START(Vnext);
- addin (_V[next_j], _AV, _S);
+ addin (_matV[next_j], _AV, _vecS);
TIMER_STOP(Vnext);
- // MGBLTraceReport (report, _MD, "V", iter + 1, _V[next_j]);
- checkAConjugacy (_MD, _AV, _V[next_j], _DEF, iter, iter + 1);
+ // MGBLTraceReport (report, _MD, "V", iter + 1, _matV[next_j]);
+ checkAConjugacy (_MD, _AV, _matV[next_j], _DEF, iter, iter + 1);
#ifdef MGBL_DETAILED_TRACE
- checkAConjugacy (_MD, AV1_backup, _V[next_j], _DEF, 1, iter + 1);
+ checkAConjugacy (_MD, AV1_backup, _matV[next_j], _DEF, 1, iter + 1);
#endif
i = 1 - i;
@@ -803,12 +813,12 @@ namespace LinBox
++iter;
if (!(iter % progress_interval))
- commentator.progress (total_dim);
+ commentator().progress (total_dim);
if (total_dim > A.rowdim ()) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "Maximum number of iterations passed without termination" << std::endl;
- commentator.stop ("ERROR", NULL, "MGBlockLanczosSolver::iterate");
+ commentator().stop ("ERROR", NULL, "MGBlockLanczosSolver::iterate");
return false;
}
}
@@ -827,7 +837,7 @@ namespace LinBox
TIMER_REPORT(orthogonalization);
TIMER_REPORT(terminationCheck);
- commentator.stop (ret ? "done" : "breakdown", NULL, "MGBlockLanczosSolver::iterate");
+ commentator().stop (ret ? "done" : "breakdown", NULL, "MGBlockLanczosSolver::iterate");
return ret;
}
@@ -842,19 +852,19 @@ namespace LinBox
linbox_check (S.size () == Winv.coldim ());
linbox_check (S.size () == T.rowdim ());
linbox_check (S.size () == T.coldim ());
- linbox_check (S.size () == _M.rowdim ());
- linbox_check (S.size () * 2 == _M.coldim ());
+ linbox_check (S.size () == _matM.rowdim ());
+ linbox_check (S.size () * 2 == _matM.coldim ());
#ifdef MGBL_DETAILED_TRACE
- commentator.start ("Computing Winv and S", "MGBlockLanczosSolver::compute_Winv_S", S.size ());
+ commentator().start ("Computing Winv and S", "MGBlockLanczosSolver::compute_Winv_S", S.size ());
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Input T:" << std::endl;
_MD.write (report, T);
#endif
- DenseSubmatrix<Element> M1 (_M, 0, 0, T.rowdim (), T.coldim ());
- DenseSubmatrix<Element> M2 (_M, 0, T.coldim (), T.rowdim (), T.coldim ());
+ BlasMatrix<Field> M1 (_matM, 0, 0, T.rowdim (), T.coldim ());
+ BlasMatrix<Field> M2 (_matM, 0, T.coldim (), T.rowdim (), T.coldim ());
_MD.copy (M1, T);
setIN (M2);
@@ -869,16 +879,16 @@ namespace LinBox
for (row = 0; row < S.size (); ++row) {
#ifdef MGBL_DETAILED_TRACE
if (!(row & ((1 << 10) - 1)))
- commentator.progress (row);
+ commentator().progress (row);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Iteration " << row << ": Matrix M = " << std::endl;
- _MD.write (report, _M);
+ _MD.write (report, _matM);
#endif
- if (find_pivot_row (_M, row, 0, _indices)) {
+ if (find_pivot_row (_matM, row, 0, _indices)) {
#ifdef MGBL_DETAILED_TRACE
- commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION)
<< "Pivot found for column " << _indices[row] << std::endl;
#endif
@@ -887,17 +897,17 @@ namespace LinBox
S[_indices[row]] = true; // Use column j of V_i in W_i
// Give the (j, j) entry unity
- _F.inv (Mjj_inv, _M.getEntry (_indices[row], _indices[row]));
- _VD.mulin (*(_M.rowBegin () + _indices[row]), Mjj_inv);
+ _field.inv (Mjj_inv, _matM.getEntry (_indices[row], _indices[row]));
+ _VD.mulin (*(_matM.rowBegin () + (int)_indices[row]), Mjj_inv);
// Zero the rest of the column j
- eliminate_col (_M, row, 0, _indices, Mjj_inv);
+ eliminate_col (_matM, row, 0, _indices, Mjj_inv);
++Ni;
}
else {
#ifdef MGBL_DETAILED_TRACE
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "No pivot found for column " << _indices[row] << std::endl;
#endif
@@ -905,17 +915,17 @@ namespace LinBox
S[_indices[row]] = false; // Skip column j
- find_pivot_row (_M, row, _N, _indices);
+ find_pivot_row (_matM, row, (int)_block, _indices);
- const typename Field::Element &Mjj = _M.refEntry (_indices[row], _indices[row] + _N);
+ const typename Field::Element &Mjj = _matM.refEntry (_indices[row], _indices[row] + _block);
- linbox_check (!_F.isZero (Mjj));
+ linbox_check (!_field.isZero (Mjj));
// Zero the rest of the column j + N
- eliminate_col (_M, row, _N, _indices, _F.inv (Mjj_inv, Mjj));
+ eliminate_col (_matM, row, (int)_block, _indices, _field.inv (Mjj_inv, Mjj));
// Zero row j
- _VD.subin (*(_M.rowBegin () + _indices[row]), *(_M.rowBegin () + _indices[row]));
+ _VD.subin (*(_matM.rowBegin () + (int)_indices[row]), *(_matM.rowBegin () + (int)_indices[row]));
}
}
@@ -925,10 +935,10 @@ namespace LinBox
report << "Computed Winv:" << std::endl;
_MD.write (report, Winv);
- commentator.stop ("done", NULL, "MGBlockLanczosSolver::compute_Winv_S");
+ commentator().stop ("done", NULL, "MGBlockLanczosSolver::compute_Winv_S");
#endif
- return Ni;
+ return (int)Ni;
}
template <class Field, class Matrix>
@@ -1018,7 +1028,7 @@ namespace LinBox
if (*l)
_VD.dot (*k, *i, *j);
else
- _F.subin (*k, *k);
+ _field.subin (*k, *k);
}
_VD.copy (*i, tmp);
@@ -1083,7 +1093,7 @@ namespace LinBox
size_t idx = 0;
for (i = A.rowBegin (); i != A.rowEnd (); ++i, ++idx)
- _F.addin ((*i)[idx], _one);
+ _field.addin ((*i)[idx], _one);
return A;
}
@@ -1143,7 +1153,7 @@ namespace LinBox
for (i = A.rowBegin (), i_idx = 0; i != A.rowEnd (); ++i, ++i_idx) {
_VD.subin (*i, *i);
- _F.assign ((*i)[i_idx], _one);
+ _field.assign ((*i)[i_idx], _one);
}
return A;
@@ -1167,13 +1177,13 @@ namespace LinBox
typename Matrix::Col col_vec;
typename Matrix::Row row_vec;
- col_vec = *(_M.colBegin () + indices[row] + col_offset);
- row_vec = *(_M.rowBegin () + indices[row]);
+ col_vec = *(_matM.colBegin () + (int)indices[row] + col_offset);
+ row_vec = *(_matM.rowBegin () + (int)indices[row]);
for (idx = row; idx < A.rowdim (); ++idx) {
- if (!_F.isZero (A.getEntry (indices[idx], indices[row] + col_offset))) {
+ if (!_field.isZero (A.getEntry (indices[idx], indices[row] + col_offset))) {
if (idx != row) {
- typename Matrix::Row row1 = *(A.rowBegin () + indices[idx]);
+ typename Matrix::Row row1 = *(A.rowBegin () + (int)indices[idx]);
std::swap_ranges (row_vec.begin (), row_vec.end (), row1.begin ());
}
@@ -1195,38 +1205,38 @@ namespace LinBox
// I'm assuming everything left of the column with the index of the pivot row is 0
size_t row;
- typename DenseSubmatrix<Element>::Row pivot_row;
+ typename BlasMatrix<Field>::Row pivot_row;
typename Field::Element p;
- pivot_row = *(A.rowBegin () + indices[pivot]);
+ pivot_row = *(A.rowBegin () + (int)indices[pivot]);
for (row = 0; row < pivot; ++row) {
const typename Field::Element &Aij = A.getEntry (indices[row], indices[pivot] + col_offset);
- if (!_F.isZero (Aij))
- _VD.axpyin (*(A.rowBegin () + indices[row]), _F.neg (p, Aij), pivot_row);
+ if (!_field.isZero (Aij))
+ _VD.axpyin (*(A.rowBegin () +(int) indices[row]), _field.neg (p, Aij), pivot_row);
}
for (++row; row < A.rowdim (); ++row) {
const typename Field::Element &Aij = A.getEntry (indices[row], indices[pivot] + col_offset);
- if (!_F.isZero (Aij))
- _VD.axpyin (*(A.rowBegin () + indices[row]), _F.neg (p, Aij), pivot_row);
+ if (!_field.isZero (Aij))
+ _VD.axpyin (*(A.rowBegin () + (int) indices[row]), _field.neg (p, Aij), pivot_row);
}
}
template <class Field, class Matrix>
inline void MGBlockLanczosSolver<Field, Matrix>::init_temps ()
{
- _VTAV.resize (_N, _N);
- _Winv[0].resize (_N, _N);
- _Winv[1].resize (_N, _N);
- _AVTAVSST_VTAV.resize (_N, _N);
- _T.resize (_N, _N);
- _DEF.resize (_N, _N);
- _S.resize (_N);
- _M.resize (_N, 2 * _N);
- _indices.resize (_N);
+ _VTAV.resize (_block, _block);
+ _Winv[0].resize (_block, _block);
+ _Winv[1].resize (_block, _block);
+ _AVTAVSST_VTAV.resize (_block, _block);
+ _matT.resize (_block, _block);
+ _DEF.resize (_block, _block);
+ _vecS.resize (_block);
+ _matM.resize (_block, 2 * _block);
+ _indices.resize (_block);
}
// Check whether the given matrix is "almost" the identity, i.e. the identity
@@ -1240,19 +1250,19 @@ namespace LinBox
typename Field::Element neg_one;
- _F.init (neg_one, -1);
+ _field.init (neg_one, -1);
size_t i, j;
for (i = 0; i < M.rowdim (); ++i) {
for (j = 0; j < M.coldim (); ++j) {
- if (i != j && !_F.isZero (M.getEntry (i, j))) {
- if (!_F.isZero (M.getEntry (i, i))) {
+ if (i != j && !_field.isZero (M.getEntry (i, j))) {
+ if (!_field.isZero (M.getEntry (i, i))) {
typename Matrix::ConstRowIterator row = M.rowBegin () + j;
if (!_VD.isZero (*row))
return false;
}
- else if (!_F.isZero (M.getEntry (j, j))) {
+ else if (!_field.isZero (M.getEntry (j, j))) {
typename Matrix::ConstColIterator col = M.colBegin () + i;
if (!_VD.isZero (*col))
return false;
@@ -1260,7 +1270,7 @@ namespace LinBox
else
return false;
}
- else if (!_F.isZero (M.getEntry (i, j)) && !_F.areEqual (M.getEntry (i, j), neg_one))
+ else if (!_field.isZero (M.getEntry (i, j)) && !_field.areEqual (M.getEntry (i, j), neg_one))
return false;
}
}
@@ -1281,7 +1291,7 @@ namespace LinBox
template <class Field, class Matrix>
inline bool MGBlockLanczosSolver<Field, Matrix>::test_compute_Winv_S_mul (int n) const
{
- commentator.start ("Testing compute_Winv_S, mul, addIN, and isZero", "test_compute_Winv_S_mul");
+ commentator().start ("Testing compute_Winv_S, mul, addIN, and isZero", "test_compute_Winv_S_mul");
Matrix A (n, n);
Matrix AT (n, n);
@@ -1292,7 +1302,7 @@ namespace LinBox
bool ret = true;
- RandomDenseStream<Field, typename Matrix::Row> stream (_F, _randiter, n);
+ RandomDenseStream<Field, typename Matrix::Row> stream (_field, _randiter, n);
typename Matrix::RowIterator i = A.rowBegin ();
typename Matrix::ColIterator j = AT.colBegin ();
@@ -1305,7 +1315,7 @@ namespace LinBox
_MD.mul (ATA, AT, A);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Computed A^T A:" << std::endl;
_MD.write (report, ATA);
@@ -1321,7 +1331,7 @@ namespace LinBox
_MD.write (report, WA);
if (!isAlmostIdentity (WA)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: WA^T A != I" << std::endl;
ret = false;
}
@@ -1334,12 +1344,12 @@ namespace LinBox
_MD.write (report, WA);
if (!isAlmostIdentity (WA)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: A^T AW != I" << std::endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), NULL, "test_compute_Winv_S_mul");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_compute_Winv_S_mul");
return ret;
}
@@ -1349,7 +1359,7 @@ namespace LinBox
template <class Field, class Matrix>
inline bool MGBlockLanczosSolver<Field, Matrix>::test_compute_Winv_S_mulin (int n) const
{
- commentator.start ("Testing compute_Winv_S, copy, mulin, addIN, and isZero", "test_compute_Winv_S_mulin");
+ commentator().start ("Testing compute_Winv_S, copy, mulin, addIN, and isZero", "test_compute_Winv_S_mulin");
Matrix A (n, n);
Matrix AT (n, n);
@@ -1360,7 +1370,7 @@ namespace LinBox
bool ret = true;
- RandomDenseStream<Field, typename Matrix::Row> stream (_F, _randiter, n);
+ RandomDenseStream<Field, typename Matrix::Row> stream (_field, _randiter, n);
typename Matrix::RowIterator i = A.rowBegin ();
typename Matrix::ColIterator j = AT.colBegin ();
@@ -1373,7 +1383,7 @@ namespace LinBox
_MD.mul (ATA, AT, A);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Computed A^T A:" << std::endl;
_MD.write (report, ATA);
@@ -1391,7 +1401,7 @@ namespace LinBox
_MD.write (report, WA);
if (!isAlmostIdentity (WA)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: WA^T A != I" << std::endl;
ret = false;
}
@@ -1406,12 +1416,12 @@ namespace LinBox
_MD.write (report, WA);
if (!isAlmostIdentity (WA)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: A^T AW != I" << std::endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), NULL, "test_compute_Winv_S_mulin");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_compute_Winv_S_mulin");
return ret;
}
@@ -1423,11 +1433,11 @@ namespace LinBox
template <class Field, class Matrix>
inline bool MGBlockLanczosSolver<Field, Matrix>::test_mul_SST (int n) const
{
- commentator.start ("Testing addin", "test_mulTranspose");
+ commentator().start ("Testing addin", "test_mulTranspose");
bool ret = true;
- commentator.stop (MSG_STATUS (ret), NULL, "test_mulTranspose");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_mulTranspose");
return ret;
}
@@ -1438,11 +1448,11 @@ namespace LinBox
template <class Field, class Matrix>
inline bool MGBlockLanczosSolver<Field, Matrix>::test_mul_ABSST (int n) const
{
- commentator.start ("Testing addin", "test_mulTranspose");
+ commentator().start ("Testing addin", "test_mulTranspose");
bool ret = true;
- commentator.stop (MSG_STATUS (ret), NULL, "test_mulTranspose");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_mulTranspose");
return ret;
}
@@ -1453,7 +1463,7 @@ namespace LinBox
template <class Field, class Matrix>
inline bool MGBlockLanczosSolver<Field, Matrix>::test_mulTranspose (int m, int n) const
{
- commentator.start ("Testing mulTranspose, m-v mul", "test_mulTranspose");
+ commentator().start ("Testing mulTranspose, m-v mul", "test_mulTranspose");
Matrix A (m, n);
typename Vector<Field>::Dense x (m), y (n);
@@ -1462,20 +1472,20 @@ namespace LinBox
bool ret = true;
- RandomDenseStream<Field, typename Matrix::Row> stream (_F, _randiter, n);
+ RandomDenseStream<Field, typename Matrix::Row> stream (_field, _randiter, n);
typename Matrix::RowIterator i = A.rowBegin ();
for (; i != A.rowEnd (); ++i)
stream >> *i;
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Computed A:" << std::endl;
_MD.write (report, A);
- RandomDenseStream<Field, Matrix> stream1 (_F, _randiter, m);
+ RandomDenseStream<Field, Matrix> stream1 (_field, _randiter, m);
stream1 >> x;
- RandomDenseStream<Field, Matrix> stream2 (_F, _randiter, n);
+ RandomDenseStream<Field, Matrix> stream2 (_field, _randiter, n);
stream1 >> y;
report << "Computed x: ";
@@ -1497,20 +1507,20 @@ namespace LinBox
_VD.dot (ATxy, ATx, y);
report << "Computed ATxy: ";
- _F.write (report, ATxy) << std::endl;
+ _field.write (report, ATxy) << std::endl;
_VD.dot (xAy, x, Ay);
report << "Computed xAy: ";
- _F.write (report, xAy) << std::endl;
+ _field.write (report, xAy) << std::endl;
- if (!_F.areEqual (ATxy, xAy)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ if (!_field.areEqual (ATxy, xAy)) {
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: <A^T x, y> != <x, Ay>" << std::endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), NULL, "test_mulTranspose");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_mulTranspose");
return ret;
}
@@ -1520,11 +1530,11 @@ namespace LinBox
template <class Field, class Matrix>
inline bool MGBlockLanczosSolver<Field, Matrix>::test_mulTranspose_ABSST (int n) const
{
- commentator.start ("Testing addin_ABSST", "test_mulTranspose_ABSST");
+ commentator().start ("Testing addin_ABSST", "test_mulTranspose_ABSST");
bool ret = true;
- commentator.stop (MSG_STATUS (ret), NULL, "test_mulTranspose_ABSST");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_mulTranspose_ABSST");
return ret;
}
@@ -1534,11 +1544,11 @@ namespace LinBox
template <class Field, class Matrix>
inline bool MGBlockLanczosSolver<Field, Matrix>::test_mulin_ABSST (int n) const
{
- commentator.start ("Testing addin_ABSST", "test_mulin_ABSST");
+ commentator().start ("Testing addin_ABSST", "test_mulin_ABSST");
bool ret = true;
- commentator.stop (MSG_STATUS (ret), NULL, "test_mulin_ABSST");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_mulin_ABSST");
return ret;
}
@@ -1548,11 +1558,11 @@ namespace LinBox
template <class Field, class Matrix>
inline bool MGBlockLanczosSolver<Field, Matrix>::test_addin_ABSST (int n) const
{
- commentator.start ("Testing addin_ABSST", "test_addin_ABSST");
+ commentator().start ("Testing addin_ABSST", "test_addin_ABSST");
bool ret = true;
- commentator.stop (MSG_STATUS (ret), NULL, "test_addin_ABSST");
+ commentator().stop (MSG_STATUS (ret), NULL, "test_addin_ABSST");
return ret;
}
@@ -1562,18 +1572,18 @@ namespace LinBox
{
bool ret = true;
- commentator.start ("Running self check", "runSelfCheck", 10);
+ commentator().start ("Running self check", "runSelfCheck", 10);
- if (!test_compute_Winv_S_mul (_N)) ret = false;
- if (!test_compute_Winv_S_mulin (_N)) ret = false;
- if (!test_mul_SST (_N)) ret = false;
- if (!test_mul_ABSST (_N)) ret = false;
- if (!test_mulTranspose (_N * 10, _N)) ret = false;
- if (!test_mulTranspose_ABSST (_N)) ret = false;
- if (!test_mulin_ABSST (_N)) ret = false;
- if (!test_addin_ABSST (_N)) ret = false;
+ if (!test_compute_Winv_S_mul (_block)) ret = false;
+ if (!test_compute_Winv_S_mulin (_block)) ret = false;
+ if (!test_mul_SST (_block)) ret = false;
+ if (!test_mul_ABSST (_block)) ret = false;
+ if (!test_mulTranspose (_block * 10, _block)) ret = false;
+ if (!test_mulTranspose_ABSST (_block)) ret = false;
+ if (!test_mulin_ABSST (_block)) ret = false;
+ if (!test_addin_ABSST (_block)) ret = false;
- commentator.stop (MSG_STATUS (ret), NULL, "runSelfCheck");
+ commentator().stop (MSG_STATUS (ret), NULL, "runSelfCheck");
return ret;
}
@@ -1581,3 +1591,12 @@ namespace LinBox
} // namespace LinBox
#endif // __LINBOX_mg_block_lanczos_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/minpoly-integer.h b/linbox/algorithms/minpoly-integer.h
index 7806c23..ff9d84c 100644
--- a/linbox/algorithms/minpoly-integer.h
+++ b/linbox/algorithms/minpoly-integer.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* author: Zhendong Wan
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -36,14 +37,14 @@
-#include <linbox/field/field-traits.h>
-#include <linbox/algorithms/matrix-hom.h>
-#include <linbox/vector/vector-domain.h>
-#include <linbox/randiter/random-prime.h>
-//#include <linbox/solutions/minpoly.h>
-#include <linbox/util/commentator.h>
+#include "linbox/field/field-traits.h"
+#include "linbox/algorithms/matrix-hom.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/randiter/random-prime.h"
+//#include "linbox/solutions/minpoly.h"
+#include "linbox/util/commentator.h"
#include <fflas-ffpack/ffpack/ffpack.h>
-#include <linbox/algorithms/cra-early-multip.h>
+#include "linbox/algorithms/cra-early-multip.h"
namespace LinBox
{
@@ -86,13 +87,13 @@ namespace LinBox
typedef typename Field::Element Element;
template <class Poly, class Ring>
- static Poly& minPolyBlas (Poly& y, const DenseMatrix<Ring>& M);
+ static Poly& minPolyBlas (Poly& y, const BlasMatrix<Ring>& M);
template <class Poly, class Ring>
- static Poly& minPolyBlas (Poly& y, const DenseMatrix<Ring>& M, int degree);
+ static Poly& minPolyBlas (Poly& y, const BlasMatrix<Ring>& M, int degree);
template <class Ring>
- static int minPolyDegreeBlas (const DenseMatrix<Ring>& M, int n_try = 1);
+ static int minPolyDegreeBlas (const BlasMatrix<Ring>& M, int n_try = 1);
};
template<class _Integer, class _Field>
@@ -173,7 +174,7 @@ namespace LinBox
FBlackbox fbb(M, F);
minpoly (fp, fbb);
if ((int)fp.size() - 1 != degree) {
- commentator.report (Commentator::LEVEL_IMPORTANT,
+ commentator().report (Commentator::LEVEL_IMPORTANT,
INTERNAL_DESCRIPTION) << "Bad prime.\n";
continue;
}
@@ -181,7 +182,7 @@ namespace LinBox
}
cra. result (y);
- // commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "Number of primes needed: " << cra. steps() << std::endl;
+ // commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "Number of primes needed: " << cra. steps() << std::endl;
return y;
}
@@ -218,7 +219,7 @@ namespace LinBox
FBlackbox fbb(M,F);
minpolySymmetric (fp, fbb);
if ((int)fp.size() - 1 != degree) {
- commentator.report (Commentator::LEVEL_IMPORTANT,
+ commentator().report (Commentator::LEVEL_IMPORTANT,
INTERNAL_DESCRIPTION) << "Bad prime.\n";
continue;
}
@@ -254,7 +255,7 @@ namespace LinBox
template <class _Integer, class _Field>
template <class Poly, class Ring>
- Poly& MinPolyBlas<_Integer, _Field>::minPolyBlas (Poly& y, const DenseMatrix<Ring>& M)
+ Poly& MinPolyBlas<_Integer, _Field>::minPolyBlas (Poly& y, const BlasMatrix<Ring>& M)
{
int degree = minPolyDegreeBlas (M);
minPolyBlas (y, M, degree);
@@ -263,7 +264,7 @@ namespace LinBox
template <class _Integer, class _Field>
template <class Poly, class Ring>
- Poly& MinPolyBlas<_Integer, _Field>::minPolyBlas (Poly& y, const DenseMatrix<Ring>& M, int degree)
+ Poly& MinPolyBlas<_Integer, _Field>::minPolyBlas (Poly& y, const BlasMatrix<Ring>& M, int degree)
{
y. resize (degree + 1);
@@ -277,7 +278,7 @@ namespace LinBox
Element* X = new Element [n*(n+1)];
size_t* Perm = new size_t[n];
Element* p;
- typename DenseMatrix<Ring>::ConstRawIterator raw_p;
+ typename BlasMatrix<Ring>::ConstIterator raw_p;
std::vector<Element> poly (degree + 1);
typename std::vector<Element>::iterator poly_ptr;
@@ -285,7 +286,7 @@ namespace LinBox
do {
++primeg; while(cra.noncoprime(*primeg)) ++primeg;
Field F(*primeg);
- for (p = FA, raw_p = M. rawBegin();
+ for (p = FA, raw_p = M. Begin();
p != FA + (n*n); ++ p, ++ raw_p)
F. init (*p, *raw_p);
@@ -298,7 +299,7 @@ namespace LinBox
while (! cra. terminated()) {
++primeg; while(cra.noncoprime(*primeg)) ++primeg;
Field F(*primeg);
- for (p = FA, raw_p = M. rawBegin();
+ for (p = FA, raw_p = M. Begin();
p != FA + (n*n); ++ p, ++ raw_p)
F. init (*p, *raw_p);
@@ -306,7 +307,7 @@ namespace LinBox
FFPACK::MinPoly( F, poly, n, FA, n, X, n, Perm);
if(poly. size() != degree + 1) {
- commentator.report (Commentator::LEVEL_IMPORTANT,
+ commentator().report (Commentator::LEVEL_IMPORTANT,
INTERNAL_DESCRIPTION) << "Bad prime.\n";
continue;
}
@@ -322,7 +323,7 @@ namespace LinBox
template <class _Integer, class _Field>
template <class Ring>
- int MinPolyBlas<_Integer, _Field>::minPolyDegreeBlas (const DenseMatrix<Ring>& M, int n_try)
+ int MinPolyBlas<_Integer, _Field>::minPolyDegreeBlas (const BlasMatrix<Ring>& M, int n_try)
{
size_t n = M. rowdim();
int degree = 0;
@@ -338,11 +339,11 @@ namespace LinBox
long bit2 = (long) floor (log(sqrt(double(4503599627370496LL/n)))/M_LN2);
RandomPrimeIterator primeg(bit1 < bit2 ? bit1 : bit2);
- typename DenseMatrix<Ring>::ConstRawIterator raw_p;
+ typename BlasMatrix<Ring>::ConstIterator raw_p;
for (int i = 0; i < n_try; ++ i) {
++primeg;
Field F(*primeg);
- for (p = FA, raw_p = M. rawBegin();
+ for (p = FA, raw_p = M. Begin();
p!= FA + (n*n); ++ p, ++ raw_p)
F. init (*p, *raw_p);
@@ -358,3 +359,12 @@ namespace LinBox
} // LinBox
#endif //__LINBOX_minpoly_integer_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/minpoly-rational.h b/linbox/algorithms/minpoly-rational.h
index 5c18e8b..4a642ab 100644
--- a/linbox/algorithms/minpoly-rational.h
+++ b/linbox/algorithms/minpoly-rational.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/rational-reconstruction-base.h
* Copyright (C) 2009 Anna Marszalek
*
* Written by Anna Marszalek <aniau at astronet.pl>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_rat_minpoly_H
@@ -26,12 +27,11 @@
#include "linbox/util/commentator.h"
#include "linbox/util/timer.h"
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
//#include "linbox/field/gmp-rational.h"
#include "linbox/field/PID-integer.h"
#include "linbox/blackbox/rational-matrix-factory.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/algorithms/cra-early-multip.h"
#include "linbox/algorithms/cra-domain.h"
//#include "linbox/algorithms/rational-cra.h"
@@ -83,7 +83,8 @@ namespace LinBox
A(b), M(n), mul(p)
{}
MyRationalModularMinpoly(MyRationalModularMinpoly& C) :
- MyRationalModularMinpoly(C.A,C.M,C.mul)
+ // MyRationalModularMinpoly(C.A,C.M,C.mul) //-std=c++11
+ A(C.A), M(C.M), mul(C.mul)
{}
template<typename Polynomial, typename Field>
@@ -120,7 +121,8 @@ namespace LinBox
A(b), M(n), vD(ve), mul(p) {}
MyIntegerModularMinpoly(MyIntegerModularMinpoly& C) :
- MyIntegerModularMinpoly(C.A,C.M,C.vD,C.mul)
+ // MyIntegerModularMinpoly(C.A,C.M,C.vD,C.mul) //-std=c++11
+ A(C.A), M(C.M),vD(C.vD),mul(C.mul)
{}
template<typename Polynomial, typename Field>
@@ -159,14 +161,14 @@ namespace LinBox
template <class Rationals, template <class> class Vector, class MyMethod >
Vector<typename Rationals::Element>& rational_minpoly (Vector<typename Rationals::Element> &p,
- const DenseMatrix<Rationals > &A,
+ const BlasMatrix<Rationals > &A,
const MyMethod &Met= Method::Hybrid())
{
typedef Modular<double> myModular;
typedef typename Rationals::Element Quotient;
- commentator.start ("Rational Minpoly", "Rminpoly");
+ commentator().start ("Rational Minpoly", "Rminpoly");
RandomPrimeIterator genprime( 26-(int)ceil(log((double)A.rowdim())*0.7213475205));
@@ -174,7 +176,7 @@ namespace LinBox
std::vector<Integer> M(A.rowdim()+1,1);
std::vector<Integer> Di(A.rowdim());
- RationalMatrixFactory<PID_integer,Rationals, DenseMatrix<Rationals > > FA(&A);
+ RationalMatrixFactory<PID_integer,Rationals, BlasMatrix<Rationals > > FA(&A);
Integer da=1, di=1; Integer D=1;
FA.denominator(da);
@@ -190,14 +192,14 @@ namespace LinBox
}
PID_integer Z;
- DenseMatrix<PID_integer> Atilde(Z,A.rowdim(), A.coldim());
+ BlasMatrix<PID_integer> Atilde(Z,A.rowdim(), A.coldim());
FA.makeAtilde(Atilde);
ChineseRemainder< EarlyMultipCRA<Modular<double> > > cra(4UL);
- MyRationalModularMinpoly<DenseMatrix<Rationals > , MyMethod> iteration1(A, Met, M);
- MyIntegerModularMinpoly<DenseMatrix<PID_integer>, MyMethod> iteration2(Atilde, Met, Di, M);
- MyModularMinpoly<MyRationalModularMinpoly<DenseMatrix<Rationals > , MyMethod>,
- MyIntegerModularMinpoly<DenseMatrix<PID_integer>, MyMethod> > iteration(&iteration1,&iteration2);
+ MyRationalModularMinpoly<BlasMatrix<Rationals > , MyMethod> iteration1(A, Met, M);
+ MyIntegerModularMinpoly<BlasMatrix<PID_integer>, MyMethod> iteration2(Atilde, Met, Di, M);
+ MyModularMinpoly<MyRationalModularMinpoly<BlasMatrix<Rationals > , MyMethod>,
+ MyIntegerModularMinpoly<BlasMatrix<PID_integer>, MyMethod> > iteration(&iteration1,&iteration2);
RReconstruction<PID_integer, ClassicMaxQRationalReconstruction<PID_integer> > RR;
@@ -261,7 +263,7 @@ namespace LinBox
size_t i =0;
integer t,tt,ttt;
integer err;
- size_t max_err = 0;
+ // size_t max_err = 0;
Quotient qerr;
p.resize(PP.size());
typename Vector <typename Rationals::Element>::iterator it;
@@ -286,9 +288,10 @@ namespace LinBox
size_t i =0;
integer t,tt;
integer err;
- size_t max_res=0;int max_i; double rel;
+ size_t max_res=0;int max_i;
+ // double rel;
size_t max_resu=0; int max_iu;
- size_t max_err = 0;
+ // size_t max_err = 0;
Quotient qerr;
p.resize(PP.size());
@@ -316,7 +319,7 @@ namespace LinBox
if (resi > max_res) {max_res = resi; max_i=i;}
}
- commentator.stop ("done", NULL, "Iminpoly");
+ commentator().stop ("done", NULL, "Iminpoly");
return p;
@@ -326,3 +329,12 @@ namespace LinBox
#endif //__LINBOX_rat_minpoly_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/numeric-solver-lapack.h b/linbox/algorithms/numeric-solver-lapack.h
index c20beeb..5f214bd 100644
--- a/linbox/algorithms/numeric-solver-lapack.h
+++ b/linbox/algorithms/numeric-solver-lapack.h
@@ -1,84 +1,132 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/* Copyright (C) 2011 LinBox
+ * Written Bryan Youse <>
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
/* numeric-solver-lapack.h
* numeric solver using lapack routines
* to support development of iterative numeric/symbolic solver
*/
-#ifndef __NUMERIC_SOLVER_LAPACK_H
-#define __NUMERIC_SOLVER_LAPACK_H
+#ifndef __LINBOX_numeric_solver_lapack_H
+#define __LINBOX_numeric_solver_lapack_H
-#include <linbox/blackbox/blas-blackbox.h>
namespace LinBox {
-template <class Matrix>
-struct LPS {
-
- LPS() : _Ap(NULL), _IM(NULL), _m(0), _n(0) {}
- ~LPS() { delete _IM; }
- LPS(Matrix& A) { init(A); }
- int init(Matrix & A); // set up for solving - expect multiple subsequent calls to solve() and apply().
-
- template<class Vector> int solve(Vector& x, const Vector& b); // x such that Ax = b (approx)
- template<class Vector> Vector& apply(Vector& y, const Vector& x); // y = Ax (approx)
-
-protected:
- Matrix* _Ap; // for right now, assume this points to the input, double matrix A.
- double *_IM;
-
- size_t _m, _n;
-};
-
-template <class Matrix>
-int LPS<Matrix>::init(Matrix& A) {
- _Ap = &A; // would need memcpy if *_Ap to get mods.
- _m = A.rowdim();
- _n = A.coldim();
-
- // kludgey pointer to beginning of double vals
- void *thedata = &*(_Ap->rawBegin());
-
- _IM = new double[_n * _n];
- memcpy((void *)_IM, thedata, sizeof(double)*_m*_n);
-
- // time to set up inverse of matrix
- int lda = _n;
- int P[_n];
- //std::cerr << "Bef getrf: M_0,0 " << *_IM << ", M_n-1,n-1 " << *(_IM+_n*_n-1) << std::endl;
- int ierr = clapack_dgetrf (CblasRowMajor, _n, _n, _IM, lda, P);
- //std::cerr << "Aft getrf: M_0,0 " << *_IM << ", M_n-1,n-1 " << *(_IM+_n*_n-1) << std::endl;
- if (ierr != 0) {
- //std::cerr << "In LPS::init Matrix is not full rank" << std::endl;
- return -1;
+ template <class Matrix>
+ struct LPS {
+
+ LPS() : _Ap(NULL), _IM(NULL), _m(0), _n(0) {}
+ ~LPS() {
+ if(_IM) {
+ // std::cout << "delete" << std::endl;
+ delete[] _IM;
+ }
+ }
+ LPS(Matrix& A) { init(A); }
+ int init(Matrix & A); // set up for solving - expect multiple subsequent calls to solve() and apply().
+
+ template<class Vector> int solve(Vector& x, const Vector& b); // x such that Ax = b (approx)
+ template<class Vector> Vector& apply(Vector& y, const Vector& x); // y = Ax (approx)
+
+ protected:
+ Matrix* _Ap; // for right now, assume this points to the input, double matrix A.
+ double *_IM;
+
+ size_t _m, _n;
+ };
+
+ template <class Matrix>
+ int LPS<Matrix>::init(Matrix& A)
+ {
+ _Ap = &A; // would need memcpy if *_Ap to get mods.
+ _m = A.rowdim();
+ _n = A.coldim();
+
+ // kludgey pointer to beginning of double vals
+ void *thedata = &*(_Ap->Begin());
+
+ linbox_check(_n);
+ _IM = new double[_n * _n];
+ memcpy((void *)_IM, thedata, sizeof(double)*_m*_n);
+
+ // time to set up inverse of matrix
+ int lda = (int)_n;
+ int * P = new int[_n];
+ // std::cerr << "Bef getrf: M_0,0 " << *_IM << ", M_n-1,n-1 " << *(_IM+_n*_n-1) << std::endl;
+ int ierr = clapack_dgetrf (CblasRowMajor, (int)_n, (int)_n, _IM, lda, P);
+ // std::cerr << "Aft getrf: M_0,0 " << *_IM << ", M_n-1,n-1 " << *(_IM+_n*_n-1) << std::endl;
+ if (ierr != 0) {
+ // std::cerr << "In LPS::init Matrix is not full rank" << std::endl;
+ delete[] P ;
+ return -1;
+ }
+ clapack_dgetri (CblasRowMajor, (int)_n, _IM, lda, P);
+ delete[] P ;
+
+ return 0;
}
- clapack_dgetri (CblasRowMajor, _n, _IM, lda, P);
- return 0;
-}
+ template <class Matrix>
+ template<class Vector>
+ int LPS<Matrix>::solve(Vector& x, const Vector& b)
+ {
+ linbox_check(typeid(typename Vector::value_type)==typeid(double));
+ // std::cout << "input :" << b << std::endl;
+ const double * bdata = &*(b.begin());
+ double * xdata = &*(x.begin());
-template <class Matrix>
-template<class Vector>
-int LPS<Matrix>::solve(Vector& x, const Vector& b) {
- const double * bdata = &*(b.begin());
- double * xdata = &*(x.begin());
-
- cblas_dgemv(CblasRowMajor, CblasNoTrans, _m, _n, 1, _IM, _n, bdata, 1, 0, xdata, 1);
+ cblas_dgemv(CblasRowMajor, CblasNoTrans, (int)_m, (int)_n, 1, _IM, (int)_n, bdata, 1, 0, xdata, 1);
+ // std::cout << "result to solve :" << x << std::endl;
- return 0;
-}
+ return 0;
+ }
-template <class Matrix>
-template<class Vector>
-Vector& LPS<Matrix>::apply(Vector& y, const Vector& x) {
- const double * xdata = &*(x.begin());
- double * ydata = &*(y.begin());
- double *thedata = &*(_Ap->rawBegin());
+ template <class Matrix>
+ template<class Vector>
+ Vector& LPS<Matrix>::apply(Vector& y, const Vector& x)
+ {
+ // std::cout << "input :" << x << std::endl;
+ const double * xdata = &*(x.begin());
+ double * ydata = &*(y.begin());
+ double *thedata = &*(_Ap->Begin());
- cblas_dgemv(CblasRowMajor, CblasNoTrans, _m, _n, 1, thedata, _n, xdata, 1, 0, ydata, 1);
+ cblas_dgemv(CblasRowMajor, CblasNoTrans, (int)_m, (int)_n, 1, thedata, (int)_n, xdata, 1, 0, ydata, 1);
+ // std::cout << "result to apply :" << y << std::endl;
- return y;
-}
+ return y;
+ }
} // namespace LinBox
-#endif // __NUMERIC_SOLVER_LAPACK_H
+#endif // __LINBOX_numeric_solver_lapack_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/one-invariant-factor.h b/linbox/algorithms/one-invariant-factor.h
index 455e372..1615770 100644
--- a/linbox/algorithms/one-invariant-factor.h
+++ b/linbox/algorithms/one-invariant-factor.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Author: Zhendong Wan
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,27 +17,27 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_ith_invariant_factor_H
#define __LINBOX_ith_invariant_factor_H
-#include <linbox/util/debug.h>
-#include <linbox/algorithms/default.h>
-#include <linbox/blackbox/compose.h>
-#include <linbox/blackbox/random-matrix-traits.h>
+#include "linbox/util/debug.h"
+#include "linbox/algorithms/default.h"
+#include "linbox/blackbox/compose.h"
+#include "linbox/blackbox/random-matrix-traits.h"
namespace LinBox
{
/// \brief Limited doc so far.
template<class _Ring,
- class _LastInvariantFactor,
- class _Compose,
- class _RandomMatrix>
+ class _LastInvariantFactor,
+ class _Compose,
+ class _RandomMatrix>
class OneInvariantFactor {
@@ -179,9 +180,9 @@ namespace LinBox
}
*/
// Always use LAR please refer ISSAC'04 paper by BDS and ZW
- randomMatrix.randomMatrix(L, r, i, A.rowdim());
+ randomMatrix.randomMatrix(L, r, i, (int)A.rowdim());
- randomMatrix.randomMatrix(R, r, A.coldim(), i);
+ randomMatrix.randomMatrix(R, r, (int)A.coldim(), i);
compose.compose(LAR, *L, A, *R);
@@ -245,8 +246,8 @@ namespace LinBox
for (count =0; count < threshold; ++ count) {
r.assign (prev, oif); r. assign (p_bonus, bonus);
// Always use LAR please refer ISSAC'04 papre by BDS and ZW
- randomMatrix.randomMatrix(L, r, i, A.rowdim());
- randomMatrix.randomMatrix(R, r, A.coldim(), i);
+ randomMatrix.randomMatrix(L, r, i, (int)A.rowdim());
+ randomMatrix.randomMatrix(R, r, (int)A.coldim(), i);
compose.compose(LAR, *L, A, *R);
lif.lastInvariantFactor_Bonus(tmp_i, bonus, *LAR, PrimeL);
@@ -285,3 +286,12 @@ namespace LinBox
#endif //__LINBOX_ith_invariant_factor_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-cra-early-multip.h b/linbox/algorithms/rational-cra-early-multip.h
index 6670c90..8ba88c6 100644
--- a/linbox/algorithms/rational-cra-early-multip.h
+++ b/linbox/algorithms/rational-cra-early-multip.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by <Jean-Guillaume.Dumas at imag.fr>
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_rational_early_multip_cra_H
@@ -113,8 +114,8 @@ namespace LinBox
++ v1_p, ++ v2_p)
D.axpyin(z, (*v1_p), D.init(tmp, (*v2_p)));
#if 0
- commentator.report(Commentator::LEVEL_ALWAYS, INTERNAL_DESCRIPTION) << "v: " << v2 << std::endl;
- commentator.report(Commentator::LEVEL_ALWAYS, INTERNAL_DESCRIPTION) << "z: " << z << std::endl;
+ commentator().report(Commentator::LEVEL_ALWAYS, INTERNAL_DESCRIPTION) << "v: " << v2 << std::endl;
+ commentator().report(Commentator::LEVEL_ALWAYS, INTERNAL_DESCRIPTION) << "z: " << z << std::endl;
#endif
return z;
}
@@ -123,3 +124,12 @@ namespace LinBox
#endif //__LINBOX_rational_early_multip_cra_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-cra-early-single.h b/linbox/algorithms/rational-cra-early-single.h
index a103347..25e838a 100644
--- a/linbox/algorithms/rational-cra-early-single.h
+++ b/linbox/algorithms/rational-cra-early-single.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2007 LinBox
* Written by <Jean-Guillaume.Dumas at imag.fr>
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_rational_early_single_cra_H
@@ -141,3 +142,12 @@ namespace LinBox
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-cra-full-multip.h b/linbox/algorithms/rational-cra-full-multip.h
index f8c963c..89ee540 100644
--- a/linbox/algorithms/rational-cra-full-multip.h
+++ b/linbox/algorithms/rational-cra-full-multip.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2007 LinBox
* Written by JG Dumas
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_rational_full_multip_cra_H
@@ -141,3 +142,12 @@ namespace LinBox
}
#endif //__LINBOX_rational_full_multip_cra_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-cra.h b/linbox/algorithms/rational-cra.h
index e905185..3442235 100644
--- a/linbox/algorithms/rational-cra.h
+++ b/linbox/algorithms/rational-cra.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2007 LinBox
* Written by JG Dumas
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -83,9 +84,11 @@ namespace LinBox
Integer & operator() (Integer& num, Integer& den, Function& Iteration, RandPrimeIterator& genprime)
{
++genprime;
- Domain D(*genprime);
- DomainElement r; D.init(r);
- Builder_.initialize( D, Iteration(r, D) );
+ {
+ Domain D(*genprime);
+ DomainElement r; D.init(r);
+ Builder_.initialize( D, Iteration(r, D) );
+ }
while( ! Builder_.terminated() ) {
++genprime; while(Builder_.noncoprime(*genprime) ) ++genprime;
Domain D(*genprime);
@@ -99,9 +102,11 @@ namespace LinBox
Vect<Integer, Alloc<Integer> > & operator() (Vect<Integer, Alloc<Integer> >& num, Integer& den, Function& Iteration, RandPrimeIterator& genprime)
{
++genprime;
- Domain D(*genprime);
- Vect<DomainElement, Alloc<DomainElement> > r;
- Builder_.initialize( D, Iteration(r, D) );
+ {
+ Domain D(*genprime);
+ Vect<DomainElement, Alloc<DomainElement> > r;
+ Builder_.initialize( D, Iteration(r, D) );
+ }
while( ! Builder_.terminated() ) {
++genprime; while(Builder_.noncoprime(*genprime) ) ++genprime;
Domain D(*genprime);
@@ -114,3 +119,12 @@ namespace LinBox
}
#endif //__LINBOX_rational_cra_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-cra2.h b/linbox/algorithms/rational-cra2.h
index c67a181..89f745c 100644
--- a/linbox/algorithms/rational-cra2.h
+++ b/linbox/algorithms/rational-cra2.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/rational-reconstruction-base.h
* Copyright (C) 2009 Anna Marszalek
*
* Written by Anna Marszalek <aniau at astronet.pl>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -29,8 +30,8 @@
#include "linbox/field/PID-integer.h"
-#include <linbox/algorithms/rational-reconstruction-base.h>
-#include <linbox/algorithms/classic-rational-reconstruction.h>
+#include "linbox/algorithms/rational-reconstruction-base.h"
+#include "linbox/algorithms/classic-rational-reconstruction.h"
//#define RCRATIMING
@@ -106,12 +107,13 @@ namespace LinBox
template<class Function, class RandPrimeIterator>
Integer & operator() (Integer& num, Integer& den, Function& Iteration, RandPrimeIterator& genprime)
{
-
- ++genprime;
- Domain D(*genprime);
- DomainElement r; D.init(r);
- Builder_.initialize( D, Iteration(r, D) );
- ++IterCounter;
+ {
+ ++genprime;
+ Domain D(*genprime);
+ DomainElement r; D.init(r);
+ Builder_.initialize( D, Iteration(r, D) );
+ ++IterCounter;
+ }
int coprime =0;
int maxnoncoprime = 1000;
@@ -135,9 +137,9 @@ namespace LinBox
DomainElement r; D.init(r);
Builder_.progress( D, Iteration(r, D) );
if (RR_.scheduled(IterCounter-1)) {
- Integer M ; Builder_.getModulus(M);
- Integer r ; Builder_.getResidue(r);
- if (RR_.reconstructRational(num,den,r,M)) {
+ Integer Mint ; Builder_.getModulus(Mint);
+ Integer rint ; Builder_.getResidue(rint);
+ if (RR_.reconstructRational(num,den,rint,Mint)) {
Builder_.changePreconditioner(f_in*num,m_in*den);
int k ; Builder_.getThreshold(k);
if (this->operator()(k,num,den,Iteration,genprime)) break;
@@ -231,11 +233,13 @@ namespace LinBox
template<template <class, class> class Vect, template<class> class Alloc, class Function, class RandPrimeIterator>
Vect<Integer, Alloc<Integer> > & operator() (Vect<Integer, Alloc<Integer> >& num, Integer& den, Function& Iteration, RandPrimeIterator& genprime)
{
- ++IterCounter;
- ++genprime;
- Domain D(*genprime);
- Vect<DomainElement, Alloc<DomainElement> > r;
- Builder_.initialize( D, Iteration(r, D) );
+ {
+ ++IterCounter;
+ ++genprime;
+ Domain D(*genprime);
+ Vect<DomainElement, Alloc<DomainElement> > r;
+ Builder_.initialize( D, Iteration(r, D) );
+ }
int coprime =0;
int maxnoncoprime = 1000;
@@ -263,18 +267,21 @@ namespace LinBox
Builder_.progress( D, Iteration(r, D) );
if (RR_.scheduled(IterCounter-1) || Builder_.terminated()) {
- Integer M ; Builder_.getModulus(M);
+ Integer Mint ; Builder_.getModulus(Mint);
if ( Builder_.terminated() ) {//early or full termination occurred, check reconstruction of the whole vector
//early or full termination
- Vect<Integer, Alloc<Integer> > r ; Builder_.getResidue(r);
- if (RR_.reconstructRational(num,den,r,M) ) {
+ Vect<Integer, Alloc<Integer> > r_v ;
+ Builder_.getResidue(r_v);
+ if (RR_.reconstructRational(num,den,r_v,Mint) ) {
Vect<Integer, Alloc<Integer> > vnum(num),vden(m_in.size(),den);
for (int i=0; i < (int)vnum.size(); ++ i) {
if (vnum[i]==0) vnum[i] = 1; // no prec
}
- Builder_.productin(vnum, f_in); Builder_.productin(vden,m_in);
+ Builder_.productin(vnum, f_in);
+ Builder_.productin(vden,m_in);
Builder_.changePreconditioner(vnum,vden) ;
- int k ; Builder_.getThreshold(k);
+ int k ;
+ Builder_.getThreshold(k);
if (this->operator()(k,num,den,Iteration,genprime)) {
break;
}
@@ -290,9 +297,10 @@ namespace LinBox
}
else {
//heuristics: reconstruction of vector
- Integer r ; Builder_.getResidue(r);
+ Integer rint ;
+ Builder_.getResidue(rint);
Integer n,d;
- if (RR_.reconstructRational(n,d,r,M)) {
+ if (RR_.reconstructRational(n,d,rint,Mint)) {
Vect<Integer, Alloc<Integer> > vden(m_in.size(),d);
Builder_.productin(vden,m_in);
Builder_.changePreconditioner(f_in,vden);
@@ -444,3 +452,12 @@ namespace LinBox
#undef CRATIMING
#endif // __LINBOX_rational2_cra_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-reconstruction-base.h b/linbox/algorithms/rational-reconstruction-base.h
index 61175aa..da19fd4 100644
--- a/linbox/algorithms/rational-reconstruction-base.h
+++ b/linbox/algorithms/rational-reconstruction-base.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/rational-reconstruction-base.h
* Copyright (C) 2009 Anna Marszalek
*
* Written by Anna Marszalek <aniau at astronet.pl>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_reconstruction_base_H
@@ -30,7 +31,7 @@
#include <deque>
#include <math.h>
-#include <linbox/field/PID-integer.h>
+#include "linbox/field/PID-integer.h"
namespace LinBox
{
@@ -47,7 +48,7 @@ namespace LinBox
* together with method reconstructRational(a,b,x,m)
* implements scheduling INCREMENTAL, QUADRATIC, GEOMETRIC, CERTIFIED
* implements vector reconstruction
- * _Z is the integer ring used for reconstruction, default PID_integer
+ * _intRing is the integer ring used for reconstruction, default PID_integer
* _RR is the rational reconstruction method, see fast-ratioinal-reconstruction.h, classic-rational-reconstruction.h
* THRESHOLD_ - treshold for INCREMENTAL schedule
* rbound_ - min number of iterations for all schedule
@@ -55,36 +56,36 @@ namespace LinBox
template <class Ring=PID_integer, class RRBase=RReconstructionBase<PID_integer> >
struct RReconstruction {
protected:
- Ring _Z;
+ Ring _intRing;
RRBase _RR;
mutable size_t RecCounter;
- const RReconstructionSchedule _M;
+ const RReconstructionSchedule _meth;
const size_t THRESHOLD_;
const size_t rbound_;
public:
typedef typename Ring::Element Element;
- RReconstruction(const Ring& Z=Ring(), const RReconstructionSchedule M = GEOMETRIC, size_t T=DEF_RR_THRESH, size_t b= 0) :
- _Z(Z), _RR(Z), _M(M), THRESHOLD_(T), rbound_(b)
+ RReconstruction(const Ring& Z=Ring(), const RReconstructionSchedule Meth = GEOMETRIC, size_t T=DEF_RR_THRESH, size_t b= 0) :
+ _intRing(Z), _RR(Z), _meth(Meth), THRESHOLD_(T), rbound_(b)
{
RecCounter =0;
- if (_M == QUADRATIC) {
+ if (_meth == QUADRATIC) {
RecCounter = (int)sqrt((double)rbound_);//RecCounter^2 < rbound_ <=(RecCounter+1)^2
}
- else if (_M == GEOMETRIC) {
+ else if (_meth == GEOMETRIC) {
RecCounter = (size_t) log((double)rbound_) ;//2^RecCounter < rbound_ <=2^(RecCounter+1)
}
}
- RReconstruction(const RRBase& RR, const RReconstructionSchedule M = GEOMETRIC, size_t T=DEF_RR_THRESH, size_t b = 0) :
- _Z(RR._Z), _RR(RR),_M(M), THRESHOLD_(T), rbound_(b)
+ RReconstruction(const RRBase& RR, const RReconstructionSchedule Meth = GEOMETRIC, size_t T=DEF_RR_THRESH, size_t b = 0) :
+ _intRing(RR._intRing), _RR(RR),_meth(Meth), THRESHOLD_(T), rbound_(b)
{
RecCounter =0;
- if (_M == QUADRATIC) {
+ if (_meth == QUADRATIC) {
RecCounter = (size_t)sqrt((double)rbound_);//RecCounter^2 < rbound_ <=(RecCounter+1)^2
}
- else if (_M == GEOMETRIC) {
- RecCounter = (size_t)((double)log((double)rbound_)/log(2));//2^RecCounter < rbound_ <=2^(RecCounter+1)
+ else if (_meth == GEOMETRIC) {
+ RecCounter = (size_t)((double)log((double)rbound_)/log(2.));//2^RecCounter < rbound_ <=2^(RecCounter+1)
}
}
@@ -98,19 +99,19 @@ namespace LinBox
{
//if (RecCounter ==0) return true;
if (i < rbound_) return false; //skip first rbound iterations
- if (_M == INCREMENTAL) {
+ if (_meth == INCREMENTAL) {
if (RecCounter%THRESHOLD_==0 ) return true;
else return false;
}
- else if (_M == QUADRATIC) {
+ else if (_meth == QUADRATIC) {
if (RecCounter*RecCounter < i) return true;
else return false;
}
- else if (_M == GEOMETRIC) {
+ else if (_meth == GEOMETRIC) {
if ((1UL << RecCounter) < i) return true;
else return false;
}
- else if (_M == CERTIFIED) {
+ else if (_meth == CERTIFIED) {
if ( i > rbound_) return true;
else return false;
}
@@ -160,7 +161,7 @@ namespace LinBox
}
}
else {//if (inc == -1)
- int i = x.size()-1;
+ int i = (int)x.size()-1;
for (; i >=0; --i ) {
Element x_in(x[i]);
x_in *=old_den;
@@ -181,7 +182,7 @@ namespace LinBox
else {
//std::cout << a[i] << "/" << b*new_den << "\n";
if (new_den > 1) {
- for (int j = a.size()-1; j > i ; --j) {
+ for (int j = (int)a.size()-1; j > i ; --j) {
a[j] *=new_den;
}
b *= new_den;
@@ -289,15 +290,15 @@ namespace LinBox
template <class Ring>
class RReconstructionBase {
public:
- Ring _Z;
+ Ring _intRing;
mutable OpCounter C;
typedef typename Ring::Element Element;
RReconstructionBase(const Ring& Z) :
- _Z(Z)
+ _intRing(Z)
{}
RReconstructionBase(const RReconstructionBase<Ring>& RR) :
- _Z(RR._Z)
+ _intRing(RR._intRing)
{}
virtual bool reconstructRational(Element& a, Element& b, const Element& x, const Element& m) const =0;
@@ -319,26 +320,26 @@ namespace LinBox
class RReconstructionBase<PID_integer> {
public:
typedef PID_integer Ring;
- Ring _Z;
+ Ring _intRing;
mutable OpCounter C;
typedef Ring::Element Element;
RReconstructionBase(const Ring& Z) :
- _Z(Z)
+ _intRing(Z)
{}
RReconstructionBase(const RReconstructionBase<Ring>& RR) :
- _Z(RR._Z)
+ _intRing(RR._intRing)
{}
bool reconstructRational(Element& a, Element& b, const Element& x, const Element& m)
{
- Element a_bound; _Z.sqrt(a_bound,m/2);
- return _Z.reconstructRational(a,b,x,m,a_bound,a_bound);
+ Element a_bound; _intRing.sqrt(a_bound,m/2);
+ return _intRing.reconstructRational(a,b,x,m,a_bound,a_bound);
}
bool reconstructRational(Element& a, Element& b, const Element& x, const Element& m, const Element& a_bound)
{
- _Z.reconstructRational(a,b,x,m,a_bound);
+ _intRing.reconstructRational(a,b,x,m,a_bound);
return true;
}
@@ -356,3 +357,12 @@ namespace LinBox
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-reconstruction.h b/linbox/algorithms/rational-reconstruction.h
index c8cbbff..97c3a76 100644
--- a/linbox/algorithms/rational-reconstruction.h
+++ b/linbox/algorithms/rational-reconstruction.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*
* Copyright (C) 2004 Zhendong Wan, Pascal Giorgi
*
* Written by Zhendong Wan <wan at mail.eecis.udel.edu>
* Modified by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,47 +18,51 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/rational-reconstruction.h
* @ingroup algorithms
* @brief NO DOC
- * @bug demander FPLLL comme dépendance optionnelle...
+ * @todo wrap Mat_ZZ<T>/IntMat in BlasMatrix<T>, BlasMatrix<Integer> e.g.
+ * @bug there seems to be a confusion between Ring _r, [iI]nteger... Besides we have to check that Ring/Integer/NTL_ZZ are the 'same'.
*/
#ifndef __LINBOX_reconstruction_H
#define __LINBOX_reconstruction_H
-#include <linbox/algorithms/rational-reconstruction-base.h>
-#include <linbox/algorithms/classic-rational-reconstruction.h>
-//#include <linbox/algorithms/fast-rational-reconstruction.h>
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+
-#include <linbox/linbox-config.h>
-#include <linbox/util/debug.h>
+#include "linbox/algorithms/rational-reconstruction-base.h"
+#include "linbox/algorithms/classic-rational-reconstruction.h"
+//#include "linbox/algorithms/fast-rational-reconstruction.h"
//#define DEBUG_RR
//#define DEBUG_RR_BOUNDACCURACY
#define DEF_THRESH 50
-#ifdef __LINBOX_HAVE_NTL
-#include <NTL/LLL.h>
-#endif
+#if defined(__LINBOX_HAVE_FPLLL) || defined(__LINBOX_HAVE_NTL)
+#include "linbox/algorithms/lattice.h"
+#endif
-//#define __LINBOX_HAVE_FPLLL
#ifdef __LINBOX_HAVE_FPLLL
-extern "C" {
-#include <libfplll/myheuristic.h>
-#include <libfplll/myproved.h>
-}
-#include <linbox/algorithms/short-vector.h>
+#include "linbox/algorithms/short-vector.h"
#endif
+
+
+
namespace LinBox
{
+ long NumBytes(const Integer & m)
+ {
+ return ( (m.bitsize()+7 )/8) ;
+ }
/*! \brief Limited doc so far.
* Used, for instance, after LiftingContainer.
@@ -70,7 +75,7 @@ namespace LinBox
public:
typedef _LiftingContainer LiftingContainer;
typedef typename LiftingContainer::Ring Ring;
- typedef typename Ring::Element Integer;
+ typedef typename Ring::Element myInteger;
typedef typename LiftingContainer::IVector Vector;
typedef typename LiftingContainer::Field Field;
typedef typename Field::Element Element;
@@ -201,8 +206,8 @@ namespace LinBox
linbox_check(num. size() == (size_t)_lcontainer.size());
typedef Vector IVector;
typedef std::vector<IVector> LVector;
- int n = num. size();
- int len = _lcontainer. length();
+ int n = (int)num. size();
+ int len = (int)_lcontainer. length();
Integer prime = _lcontainer.prime();//prime
LVector digits; //Store all p-adic digits
digits. resize (len); //reserve space for all digits
@@ -295,16 +300,14 @@ namespace LinBox
}
if (!_r. isZero (rem1)) {
- int status;
- status = _r.reconstructRational(tmp_num, tmp_den, c1, modulus, numbound, denbound);
+ int status = (int)_r.reconstructRational(tmp_num, tmp_den, c1, modulus, numbound, denbound);
if(status) {
_r. assign (c1_den, tmp_den); _r. assign (c1_num, tmp_num);
}
}
if (!_r. isZero (rem2)) {
- int status;
- status = _r.reconstructRational(tmp_num, tmp_den, c2, modulus, numbound, denbound);
+ int status =(int) _r.reconstructRational(tmp_num, tmp_den, c2, modulus, numbound, denbound);
if(status) {
_r. assign (c2_den, tmp_den); _r. assign (c2_num, tmp_num);
}
@@ -342,8 +345,7 @@ namespace LinBox
else if (_r. compare(abs_neg, numbound) < 0)
_r. assign (*num_p, neg_res);
else {
- int status;
- status = _r. reconstructRational(tmp_num, tmp_den, *res_p, modulus, numbound, denbound);
+ int status= (int) _r. reconstructRational(tmp_num, tmp_den, *res_p, modulus, numbound, denbound);
if (!status) {
std::cout << "ERROR in reconstruction ? (1)\n" << std::endl;
#ifdef DEBUG_RR
@@ -459,7 +461,7 @@ namespace LinBox
tmp = pPower * iN;
tmp /= iD;
- root(tmp, tmp, 2*len);
+ root(tmp, tmp, (unsigned int)(2*len));
_r.init(numFactor, tmp);
// inital numbound is numFactor/sqrt(2)
@@ -541,10 +543,10 @@ namespace LinBox
if (!verybig)
_r.init(numbound, exp(i*half_log_p - half_log_2 + multy * (i - 1)));
- Integer tmp;
- _r.init(tmp, 2);
- _r.mulin(tmp, numbound);
- _r.quo(denbound, modulus, tmp);
+ Integer tmp2;
+ _r.init(tmp2, 2);
+ _r.mulin(tmp2, numbound);
+ _r.quo(denbound, modulus, tmp2);
}
#ifdef DEBUG_RR
std::cout << "i, N, D bounds: " << i << ", " << numbound << ", " << denbound << std::endl;
@@ -778,7 +780,7 @@ namespace LinBox
#endif
#ifdef LIFTING_PROGRESS
Commentator lifting_commentator;
- lifting_commentator.start("Padic Lifting","LinBox::LiftingContainer",_lcontainer.length());
+ lifting_commentator().start("Padic Lifting","LinBox::LiftingContainer",_lcontainer.length());
#endif
#if 0
Timer eval_horner,eval_horn;
@@ -789,7 +791,7 @@ namespace LinBox
for (size_t i=0 ; iter != _lcontainer.end() && iter.next(digit_approximation[i]);++i) {
#ifdef LIFTING_PROGRESS
- lifting_commentator.progress(i);
+ lifting_commentator().progress(i);
#endif
#if 0
eval_horn.start();
@@ -802,7 +804,7 @@ namespace LinBox
}
#ifdef LIFTING_PROGRESS
- lifting_commentator.stop ("Done", "Done", "LinBox::LinBox::LiftingContainer");
+ lifting_commentator().stop ("Done", "Done", "LinBox::LinBox::LiftingContainer");
#endif
// problem occured during lifting
@@ -1211,6 +1213,7 @@ namespace LinBox
template<class Vector1>
bool getRational4(Vector1& num, Integer& den, size_t thresh) const
{
+ THIS_CODE_COMPILES_BUT_IS_NOT_TESTED;
#ifdef RSTIMING
ttRecon.clear();
@@ -1240,17 +1243,18 @@ namespace LinBox
_r.convert(N, _lcontainer.numbound());
_r.convert(D, _lcontainer.denbound());
_r.convert(mod, prime);
- ::Givaro::root (D, D, k); D+=1;
+ Givaro::root (D, D, (unsigned)k);
+ D+=1;
bound=2*N*D;
std::cout<<"size in bit of the bound : "<<bound.bitsize()<<std::endl;
- size_t minsteps = logp(bound, mod)+1;
+ size_t minsteps = (size_t)logp(bound, mod)+1;
Timer magn;
magn.start();
// magnitude of A and b
integer maxValue=0,value, MagnA, Magnb;
- typename LiftingContainer::IMatrix::ConstRawIterator it = _lcontainer.getMatrix().rawBegin();
- for (; it != _lcontainer.getMatrix().rawEnd(); ++it) {
+ typename LiftingContainer::IMatrix::ConstIterator it = _lcontainer.getMatrix().Begin();
+ for (; it != _lcontainer.getMatrix().End(); ++it) {
_r.convert(value,*it);
if (value<0) value=-value;
if (value> maxValue)
@@ -1358,23 +1362,29 @@ namespace LinBox
// construct the lattice
- NTL::mat_ZZ Lattice;
- NTL::ZZ m, tmp, det;
- integer tmp_int;
+ integer tmp_int,tmp;
_r.convert(mod, modulus);
- m=NTL::to_ZZ((std::string(mod)).c_str());
-
-
- Lattice.SetDims(k+1, k+1);
- NTL::clear(Lattice);
- Lattice[0][0]=1;
+ // NTL::ZZ m, tmp ;
+ // NTL::mat_ZZ Lattice;
+ // m=NTL::to_ZZ((std::string(mod)).c_str());
+ // Lattice.SetDims(k+1, k+1);
+ // NTL::clear(Lattice);
+ // Lattice[0][0]=1;
+ // for (size_t i= bad_num_index+1;i< bad_num_index+k+1;++i){
+ // Lattice[i][i]=m;//not working when bad index <> 0
+ // _r.convert(tmp_int, real_approximation[i-1]);
+ // tmp=NTL::to_ZZ((std::string(tmp_int)).c_str());
+ // Lattice[0][i]=tmp;//not working when bad index <> 0
+ // }
+ BlasMatrix<Ring> Lattice(_r,k+1,k+1);
+ Lattice.setEntry(0,0,_r.one);
for (size_t i= bad_num_index+1;i< bad_num_index+k+1;++i){
- Lattice[i][i]=m;//not working when bad index <> 0
+ Lattice.setEntry(i,i,mod);//not working when bad index <> 0
_r.convert(tmp_int, real_approximation[i-1]);
- tmp=NTL::to_ZZ((std::string(tmp_int)).c_str());
- Lattice[0][i]=tmp;//not working when bad index <> 0
+ Lattice.setEntry(0,i,tmp_int);//not working when bad index <> 0
}
+
// ratio to check the validity of the denominator compare to the entries in the reduced lattice
NTL::ZZ ratio;
ratio=NTL::to_ZZ(100L);
@@ -1383,17 +1393,19 @@ namespace LinBox
Timer chrono;
chrono.start();
//NTL::LLL(det, Lattice);
- NTL::LLL_XD(Lattice);
+ // NTL::LLL_XD(Lattice);
+ lllReduceIn<Ring>(Lattice,latticeMethod::latticeNTL_LLL());
chrono.stop();
std::cout<<"lattice reduction time : "<<chrono<<std::endl;
// check if the 1st row is the short vector
+ // Lattice[i][j] should work. Using standard getEntry though
latticeOK=true;
- tmp=abs(Lattice[0][0])*ratio;
+ tmp=abs(Lattice.getEntry(0,0))*ratio;
for (size_t i=1;i<k+1;++i){
for (size_t j=0;j<k+1;++j)
- if (tmp > abs(Lattice[i][j])){
+ if (tmp > abs(Lattice.getEntry(i,j))){
latticeOK=false;
break;
}
@@ -1405,24 +1417,29 @@ namespace LinBox
if (latticeOK) {// lattice ok
Timer checknum;
checknum.start();
- bool neg=false;
+ // bool neg=false;
// get the denominator from the lattice
- tmp =Lattice[0][0];
- if (sign(tmp) <0) neg=true;
- long b = NumBytes(tmp);
- unsigned char* byteArray;
- byteArray = new unsigned char[(size_t)b ];
- BytesFromZZ(byteArray, tmp, b);
- integer base(256);
- integer dd= integer(0);
- for(long i = b - 1; i >= 0; --i) {
- dd *= base;
- dd += integer(byteArray[i]);
- }
- delete [] byteArray;
+ // tmp =Lattice.getEntry(0,0);
+ // if (sign(tmp) <0)
+ // neg=true;
+ // long b = NTL::NumBytes(tmp);
+ // long b = NumBytes(tmp);
+ // unsigned char* byteArray;
+ // byteArray = new unsigned char[(size_t)b ];
+ // BytesFromZZ(byteArray, tmp, b);
+ // integer base(256);
+ // integer dd= integer(0);
+ // for(long i = b - 1; i >= 0; --i) {
+ // dd *= base;
+ // dd += integer(byteArray[i]);
+ // }
+ // delete [] byteArray;
+ myInteger dd = Lattice.getEntry(0,0);
+ bool neg = (dd<0);
Integer denom;
_r.init(denom,dd);
- if (neg) _r.negin(denom);
+ if (neg)
+ _r.negin(denom);
neg_denom= neg_denom^neg;
@@ -1540,6 +1557,7 @@ namespace LinBox
template<class Vector1>
bool getRational5(Vector1& num, Integer& den, size_t thresh) const
{
+ THIS_CODE_COMPILES_BUT_IS_NOT_TESTED;
#ifdef RSTIMING
ttRecon.clear();
@@ -1569,7 +1587,7 @@ namespace LinBox
_r.convert(N, _lcontainer.numbound());
_r.convert(D, _lcontainer.denbound());
_r.convert(mod, prime);
- ::Givaro::root (D, D, k); D+=1;
+ Givaro::root (D, D, k); D+=1;
bound=2*N*D;
std::cout<<"size in bit of the bound : "<<bound.bitsize()<<std::endl;
size_t minsteps = logp(bound, mod)+1;
@@ -1578,8 +1596,8 @@ namespace LinBox
magn.start();
// magnitude of A and b
integer maxValue=0,value, MagnA, Magnb;
- typename LiftingContainer::IMatrix::ConstRawIterator it = _lcontainer.getMatrix().rawBegin();
- for (; it != _lcontainer.getMatrix().rawEnd(); ++it) {
+ typename LiftingContainer::IMatrix::ConstIterator it = _lcontainer.getMatrix().Begin();
+ for (; it != _lcontainer.getMatrix().End(); ++it) {
_r.convert(value,*it);
if (value<0) value=-value;
if (value> maxValue)
@@ -1689,24 +1707,37 @@ namespace LinBox
// construct the lattice
- mpz_t **Lattice;
- Lattice= new mpz_t*[k+2];
- for (size_t i=0;i<k+2;++i){
- Lattice[i]= new mpz_t[k+2];
- for (size_t j=0;j<k+2;++j)
- mpz_init(Lattice[i][j]);
- }
+ // mpz_t **Lattice;
+ // ZZ_mat<mpz_t> Lattice(k+1,k+1) ;
+ // Lattice= new mpz_t*[k+2];
+ // for (size_t i=0;i<k+2;++i){
+ // Lattice[i]= new mpz_t[k+2];
+ // for (size_t j=0;j<k+2;++j)
+ // mpz_init(Lattice[i][j]);
+ // }
+ BlasMatrix<Ring> Lattice(_r,k+1,k+1);
integer tmp=1;
_r.convert(mod, modulus);
- mpz_set(Lattice[1][1], tmp.get_mpz());
- for (size_t i=2;i< k+2;++i){
- mpz_set(Lattice[i][i],mod.get_mpz());
- _r.convert(tmp, real_approximation[bad_num_index+i-2]);
- mpz_set(Lattice[1][i],tmp.get_mpz());
+ // mpz_set(Lattice[1][1], tmp.get_mpz());
+
+ // Lattice.Set(0,0,Z_NR<mpz_t>(tmp.get_mpz()));
+ // for (size_t i=1;i< k+1;++i){
+ // mpz_set(Lattice[i][i],mod.get_mpz());
+ // Lattice.Set(i,i, Z_NR<mpz_t>(mod.get_mpz()) );
+ // _r.convert(tmp, real_approximation[bad_num_index+i-1]);
+ // Lattice.Set(0,i,Z_NR<mpz_t>(tmp.get_mpz()));
+ // mpz_set(Lattice[1][i],tmp.get_mpz());
+ // }
+ Lattice.setEntry(0,0,tmp);
+ for (size_t i=1;i< k+1;++i){
+ Lattice.setEntry(i,i, mod );
+ _r.convert(tmp, real_approximation[bad_num_index+i-1]);
+ Lattice.setEntry(0,i,FPLLL::Z_NR<mpz_t>(tmp.get_mpz()));
}
+
// ratio to check the validity of the denominator compare to the entries in the reduced lattice
integer ratio;
ratio=100L;
@@ -1714,17 +1745,21 @@ namespace LinBox
// reduce the lattice using LLL algorithm
Timer chrono;
chrono.start();
- myLLLproved(Lattice, k+1,k+1);
+ lllReduceIn<Ring>(Lattice,latticeMethod::latticeFPLLL());
+ // myLLLproved(Lattice, k+1,k+1);
+ // ::proved<Integer,double>LLL(Lattice);
+ // LLL.LLL();
chrono.stop();
std::cout<<"lattice reduction time : "<<chrono<<std::endl;
// check if the 1st row is the short vector
latticeOK=true;
- mpz_mul(tmp.get_mpz(), Lattice[1][1],ratio.get_mpz());
- for (size_t i=2;i<k+2;++i){
- for (size_t j=1;j<k+2;++j)
- if (mpz_cmpabs(tmp.get_mpz() , Lattice[i][j])> 0){
+ _r.mul(tmp, Lattice.getEntry(0,0),ratio);
+ // mpz_mul(tmp.get_mpz(), Lattice(0,0).GetData(),ratio.get_mpz());
+ for (size_t i=1;i<k+1;++i){
+ for (size_t j=0;j<k+1;++j)
+ if (AbsCompare(tmp , Lattice.getEntry(i,j) )> 0){
latticeOK=false;
break;
}
@@ -1732,15 +1767,16 @@ namespace LinBox
integer dd;
// get the denominator from the lattice
- mpz_set(dd.get_mpz(),Lattice[1][1]);
+ // mpz_set(dd.get_mpz(),Lattice(0,0).GetData());
+ dd = Lattice.getEntry(0,0);
//delete the lattice
- for (size_t i=0;i<k+2;++i){
- for (size_t j=0;j<k+2;++j)
- mpz_clear(Lattice[i][j]);
- delete[] Lattice[i];
- }
- delete[] Lattice;
+ // for (size_t i=0;i<k+2;++i){
+ // for (size_t j=0;j<k+2;++j)
+ // mpz_clear(Lattice[i][j]);
+ // delete[] Lattice[i];
+ // }
+ // delete[] Lattice;
if (latticeOK) {// lattice ok
@@ -1893,7 +1929,7 @@ namespace LinBox
_r.convert(N, _lcontainer.numbound());
_r.convert(D, _lcontainer.denbound());
_r.convert(mod, prime);
- ::Givaro::root (D, D, k); D+=1;
+ Givaro::root (D, D, k); D+=1;
bound=2*N*D;
std::cout<<"size in bit of the bound : "<<bound.bitsize()<<std::endl;
size_t minsteps = logp(bound, mod)+1;
@@ -1902,8 +1938,8 @@ namespace LinBox
magn.start();
// magnitude of A and b
integer maxValue=0,value, MagnA, Magnb;
- typename LiftingContainer::IMatrix::ConstRawIterator it = _lcontainer.getMatrix().rawBegin();
- for (; it != _lcontainer.getMatrix().rawEnd(); ++it) {
+ typename LiftingContainer::IMatrix::ConstIterator it = _lcontainer.getMatrix().Begin();
+ for (; it != _lcontainer.getMatrix().End(); ++it) {
_r.convert(value,*it);
if (value<0) value=-value;
if (value> maxValue)
@@ -2040,10 +2076,10 @@ namespace LinBox
// check if the 1st row is the short vector
latticeOK=true;
- tmp = ::Givaro::abs(L3[0][0]*ratio);
+ tmp = Givaro::abs(L3[0][0]*ratio);
for (size_t i=1;i<k+1;++i){
for (size_t j=0;j<k+1;++j)
- if (tmp > ::Givaro::abs(L3[i][j])){
+ if (tmp > Givaro::abs(L3[i][j])){
latticeOK=false;
break;
}
@@ -2184,3 +2220,12 @@ namespace LinBox
#undef DEF_THRESH
#endif //__LINBOX_reconstruction_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-reconstruction2.h b/linbox/algorithms/rational-reconstruction2.h
index 3100af1..19a8e4a 100644
--- a/linbox/algorithms/rational-reconstruction2.h
+++ b/linbox/algorithms/rational-reconstruction2.h
@@ -1,16 +1,30 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (c) LinBox
* Author Z. Wan
* Modified to fit in linbox
* Using GMP directly
* Implement the idea in the manuscript, available at http://www.cis.udel.edu/~wan/jsc_wan.ps
- * see COPYING for licence details
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_rational_reconstruction2_H__
#define __LINBOX_rational_reconstruction2_H__
-#include <linbox/integer.h>
+#include "linbox/integer.h"
namespace LinBox
{
@@ -67,3 +81,12 @@ namespace LinBox
#endif //__LINBOX_rational_reconstruction2_H__
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-solver-adaptive.h b/linbox/algorithms/rational-solver-adaptive.h
index 4c20a50..b15dc7f 100644
--- a/linbox/algorithms/rational-solver-adaptive.h
+++ b/linbox/algorithms/rational-solver-adaptive.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2007 LinBox
*
* Written by Zhendong Wan <wan at mail.eecis.udel.edu>
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,19 +17,22 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_rational_solver_adaptive_H
#define __LINBOX_rational_solver_adaptive_H
-#include <linbox/field/modular-int32.h>
-#include <linbox/algorithms/rational-solver.h>
-#include <linbox/randiter/random-prime.h>
-#include <linbox/blackbox/dense.h>
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+
+
+#include "linbox/field/modular.h"
+#include "linbox/algorithms/rational-solver.h"
+#include "linbox/randiter/random-prime.h"
namespace LinBox
{
@@ -36,7 +40,7 @@ namespace LinBox
// Generic non-numerical solver requires conversion of the vector
template<class IRing, class OutVector, class InVector>
struct RationalSolverAdaptiveClass {
- static SolverReturnStatus solveNonsingular(OutVector& num, typename IRing::Element& den, const DenseMatrix<IRing>& M, const InVector& b)
+ static SolverReturnStatus solveNonsingular(OutVector& num, typename IRing::Element& den, const BlasMatrix<IRing>& M, const InVector& b)
{
linbox_check ((M. rowdim() == M. coldim()) && (b.size() == M.rowdim()) && (num. size() ==M.coldim()));
typedef Modular<int32_t> Field;
@@ -62,10 +66,11 @@ namespace LinBox
}
};
+
// Specialization when the vector is already over the ring
template<class IRing, class OutVector, template<typename T> class Container>
struct RationalSolverAdaptiveClass<IRing, OutVector, Container<typename IRing::Element> > {
- static SolverReturnStatus solveNonsingular(OutVector& num, typename IRing::Element& den, const DenseMatrix<IRing>& M, const Container<typename IRing::Element> & b) {
+ static SolverReturnStatus solveNonsingular(OutVector& num, typename IRing::Element& den, const BlasMatrix<IRing>& M, const Container<typename IRing::Element> & b) {
linbox_check ((M. rowdim() == M. coldim()) && (b.size() == M.rowdim()) && (num. size() ==M.coldim()));
typedef Modular<int32_t> Field;
// typedef Modular<double> Field;
@@ -86,7 +91,7 @@ namespace LinBox
class RationalSolverAdaptive {
public:
template<class IRing, class OutVector, class InVector>
- static SolverReturnStatus solveNonsingular(OutVector& num, typename IRing::Element& den, const DenseMatrix<IRing>& M, const InVector& b) {
+ static SolverReturnStatus solveNonsingular(OutVector& num, typename IRing::Element& den, const BlasMatrix<IRing>& M, const InVector& b) {
return RationalSolverAdaptiveClass<IRing,OutVector,InVector>::solveNonsingular(num, den, M, b);
}
};
@@ -94,3 +99,12 @@ namespace LinBox
}
#endif //__LINBOX_rational_solver_adaptive_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-solver-sn.h b/linbox/algorithms/rational-solver-sn.h
index 33fcf19..1809492 100644
--- a/linbox/algorithms/rational-solver-sn.h
+++ b/linbox/algorithms/rational-solver-sn.h
@@ -1,31 +1,51 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* sn-rational-solver.h */
-#ifndef __RATIONAL_SOLVER_SN_H
-#define __RATIONAL_SOLVER_SN_H
+/* Copyright (C) 2011 LinBox
+ * Written Bryan Youse <>
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+#ifndef __LINBOX_rational_solver_sn_H
+#define __LINBOX_rational_solver_sn_H
#include <iostream>
-#include <linbox/integer.h>
-#include <linbox/field/param-fuzzy.h>
-#include <linbox/solutions/methods.h>
-#include <linbox/blackbox/archetype.h>
-#include <linbox/blackbox/blas-blackbox.h>
-#include <linbox/algorithms/dyadic-to-rational.h>
-#include <linbox/blackbox/compose.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/algorithms/vector-fraction.h>
-#include <linbox/algorithms/matrix-hom.h>
-#include <linbox/util/timer.h>
-#include <linbox/field/PID-integer.h>
+#include "linbox/integer.h"
+#include "linbox/field/param-fuzzy.h"
+#include "linbox/solutions/methods.h"
+#include "linbox/blackbox/archetype.h"
+#include "linbox/algorithms/dyadic-to-rational.h"
+#include "linbox/blackbox/compose.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/algorithms/vector-fraction.h"
+#include "linbox/algorithms/matrix-hom.h"
+#include "linbox/util/timer.h"
+#include "linbox/field/PID-integer.h"
namespace LinBox {
- // bsd and mac problem
-#undef _R
-
- /** \brief define the possible return status of the solver's computation.
- */
+
+ /** \brief define the possible return status of the solver's computation.
+ */
enum SNSolverReturnStatus {
SNSS_OK, SNSS_FAILED, SNSS_SINGULAR, SNSS_INCONSISTENT
};
@@ -33,36 +53,36 @@ namespace LinBox {
enum ShiftStatus {
SHIFT_GROW, SHIFT_SHRINK, SHIFT_PEAK, SHIFT_SEARCH, SHIFT_MAX
};
-
-/*
- * A NumericSolver has
- * init from a matrix A,
- * solve(double* x, double* b) // x = A^{-1}b
- * apply(double* y, double * x); // y = Ax
- */
-
-template<class Ring, class NumericSolver>
-class RationalSolverSN {
+
+ /*
+ * A NumericSolver has
+ * init from a matrix A,
+ * solve(double* x, double* b) // x = A^{-1}b
+ * apply(double* y, double * x); // y = Ax
+ */
+
+ template<class Ring, class NumericSolver>
+ class RationalSolverSN {
public:
typedef typename Ring::Element Int;
typedef std::vector<Int> IVector;
// note: the type integer is also used. For instance, we assume shift operator<< works on integer.
- typedef ParamFuzzy Field;
+ typedef ParamFuzzy Field;
typedef typename Field::Element Float;
- typedef std::vector<Float> FVector;
- typedef BlasBlackbox<Field> FMatrix;
+ typedef std::vector<Float> FVector;
+ typedef BlasMatrix<Field> FMatrix;
protected:
- Ring _R;
- VectorDomain<Ring> _VDR;
- Field _F;
+ Ring _ring;
+ VectorDomain<Ring> _VDR;
+ Field _field;
VectorDomain<Field> _VDF;
- NumericSolver _S;
+ NumericSolver _numsolver;
//inline static int check (int n, const double* M, integer* numx, integer& denx, double* b) ;
- //inline void update_r_xs (double* r, double* xs_int, double* xs_frac,
+ //inline void update_r_xs (double* r, double* xs_int, double* xs_frac,
// int n, const double* M, double* x, int shift);
- //inline int rat_sol(IVector& numx, Int& denx, NumericSolver& _S, FVector& r, integer Bd);
+ //inline int rat_sol(IVector& numx, Int& denx, NumericSolver& _numsolver, FVector& r, integer Bd);
//inline void dyadicToRational(ZIVector& num, Int& den, vector<integer>& numx, integer& denx, integer Bd);
private:
size_t shift, shift_prev, shift_max, SHIFT_BOUND, HIT, MISS, iterations;
@@ -73,11 +93,12 @@ class RationalSolverSN {
public:
RationalSolverSN(const Ring& R = Ring(), const NumericSolver& S = NumericSolver(),
- bool ea=false)
- : _R(R), _VDR(R), _F(Field()), _VDF(Field()), _S(S), exact_apply(ea) {}
+ bool ea=false) :
+ _ring(R), _VDR(R), _field(Field()), _VDF(Field()), _numsolver(S), exact_apply(ea)
+ {}
/**
- * IMatrix is matrix of integer type, eg. BlasBlackbox<PID-integer>
+ * IMatrix is matrix of integer type, eg. BlasMatrix<PID-integer>
* IVector is linbox Vector of integer, eg. vector<PID-integer::Element>
* M is the matrix, b is rhs.
* num, den are the output such that M*num = den*b (and den != 0 if successful).
@@ -85,8 +106,9 @@ class RationalSolverSN {
// sparse matrix flag at the end, then avoid copying to DM as well ass
// new method to get hadamard bound and matrix norm!
template <class IMatrix, class IVector>
- SNSolverReturnStatus solve(IVector& num, Int& den,
- const IMatrix& M, const IVector& b) {
+ SNSolverReturnStatus solve(IVector& num, Int& den,
+ const IMatrix& M, const IVector& b)
+ {
Timer timer, solve_timer, rr_timer, tt;
size_t n = b.size();
@@ -94,13 +116,13 @@ class RationalSolverSN {
linbox_check((b.size() == M.rowdim()) && (num. size() == M.coldim()));
// DM is M as matrix of doubles
- FMatrix DM(_F, n, n);
+ FMatrix DM(_field, n, n);
// Fix MatrixHom?
//FMatrix* DMp = &DM;
- //MatrixHom::map<FMatrix, IMatrix, Field>(DMp, M, _F);
+ //MatrixHom::map<FMatrix, IMatrix, Field>(DMp, M, _field);
if(n != M. rowdim() || n != M. coldim() || n != num.size()) {
- //std::cerr << "solve fail 1 - dimension mismatch" << std::endl;
+ // std::cerr << "solve fail 1 - dimension mismatch" << std::endl;
return SNSS_FAILED;
}
@@ -109,14 +131,14 @@ class RationalSolverSN {
SHIFT_BOUND = 52;
// why can't i put this in the for loop def???
- typename FMatrix::RawIterator dm_p = DM.rawBegin();
- for (typename IMatrix::ConstRawIterator raw_p = M.rawBegin();
- raw_p != M. rawEnd(); ++ raw_p, ++dm_p) {
- _F.init(*dm_p, *raw_p);
+ typename FMatrix::Iterator dm_p = DM.Begin();
+ for (typename IMatrix::ConstIterator raw_p = M.Begin();
+ raw_p != M. End(); ++ raw_p, ++dm_p) {
+ _field.init(*dm_p, *raw_p);
}
// build a numeric solver from new double matrix
- _S.init(DM);
+ _numsolver.init(DM);
// r is b as vector of doubles. (r is initial residual)
FVector r(n);
@@ -126,15 +148,15 @@ class RationalSolverSN {
typename FVector::iterator r_p = r.begin();
for ( ; b_p != b. begin() + n; ++b_p, ++r_p, ++bi_p) {
*bi_p = *b_p; // copy original RHS
- _F.init(*r_p, *b_p);
+ _field.init(*r_p, *b_p);
}
// denBound is the Hadamard bound, loopBound is roughly twice as much
integer denBound, loopBound;
- zw_hbound (denBound, n, n, &*(DM.rawBegin()));
+ zw_hbound (denBound, (int)n, (int)n, &*(DM.Begin()));
loopBound = denBound*denBound;
- mnorm = zw_dOOnorm(&*(DM.rawBegin()), n, n); // infinity-norm of matrix
+ mnorm = zw_dOOnorm(&*(DM.Begin()), (int)n, (int)n); // infinity-norm of matrix
// set max shift to avoid exact applys
size_t bits = 0;
size_t mn2 = nextPower2((size_t)mnorm);
@@ -143,7 +165,7 @@ class RationalSolverSN {
SHIFT_BOUND -= bits;
//std::cerr << "BITS" << bits << "MAX" << SHIFT_BOUND << std::endl;
- loopBound *= (2*mnorm + zw_dmax(n, &*(r.begin()), 1));
+ loopBound *= (2*mnorm + zw_dmax((int)n, &*(r.begin()), 1));
std::vector<integer> numx(n), tnum(n); // numerator of binary expansion
integer denx = 1, tden; // denominator of binary expansion (denx is a power of 2).
@@ -176,57 +198,60 @@ class RationalSolverSN {
#endif
//size_t rr_count = 0;
//solve_timer.clear(); rr_timer.clear();
- do{
+ do{
//tt.clear(); tt.start();
ret = rat_sol(numx, denx, xs_int, xs_frac, bi, lastb, r, lastr, x, bound, M);
//tt.stop(); solve_timer += tt;
if(ret == 1){
- //std::cerr << "numsym loop failed - likely lack of num accuracy" << std::endl;
+ // std::cerr << "numsym loop failed - likely lack of num accuracy" << std::endl;
return SNSS_FAILED;
}
else if(ret == 2) denBound = denx; // zero residual
- // we're trying to early-term
+ // we're trying to early-term
//std::cerr << bound << " " << loopBound << std::endl;
if(bound < loopBound){
// update bound for next iteration (if applicable)
- /* it_cost = solve_timer.realtime()/(double)iterations;
- rr_cost = rr_timer.realtime()/(double)rr_count;
- std::cerr << "iteration cost: " << it_cost << " v. rr cost: " << rr_cost << std::endl; */
- Z.sqrt(bound, loopBound*bound);
+#if 0
+ it_cost = solve_timer.realtime()/(double)iterations;
+ rr_cost = rr_timer.realtime()/(double)rr_count;
+ std::cerr << "iteration cost: " << it_cost << " v. rr cost: " << rr_cost << std::endl;
+#endif
+ Z.sqrt(bound, loopBound*bound);
bound <<= 2;
- int rPos = rand()%n;
+ int rPos = rand()%(int)n;
//std::cerr << "At iteration " << iterations << ", ";
if(dyadicToRational(Z, ay, be, numx[rPos], denx, denBound) /*== 2*/){
- //std::cerr << "Random single worked! ";
+ //std::cerr << "Random single worked! ";
}
- else{
- //std::cerr << "Random single failed." << std::endl;
+ else{
+ //std::cerr << "Random single failed." << std::endl;
continue;
}
- }
-
+ }
+
//tt.clear(); tt.start();
recon_status = dyadicToRational(Z, num, den, numx, denx, denBound);
//tt.stop(); rr_timer += tt; ++rr_count;
//std::cerr << "RRT: " << rr_timer << std::endl;
recon_success = recon_status > 0;
- //if(!recon_success) std::cerr << "Full failed!" << std::endl;
- //else std::cerr << "Full worked!" << std::endl;
+ //if(!recon_success) std::cerr << "Full failed!" << std::endl;
+ //else std::cerr << "Full worked!" << std::endl;
} while((bound < loopBound) && !recon_success);
//timer.stop(); std::cerr << "rat_sol time: " << solve_timer.realtime() << " rr time: " << rr_timer.realtime() << " Total: " << timer << std::endl;
- /*writeVec(numx, "numx", 0, 10);
+#if 0
+ writeVec(numx, "numx", 0, 10);
std::cerr << denx << std::endl;
writeVec(num, "num");
- std::cerr << "den: (large)" << std::endl;// << den << endl;
- */
+ std::cerr << "den: " /*(large)" << std::endl;*/ << den << std::endl;
+#endif
if (recon_success) {
- /*
+#if 0
if(recon_status == 2) std::cerr << "reconstruction guaranteed" << std::endl;
else std::cerr << "reconstruction speculative" << std::endl;
@@ -234,20 +259,20 @@ class RationalSolverSN {
std::cerr << HIT << " hits, " << MISS << " misses. (";
fprintf(stderr, "%.2f", (float)(HIT)/(float)(HIT+MISS)*100.0);
std::cerr << "%) Maximum shift: " << shift_max << std::endl;
- */
+#endif
}
else{
- //std::cerr << "rat reconstruction asserts failure" << std::endl;
- //dumpData(M, b, numx, denx, denBound);
+ // std::cerr << "rat reconstruction asserts failure" << std::endl;
+ // dumpData(M, b, numx, denx, denBound);
return SNSS_FAILED;
}
- if (_R.isZero(den)) {
- //std::cerr << "fail: zero denominator after rat-recons" << std::endl;
+ if (_ring.isZero(den)) {
+ // std::cerr << "fail: zero denominator after rat-recons" << std::endl;
return SNSS_FAILED;
}
- /*
+#if 0
// Answer checking
IVector y(n), z(n);
M.apply(y, num);
@@ -257,22 +282,21 @@ class RationalSolverSN {
dumpData(M, b, numx, denx, denBound);
return SNSS_FAILED;
}
- */
-
+#endif
return SNSS_OK;
- } // solve
+ } // solve
#include "rational-solver-sn.inl"
-#if 0
-//embedded definitions now, so no declarations
- // functions used by solve()
- //protected:
+#if 0
+ //embedded definitions now, so no declarations
+ // functions used by solve()
+ //protected:
//print out a vector
template <class Elt>
inline static int printvec (const Elt* v, int n);
- /** Compute the OO-norm of a mtrix */
+ /** Compute the OO-norm of a mtrix */
inline static double zw_dOOnorm(const double* M, int m, int n);
/** compute the maximam of absolute value of an array*/
inline static double zw_dmax (const int N, const double* a, const int inc);
@@ -289,7 +313,7 @@ class RationalSolverSN {
inline static int zw_hbound (integer& b, int m, int n, const double* M);
// compute the inverse of a general matrix
inline static int zw_dgeinv(double* M, int n);
- /* solve Ax = b
+ /* solve Ax = b
* A, the integer matrix
* b, integer rhs
* Return value
@@ -301,8 +325,17 @@ class RationalSolverSN {
//inline int rsol (Ring& R, int n, const double* M, integer* numx, integer& denx, double* b);
#endif
-}; // class RationalSolverSN
+ }; // class RationalSolverSN
} // namespace LinBox
-#endif // __SNRATIONAL_SOLVER_H
+#endif // __LINBOX_rational_solver_sn_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-solver-sn.inl b/linbox/algorithms/rational-solver-sn.inl
index 77280ac..5e54ece 100644
--- a/linbox/algorithms/rational-solver-sn.inl
+++ b/linbox/algorithms/rational-solver-sn.inl
@@ -1,3 +1,28 @@
+
+/* Copyright (C) 2011 LinBox
+ * Written Bryan Youse <>
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
// rational-solver-sn.inl
// WARNING: this file is included from INSIDE the definition of class LinBox::RationalSolverSN
@@ -13,16 +38,17 @@
#define log_2(x) (log(x)/M_LN2)
-int zw_shift(NumericSolver &_S, size_t n, FVector &r, FVector &x){
+int zw_shift(NumericSolver & NS_S, size_t n, FVector &r, FVector &x)
+{
// ZW method for calculating shift
// compute ax
FVector ax(n);
- _S.apply(ax, x);
+ NS_S.apply(ax, x);
// compute ax = ax -r, the negative of residual
for(size_t i=0; i<n; i++)
- _F.sub(ax[i], ax[i], r[i]);
+ _field.sub(ax[i], ax[i], r[i]);
// compute possible shift
- int zw_shift;
+ int zw_shift_loc;
double normr1, normr2, normr3, shift1, shift2;
normr1 = zw_dmax(n, &*r.begin(), 1);
normr2 = zw_dmax(n, &*ax.begin(), 1);
@@ -31,17 +57,17 @@ int zw_shift(NumericSolver &_S, size_t n, FVector &r, FVector &x){
//cerr << normr1 << " " << normr2 << " " << normr3 << endl;
//try to find a good scalar
if (normr2 <.0000000001)
- zw_shift = 30;
+ zw_shift_loc = 30;
else {
shift1 = floor(log_2 (normr1 / normr2)) - 2;
- zw_shift = (int)(30 < shift1 ? 30 : shift1);
+ zw_shift_loc = (int)(30 < shift1 ? 30 : shift1);
}
normr3 = normr3 > 2 ? normr3 : 2;
shift2 = floor(53. / log_2 (normr3));
- zw_shift = (int)(zw_shift < shift2 ? zw_shift : shift2);
+ zw_shift_loc = (int)(zw_shift_loc < shift2 ? zw_shift_loc : shift2);
- return zw_shift;
+ return zw_shift_loc;
}
template <class IMatrix>
@@ -58,14 +84,14 @@ int rat_sol(IVector& numx, Int& denx, FVector& xs_int, FVector& xs_frac, IVector
FVector nextx(n), quo(n);
integer denx_i;
- typename Field::Element one; _F.init(one, 1);
+ typename Field::Element one; _field.init(one, 1);
// need to save original r for zw_shift calculation
// TODO: I took out the ZWSHIFT, still need last r??
if(denx == 1){
// compute first approximate solution x
- _S.solve(x, r);
+ _numsolver.solve(x, r);
//writeVec(x, "x from first solve");
copy(r.begin(), r.end(), lastr.begin());
@@ -77,30 +103,30 @@ int rat_sol(IVector& numx, Int& denx, FVector& xs_int, FVector& xs_frac, IVector
}
//std::cerr << "while loopbound " << loopBound << std::endl;
- while (_R.compare(denx, loopBound) < 0) {
+ while (_ring.compare(denx, loopBound) < 0) {
++iterations;
// x = DM^{-1}*r
- _S.solve(nextx, r);
+ _numsolver.solve(nextx, r);
for(size_t i=0; i<n; i++){
// TODO - analyze logic here
// quo[i] = xs_frac[i] / nextx[i] - 1;
- //_F.div(quo[i], xs_frac[i], nextx[i]);
- //_F.subin(quo[i], one);
- _F.sub(quo[i], xs_frac[i], nextx[i]);
+ //_field.div(quo[i], xs_frac[i], nextx[i]);
+ //_field.subin(quo[i], one);
+ _field.sub(quo[i], xs_frac[i], nextx[i]);
}
- double q = zw_dmax(n, &*quo.begin(), 1);
+ double q = zw_dmax((int)n, &*quo.begin(), 1);
//writeVec(nextx, "nextx from loop"); // DEBUG PRINTOUTS
//writeVec(xs_frac, "xs_frac from loop");
//writeVec(quo, "quo");
/* fails to write!!
- _VDF.write(std::cerr << "nextx from loop: ", nextx) << std::endl;
- _VDF.write(std::cerr << "xs_frac from loop: ", xs_frac) << std::endl;
- _VDF.write(std::cerr << "quo minus 1: ", quo) << std::endl;
- if ( 0 == iterations%500) std::cerr << iterations << " MAX DIFFERENCE: " << q << std::endl;
- */
+ _VDF.write(std::cerr << "nextx from loop: ", nextx) << std::endl;
+ _VDF.write(std::cerr << "xs_frac from loop: ", xs_frac) << std::endl;
+ _VDF.write(std::cerr << "quo minus 1: ", quo) << std::endl;
+ if ( 0 == iterations%500) std::cerr << iterations << " MAX DIFFERENCE: " << q << std::endl;
+ */
//if (q == 0.0) (QUIT HERE??)
if (q < threshold) {
@@ -129,10 +155,10 @@ int rat_sol(IVector& numx, Int& denx, FVector& xs_int, FVector& xs_frac, IVector
// point of no return, quit
if (shift < 2){
/*
- std::cerr << "rat_sol failure, no bits in x overlap in nextx." << std::endl;
- std::cerr << "Iterations: " << iterations << std::endl;
- writeVec(b, "b", 0, 5); writeVec(r, "r", 0, 5);
- */
+ std::cerr << "rat_sol failure, no bits in x overlap in nextx." << std::endl;
+ std::cerr << "Iterations: " << iterations << std::endl;
+ writeVec(b, "b", 0, 5); writeVec(r, "r", 0, 5);
+ */
return -1;
}
@@ -149,31 +175,32 @@ int rat_sol(IVector& numx, Int& denx, FVector& xs_int, FVector& xs_frac, IVector
return 0;
}// rat_sol
-inline void upshift(){
+inline void upshift()
+{
switch(sstatus){
// exponential increase
- case SHIFT_GROW:
- shift_prev = shift;
- debugneol("G");
- shift_max = shift<<=1;
- break;
- case SHIFT_SEARCH:
- shift_prev = shift;
- debugneol("S");
- shift = (shift + shift_max)>>1;
- searchPeak = true;
- break;
- case SHIFT_PEAK:
- debugneol("P");
- // maybe increase if we have been successful for a while
- break;
- case SHIFT_MAX:
- debugneol("M");
- // machine precision-- can go no higher
- break;
- case SHIFT_SHRINK:
- debugneol("H");
- break;
+ case SHIFT_GROW:
+ shift_prev = shift;
+ debugneol("G");
+ shift_max = shift<<=1;
+ break;
+ case SHIFT_SEARCH:
+ shift_prev = shift;
+ debugneol("S");
+ shift = (shift + shift_max)>>1;
+ searchPeak = true;
+ break;
+ case SHIFT_PEAK:
+ debugneol("P");
+ // maybe increase if we have been successful for a while
+ break;
+ case SHIFT_MAX:
+ debugneol("M");
+ // machine precision-- can go no higher
+ break;
+ case SHIFT_SHRINK:
+ debugneol("H");
+ break;
}
if(shift > SHIFT_BOUND){
shift_max = shift = SHIFT_BOUND;
@@ -182,47 +209,49 @@ inline void upshift(){
debug("^shift: " << shift << " max: " << shift_max << " prev: " << shift_prev);
}
-inline void downshift(){
+inline void downshift()
+{
/*
shift -= 2;
sstatus = SHIFT_PEAK;
cerr << "peaked at " << shift << endl;
- */
+ */
// back up
switch(sstatus){
- case SHIFT_GROW:
- debugneol("G");
- case SHIFT_MAX:
- debugneol("M");
- case SHIFT_SEARCH:
- // TODO - previous shift could fail
- debugneol("S");
- shift_max = shift;
- shift = (shift_prev + shift)>>1;
- sstatus = SHIFT_SEARCH;
- // searchPeak true means we were going up but got knocked back
- if(shift == shift_prev || searchPeak)
- sstatus = SHIFT_PEAK;
- break;
- case SHIFT_SHRINK:
- debugneol("H");
- shift >>= 1;
- break;
- case SHIFT_PEAK:
- debugneol("P");
- shift -= 1;
- break;
- default:
- break;
+ case SHIFT_GROW:
+ debugneol("G");
+ case SHIFT_MAX:
+ debugneol("M");
+ case SHIFT_SEARCH:
+ // TODO - previous shift could fail
+ debugneol("S");
+ shift_max = shift;
+ shift = (shift_prev + shift)>>1;
+ sstatus = SHIFT_SEARCH;
+ // searchPeak true means we were going up but got knocked back
+ if(shift == shift_prev || searchPeak)
+ sstatus = SHIFT_PEAK;
+ break;
+ case SHIFT_SHRINK:
+ debugneol("H");
+ shift >>= 1;
+ break;
+ case SHIFT_PEAK:
+ debugneol("P");
+ shift -= 1;
+ break;
+ default:
+ break;
}
debug("vshift: " << shift << " max: " << shift_max << " prev: " << shift_prev);
} // downshift
-inline void update_xs(FVector& xs_int, FVector& xs_frac, FVector& x){
+inline void update_xs(FVector& xs_int, FVector& xs_frac, FVector& x)
+{
Float scalar, tmp;
int64_t shifted = ((int64_t)1 << shift);
- _F.init(scalar, shifted);
+ _field.init(scalar, (double) shifted);
// make xs_int and xs_frac such that x*scalar = xs_int + xs_frac.
for(size_t i = 0; i < xs_int.size(); ++i){
@@ -235,16 +264,17 @@ inline void update_xs(FVector& xs_int, FVector& xs_frac, FVector& x){
return;
}
-inline void update_r(FVector& r, FVector& xs_int){
+inline void update_r(FVector& r, FVector& xs_int)
+{
Float scalar;
size_t n = r.size();
int64_t shifted = ((int64_t)1 << shift);
- _F.init(scalar, shifted);
+ _field.init(scalar, (double)shifted);
FVector y(n);
//update r = r * 2^shift - Mat*xs_int
_VDF.mulin(r, scalar);
- _S.apply(y, xs_int);
+ _numsolver.apply(y, xs_int);
_VDF.subin(r, y);
return;
@@ -263,27 +293,27 @@ inline void update_r_exact(IVector& r_exact, FVector& r, FVector& xs_int, IMatri
_VDR.mulin(r_exact, scalar);
// determine if exact apply is needed
- double vnorm = zw_dOOnorm(&*xs_int.begin(), n, 1);
+ double vnorm = zw_dOOnorm(&*xs_int.begin(), (int)n, 1);
int64_t th = ((int64_t)1 << 52); // double mantissa
Float thresh;
- _F.init(thresh, th);
+ _field.init(thresh, (double)th);
debugneol("vnorm " << vnorm);
// r -= Mat * xs_int
- if(_F.mulin(vnorm, mnorm) < thresh){
+ if(_field.mulin(vnorm, mnorm) < thresh){
debugneol("Numeric ");
FVector y(n);
- _S.apply(y, xs_int);
+ _numsolver.apply(y, xs_int);
for(size_t i = 0; i < n; ++i)
- _R.init(y_i[i], y[i]);
+ _ring.init(y_i[i], y[i]);
}
else{
SHIFT_BOUND--; // to less this possibility
debugneol("Exact ");
for(size_t i = 0; i < n; ++i)
- _R.init(x_i[i], xs_int[i]);
+ _ring.init(x_i[i], xs_int[i]);
IM.apply(y_i, x_i);
}
@@ -293,36 +323,38 @@ inline void update_r_exact(IVector& r_exact, FVector& r, FVector& xs_int, IMatri
typename FVector::iterator rp = r.begin();
typename IVector::iterator rep = r_exact.begin();
for(; rp!= r.end(); ++rp, ++rep)
- _F.init(*rp, *rep);
+ _field.init(*rp, *rep);
return;
} // update_r_exact
// no longer called...
-inline int HadamardBound(integer& B, FMatrix& DM) {
+inline int HadamardBound(integer& B, FMatrix& DM)
+{
size_t n = DM.rowdim();
- zw_hbound (B, n, n, &*DM.rawBegin()); // compute the Hadamard bound
+ zw_hbound (B, n, n, &*DM.Begin()); // compute the Hadamard bound
B = B * B;
- double mnorm = zw_dOOnorm(&*DM.rawBegin(), n, n);
+ double mnorm_loc = zw_dOOnorm(&*DM.Begin(), n, n);
// [don't know what this comment is about] should be a check for 2 * mnorm + zw_dmax (n, b, 1);
// TODO what is "b"? from copied code it is the RHS array of doubles
// zw_max just seems to get abs(max value of b)
// next line false, just to compile
double *b;
- B *= 2 * mnorm + zw_dmax (n, b, 1); // [don't know what this factor is about]
+ B *= 2 * mnorm_loc + zw_dmax (n, b, 1); // [don't know what this factor is about]
B <<= 1; // [extra factor of 2 for some reason... ]
return B;
}
//update num, *num <- *num * 2^shift + d
-inline IVector& update_num (IVector& num, const FVector& d) {
+inline IVector& update_num (IVector& num, const FVector& d)
+{
size_t n = d.size();
IVector d_i(n);
for (size_t i = 0; i < n; ++i) {
- _R.init(d_i[i], d[i]);
+ _ring.init(d_i[i], d[i]);
}
- Int scalar; _R.init(scalar, (long long int)1 << shift);
+ Int scalar; _ring.init(scalar, 1UL << shift);
// TODO - analyze GMP shifting capability
_VDR.mulin(num, scalar);
_VDR.addin(num, d_i);
@@ -330,7 +362,8 @@ inline IVector& update_num (IVector& num, const FVector& d) {
}
//update r = r * shift - M d
-inline static int update_r_ll (double* r, int n, const double* M, const double* d, int shift) {
+inline static int update_r_ll (double* r, int n, const double* M, const double* d, int shift)
+{
long long int tmp;
double* p1;
const double* p2;
@@ -346,23 +379,26 @@ inline static int update_r_ll (double* r, int n, const double* M, const double*
return 0;
}
-inline static size_t nextPower2(size_t n){
+inline static size_t nextPower2(size_t n)
+{
size_t p = 1;
while(p < n) p <<= 1;
return p;
}
-inline static double highAbs(FMatrix M){
+inline static double highAbs(FMatrix M)
+{
double max = 0;
- typename FMatrix::RawIterator ri = M.rawBegin();
- for(; ri != M.rawEnd(); ++ri){
+ typename FMatrix::Iterator ri = M.Begin();
+ for(; ri != M.End(); ++ri){
double tmp = fabs(*ri);
if(max < tmp) max = tmp;
}
return max;
}
-inline static double zw_dOOnorm(const double* M, int m, int n) {
+inline static double zw_dOOnorm(const double* M, int m, int n)
+{
double norm = 0;
double old = 0;
const double* p;
@@ -375,11 +411,13 @@ inline static double zw_dOOnorm(const double* M, int m, int n) {
return norm;
}
-inline static double zw_dmax (const int N, const double* a, const int inc) {
+inline static double zw_dmax (const int N, const double* a, const int inc)
+{
return fabs(a[cblas_idamax (N, a, inc)]);
}
-inline static int zw_hbound (integer& b, int m, int n, const double* M){
+inline static int zw_hbound (integer& b, int m, int n, const double* M)
+{
double norm = 0;
const double* p;
integer tmp;
@@ -399,7 +437,8 @@ inline static int zw_hbound (integer& b, int m, int n, const double* M){
* bound: upper bound on printed value (0 - ignore bound) */
template<class Vec>
std::ostream& writeVec(Vec& out, const char *tag="", integer bound=/*40000000*/0,
- size_t numEntries=5, std::ostream &os=std::cerr){
+ size_t numEntries=5, std::ostream &os=std::cerr)
+{
os << tag << ": [";
size_t n = (out.size() < numEntries ? out.size() : numEntries);
@@ -418,7 +457,8 @@ std::ostream& writeVec(Vec& out, const char *tag="", integer bound=/*40000000*/0
}
template<class Vec>
-void writeVecFile(Vec& out, const char* file){
+void writeVecFile(Vec& out, const char* file)
+{
std::ofstream os;
os.open(file, std::ios::out);
@@ -432,7 +472,8 @@ void writeVecFile(Vec& out, const char* file){
// to write diagnostic info to files for further testing
template <class Matrix>
-void dumpData(const Matrix &M, const IVector &b, IVector &numx, integer &denx, integer &denBound){
+void dumpData(const Matrix &M, const IVector &b, IVector &numx, integer &denx, integer &denBound)
+{
#ifdef SPITOUT
std::ofstream matout;
matout.open("debug.mat", std::ios::out);
@@ -448,3 +489,12 @@ void dumpData(const Matrix &M, const IVector &b, IVector &numx, integer &denx, i
dout.close();
#endif
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-solver.h b/linbox/algorithms/rational-solver.h
index 7f8a583..1607804 100644
--- a/linbox/algorithms/rational-solver.h
+++ b/linbox/algorithms/rational-solver.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/rational-solver.h
* Copyright (C) 2004 Zhendong Wan, Pascal Giorgi
*
@@ -7,10 +5,13 @@
* and Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
* Modified by David Pritchard <daveagp at mit.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/rational-solver.h
@@ -33,13 +34,17 @@
#include <iostream>
-#include <linbox/solutions/methods.h>
-#include <linbox/blackbox/archetype.h>
-#include <linbox/blackbox/lambda-sparse.h>
-#include <linbox/blackbox/compose.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/algorithms/vector-fraction.h>
-#include <linbox/util/timer.h>
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+
+// #include "linbox/field/multimod-field.h"
+#include "linbox/solutions/methods.h"
+#include "linbox/blackbox/archetype.h"
+#include "linbox/blackbox/lambda-sparse.h"
+#include "linbox/blackbox/compose.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/algorithms/vector-fraction.h"
+#include "linbox/util/timer.h"
//#define RSTIMING
#define DEFAULT_PRIMESIZE 20
@@ -47,8 +52,6 @@
namespace LinBox
{// LinBox
-// bsd and mac problem
-#undef _R
#define SINGULARITY_THRESHOLD 5
#define BAD_PRECONTITIONER_THRESHOLD 5
@@ -62,7 +65,7 @@ namespace LinBox
* i.e. solution over the rational for an integer linear system.
*
* \par Headers
- * <code>\#include <linbox/algorithms/rational-solver.h></code>
+ * <code>\#include "linbox/algorithms/rational-solver.h></code>
*
* See the following reference for details on this algorithm:
* \bib
@@ -244,7 +247,7 @@ namespace LinBox
typedef std::vector<Element> FPolynomial;
protected:
- Ring _R;
+ Ring _ring;
mutable RandomPrime _genprime;
mutable Prime _prime;
WiedemannTraits _traits;
@@ -266,7 +269,7 @@ namespace LinBox
RationalSolver (const Ring& r = Ring(),
const RandomPrime& rp = RandomPrime(DEFAULT_PRIMESIZE),
const WiedemannTraits& traits=WiedemannTraits()) :
- _R(r), _genprime(rp), _traits(traits)
+ _ring(r), _genprime(rp), _traits(traits)
{
++_genprime; _prime=*_genprime;
@@ -284,7 +287,7 @@ namespace LinBox
RationalSolver (const Prime& p, const Ring& r = Ring(),
const RandomPrime& rp = RandomPrime(DEFAULT_PRIMESIZE),
const WiedemannTraits& traits=WiedemannTraits()) :
- _R(r), _genprime(rp), _prime(p), _traits(traits)
+ _ring(r), _genprime(rp), _prime(p), _traits(traits)
{
#ifdef RSTIMING
@@ -443,12 +446,12 @@ namespace LinBox
typedef typename Ring::Element Integer;
typedef typename Field::Element Element;
typedef typename RandomPrime::Prime_Type Prime;
- typedef BlasMatrix<Element> Coefficient;
+ typedef BlasMatrix<Field> Coefficient;
typedef std::vector<Element> FPolynomial;
typedef std::vector<Coefficient> FBlockPolynomial;
protected:
- Ring _R;
+ Ring _ring;
RandomPrime _genprime;
mutable Prime _prime;
BlockWiedemannTraits _traits;
@@ -470,7 +473,7 @@ namespace LinBox
RationalSolver (const Ring& r = Ring(),
const RandomPrime& rp = RandomPrime(DEFAULT_PRIMESIZE),
const BlockWiedemannTraits& traits=BlockWiedemannTraits()) :
- _R(r), _genprime(rp), _traits(traits)
+ _ring(r), _genprime(rp), _traits(traits)
{
++_genprime; _prime=*_genprime;
@@ -488,7 +491,7 @@ namespace LinBox
RationalSolver (const Prime& p, const Ring& r = Ring(),
const RandomPrime& rp = RandomPrime(DEFAULT_PRIMESIZE),
const BlockWiedemannTraits& traits=BlockWiedemannTraits()) :
- _R(r), _genprime(rp), _prime(p), _traits(traits)
+ _ring(r), _genprime(rp), _prime(p), _traits(traits)
{
#ifdef RSTIMING
@@ -633,7 +636,7 @@ namespace LinBox
mutable RandomPrime _genprime;
mutable Prime _prime;
- Ring _R;
+ Ring _ring;
#ifdef RSTIMING
mutable Timer
tSetup, ttSetup,
@@ -663,7 +666,7 @@ namespace LinBox
*/
RationalSolver (const Ring& r = Ring(),
const RandomPrime& rp = RandomPrime(DEFAULT_PRIMESIZE)) :
- lastCertificate(r, 0), _genprime(rp), _R(r)
+ lastCertificate(r, 0), _genprime(rp), _ring(r)
{
++_genprime; _prime=*_genprime;
#ifdef RSTIMING
@@ -679,7 +682,7 @@ namespace LinBox
*/
RationalSolver (const Prime& p, const Ring& r = Ring(),
const RandomPrime& rp = RandomPrime(DEFAULT_PRIMESIZE)) :
- lastCertificate(r, 0), _genprime(rp), _prime(p), _R(r)
+ lastCertificate(r, 0), _genprime(rp), _prime(p), _ring(r)
{
#ifdef RSTIMING
clearTimers();
@@ -804,7 +807,7 @@ namespace LinBox
Ring getRing() const
{
- return _R;
+ return _ring;
}
void chooseNewPrime() const
@@ -901,7 +904,7 @@ namespace LinBox
Keep it just for interface consistency.
*/
template <class Ring, class Field, class RandomPrime>
- class RationalSolver<Ring, Field, RandomPrime, NumericalTraits>;
+ class RationalSolver<Ring, Field, RandomPrime, NumericalTraits>;
/** \brief solver using a hybrid Numeric/Symbolic computation.
*
@@ -937,7 +940,7 @@ namespace LinBox
protected:
RandomPrime _genprime;
mutable Prime _prime;
- Ring _R;
+ Ring _ring;
public:
@@ -948,7 +951,7 @@ namespace LinBox
*/
RationalSolver (const Ring& r = Ring(),
const RandomPrime& rp = RandomPrime(DEFAULT_PRIMESIZE)) :
- _genprime(rp), _R(r)
+ _genprime(rp), _ring(r)
{
_prime=_genprime.randomPrime();
}
@@ -961,7 +964,7 @@ namespace LinBox
*/
RationalSolver (const Prime& p, const Ring& r = Ring(),
const RandomPrime& rp = RandomPrime(DEFAULT_PRIMESIZE)) :
- _genprime(rp), _prime(p), _R(r)
+ _genprime(rp), _prime(p), _ring(r)
{}
@@ -992,7 +995,7 @@ namespace LinBox
protected:
RandomPrime _genprime;
mutable Prime _prime;
- Ring _R;
+ Ring _ring;
public:
@@ -1003,7 +1006,7 @@ namespace LinBox
*/
RationalSolver (const Ring& r = Ring(),
const RandomPrime& rp = RandomPrime(DEFAULT_PRIMESIZE)) :
- _genprime(rp), _R(r)
+ _genprime(rp), _ring(r)
{
_prime=_genprime.randomPrime();
}
@@ -1016,7 +1019,7 @@ namespace LinBox
*/
RationalSolver (const Prime& p, const Ring& r = Ring(),
const RandomPrime& rp = RandomPrime(DEFAULT_PRIMESIZE)) :
- _genprime(rp), _prime(p), _R(r)
+ _genprime(rp), _prime(p), _ring(r)
{}
@@ -1030,8 +1033,17 @@ namespace LinBox
}
-#include <linbox/algorithms/rational-solver.inl>
+#include "linbox/algorithms/rational-solver.inl"
#endif //__LINBOX_rational_solver_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-solver.inl b/linbox/algorithms/rational-solver.inl
index d4046c3..19778d9 100644
--- a/linbox/algorithms/rational-solver.inl
+++ b/linbox/algorithms/rational-solver.inl
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/rational-solver.inl
* Copyright (C) 2004 Pascal Giorgi
*
* Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
* Modified by David Pritchard <daveagp at mit.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,49 +18,46 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_rational_solver_INL
#define __LINBOX_rational_solver_INL
-#include <linbox/blackbox/dense.h>
-#include <linbox/blackbox/sparse.h>
-#include <linbox/blackbox/lambda-sparse.h>
-#include <linbox/blackbox/lambda-sparse.h>
-#include <linbox/blackbox/transpose.h>
-#include <linbox/blackbox/diagonal.h>
-#include <linbox/blackbox/compose.h>
-#include <linbox/algorithms/lifting-container.h>
-#include <linbox/algorithms/rational-reconstruction.h>
-#include <linbox/algorithms/matrix-inverse.h>
-#include <linbox/algorithms/matrix-hom.h>
-#include <linbox/algorithms/gauss.h>
-#include <linbox/algorithms/blackbox-container.h>
-#include <linbox/algorithms/massey-domain.h>
-#include <linbox/algorithms/blackbox-block-container.h>
-#include <linbox/algorithms/block-massey-domain.h>
-#include <linbox/algorithms/vector-fraction.h>
+#include "linbox/util/debug.h"
+#include "linbox/linbox-config.h"
+
+#include "linbox/blackbox/sparse.h"
+#include "linbox/blackbox/lambda-sparse.h"
+#include "linbox/blackbox/transpose.h"
+#include "linbox/blackbox/diagonal.h"
+#include "linbox/blackbox/compose.h"
+#include "linbox/algorithms/lifting-container.h"
+#include "linbox/algorithms/rational-reconstruction.h"
+#include "linbox/algorithms/matrix-inverse.h"
+#include "linbox/algorithms/matrix-hom.h"
+#include "linbox/algorithms/gauss.h"
+#include "linbox/algorithms/blackbox-container.h"
+#include "linbox/algorithms/massey-domain.h"
+#include "linbox/algorithms/blackbox-block-container.h"
+#include "linbox/algorithms/block-massey-domain.h"
+#include "linbox/algorithms/vector-fraction.h"
#include <fflas-ffpack/ffpack/ffpack.h>
#include <fflas-ffpack/fflas/fflas.h>
-#include <linbox/solutions/methods.h>
-#include <linbox/util/debug.h>
-#include <linbox/linbox-config.h>
-#include <linbox/field/multimod-field.h>
-#include <linbox/blackbox/block-hankel-inverse.h>
+#include "linbox/solutions/methods.h"
+#include "linbox/blackbox/block-hankel-inverse.h"
-#ifdef __LINBOX_BLAS_AVAILABLE
-#include <linbox/config-blas.h>
-#include <linbox/blackbox/blas-blackbox.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/algorithms/blas-domain.h>
-#include <linbox/matrix/factorized-matrix.h>
-#include <linbox/util/timer.h>
-#endif
+// #ifdef __LINBOX_BLAS_AVAILABLE
+#include "linbox/config-blas.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/algorithms/blas-domain.h"
+#include "linbox/matrix/factorized-matrix.h"
+#include "linbox/util/timer.h"
+// #endif
//#define DEBUG_DIXON
//#define DEBUG_INC
@@ -208,7 +206,7 @@ namespace LinBox
typedef WiedemannLiftingContainer<Ring, Field, IMatrix, FMatrix, FPolynomial> LiftingContainer;
- LiftingContainer lc(_R, *F, A, *Ap, MinPoly, b,_prime);
+ LiftingContainer lc(_ring, *F, A, *Ap, MinPoly, b,_prime);
RationalReconstruction<LiftingContainer> re(lc);
@@ -304,43 +302,43 @@ namespace LinBox
typedef WiedemannLiftingContainer<Ring, Field, IPrecondMatrix, FPrecondMatrix, FPolynomial> LiftingContainer;
std::cerr<<"before lc\n";
- LiftingContainer lc(_R, *F, *PAQ, *PApQ, MinPoly, Pb, _prime);
+ LiftingContainer lc(_ring, *F, *PAQ, *PApQ, MinPoly, Pb, _prime);
std::cerr<<"constructing lifting container of length: "<<lc.length()<<std::endl;
- RationalReconstruction<LiftingContainer> re(lc,_R,2);
+ RationalReconstruction<LiftingContainer> re(lc,_ring,2);
re.getRational(num, den, 0);
if (Q != NULL) {
- /*
+#if 0
typename Ring::Element lden;
- _R. init (lden, 1);
+ _ring. init (lden, 1);
typename Vector1::iterator p;
for (p = answer.begin(); p != answer.end(); ++ p)
- _R. lcm (lden, lden, p->second);
+ _ring. lcm (lden, lden, p->second);
-*/
+#endif
IVector Qx(num.size());
- /*
+#if 0
typename IVector::iterator p_x;
for (p = answer.begin(), p_x = x. begin(); p != answer.end(); ++ p, ++ p_x) {
- _R. mul (*p_x, p->first, lden);
- _R. divin (*p_x, p->second);
+ _ring. mul (*p_x, p->first, lden);
+ _ring. divin (*p_x, p->second);
}
- */
+#endif
Q->apply(Qx, num);
- /*
+#if 0
for (p=answer.begin(),p_x=Qx.begin(); p != answer.end();++p,++p_x){
p->first=*p_x;
p->second=lden;
}
- */
+#endif
num = Qx;
}
@@ -377,24 +375,24 @@ namespace LinBox
std::cerr<<"A mod p:\n";
Ap->write(std::cerr);
#endif
- VectorDomain<Ring> VD(_R);
+ VectorDomain<Ring> VD(_ring);
#if 0
std::cerr<<"b:\n";
VD.write(std::cerr,b)<<std::endl;
#endif
- commentator.start ("Constructing sparse preconditioner");
+ commentator().start ("Constructing sparse preconditioner");
typedef LambdaSparseMatrix<Ring> IPreconditioner;
typedef LambdaSparseMatrix<Field> FPreconditioner;
size_t min_dim = A->coldim() < A->rowdim() ? A->coldim() : A->rowdim();
- P = new IPreconditioner(_R,min_dim,A->rowdim(),2,3.);
+ P = new IPreconditioner(_ring,min_dim,A->rowdim(),2,3.);
// std::cerr<<"P:\n";
// P->write(std::cerr);
- Q = new IPreconditioner(_R,A->coldim(),min_dim,2,3.);
+ Q = new IPreconditioner(_ring,A->coldim(),min_dim,2,3.);
// std::cerr<<"Q:\n";
// Q->write(std::cerr);
@@ -417,7 +415,7 @@ namespace LinBox
PApQ = new Compose<FPreconditioner, Compose<FMatrix,FPreconditioner> > (Pmodp, ApQ);
std::cerr<<"Preconditioning done\n";
- commentator.stop ("done");
+ commentator().stop ("done");
}
@@ -439,14 +437,14 @@ namespace LinBox
switch (_traits.preconditioner() ) {
case WiedemannTraits::BUTTERFLY:
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<<"ERROR: Butterfly preconditioner not implemented yet. Sorry." << std::endl;
case WiedemannTraits::SPARSE:
{
- commentator.start ("Constructing sparse preconditioner");
+ commentator().start ("Constructing sparse preconditioner");
- P = new LambdaSparseMatrix<Ring> (_R,Ap->coldim(),Ap->rowdim(),2);
+ P = new LambdaSparseMatrix<Ring> (_ring,Ap->coldim(),Ap->rowdim(),2);
PAQ = new Compose<LambdaSparseMatrix<Ring>, IMatrix> (*P,A);
@@ -456,12 +454,12 @@ namespace LinBox
PApQ = new Compose<LambdaSparseMatrix<Field>, FMatrix> (Pmodp, *Ap);
- commentator.stop ("done");
+ commentator().stop ("done");
break;
}
case WiedemannTraits::TOEPLITZ:
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Toeplitz preconditioner not implemented yet. Sorry." << std::endl;
case WiedemannTraits::NONE:
@@ -552,7 +550,7 @@ namespace LinBox
Transpose<IMatrix> B(A);
- LiftingContainer lc(_R, F, B, Bp, b,_prime, m, n);
+ LiftingContainer lc(_ring, F, B, Bp, b,_prime, m, n);
RationalReconstruction<LiftingContainer> re(lc);
@@ -642,9 +640,9 @@ namespace LinBox
int trials = 0, notfr;
// history sensitive data for optimal reason
- static const IMatrix* IMP;
+ // static const IMatrix* IMP;
- BlasBlackbox<Field>* FMP = NULL;
+ BlasMatrix<Field>* FMP = NULL;
Field *F=NULL;
do
@@ -665,8 +663,8 @@ namespace LinBox
#ifdef RSTIMING
tNonsingularSetup.start();
#endif
- typedef typename Field::Element Element;
- typedef typename Ring::Element Integer;
+ // typedef typename Field::Element Element;
+ // typedef typename Ring::Element Integer;
// checking size of system
linbox_check(A.rowdim() == A.coldim());
@@ -683,20 +681,20 @@ namespace LinBox
// Could delete a non allocated matrix -> segfault
if (FMP != NULL) delete FMP;
- IMP = &A;
+ // IMP = &A;
if (F != NULL) delete F;
F= new Field (_prime);
- FMP = new BlasBlackbox<Field>(*F, A.rowdim(),A.coldim());
+ FMP = new BlasMatrix<Field>(*F, A.rowdim(),A.coldim());
MatrixHom::map (*FMP, A, *F); // use MatrixHom to reduce matrix PG 2005-06-16
#if 0
- typename BlasBlackbox<Field>::RawIterator iter_p = FMP->rawBegin();
- typename IMatrix::ConstRawIterator iter = A.rawBegin();
- for (;iter != A.rawEnd();++iter,++iter_p)
- F->init(*iter_p, _R.convert(tmp,*iter));
+ typename BlasMatrix<Field>::Iterator iter_p = FMP->Begin();
+ typename IMatrix::ConstIterator iter = A.Begin();
+ for (;iter != A.End();++iter,++iter_p)
+ F->init(*iter_p, _ring.convert(tmp,*iter));
#endif
#ifdef DEBUG_DIXON
@@ -708,11 +706,11 @@ namespace LinBox
if (!checkBlasPrime(_prime)){
if (FMP != NULL) delete FMP;
- FMP = new BlasBlackbox<Field>(*F, A.rowdim(),A.coldim());
- notfr = MatrixInverse::matrixInverseIn(*F,*FMP);
+ FMP = new BlasMatrix<Field>(*F, A.rowdim(),A.coldim());
+ notfr = (int)MatrixInverse::matrixInverseIn(*F,*FMP);
}
else {
- BlasBlackbox<Field> *invA = new BlasBlackbox<Field>(*F, A.rowdim(),A.coldim());
+ BlasMatrix<Field> *invA = new BlasMatrix<Field>(*F, A.rowdim(),A.coldim());
BlasMatrixDomain<Field> BMDF(*F);
#ifdef RSTIMING
tNonsingularSetup.stop();
@@ -747,8 +745,8 @@ namespace LinBox
FMP->write(std::cout);
#endif
- typedef DixonLiftingContainer<Ring,Field,IMatrix,BlasBlackbox<Field> > LiftingContainer;
- LiftingContainer lc(_R, *F, A, *FMP, b, _prime);
+ typedef DixonLiftingContainer<Ring,Field,IMatrix,BlasMatrix<Field> > LiftingContainer;
+ LiftingContainer lc(_ring, *F, A, *FMP, b, _prime);
RationalReconstruction<LiftingContainer > re(lc);
if (!re.getRational(num, den,0)){
delete FMP;
@@ -828,27 +826,27 @@ namespace LinBox
tSetup.start();
#endif
- typedef typename Field::Element Element;
- typedef typename Ring::Element Integer;
+ // typedef typename Field::Element Element;
+ typedef typename Ring::Element Integer_t;
typedef DixonLiftingContainer<Ring, Field,
- BlasBlackbox<Ring>, BlasBlackbox<Field> > LiftingContainer;
+ BlasMatrix<Ring>, BlasMatrix<Field> > LiftingContainer;
// checking size of system
linbox_check(A.rowdim() == b.size());
LinBox::integer tmp;
- Integer _rone,_rzero;
- _R.init(_rone,1);
- _R.init(_rzero,0);
+ Integer_t _rone,_rzero;
+ _ring.init(_rone,1);
+ _ring.init(_rzero,0);
Field F (_prime);
- BlasMatrixDomain<Ring> BMDI(_R);
+ BlasMatrixDomain<Ring> BMDI(_ring);
BlasMatrixDomain<Field> BMDF(F);
- BlasApply<Ring> BAR(_R);
- MatrixDomain<Ring> MD(_R);
- VectorDomain<Ring> VDR(_R);
+ BlasApply<Ring> BAR(_ring);
+ MatrixDomain<Ring> MD(_ring);
+ VectorDomain<Ring> VDR(_ring);
- BlasBlackbox<Ring> A_check(_R, A); // used to check answer later
+ BlasMatrix<Ring> A_check(A); // used to check answer later
// TAS_xxx stands for Transpose Augmented System (A|b)t
// this provides a factorization (A|b) = TAS_Pt . TAS_Ut . TAS_Qt . TAS_Lt
@@ -856,10 +854,10 @@ namespace LinBox
// - TAS_P . (A|b) . TAS_Q has nonzero principal minors up to TAS_rank
// - TAS_Q permutes b to the (TAS_rank)th column of A iff the system is inconsistent mod p
- BlasBlackbox<Field>* TAS_factors = new BlasBlackbox<Field>(F, A.coldim()+1, A.rowdim());
- Hom<Ring, Field> Hmap(_R, F);
+ BlasMatrix<Field>* TAS_factors = new BlasMatrix<Field>(F, A.coldim()+1, A.rowdim());
+ Hom<Ring, Field> Hmap(_ring, F);
- BlasBlackbox<Field> Ap(F, A.rowdim(), A.coldim());
+ BlasMatrix<Field> Ap(F, A.rowdim(), A.coldim());
MatrixHom::map(Ap, A, F);
for (size_t i=0;i<A.rowdim();++i)
@@ -870,7 +868,7 @@ namespace LinBox
for (size_t i=0;i<A.rowdim();++i){
typename Field::Element tmpe;
F.init(tmpe);
- F.init(tmpe,_R.convert(tmp,b[i]));
+ F.init(tmpe,_ring.convert(tmp,b[i]));
TAS_factors->setEntry(A.coldim(),i, tmpe);
}
#ifdef RSTIMING
@@ -881,8 +879,8 @@ namespace LinBox
BlasPermutation<size_t> TAS_P(TAS_factors->coldim()) ;
BlasPermutation<size_t> TAS_Qt(TAS_factors->rowdim()) ;
- LQUPMatrix<Field>* TAS_LQUP = new LQUPMatrix<Field>(F, *TAS_factors,TAS_P,TAS_Qt);
- size_t TAS_rank = TAS_LQUP->getrank();
+ LQUPMatrix<Field>* TAS_LQUP = new LQUPMatrix<Field>(*TAS_factors,TAS_P,TAS_Qt);
+ size_t TAS_rank = TAS_LQUP->getRank();
// check consistency. note, getQ returns Qt.
// BlasPermutation<size_t> TAS_P = TAS_LQUP->getP();
@@ -918,16 +916,16 @@ namespace LinBox
//special case when A = 0, mod p. dealt with to avoid crash later
bool aEmpty = true;
if (level >= SL_LASVEGAS) { // in monte carlo, we assume A is actually empty
- typename BlasBlackbox<Ring>::RawIterator iter = A_check.rawBegin();
- for (; aEmpty && iter != A_check.rawEnd(); ++iter)
- aEmpty &= _R.isZero(*iter);
+ typename BlasMatrix<Ring>::Iterator iter = A_check.Begin();
+ for (; aEmpty && iter != A_check.End(); ++iter)
+ aEmpty &= _ring.isZero(*iter);
}
if (aEmpty) {
for (size_t i=0; i<b.size(); i++)
- if (!_R.areEqual(b[i], _rzero)) {
+ if (!_ring.areEqual(b[i], _rzero)) {
if (level >= SL_CERTIFIED) {
lastCertificate.clearAndResize(b.size());
- _R.assign(lastCertificate.numer[i], _rone);
+ _ring.assign(lastCertificate.numer[i], _rone);
}
return SS_INCONSISTENT;
}
@@ -938,14 +936,14 @@ namespace LinBox
answer[i].second = _rone;
}
#endif
- _R. assign (den, _rone);
+ _ring. assign (den, _rone);
for (typename Vector1::iterator p = num. begin(); p != num. end(); ++ p)
- _R. assign (*p, _rzero);
+ _ring. assign (*p, _rzero);
if (level >= SL_LASVEGAS)
- _R.init(lastCertifiedDenFactor, 1);
+ _ring.init(lastCertifiedDenFactor, 1);
if (level == SL_CERTIFIED) {
- _R.init(lastZBNumer, 0);
+ _ring.init(lastZBNumer, 0);
lastCertificate.clearAndResize(b.size());
}
return SS_OK;
@@ -954,7 +952,7 @@ namespace LinBox
continue; //try new prime
}
- BlasBlackbox<Field>* Atp_minor_inv = NULL;
+ BlasMatrix<Field>* Atp_minor_inv = NULL;
if ((appearsInconsistent && level > SL_MONTECARLO) || randomSolution == false) {
// take advantage of the (LQUP)t factorization to compute
@@ -962,7 +960,7 @@ namespace LinBox
#ifdef RSTIMING
tFastInvert.start();
#endif
- Atp_minor_inv = new BlasBlackbox<Field>(F, rank, rank);
+ Atp_minor_inv = new BlasMatrix<Field>(F, rank, rank);
FFPACK::LQUPtoInverseOfFullRankMinor(F, rank, TAS_factors->getPointer(), A.rowdim(),
@@ -986,14 +984,14 @@ namespace LinBox
#endif
std::vector<Integer> zt(rank);
for (size_t i=0; i<rank; i++)
- _R.assign(zt[i], A.getEntry(srcRow[rank], srcCol[i]));
+ _ring.assign(zt[i], A.getEntry(srcRow[rank], srcCol[i]));
- BlasBlackbox<Ring> At_minor(_R, rank, rank);
+ BlasMatrix<Ring> At_minor(_ring, rank, rank);
for (size_t i=0; i<rank; i++)
for (size_t j=0; j<rank; j++)
- _R.assign(At_minor.refEntry(j, i), A.getEntry(srcRow[i], srcCol[j]));
+ _ring.assign(At_minor.refEntry(j, i), A.getEntry(srcRow[i], srcCol[j]));
#ifdef DEBUG_INC
- At_minor.write(std::cout << "At_minor:" << std::endl);//, _R);
+ At_minor.write(std::cout << "At_minor:" << std::endl);//, _ring);
Atp_minor_inv->write(std::cout << "Atp_minor_inv:" << std::endl);//, F);
std::cout << "zt: "; for (size_t i=0; i<rank; i++) std::cout << zt[i] <<' '; std::cout << std::endl;
#endif
@@ -1002,7 +1000,7 @@ namespace LinBox
ttCheckConsistency += tCheckConsistency;
#endif
- LiftingContainer lc(_R, F, At_minor, *Atp_minor_inv, zt, _prime);
+ LiftingContainer lc(_ring, F, At_minor, *Atp_minor_inv, zt, _prime);
RationalReconstruction<LiftingContainer > re(lc);
@@ -1015,12 +1013,12 @@ namespace LinBox
ttConsistencySolve.update(re, lc);
tCheckConsistency.start();
#endif
- VectorFraction<Ring> cert(_R, short_num. size());
+ VectorFraction<Ring> cert(_ring, short_num. size());
cert. numer = short_num;
cert. denom = short_den;
cert.numer.resize(b.size());
- _R.subin(cert.numer[rank], cert.denom);
- _R.init(cert.denom, 1);
+ _ring.subin(cert.numer[rank], cert.denom);
+ _ring.init(cert.denom, 1);
BMDI.mulin_left(cert.numer, TAS_P);
#ifdef DEBUG_INC
cert.write(std::cout << "cert:") << std::endl;
@@ -1031,7 +1029,7 @@ namespace LinBox
BAR.applyVTrans(certnumer_A, A_check, cert.numer);
typename std::vector<Integer>::iterator cai = certnumer_A.begin();
for (size_t i=0; certifies && i<A.coldim(); i++, cai++)
- certifies &= _R.isZero(*cai);
+ certifies &= _ring.isZero(*cai);
#ifdef RSTIMING
tCheckConsistency.stop();
ttCheckConsistency += tCheckConsistency;
@@ -1048,9 +1046,9 @@ namespace LinBox
tMakeConditioner.start();
#endif
// we now know system is consistent mod p.
- BlasBlackbox<Ring> A_minor(_R, rank, rank); // -- will have the full rank minor of A
- BlasBlackbox<Field> *Ap_minor_inv; // -- will have inverse mod p of A_minor
- BlasBlackbox<Ring> *P = NULL, *B = NULL; // -- only used in random case
+ BlasMatrix<Ring> A_minor(_ring, rank, rank); // -- will have the full rank minor of A
+ BlasMatrix<Field> *Ap_minor_inv; // -- will have inverse mod p of A_minor
+ BlasMatrix<Ring> *P = NULL, *B = NULL; // -- only used in random case
if (!randomSolution) {
// use shortcut - transpose Atp_minor_inv to get Ap_minor_inv
@@ -1066,39 +1064,39 @@ namespace LinBox
// permute original entries into A_minor
for (size_t i=0; i<rank; i++)
for (size_t j=0; j<rank; j++)
- _R.assign(A_minor.refEntry(i, j), A_check.getEntry(srcRow[i], srcCol[j]));
+ _ring.assign(A_minor.refEntry(i, j), A_check.getEntry(srcRow[i], srcCol[j]));
#ifdef RSTIMING
tMakeConditioner.stop();
ttMakeConditioner += tMakeConditioner;
#endif
if (makeMinDenomCert && level >= SL_LASVEGAS){
- B = new BlasBlackbox<Ring>(_R, rank, A.coldim());
+ B = new BlasMatrix<Ring>(_ring, rank, A.coldim());
for (size_t i=0; i<rank; i++)
for (size_t j=0; j<A.coldim(); j++)
- _R.assign(B->refEntry(i, j), A_check.getEntry(srcRow[i],j));
+ _ring.assign(B->refEntry(i, j), A_check.getEntry(srcRow[i],j));
}
}
else {
- P = new BlasBlackbox<Ring>(_R, A.coldim(), rank);
- B = new BlasBlackbox<Ring>(_R, rank,A.coldim());
- BlasBlackbox<Field> Ap_minor(F, rank, rank);
- Ap_minor_inv = new BlasBlackbox<Field>(F, rank, rank);
+ P = new BlasMatrix<Ring>(_ring, A.coldim(), rank);
+ B = new BlasMatrix<Ring>(_ring, rank,A.coldim());
+ BlasMatrix<Field> Ap_minor(F, rank, rank);
+ Ap_minor_inv = new BlasMatrix<Field>(F, rank, rank);
int nullity;
- LinBox::integer tmp=0;
+ LinBox::integer tmp2=0;
size_t maxBitSize = 0;
for (size_t i=0; i<rank; i++)
for (size_t j=0; j<A.coldim(); j++){
- _R.assign(B->refEntry(i, j), A_check.getEntry(srcRow[i], j));
- _R.convert(tmp, A_check.getEntry(srcRow[i], j));
- maxBitSize = std::max(maxBitSize, tmp.bitsize());
+ _ring.assign(B->refEntry(i, j), A_check.getEntry(srcRow[i], j));
+ _ring.convert(tmp2, A_check.getEntry(srcRow[i], j));
+ maxBitSize = std::max(maxBitSize, tmp2.bitsize());
}
#ifdef RSTIMING
bool firstLoop = true;
#endif
// prepare B to be preconditionned through BLAS matrix mul
- MatrixApplyDomain<Ring, BlasBlackbox<Ring> > MAD(_R,*B);
+ MatrixApplyDomain<Ring, BlasMatrix<Ring> > MAD(_ring,*B);
MAD.setup(2);
do { // O(1) loops of this preconditioner expected
@@ -1109,12 +1107,12 @@ namespace LinBox
tMakeConditioner.start();
#endif
// compute P a n*r random matrix of entry in [0,1]
- typename BlasBlackbox<Ring>::RawIterator iter;
- for (iter = P->rawBegin(); iter != P->rawEnd(); ++iter) {
+ typename BlasMatrix<Ring>::Iterator iter;
+ for (iter = P->Begin(); iter != P->End(); ++iter) {
if (rand() > RAND_MAX/2)
- _R.assign(*iter, _rone);
+ _ring.assign(*iter, _rone);
else
- _R.assign(*iter, _rzero);
+ _ring.assign(*iter, _rzero);
}
// compute A_minor = B.P
@@ -1127,8 +1125,8 @@ namespace LinBox
double *A_minor_dbl = new double[rank*rank];
for (size_t i=0;i<rank;++i)
for (size_t j=0;j<A.coldim(); j++){
- _R.convert(B_dbl[j+i*A.coldim()], B->getEntry(i,j));
- _R.convert(P_dbl[i+j*rank], P->getEntry(j,i));
+ _ring.convert(B_dbl[j+i*A.coldim()], B->getEntry(i,j));
+ _ring.convert(P_dbl[i+j*rank], P->getEntry(j,i));
}
cblas_dgemm(CblasRowMajor, CblasNoTrans,
CblasNoTrans,
@@ -1137,7 +1135,7 @@ namespace LinBox
for (size_t i=0;i<rank;++i)
for (size_t j=0;j<rank;++j)
- _R.init(A_minor.refEntry(i,j),A_minor_dbl[j+i*rank]);
+ _ring.init(A_minor.refEntry(i,j),A_minor_dbl[j+i*rank]);
delete[] B_dbl;
delete[] P_dbl;
@@ -1153,7 +1151,7 @@ namespace LinBox
for (size_t i=0;i<rank;++i)
for (size_t j=0;j<rank;++j)
F.init(Ap_minor.refEntry(i,j),
- _R.convert(tmp,A_minor.getEntry(i,j)));
+ _ring.convert(tmp2,A_minor.getEntry(i,j)));
#ifdef RSTIMING
tMakeConditioner.stop();
ttMakeConditioner += tMakeConditioner;
@@ -1171,14 +1169,14 @@ namespace LinBox
BMDI.mulin_right(TAS_P, newb);
newb.resize(rank);
- BlasBlackbox<Ring> BBA_minor(_R,A_minor);
+ BlasMatrix<Ring> BBA_minor(A_minor);
#if 0
- BlasBlackbox<Field> BBA_inv(F,*Ap_minor_inv);
+ BlasMatrix<Field> BBA_inv(F,*Ap_minor_inv);
BlasMatrix<Integer> BBA_minor(A_minor);
- BlasMatrix<Element> BBA_inv(*Ap_minor_inv);
- LiftingContainer lc(_R, F, BBA_minor, BBA_inv, newb, _prime);
+ BlasMatrix<Field> BBA_inv(*Ap_minor_inv);
+ LiftingContainer lc(_ring, F, BBA_minor, BBA_inv, newb, _prime);
#endif
- LiftingContainer lc(_R, F, BBA_minor, *Ap_minor_inv, newb, _prime);
+ LiftingContainer lc(_ring, F, BBA_minor, *Ap_minor_inv, newb, _prime);
#ifdef DEBUG_DIXON
std::cout<<"length of lifting: "<<lc.length()<<std::endl;
@@ -1194,7 +1192,7 @@ namespace LinBox
ttSystemSolve.update(re, lc);
tCheckAnswer.start();
#endif
- VectorFraction<Ring> answer_to_vf(_R, short_num. size());
+ VectorFraction<Ring> answer_to_vf(_ring, short_num. size());
answer_to_vf. numer = short_num;
answer_to_vf. denom = short_den;
@@ -1227,7 +1225,7 @@ namespace LinBox
bool needNewPrime = false;
for (; !needNewPrime && ib != b.end(); iAx++, ib++, thisrow++)
- if (!_R.areEqual(_R.mul(tmpi, *ib, answer_to_vf.denom), *iAx)) {
+ if (!_ring.areEqual(_ring.mul(tmpi, *ib, answer_to_vf.denom), *iAx)) {
// should attempt to certify inconsistency now
// as in "if [A31 | A32]y != b3" of step (4)
needNewPrime = true;
@@ -1310,19 +1308,19 @@ namespace LinBox
tCertSetup.stop();
ttCertSetup += tCertSetup;
#endif
- //LiftingContainer lc2(_R, F, BBA_minor, BBA_inv, q, _prime);
- LiftingContainer lc2(_R, F, A_minor, *Ap_minor_inv, q, _prime);
+ //LiftingContainer lc2(_ring, F, BBA_minor, BBA_inv, q, _prime);
+ LiftingContainer lc2(_ring, F, A_minor, *Ap_minor_inv, q, _prime);
- RationalReconstruction<LiftingContainer> re(lc2);
+ RationalReconstruction<LiftingContainer> rere(lc2);
Vector1 u_num(rank); Integer u_den;
- if (!re.getRational(u_num, u_den,0)) return SS_FAILED;
+ if (!rere.getRational(u_num, u_den,0)) return SS_FAILED;
#ifdef RSTIMING
- ttCertSolve.update(re, lc2);
+ ttCertSolve.update(rere, lc2);
tCertMaking.start();
#endif
// remainder of code does z <- denom(partial_cert . Mr) * partial_cert * Qt
- VectorFraction<Ring> u_to_vf(_R, u_num.size());
+ VectorFraction<Ring> u_to_vf(_ring, u_num.size());
u_to_vf. numer = u_num;
u_to_vf. denom = u_den;
std::vector<Integer> uB(A.coldim());
@@ -1330,17 +1328,17 @@ namespace LinBox
#if 0
std::cout << "BP: ";
- A_minor.write(std::cout, _R) << std::endl;
+ A_minor.write(std::cout, _ring) << std::endl;
std::cout << "q: ";
for (size_t i=0; i<rank; i++) std::cout << q[i]; std::cout << std::endl;
u_to_vf.write(std::cout << "u: ") << std::endl;
#endif
Integer numergcd = _rzero;
- vectorGcdIn(numergcd, _R, uB);
+ vectorGcdIn(numergcd, _ring, uB);
// denom(partial_cert . Mr) = partial_cert_to_vf.denom / numergcd
- VectorFraction<Ring> z(_R, b.size()); //new constructor
+ VectorFraction<Ring> z(_ring, b.size()); //new constructor
u_to_vf.numer.resize(A.rowdim());
BMDI.mul(z.numer, u_to_vf.numer, TAS_P);
@@ -1355,11 +1353,11 @@ namespace LinBox
// output new certified denom factor
Integer znumer_b, zbgcd;
VDR.dotprod(znumer_b, z.numer, b);
- _R.gcd(zbgcd, znumer_b, z.denom);
- _R.div(lastCertifiedDenFactor, z.denom, zbgcd);
+ _ring.gcd(zbgcd, znumer_b, z.denom);
+ _ring.div(lastCertifiedDenFactor, z.denom, zbgcd);
if (level >= SL_CERTIFIED)
- _R.div(lastZBNumer, znumer_b, zbgcd);
+ _ring.div(lastZBNumer, znumer_b, zbgcd);
#ifdef RSTIMING
tCertMaking.stop();
ttCertMaking += tCertMaking;
@@ -1398,7 +1396,7 @@ namespace LinBox
linbox_check(A.rowdim() == A.coldim());
linbox_check(A.rowdim() % blocksize == 0);
- typedef typename Field::Element Element;
+ typedef typename Field::Element Element_t;
@@ -1410,7 +1408,7 @@ namespace LinBox
// precondition Ap with a random diagonal Matrix
typename Field::RandIter G(F,0,123456);
- std::vector<Element> diag(Ap.rowdim());
+ std::vector<Element_t> diag(Ap.rowdim());
for(size_t i=0;i<Ap.rowdim();++i){
do {
@@ -1428,7 +1426,7 @@ namespace LinBox
size_t numblock = n/blocksize;
// generate randomly U and V
- BlasMatrix<Element> U(blocksize,A.rowdim()), V(A.coldim(),blocksize);
+ BlasMatrix<Field> U(F,blocksize,A.rowdim()), V(A.coldim(),blocksize);
for (size_t j=0;j<blocksize; ++j)
for (size_t i=j*numblock;i<(j+1)*numblock;++i){
@@ -1455,15 +1453,15 @@ namespace LinBox
// compute the inverse of the Hankel matrix associated with the Krylov Sequence
BlockHankelInverse<Field> Hinv(F, Seq.getRep());
- std::vector<Element> y(n), x(n, 1);
+ std::vector<Element_t> y(n), x(n, 1);
#ifdef RSTIMING
chrono.stop();
std::cout<<"inverse block hankel: "<<chrono<<"\n";
#endif
- typedef BlockHankelLiftingContainer<Ring,Field,IMatrix,Compose<Diagonal<Field>,FMatrix>, BlasMatrix<Element> > LiftingContainer;
- LiftingContainer lc(_R, F, A, DAp, D, Hinv, U, V, b, _prime);
+ typedef BlockHankelLiftingContainer<Ring,Field,IMatrix,Compose<Diagonal<Field>,FMatrix>, BlasMatrix<Field> > LiftingContainer;
+ LiftingContainer lc(_ring, F, A, DAp, D, Hinv, U, V, b, _prime);
RationalReconstruction<LiftingContainer > re(lc);
if (!re.getRational(num, den, 0)) return SS_FAILED;
@@ -1496,7 +1494,7 @@ namespace LinBox
linbox_check(A.rowdim() == A.coldim());
- typedef typename Field::Element Element;
+ typedef typename Field::Element Element_t;
// reduce the matrix mod p
Field F(_prime);
@@ -1508,7 +1506,7 @@ namespace LinBox
Permutation<Field> P(A.coldim(),F),Q(A.rowdim(),F);
FMatrix L(F, A.rowdim(), A.rowdim());
unsigned long rank;
- Element det;
+ Element_t det;
GaussDomain<Field> GD(F);
GD.QLUPin(rank,det,Q,L,*Ap,P,Ap->rowdim(), Ap->coldim());
@@ -1536,12 +1534,12 @@ namespace LinBox
newNNZ += row->size();
}
}
- commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT) << "Pruned : " << (origNNZ-newNNZ) << " unnecessary elements in upper triangle" << std::endl;
+ commentator().report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT) << "Pruned : " << (origNNZ-newNNZ) << " unnecessary elements in upper triangle" << std::endl;
}
typedef SparseLULiftingContainer<Ring,Field,IMatrix,FMatrix> LiftingContainer;
- LiftingContainer lc(_R, F, A, L, Q, *Ap, P, rank, b, _prime);
+ LiftingContainer lc(_ring, F, A, L, Q, *Ap, P, rank, b, _prime);
RationalReconstruction<LiftingContainer > re(lc);
if (!re.getRational(num, den, 0))
@@ -1557,3 +1555,12 @@ namespace LinBox
#endif //__LINBOX_rational_solver_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rational-solver2.h b/linbox/algorithms/rational-solver2.h
index 5a11e75..affb886 100644
--- a/linbox/algorithms/rational-solver2.h
+++ b/linbox/algorithms/rational-solver2.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/rational-solver2.h
* Copyright (C) 2010 LinBox
* Author Z. Wan
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/rational-solver2.h
@@ -36,8 +37,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
-#include <linbox/integer.h>
-#include <linbox/algorithms/rational-reconstruction2.h>
+#include "linbox/integer.h"
+#include "linbox/algorithms/rational-reconstruction2.h"
namespace LinBox
{
@@ -78,15 +79,17 @@ namespace LinBox
return SS_FAILED;
linbox_check((b.size() == M.rowdim()) && (num. size() == M.coldim()));
- int n = M. rowdim();
+ int n = (int)M. rowdim();
integer mentry, bnorm; mentry = 1; bnorm = 1;
typename InVector::const_iterator b_p;
Integer tmp_I; integer tmp;
- typename IMatrix::ConstRawIterator raw_p;
- for (raw_p = M. rawBegin(); raw_p != M. rawEnd(); ++ raw_p) {
- r. convert (tmp, *raw_p);
- tmp = abs (tmp);
- if (tmp > mentry) mentry = tmp;
+ {
+ typename IMatrix::ConstIterator raw_p;
+ for (raw_p = M. Begin(); raw_p != M. End(); ++ raw_p) {
+ r. convert (tmp, *raw_p);
+ tmp = abs (tmp);
+ if (tmp > mentry) mentry = tmp;
+ }
}
for (b_p = b. begin(); b_p != b. end(); ++ b_p) {
@@ -104,8 +107,8 @@ namespace LinBox
double* DM = new double [n * n];
double* Db = new double [n];
double* DM_p, *Db_p;
- typename IMatrix::ConstRawIterator raw_p;
- for (raw_p = M. rawBegin(), DM_p = DM; raw_p != M. rawEnd(); ++ raw_p, ++ DM_p) {
+ typename IMatrix::ConstIterator raw_p;
+ for (raw_p = M. Begin(), DM_p = DM; raw_p != M. End(); ++ raw_p, ++ DM_p) {
r. convert (tmp, *raw_p);
*DM_p = (double) tmp;
}
@@ -187,13 +190,15 @@ namespace LinBox
{
enum CBLAS_ORDER order = CblasRowMajor;
int lda = n;
- int P[n];
+ int *P = new int[n];
int ierr = clapack_dgetrf (order, n, n, M, lda, P);
if (ierr != 0) {
std::cerr << "In RationalSolver::cblas_dgeinv Matrix is not full rank" << std::endl;
+ delete[] P ;
return -1;
}
clapack_dgetri (order, n, M, lda, P);
+ delete[] P ;
return 0;
}
@@ -276,7 +281,7 @@ namespace LinBox
return 2;
}
- int scalar = ((long long int)1 << shift);
+ int scalar = (int) (1UL << shift);
for (pd = d, p2 = x; pd != d + n; ++ pd, ++ p2)
//better use round, but sun sparc machine doesnot supprot it
*pd = floor (*p2 * scalar);
@@ -500,7 +505,7 @@ namespace LinBox
for (pd = d; pd != d + n; ++ pd, ++ p2) {
tmp -= (long long int)*pd * (long long int) *p2;
}
- *p1 = tmp;
+ *p1 = (double) tmp;
}
return 0;
}
@@ -547,3 +552,12 @@ namespace LinBox
#endif //__LINBOX_rational_solver2__H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rns.h b/linbox/algorithms/rns.h
index 64c4642..0c1188d 100644
--- a/linbox/algorithms/rns.h
+++ b/linbox/algorithms/rns.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2011 LinBox
* Written by BB <brice.boyer at imag.fr>
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/rns.h
@@ -61,7 +62,7 @@ namespace LinBox
unsigned long _ps_; //!< prime size (minimum)
- typedef ::Givaro::RNSsystem<Integer, Field > CRTSystem;
+ typedef Givaro::RNSsystem<Integer, Field > CRTSystem;
typedef typename CRTSystem::domains Domains;
typedef typename CRTSystem::array Elements;
// typedef typename CRTSystem::ring Ring;
@@ -70,6 +71,7 @@ namespace LinBox
Domains _PrimeDoms_ ;
#ifdef __LINBOX_HAVE_IML
+ //! @todo IML wrapper here
#endif
public:
/*! Create a RNS able to recover any integer of at most l bits.
@@ -136,7 +138,7 @@ namespace LinBox
unsigned long _ps_; //!< prime size (minimum)
- typedef ::Givaro::RNSsystemFixed<Integer> CRTSystemFixed;
+ typedef Givaro::RNSsystemFixed<Integer> CRTSystemFixed;
typedef CRTSystemFixed::array Prime_t;
// typedef typename CRTSystem::domains Domains;
// typedef typename CRTSystem::array Elements;
@@ -201,3 +203,12 @@ namespace LinBox
#include "rns.inl"
#endif // __LINBOX_algorithms_rns_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/rns.inl b/linbox/algorithms/rns.inl
index 70d1f02..84aa30c 100644
--- a/linbox/algorithms/rns.inl
+++ b/linbox/algorithms/rns.inl
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2011 LinBox
* Written by BB <brice.boyer at imag.fr>
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file algorithms/rns.inl
@@ -42,7 +43,7 @@ namespace LinBox
_bit_(l), _ps_(ps)
{
linbox_check(ps<30); // oupa, mais moins qu'un unsigned long
- unsigned int nb_primes = std::ceil(double(l)/double(ps));
+ unsigned int nb_primes = (unsigned int) std::ceil(double(l)/double(ps));
// integer maxint = Integer::pow(2,l); XXX je veux faire ça !!!!!!
integer maxint = pow((integer)2,(Unsigned?l:l+1));
_primes_.resize(nb_primes);
@@ -55,7 +56,7 @@ namespace LinBox
while(tries < 3) { // if we fail 3 times to insert, we don't have enough primes to sample.
if (curint>maxint)
break;
- RandomPrimeIterator genprimes(_ps_+penalty);
+ RandomPrimeIterator genprimes( (unsigned int) (_ps_+penalty) );
unsigned long p = genprimes.randomPrime() ;
++genprimes;
primeset.insert(p);
@@ -131,7 +132,7 @@ namespace LinBox
RNS<Unsigned>::cra(Ivect & result, Function & unitCRA)
{
std::vector<std::vector<double> > residues(_size_);
- for (size_t i = 0 ; i < _size_ ; ++i) {
+ for (int i = 0 ; i < (int)_size_ ; ++i) {
residues[i].resize(result.size());
unitCRA(residues[i],_PrimeDoms_[i]); // creates residue list
}
@@ -168,7 +169,7 @@ namespace LinBox
_bit_(l), _ps_(ps)
{
linbox_check(ps<30); // oupa, mais moins qu'un unsigned long
- unsigned int nb_primes = std::ceil(double(l)/double(ps));
+ unsigned int nb_primes = (unsigned int) std::ceil(double(l)/double(ps));
// integer maxint = Integer::pow(2,l); XXX je veux faire ça !!!!!!
integer maxint = pow((integer)2,(Unsigned?l:l+1));
// std::cout << "target max int : " << maxint << std::endl;
@@ -182,7 +183,7 @@ namespace LinBox
while(tries < 3) { // if we fail 3 times to insert, we don't have enough primes to sample.
if (curint>maxint)
break;
- RandomPrimeIterator genprimes(_ps_+penalty);
+ RandomPrimeIterator genprimes((unsigned int) (_ps_+penalty) );
unsigned long p = genprimes.randomPrime() ;
++genprimes;
primeset.insert(p);
@@ -288,3 +289,12 @@ namespace LinBox
}
#endif // __LINBOX_algorithms_rns_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/short-vector.h b/linbox/algorithms/short-vector.h
new file mode 100644
index 0000000..6e122ed
--- /dev/null
+++ b/linbox/algorithms/short-vector.h
@@ -0,0 +1,638 @@
+/* linbox/algorithms/lifting-container-base.h
+ * Copyright (C) 2005 Pascal Giorgi
+ * Copyright (C) 2011 LinBox
+ *
+ * Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+
+#ifndef __LINBOX_ternary_lattice_H
+#define __LINBOX_ternary_lattice_H
+
+
+/*! @file algorithms/short-vector.h
+ * @brief NO DOC
+ * @ingroup algorithms
+ * @ingroup lattice
+ *
+ * NO DOC
+ */
+
+#include <iostream>
+#include "linbox/field/PID-integer.h"
+#include "linbox/util/timer.h"
+#include "linbox/integer.h"
+#include <algorithm>
+#include <vector>
+
+#ifdef __LINBOX_HAVE_FPLLL
+#include <fplll/dpe.h>
+#else
+#error "you need fplll here"
+#endif
+#include <math.h>
+
+
+
+int int_div;
+int int_gauss;
+int int_comb;
+
+
+struct StopReduce{};
+
+namespace LinBox
+{
+
+ //! NO DOC
+ int large_double_division(integer &x, const integer &y, const integer &z)
+ {
+ double x_m, y_m, z_m;
+ long x_e, y_e, z_e;
+ Timer t;
+
+ y_m = mpz_get_d_2exp(&y_e, y.get_mpz_const());
+ z_m = mpz_get_d_2exp(&z_e, z.get_mpz_const());
+ x_e = y_e - z_e;
+
+
+ if (x_e <53) {
+ x_m = y_m / z_m;
+
+ if (x_m == 0.){
+ x=0;
+ return 0;
+ }
+ else {
+ int e;
+ x_m = frexp(x_m,&e);
+ x_e +=e;
+ x= round(ldexp(x_m,(int)x_e));
+ return 0;
+ //return x= ldexp(x_m,x_e);
+ }
+ }
+ else {
+ int_div++;std::cout<<"Exact Division\n";
+ x=y/z;
+ return 1;
+ }
+ }
+
+
+ //! NO DOC
+ class TernaryLattice {
+ public:
+
+
+ protected:
+
+ integer b1[3], b2[3], b3[3];
+ integer lb1, lb2, lb3;
+ integer b1b2, b1b3, b2b3 ;
+
+ Timer Tgauss, Tcoeff, Tgetcoeff, Tcombine;
+
+ integer y1, y2, TMP;
+ integer B1B2LB1, B1B2LB2, B2B3LB2, B1B3LB1;
+ integer x10,x11,x12,x20,x21,x22;
+
+ inline void innerProduct(integer &z, const integer x[3] , const integer y[3])
+ {
+ integer::mul(z,x[0],y[0]);
+ integer::axpyin(z,x[1],y[1]);
+ integer::axpyin(z,x[2],y[2]);
+ }
+
+ inline void SquareEuclideanLength(integer& l, const integer y[3])
+ {
+ innerProduct(l, y, y);
+ }
+
+
+ inline void EuclideanLength(integer& l, const integer y[3] )
+ {
+ innerProduct(l, y, y);
+ Givaro::sqrt(l,l);
+ }
+
+ inline void swap(integer x[3], integer y[3] )
+ {
+ integer tmp;
+ tmp=x[0];
+ x[0]=y[0];
+ y[0]=tmp;
+ tmp=x[1];
+ x[1]=y[1];
+ y[1]=tmp;
+ tmp=x[2];
+ x[2]=y[2];
+ y[2]=tmp;
+ }
+
+ inline void maxpyin(integer r[3], const integer &a, const integer y[3])
+ {
+ if ((a.bitsize()<32) && (a >= 0)){
+ unsigned long aa= a;
+ mpz_submul_ui(r[0].get_mpz(), y[0].get_mpz_const(), aa);
+ mpz_submul_ui(r[1].get_mpz(), y[1].get_mpz_const(), aa);
+ mpz_submul_ui(r[2].get_mpz(), y[2].get_mpz_const(), aa);
+ }
+ else {
+ integer::maxpyin(r[0],a,y[0]);
+ integer::maxpyin(r[1],a,y[1]);
+ integer::maxpyin(r[2],a,y[2]);
+ }
+ }
+
+ inline void axpyin(integer r[3], const integer &a, const integer y[3])
+ {
+ if ((a.bitsize()<32) && (a >= 0)){
+ unsigned long aa= a;
+ mpz_addmul_ui(r[0].get_mpz(), y[0].get_mpz_const(), aa);
+ mpz_addmul_ui(r[1].get_mpz(), y[1].get_mpz_const(), aa);
+ mpz_addmul_ui(r[2].get_mpz(), y[2].get_mpz_const(), aa);
+ }
+ else {
+ integer::axpyin(r[0],a,y[0]);
+ integer::axpyin(r[1],a,y[1]);
+ integer::axpyin(r[2],a,y[2]);
+ }
+ }
+
+ inline void sort()
+ {
+ if (lb1 > lb2){
+ swap(b1,b2);
+ std::swap(lb1,lb2);
+ std::swap(b1b3,b2b3);
+ }
+ if (lb1 > lb3){
+ swap(b1,b3);
+ std::swap(lb1,lb3);
+ std::swap(b1b2,b2b3);
+ }
+ if (lb2 > lb3){
+ swap(b2,b3);
+ std::swap(lb2,lb3);
+ std::swap(b1b2, b1b3);
+ }
+ }
+
+ inline void binaryGaussReduce()
+ {
+ int_gauss++;
+ integer r;
+ r=b1b2/lb1;
+ integer a[3], la;
+ assign(a,b2);
+ maxpyin(a,r,b1);
+ la= (-r*(b1b2))<<1;
+ integer::axpyin(la, r*r, lb1);
+ la+=lb2;
+
+ if (la < lb1){
+ assign(b2,b1);lb2=lb1;
+ assign(b1,a);lb1=la;
+ std::swap(b2b3,b1b3);
+ integer::maxpyin(b1b2,r,lb2);
+ integer::maxpyin(b1b3,r, b2b3);
+ binaryGaussReduce();
+ }
+ else{
+ if (la < lb2){
+ assign(b2,a);lb2=la;
+ integer::maxpyin(b2b3,r, b1b3);
+ integer::maxpyin(b1b2,r,lb1);
+ }
+ }
+ }
+
+ inline void assign(integer x[3], const integer y[3])
+ {
+ x[0]=y[0];
+ x[1]=y[1];
+ x[2]=y[2];
+ }
+
+
+ inline integer SEL(integer &l, const integer &x1,
+ const integer &my1, const integer &my2, const integer &y3)
+ {
+ Timer t;
+ t.start();
+ integer tmp, tmp_min, y_min;
+ integer b2b3_2 = b2b3<<1;
+ integer rr = b2b3_2;
+ integer::axpyin(rr,x1<<1,b1b2);
+ tmp= b1b3<<1;
+ l=lb3;
+ integer::axpyin(tmp,x1,lb1);
+ integer::axpyin(l, tmp, x1);
+
+ tmp = rr;
+ integer::axpyin(tmp, my1, lb2);
+ integer::mulin(tmp,my1);
+ tmp_min=tmp;
+ y_min =my1;
+
+ tmp = rr;
+ integer::axpyin(tmp, my2, lb2);
+ integer::mulin(tmp,my2);
+ if (tmp < tmp_min){
+ tmp_min=tmp;
+ y_min=my2;
+ }
+
+ tmp = rr;
+ integer::axpyin(tmp, y3, lb2);
+ tmp*=y3;
+ if (tmp < tmp_min){
+ tmp_min=tmp;
+ y_min=y3;
+ }
+
+
+ l+=tmp_min;
+ t.stop();
+ Tgetcoeff+=t;
+ return y_min;
+ }
+
+
+ public:
+
+ TernaryLattice(const std::vector<integer> &L)
+ {
+ linbox_check(L.size()==9);
+ b1[0]=L[0];
+ b1[1]=L[1];
+ b1[2]=L[2];
+ b2[0]=L[3];
+ b2[1]=L[4];
+ b2[2]=L[5];
+ b3[0]=L[6];
+ b3[1]=L[7];
+ b3[2]=L[8];
+ //print();
+ SquareEuclideanLength(lb1, b1);
+ SquareEuclideanLength(lb2, b2);
+ SquareEuclideanLength(lb3, b3);
+ sort();
+ innerProduct(b1b2, b1, b2);
+ innerProduct(b1b3, b1, b3);
+ innerProduct(b2b3, b2, b3);
+ }
+
+
+ template<class Blackbox>
+ TernaryLattice(const Blackbox &L)
+ {
+ int_div=0;int_gauss=0;int_comb=0;
+
+ Tgauss.clear();
+ Tcoeff.clear();
+ Tgetcoeff.clear();
+ Tcombine.clear();
+ L.field().convert(b1[0], L.getEntry(0,0));
+ L.field().convert(b1[1], L.getEntry(0,1));
+ L.field().convert(b1[2], L.getEntry(0,2));
+ L.field().convert(b2[0], L.getEntry(1,0));
+ L.field().convert(b2[1], L.getEntry(1,1));
+ L.field().convert(b2[2], L.getEntry(1,2));
+ L.field().convert(b3[0], L.getEntry(2,0));
+ L.field().convert(b3[1], L.getEntry(2,1));
+ L.field().convert(b3[2], L.getEntry(2,2));
+ SquareEuclideanLength(lb1, b1);
+ SquareEuclideanLength(lb2, b2);
+ SquareEuclideanLength(lb3, b3);
+ sort();
+ innerProduct(b1b2, b1, b2);
+ innerProduct(b1b3, b1, b3);
+ innerProduct(b2b3, b2, b3);
+ }
+
+
+ void reduce()
+ {
+
+ integer lmin_a, x1, x2;
+ {
+ Timer t;
+
+ /*
+ std::cout<<"Calling reduce (";
+ std::cout<<lb1.bitsize()<<",";
+ std::cout<<lb2.bitsize()<<",";
+ std::cout<<lb3.bitsize()<<")";;
+ */
+ //std::cout<<lb1<<",";
+ //std::cout<<lb2<<",";
+ //std::cout<<lb3;
+ //std::cout<<")\n";
+ //print();
+
+ t.start();
+ binaryGaussReduce();//std::cout<<"Gauss reduce done\n";
+ t.stop();
+ Tgauss+=t;
+ t.clear();
+ t.start();
+
+
+ integer::div(B1B2LB1, b1b2, lb1);
+ integer::div(B1B2LB2, b1b2, lb2);
+ integer::div(B2B3LB2, b2b3, lb2);
+ integer::div(B1B3LB1, b1b3, lb1);
+
+ TMP= integer(integer(1));
+ integer::maxpyin(TMP, B1B2LB1, B1B2LB2);
+
+
+ y2= B2B3LB2;
+ integer::maxpyin(y2, B1B2LB2, B1B3LB1);
+ integer::divin(y2,TMP);
+ integer::negin(y2);
+
+ y1= B1B3LB1;
+ integer::maxpyin(y1, B1B2LB1, B2B3LB2);
+ integer::divin(y1,TMP);
+ integer::negin(y1);
+
+ x10= y1;
+ x11= 1+y1;
+ x12= -1+y1;
+ x20= y2;
+ x21= 1+y2;
+ x22= -1+y2;
+
+ t.stop();
+ Tcoeff+=t;
+
+ integer la, x_tmp;
+
+
+ x2 = SEL(la, x10, x20, x21, x22); lmin_a=la;x1=x10;
+ x_tmp = SEL(la, x11, x20, x21, x22); if (la < lmin_a) {lmin_a=la;x1=x11;x2=x_tmp;}
+ x_tmp = SEL(la, x12, x20, x21, x22); if (la < lmin_a) {lmin_a=la;x1=x12;x2=x_tmp;}
+
+
+ //if (::abs(x1)-::abs(y1) != 1) std::cout<<"|x1|-|y1|: "<< ::abs(x1)-::abs(y1)<<"\n";
+ //if (::abs(x2)-::abs(y2) != 1) std::cout<<"|x2|-|y2|: "<< ::abs(x2)-::abs(y2)<<"\n";
+
+ }
+
+
+ if (lmin_a < lb3){
+ int_comb++;
+ Timer tt;
+ tt.clear();
+ tt.start();
+ axpyin(b3, x1, b1);
+ axpyin(b3, x2, b2);
+ lb3=lmin_a;
+ integer::axpyin(b1b3,x1,lb1);
+ integer::axpyin(b1b3,x2,b1b2);
+ integer::axpyin(b2b3,x1,b1b2);
+ integer::axpyin(b2b3,x2,lb2);
+
+ if (lb3 < lb1){
+ swap(b1, b3);std::swap(lb1,lb3);std::swap(b1b2, b2b3);
+ }
+ if (lb3 < lb2){
+ swap(b2, b3);std::swap(lb2,lb3);std::swap(b1b3, b1b2);
+ }
+
+ //sort();
+ tt.stop();
+ Tcombine+=tt;
+ reduce();
+ }
+ }
+
+ integer* operator[](size_t i)
+ {
+ if (i==0) return b1;
+ if (i==1) return b2;
+ if (i==2) return b3;
+ }
+
+
+ void timing()
+ {
+ std::cout<<"Gauss reduce : "<<Tgauss<<" with "<<int_gauss<<" calls \n";
+ std::cout<<"Coeff computation: "<<Tcoeff<<" with "<<int_div<<" exact division \n";
+ std::cout<<" get coeff : "<<Tgetcoeff<<"\n";
+ std::cout<<"Combine row : "<<Tcombine<<" with "<<int_comb<<" combinaison \n";
+ }
+
+ void print()
+ {
+ PID_integer Z;
+ BlasMatrix<PID_integer> M(Z,3,3);
+ M.setEntry(0,0,b1[0]);
+ M.setEntry(0,1,b1[1]);
+ M.setEntry(0,2,b1[2]);
+ M.setEntry(1,0,b2[0]);
+ M.setEntry(1,1,b2[1]);
+ M.setEntry(1,2,b2[2]);
+ M.setEntry(2,0,b3[0]);
+ M.setEntry(2,1,b3[1]);
+ M.setEntry(2,2,b3[2]);
+ //M.write(std::cout);
+ }
+
+ template<class Blackbox>
+ void getLattice(Blackbox &M)
+ {
+ M.setEntry(0,0,b1[0]);
+ M.setEntry(0,1,b1[1]);
+ M.setEntry(0,2,b1[2]);
+ M.setEntry(1,0,b2[0]);
+ M.setEntry(1,1,b2[1]);
+ M.setEntry(1,2,b2[2]);
+ M.setEntry(2,0,b3[0]);
+ M.setEntry(2,1,b3[1]);
+ M.setEntry(2,2,b3[2]);
+ }
+
+ };
+
+ //! NO DOC
+ class LargeDouble{
+ protected:
+ double _m;
+ long _e;
+ public:
+ LargeDouble(const integer &x)
+ {
+ _m=mpz_get_d_2exp(&_e, x.get_mpz_const());
+ }
+
+ LargeDouble() {}
+
+ LargeDouble(const LargeDouble &x) :
+ _m(x._m), _e(x._e)
+ {}
+
+ LargeDouble& operator= (const LargeDouble &x)
+ {
+ _m = x._m;
+ _e = x._e;
+ return *this;
+ }
+
+ integer& convert(integer &x)
+ {
+ if (_e < 53 ){
+ if (_m == 0.)
+ return x=integer(0);
+ else
+ return x=integer(round(ldexp(_m,(int)_e)));
+ }
+ else{
+ // x = (_m* 0x1P53);//9007199254740992;
+ x = (_m* 9007199254740992UL);
+ x = x<<(_e-53);
+ return x;
+ }
+ }
+
+ static LargeDouble& div(LargeDouble &x, const LargeDouble &y, const LargeDouble &z)
+ {
+ x._e = y._e - z._e;
+ x._m = y._m / y._m;
+ int e;
+ x._m = frexp(x._m, &e);
+ x._e+=e;
+ //if (x._e >= 53) throw StopReduce();
+ return x;
+ }
+
+ static LargeDouble& divin(LargeDouble &x, const LargeDouble &y)
+ {
+ x._e = x._e - y._e;
+ x._m = x._m / y._m;
+ int e;
+ x._m = frexp(x._m, &e);
+ x._e+=e;
+ //if (x._e >= 53) throw StopReduce();
+ return x;
+ }
+
+ static LargeDouble& axpyin(LargeDouble &x, const LargeDouble &a, const LargeDouble &y)
+ {
+ long e = a._e + y._e;
+ if (x._e > e + 53)
+ return x;
+ else {
+ double m = a._m * y._m;
+ if (e > x._e + 53){
+ x._e = e;
+ x._m = m;
+ return x;
+ }
+ else {
+ long ee = x._e - e;
+ if (ee >=0){
+ x._m += ldexp( m, (int)-ee);
+ }
+ else {
+ x._m = m + ldexp( x._m, (int)ee);
+ x._e = e;
+ }
+ int t;
+ x._m = frexp(x._m, &t);
+ x._e+=t;
+ return x;
+ }
+ }
+ }
+
+ static LargeDouble& maxpyin(LargeDouble &x, const LargeDouble &a, const LargeDouble &y)
+ {
+
+ long e = a._e + y._e;
+ if (x._e > e + 53)
+ return x;
+ else {
+ double m = a._m * y._m;
+ if (e > x._e + 53){
+ x._e = e;
+ x._m = - m;
+ return x;
+ }
+ else {
+ long ee = x._e - e;
+ if (ee >=0){
+ x._m -= ldexp( m, (int)-ee);
+ }
+ else {
+ x._m = ldexp( x._m, (int)ee) -m ;
+ x._e = e;
+ }
+ int t;
+ x._m = frexp(x._m, &t);
+ x._e+=t;
+ return x;
+ }
+ }
+ }
+
+ static LargeDouble& mul(LargeDouble &x, const LargeDouble &y, const LargeDouble &z)
+ {
+ x._e = y._e + z._e;
+ x._m = y._m + z._m;
+ int t;
+ x._m = frexp(x._m, &t);
+ x._e+=t;
+ return x;
+ }
+
+ static LargeDouble& negin(LargeDouble &x)
+ {
+ x._m = -x._m;
+ return x;
+ }
+ };
+
+
+ std::ostream& operator<< (std::ostream& os, LargeDouble& x)
+ {
+ integer tmp;
+ x.convert(tmp);
+ return os<<tmp;
+ }
+
+
+}// end of namespace LinBox
+
+#endif //__LINBOX_ternary_lattice_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/sigma-basis.h b/linbox/algorithms/sigma-basis.h
index 571cec7..c331c56 100644
--- a/linbox/algorithms/sigma-basis.h
+++ b/linbox/algorithms/sigma-basis.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/sigma-basis.h
* Copyright (C) 2005 Pascal Giorgi
*
- * Written by Pascal Giorgi pgiorgi at uwaterlo.ca
+ * Written by Pascal Giorgi pascal.giorgi at lirmm.fr
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_sigma_basis_H
@@ -28,19 +29,18 @@
#include <iostream>
#include <iomanip>
-#include <linbox/util/commentator.h>
-#include <linbox/util/timer.h>
-#include <linbox/algorithms/blas-domain.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/field/unparametric.h>
-#include <linbox/matrix/matrix-domain.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/matrix/factorized-matrix.h>
+#include "linbox/util/commentator.h"
+#include "linbox/util/timer.h"
+#include "linbox/algorithms/blas-domain.h"
+#include "linbox/field/unparametric.h"
+#include "linbox/matrix/matrix-domain.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/matrix/factorized-matrix.h"
-#include <linbox/algorithms/matpoly-mult.h>
-#include <linbox/algorithms/echelon-form.h>
-#include <linbox/vector/subvector.h>
-#include <linbox/util/timer.h>
+#include "linbox/algorithms/matpoly-mult.h"
+#include "linbox/algorithms/echelon-form.h"
+#include "linbox/vector/subvector.h"
+#include "linbox/util/timer.h"
//#define OPTMIZED_SIGMA_UPDATE
@@ -65,10 +65,10 @@ namespace LinBox
public:
typedef _Field Field;
typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Coefficient;
+ typedef BlasMatrix<Field> Coefficient;
private:
- Field _F;
+ Field _field;
BlasMatrixDomain<Field> _BMD;
MatrixDomain<Field> _MD;
std::vector<Coefficient> &_Serie;
@@ -134,7 +134,7 @@ namespace LinBox
public:
SigmaBasis(const Field &F, std::vector<Coefficient> &PowerSerie) :
- _F(F), _BMD(F), _MD(F), _Serie(PowerSerie), PM_domain(F)
+ _field(F), _BMD(F), _MD(F), _Serie(PowerSerie), PM_domain(F)
{
#ifdef _BM_TIMING
clearTimer();
@@ -391,15 +391,13 @@ namespace LinBox
size_t m,n;
m = PowerSerie[0].rowdim();
n = PowerSerie[0].coldim();
- Element one;
- _F.init(one,1UL);
const Coefficient ZeroSigma(m,m);
const Coefficient ZeroSerie(m,n);
if (degree == 0) {
Coefficient Identity(m,m);
for (size_t i=0;i< m;++i)
- Identity.setEntry(i,i,one);
+ Identity.setEntry(i,i,_field.one);
SigmaBase[0]=Identity;
}
@@ -471,7 +469,9 @@ namespace LinBox
void print_multime()
- {std::cout<<"multime: "<<PM_domain.multime<<std::endl;}
+ {
+ std::cout<<"multime: "<<PM_domain.multime<<std::endl;
+ }
// Computation of a minimal Sigma Base of a Power Serie up to length
// algorithm is from Giorgi, Jeannerod and Villard ISSAC'03
@@ -490,16 +490,13 @@ namespace LinBox
// Set some useful constants
const Coefficient Zero(m,m);
- Element one, zero;
- _F.init(one,1UL);
- _F.init(zero,0UL);
// Reserve memory for the Sigma Base and set SigmaBase[0] to Identity
SigmaBase.reserve(length+1);
SigmaBase.resize(1);
Coefficient Identity(m,m);
for (size_t i=0;i< m;++i)
- Identity.setEntry(i,i,one);
+ Identity.setEntry(i,i,_field.one);
SigmaBase[0]=Identity;
// Keep track on Sigma Base's row degree
@@ -578,16 +575,17 @@ namespace LinBox
#endif
//std::cout<<"MBasis: Discrepancy\n";
- //Discrepancy.write(std::cout,_F);
+ //Discrepancy.write(std::cout,_field);
// Compute LQUP of Discrepancy
BlasPermutation<size_t> Qt(Discrepancy.rowdim());
BlasPermutation<size_t> P(Discrepancy.coldim());
- LQUPMatrix<Field> LQUP(_F,Discrepancy,P,Qt);
+ LQUPMatrix<Field> LQUP(Discrepancy,P,Qt);
// Get L from LQUP
- TriangularBlasMatrix<Element> L(m, m, BlasTag::low, BlasTag::unit);
+ TriangularBlasMatrix<Field> L(_field, m, m,
+ LinBoxTag::Lower, LinBoxTag::Unit);
LQUP.getL(L);
// get the transposed permutation of Q from LQUP
@@ -595,8 +593,9 @@ namespace LinBox
// Compute the inverse of L
- TriangularBlasMatrix<Element> invL(m, m, BlasTag::low, BlasTag::unit);
- FFPACK::trinv_left(_F,m,L.getPointer(),L.getStride(),invL.getWritePointer(),invL.getStride());
+ TriangularBlasMatrix<Field> invL(_field, m, m,
+ LinBoxTag::Lower, LinBoxTag::Unit);
+ FFPACK::trinv_left(_field,m,L.getPointer(),L.getStride(),invL.getWritePointer(),invL.getStride());
#ifdef _BM_TIMING
chrono.stop();
@@ -641,11 +640,11 @@ namespace LinBox
for (int j= (int) size-2;j>=0; --j){
for (size_t l=0;l<m;++l)
//BB: #warning Q[i] pour i>r ne veut rien dire...
- _F.assign(SigmaBase[j+1].refEntry(*(Qt.getPointer()+i),l),
+ _field.assign(SigmaBase[j+1].refEntry(*(Qt.getPointer()+i),l),
SigmaBase[j].getEntry(*(Qt.getPointer()+i),l));
}
for (size_t l=0;l<m;++l)
- _F.assign(SigmaBase[0].refEntry(*(Qt.getPointer()+i),l),zero);
+ _field.assign(SigmaBase[0].refEntry(*(Qt.getPointer()+i),l),_field.zero);
}
#ifdef _BM_TIMING
chrono.stop();
@@ -734,18 +733,14 @@ namespace LinBox
Coefficient Unit(m+n,m);
const Coefficient Zero(m+n,m);
- Element one,zero,mone;
- _F.init(one,1L);
- _F.init(zero,0L);
- _F.init(mone,-1L);
for (size_t i=0;i<m;i++)
- Unit.setEntry(i,i,one);
+ Unit.setEntry(i,i,_field.one);
size_t min_mn=(m <n)? m :n;
// initialization of discrepancy
Coefficient Discrepancy(m+n,n);
for (size_t i=0;i<n;i++)
- Discrepancy.setEntry(i+m,i,one);
+ Discrepancy.setEntry(i+m,i,_field.one);
// initialization of sigma base
@@ -774,9 +769,9 @@ namespace LinBox
}
unsigned long early_stop=0;
- long N;
+ long NN;
- for (N = 0; (N < (long)length) && (early_stop < 20) ; ++N) {
+ for (NN = 0; (NN < (long)length) && (early_stop < 20) ; ++NN) {
/*
@@ -788,21 +783,21 @@ namespace LinBox
// view of m first rows of Discrepancy
Coefficient Discr(Discrepancy,0,0,m,n);
- _BMD.mul(Discr,Sigma, PowerSerie[N]);
+ _BMD.mul(Discr,Sigma, PowerSerie[NN]);
for (size_t i=1;i<SigmaBase.size();i++){
Coefficient Sigmaview(SigmaBase[i],0,0,m,m);
- _BMD.axpyin(Discr,Sigmaview,PowerSerie[N-i]);
+ _BMD.axpyin(Discr,Sigmaview,PowerSerie[NN-i]);
}
- typename Coefficient::RawIterator _iter_Discr = Discr.rawBegin();
+ typename Coefficient::Iterator _iter_Discr = Discr.Begin();
- while ((_F.isZero(*_iter_Discr) && _iter_Discr != Discr.rawEnd()))
+ while ((_field.isZero(*_iter_Discr) && _iter_Discr != Discr.End()))
++_iter_Discr;
// maybe there is something to do here
// increase the last n rows of orders
// multiply by X the last n rows of SigmaBase
- if (_iter_Discr != Discr.rawEnd())
+ if (_iter_Discr != Discr.End())
early_stop=0;
else {
early_stop++;
@@ -814,7 +809,7 @@ namespace LinBox
std::vector<size_t> Perm1(m+n);
for (size_t i=0;i<m+n;++i)
Perm1[i]=i;
- if (N>=1) {
+ if (NN>=1) {
for (size_t i=0;i<m+n;++i) {
size_t idx_min=i;
for (size_t j=i+1;j<m+n;++j)
@@ -837,10 +832,11 @@ namespace LinBox
BlasPermutation<size_t> Qt(Discrepancy.rowdim());
BlasPermutation<size_t> P(Discrepancy.coldim());
- LQUPMatrix<Field> LQUP(_F, CopyDiscr,P,Qt);
+ LQUPMatrix<Field> LQUP(CopyDiscr,P,Qt);
// Get the matrix L of LQUP decomposition
- TriangularBlasMatrix<Element> L(m+n,m+n, BlasTag::low, BlasTag::unit );
+ TriangularBlasMatrix<Field> L(_field,m+n,m+n,
+ LinBoxTag::Lower, LinBoxTag::Unit );
LQUP.getL(L);
// Get the tranposed permutation of Q from LQUP
@@ -855,8 +851,10 @@ namespace LinBox
BlasPermutation<size_t> BPerm2(Perm2);
// compute the inverse of L
- TriangularBlasMatrix<Element> invL (m+n,m+n, BlasTag::low,BlasTag::unit);
- FFPACK::trinv_left(_F,m+n,L.getPointer(),L.getStride(),invL.getWritePointer(),invL.getStride());
+ TriangularBlasMatrix<Field> invL (_field,m+n,m+n,
+ LinBoxTag::Lower,LinBoxTag::Unit);
+ FFPACK::trinv_left(_field,m+n, L.getPointer(), L.getStride(),
+ invL.getWritePointer(), invL.getStride());
// SigmaBase = BPerm2.Qt. L^(-1) . BPerm1 . SigmaBase
@@ -897,16 +895,17 @@ namespace LinBox
for (int i= (int)size-2;i>=0;i--)
for (size_t j=0;j<n;j++)
for (size_t k=0;k<n;++k)
- _F.assign(SigmaBase[i+1].refEntry(m+j,k), SigmaBase[i].getEntry(m+j,k));
+ _field.assign(SigmaBase[i+1].refEntry(m+j,k), SigmaBase[i].getEntry(m+j,k));
for (size_t j=0;j<n;j++)
for (size_t k=0;k<n;++k)
- _F.assign(SigmaBase[0].refEntry(m+j,k),zero);
+ _field.assign(SigmaBase[0].refEntry(m+j,k),_field.zero);
// Discrepancy= BPerm2.U.P from LQUP
Coefficient U(m+n,n);
- TriangularBlasMatrix<Element> trU(U,BlasTag::up,BlasTag::nonunit);
+ TriangularBlasMatrix<Field> trU( U,
+ LinBoxTag::Upper,LinBoxTag::NonUnit);
LQUP.getU(trU);
Discrepancy=U;
// BlasPermutation<size_t> P= LQUP.getP();
@@ -915,7 +914,7 @@ namespace LinBox
}
if ( early_stop == 20)
- std::cout<<"Early termination is used: stop at "<<N<<" from "<<length<<" iterations\n\n";
+ std::cout<<"Early termination is used: stop at "<<NN<<" from "<<length<<" iterations\n\n";
// extract the first m rows of SigmaBase
degree=order;
@@ -931,7 +930,7 @@ namespace LinBox
for (size_t i=0;i<m;i++)
for (long j=0;j<=degree[i];j++)
for (size_t k=0;k<m;k++)
- _F.assign(Approx[j].refEntry(i,k), SigmaBase[j].getEntry(i,k));
+ _field.assign(Approx[j].refEntry(i,k), SigmaBase[j].getEntry(i,k));
}
@@ -957,18 +956,14 @@ namespace LinBox
Coefficient Unit(m+n,m);
const Coefficient Zero(m+n,m);
- Element one,zero,mone;
- _F.init(one,1L);
- _F.init(zero,0L);
- _F.init(mone,-1L);
for (size_t i=0;i<m;i++)
- Unit.setEntry(i,i,one);
+ Unit.setEntry(i,i,_field.one);
size_t min_mn=(m <n)? m :n;
// initialization of discrepancy
Coefficient Discrepancy(m+n,n);
for (size_t i=0;i<n;i++)
- Discrepancy.setEntry(i+m,i,one);
+ Discrepancy.setEntry(i+m,i,_field.one);
// initialization of sigma base
@@ -997,9 +992,9 @@ namespace LinBox
}
unsigned long early_stop=0;
- long N;
+ long NN;
- for (N = 0; (N < (long)length) && (early_stop < 20) ; ++N) {
+ for (NN = 0; (NN < (long)length) && (early_stop < 20) ; ++NN) {
/*
@@ -1011,21 +1006,21 @@ namespace LinBox
// view of m first rows of Discrepancy
Coefficient Discr(Discrepancy,0,0,m,n);
- _BMD.mul(Discr,Sigma, PowerSerie[N]);
+ _BMD.mul(Discr,Sigma, PowerSerie[NN]);
for (size_t i=1;i<SigmaBase.size();i++){
Coefficient Sigmaview(SigmaBase[i],0,0,m,m);
- _BMD.axpyin(Discr,Sigmaview,PowerSerie[N-i]);
+ _BMD.axpyin(Discr,Sigmaview,PowerSerie[NN-i]);
}
- typename Coefficient::RawIterator _iter_Discr = Discr.rawBegin();
+ typename Coefficient::Iterator _iter_Discr = Discr.Begin();
- while ((_F.isZero(*_iter_Discr) && _iter_Discr != Discr.rawEnd()))
+ while ((_field.isZero(*_iter_Discr) && _iter_Discr != Discr.End()))
++_iter_Discr;
// maybe there is something to do here
// increase the last n rows of orders
// multiply by X the last n rows of SigmaBase
- if (_iter_Discr != Discr.rawEnd())
+ if (_iter_Discr != Discr.End())
early_stop=0;
else {
early_stop++;
@@ -1037,7 +1032,7 @@ namespace LinBox
std::vector<size_t> Perm1(m+n);
for (size_t i=0;i<m+n;++i)
Perm1[i]=i;
- if (N>=1) {
+ if (NN>=1) {
for (size_t i=0;i<m+n;++i) {
size_t idx_min=i;
for (size_t j=i+1;j<m+n;++j)
@@ -1060,10 +1055,11 @@ namespace LinBox
BlasPermutation<size_t> Qt(Discrepancy.rowdim());
BlasPermutation<size_t> P(Discrepancy.coldim());
- LQUPMatrix<Field> LQUP(_F, CopyDiscr,P,Qt);
+ LQUPMatrix<Field> LQUP(CopyDiscr,P,Qt);
// Get the matrix L of LQUP decomposition
- TriangularBlasMatrix<Element> L(m+n,m+n, BlasTag::low, BlasTag::unit );
+ TriangularBlasMatrix<Field> L(_field, m+n,m+n,
+ LinBoxTag::Lower, LinBoxTag::Unit );
LQUP.getL(L);
// Get the tranposed permutation of Q from LQUP
@@ -1078,8 +1074,10 @@ namespace LinBox
BlasPermutation<size_t> BPerm2(Perm2);
// compute the inverse of L
- TriangularBlasMatrix<Element> invL (m+n,m+n, BlasTag::low,BlasTag::unit);
- FFPACK::trinv_left(_F,m+n,L.getPointer(),L.getStride(),invL.getWritePointer(),invL.getStride());
+ TriangularBlasMatrix<Field> invL (_field,m+n,m+n,
+ LinBoxTag::Lower,LinBoxTag::Unit);
+ FFPACK::trinv_left(_field,m+n,L.getPointer(),L.getStride(),
+ invL.getWritePointer(),invL.getStride());
// SigmaBase = BPerm2.Qt. L^(-1) . BPerm1 . SigmaBase
@@ -1120,16 +1118,16 @@ namespace LinBox
for (int i= (int)size-2;i>=0;i--)
for (size_t j=0;j<n;j++)
for (size_t k=0;k<n;++k)
- _F.assign(SigmaBase[i+1].refEntry(m+j,k), SigmaBase[i].getEntry(m+j,k));
+ _field.assign(SigmaBase[i+1].refEntry(m+j,k), SigmaBase[i].getEntry(m+j,k));
for (size_t j=0;j<n;j++)
for (size_t k=0;k<n;++k)
- _F.assign(SigmaBase[0].refEntry(m+j,k),zero);
+ _field.assign(SigmaBase[0].refEntry(m+j,k),_field.zero);
// Discrepancy= BPerm2.U.P from LQUP
Coefficient U(m+n,n);
- TriangularBlasMatrix<Element> trU(U,BlasTag::up,BlasTag::nonunit);
+ TriangularBlasMatrix<Field> trU(U,LinBoxTag::Upper,LinBoxTag::NonUnit);
LQUP.getU(trU);
Discrepancy=U;
// BlasPermutation<size_t> P= LQUP.getP();
@@ -1137,7 +1135,7 @@ namespace LinBox
_BMD.mulin_right(BPerm2,Discrepancy);
// save the first pade matrix
- if (N == degree1 -1) {
+ if (NN == (long)degree1 -1) {
// extract the first m rows of SigmaBase
long max=order[0];
for (size_t i=1;i<m;i++) {
@@ -1151,13 +1149,13 @@ namespace LinBox
for (size_t i=0;i<m;i++)
for (long j=0;j<=order[i];j++)
for (size_t k=0;k<m;k++)
- _F.assign(Approx1[j].refEntry(i,k), SigmaBase[j].getEntry(i,k));
+ _field.assign(Approx1[j].refEntry(i,k), SigmaBase[j].getEntry(i,k));
}
}
if ( early_stop == 20)
- std::cout<<"Early termination is used: stop at "<<N<<" from "<<length<<" iterations\n\n";
+ std::cout<<"Early termination is used: stop at "<<NN<<" from "<<length<<" iterations\n\n";
// extract the first m rows of SigmaBase
degree=order;
@@ -1173,7 +1171,7 @@ namespace LinBox
for (size_t i=0;i<m;i++)
for (long j=0;j<=degree[i];j++)
for (size_t k=0;k<m;k++)
- _F.assign(Approx2[j].refEntry(i,k), SigmaBase[j].getEntry(i,k));
+ _field.assign(Approx2[j].refEntry(i,k), SigmaBase[j].getEntry(i,k));
}
@@ -1194,9 +1192,6 @@ namespace LinBox
// Set some useful constants
const Coefficient Zeromm(m,m);
const Coefficient Zeromn(m,n);
- Element one, zero;
- _F.init(one,1UL);
- _F.init(zero,0UL);
// Reserve memory for the Sigma Base
SigmaBase.reserve(length+1);
@@ -1205,7 +1200,7 @@ namespace LinBox
// set SigmaBase[0] to Identity
Coefficient Identity(m,m);
for (size_t i=0;i< m;++i)
- Identity.setEntry(i,i,one);
+ Identity.setEntry(i,i,_field.one);
SigmaBase[0]=Identity;
// Define Truncated Residual
@@ -1222,7 +1217,7 @@ namespace LinBox
// Keep track on Sigma Base's row degree
// I adjust the degree with the maximal difference between defects
// this is just to be sure to catch degree increase according to elimination process
- int min_defect, max_defect;
+ size_t min_defect, max_defect;
min_defect = max_defect = defect[0];
for (size_t i=0;i<m;++i){
if ( defect[i] > max_defect)
@@ -1243,7 +1238,7 @@ namespace LinBox
#ifdef _BM_TIMING
Timer chrono;
- double tSigmaUp, tResidueUp, tSigmaSh, tResidueSh, tLQUP, tPerm;
+ double /*tSigmaUp, tResidueUp, tSigmaSh, tResidueSh,*/ tLQUP, tPerm;
tSigmaUp= tResidueUp= tSigmaSh= tResidueSh= tLQUP= tPerm =0.;
#endif
@@ -1316,7 +1311,7 @@ namespace LinBox
//Discrepancy = Residual[k];
- BlasMatrix<Element> Db (Discrepancy,m-nbr_triv,0,nbr_triv,n);
+ BlasMatrix<Field> Db (Discrepancy,m-nbr_triv,0,nbr_triv,n);
// Compute Discrepancy using convolution
if (nbr_triv > m){
if (k==0){
@@ -1332,9 +1327,9 @@ namespace LinBox
}
_BMD.mulin_right(PPivT,SigmaBase[0]);
- BlasMatrix<Element> SBl (SigmaBase[0],0,0,m,m-nbr_triv);
- BlasMatrix<Element> PSt (PowerSerie[k],0,0,m-nbr_triv,n);
- BlasMatrix<Element> PSb (PowerSerie[k],m-nbr_triv,0,nbr_triv,n);
+ BlasMatrix<Field> SBl (SigmaBase[0],0,0,m,m-nbr_triv);
+ BlasMatrix<Field> PSt (PowerSerie[k],0,0,m-nbr_triv,n);
+ BlasMatrix<Field> PSb (PowerSerie[k],m-nbr_triv,0,nbr_triv,n);
Timer Dchrono;
Dchrono.start();
@@ -1359,9 +1354,9 @@ namespace LinBox
}
_BMD.mulin_right(PPivT,SigmaBase[i]);
- BlasMatrix<Element> SBli (SigmaBase[i],0,0,m,m-nbr_triv);
- BlasMatrix<Element> PSti (PowerSerie[k-i],0,0,m-nbr_triv,n);
- BlasMatrix<Element> PSbi (PowerSerie[k-i],m-nbr_triv,0,nbr_triv,n);
+ BlasMatrix<Field> SBli (SigmaBase[i],0,0,m,m-nbr_triv);
+ BlasMatrix<Field> PSti (PowerSerie[k-i],0,0,m-nbr_triv,n);
+ BlasMatrix<Field> PSbi (PowerSerie[k-i],m-nbr_triv,0,nbr_triv,n);
Dchrono.clear();
Dchrono.start();
_BMD.axpyin (Discrepancy,SBli,PSti);
@@ -1433,7 +1428,7 @@ namespace LinBox
#endif
/* new version : use of columnReducedEchelon */
- EchelonFormDomain<Field> EFD(_F);
+ EchelonFormDomain<Field> EFD(_field);
size_t rank = EFD.columnReducedEchelon(Discrepancy);
@@ -1443,7 +1438,7 @@ namespace LinBox
perm[i]=i;
size_t idx=0;
for (size_t i=0;i<rank;++i){
- while(_F.isZero(Discrepancy.getEntry(idx,i))) idx++;
+ while(_field.isZero(Discrepancy.getEntry(idx,i))) idx++;
perm[i]=idx;
idx++;
}
@@ -1464,7 +1459,7 @@ namespace LinBox
_BMD.mulin_right(Qt, Discrepancy);
// Get the (m-r)*r left bottom submatrix of Reduced Echelon matrix
- BlasMatrix<Element> G(Discrepancy, rank, 0,m-rank,rank);
+ BlasMatrix<Field> G(Discrepancy, rank, 0,m-rank,rank);
#ifdef _BM_TIMING
chrono.stop();
ttTransformation+=chrono;
@@ -1477,8 +1472,8 @@ namespace LinBox
// compute size of trivial part of SigmaBase
size_t rsize, lsize;
rsize=0;
- if (nbr_triv>rank)
- rsize=nbr_triv-rank;
+ if (nbr_triv>(int)rank)
+ rsize=(size_t)nbr_triv-rank;
lsize=m-rsize;
//std::cout<<"rsize: "<<rsize<<"\n";
@@ -1490,7 +1485,7 @@ namespace LinBox
maxs=std::max(maxs, degree[*(Qt.getPointer()+d)]);
maxs=std::min(maxs, SigmaBase.size()-1);
- //Discrepancy.write(std::cout,_F);
+ //Discrepancy.write(std::cout,_field);
#ifndef OPTMIZED_SIGMA_UPDATE
@@ -1501,9 +1496,10 @@ namespace LinBox
if (PermPivots[i]>i)
std::swap(triv_column[i], triv_column[PermPivots[i]]);
- if (nbr_triv > rank) {
+ if (nbr_triv > (int)rank) {
size_t idx_triv, idx_nontriv;
- idx_nontriv = 0; idx_triv = m-nbr_triv;
+ idx_nontriv = 0;
+ idx_triv = m-(size_t)nbr_triv;
for (size_t i=0;i<m;++i){
if (triv_column[i]!=0){
@@ -1518,12 +1514,12 @@ namespace LinBox
}
}
}
- for(int i=m-1;i>=0;--i)
+ for(size_t i=m;i--;)
if (PermPivots[i]>i)
std::swap(triv_column[i], triv_column[PermPivots[i]]);
// Modify Permutation of trivial columns to incorporate pivot columns
- if (nbr_triv>rank){
+ if (nbr_triv>(int)rank){
for(size_t i=0;i<m;++i)
std::swap(PermTrivial[i], PermTrivial[*(Qt.getPointer()+i)]);
}
@@ -1553,7 +1549,7 @@ namespace LinBox
std::cout<<"\n";
write_maple("Sigma",SigmaBase);
- //Discrepancy.write(std::cout,_F);
+ //Discrepancy.write(std::cout,_field);
@@ -1562,13 +1558,13 @@ namespace LinBox
std::cout<<triv_column[i]<<", ";
std::cout<<"\n";
- SigmaBase[0].write(std::cout,_F);
+ SigmaBase[0].write(std::cout,_field);
_BMD.mulin_right(BPerm1, SigmaBase[0]);
- SigmaBase[0].write(std::cout,_F);
+ SigmaBase[0].write(std::cout,_field);
_BMD.mulin_left(SigmaBase[0],PPiv);
- SigmaBase[0].write(std::cout,_F);
+ SigmaBase[0].write(std::cout,_field);
_BMD.mulin_left(SigmaBase[0], PTr);
- SigmaBase[0].write(std::cout,_F);
+ SigmaBase[0].write(std::cout,_field);
_BMD.mulin_left(SigmaBase[0], PTrT);
_BMD.mulin_left(SigmaBase[0],PPivT);
TransposedBlasMatrix<BlasPermutation<size_t> > BPerm1T(BPerm1);
@@ -1577,7 +1573,7 @@ namespace LinBox
// Update SigmaBase
for (size_t i=0;i<maxs+1;++i) {
- //SigmaBase[0].write(std::cout,_F);
+ //SigmaBase[0].write(std::cout,_field);
// permute SigmaBase
_BMD.mulin_right(BPerm1, SigmaBase[i]);
@@ -1585,7 +1581,7 @@ namespace LinBox
_BMD.mulin_right(Qt, SigmaBase[i]);
}
- if (nbr_triv > rank){
+ if (nbr_triv > (int)rank){
_BMD.mulin_left(SigmaBase[i],PPivT);
_BMD.mulin_left(SigmaBase[i], PTr);
}
@@ -1593,34 +1589,34 @@ namespace LinBox
// apply transformation to SigmaBase
#if 0
- BlasMatrix<Element> S_top(SigmaBase[i], 0,0,rank,m);
- BlasMatrix<Element> S_bottom(SigmaBase[i], rank,0,m-rank,m);
+ BlasMatrix<Field> S_top(SigmaBase[i], 0,0,rank,m);
+ BlasMatrix<Field> S_bottom(SigmaBase[i], rank,0,m-rank,m);
_BMD.axmyin(S_bottom, G, S_top);
#endif
- BlasMatrix<Element> S_top_left (SigmaBase[i], 0,0,rank,lsize);
- BlasMatrix<Element> S_bottom_left (SigmaBase[i], rank,0,m-rank,lsize);
+ BlasMatrix<Field> S_top_left (SigmaBase[i], 0,0,rank,lsize);
+ BlasMatrix<Field> S_bottom_left (SigmaBase[i], rank,0,m-rank,lsize);
#if 0
if (i==0){
- S_bottom_left.write(std::cout,_F);
+ S_bottom_left.write(std::cout,_field);
}
#endif
// deal with the left part of S_bottom
_BMD.axmyin(S_bottom_left, G, S_top_left);
#if 0
if (i==0){
- S_bottom_left.write(std::cout,_F);
+ S_bottom_left.write(std::cout,_field);
}
#endif
// deal with the right part of S_bottom
if (rsize > 0){
- BlasMatrix<Element> S_bottom_right(SigmaBase[i],rank,lsize,m-rank, rsize);
+ BlasMatrix<Field> S_bottom_right(SigmaBase[i],rank,lsize,m-rank, rsize);
_MD.negin(S_bottom_right);
}
// undo the permutation on sigmaBase
- if (nbr_triv > rank){
+ if (nbr_triv > (int)rank){
_BMD.mulin_left(SigmaBase[i], PTrT);
_BMD.mulin_left(SigmaBase[i],PPiv);
}
@@ -1629,7 +1625,7 @@ namespace LinBox
_BMD.mulin_right(Q, SigmaBase[i]);
#if 0
if (i==0){
- S_bottom_left.write(std::cout,_F);
+ S_bottom_left.write(std::cout,_field);
}
#endif
}
@@ -1641,7 +1637,7 @@ namespace LinBox
_BMD.mulin_right(Qt, SigmaBase[i]);
// apply transformation to SigmaBase
- BlasMatrix<Element> S_bottom(SigmaBase[i], rank,0,m-rank,m);
+ BlasMatrix<Field> S_bottom(SigmaBase[i], rank,0,m-rank,m);
_MD.negin(S_bottom);
// undo the permutation on sigmaBase
@@ -1659,7 +1655,7 @@ namespace LinBox
_BMD.mulin_right(BPerm1, SigmaBase[i]);
if (!QisTrivial)
_BMD.mulin_right(Qt, SigmaBase[i]);
- if (nbr_triv > rank)
+ if (nbr_triv > (int)rank)
_BMD.mulin_left(SigmaBase[i], PTr);
}
@@ -1669,7 +1665,7 @@ namespace LinBox
for (size_t l=0;l<q;++l){
// get kth part of G
- BlasMatrix<Element> Gk(G,l*rank,0,rank,rank);
+ BlasMatrix<Field> Gk(G,l*rank,0,rank,rank);
// get maximal degree of kth part of sigma base
size_t maxk=0;
@@ -1678,58 +1674,58 @@ namespace LinBox
maxk=std::min(maxk,SigmaBase.size()-1);
for (size_t i=0;i<maxs+1;++i){
- BlasMatrix<Element> S_top_left (SigmaBase[i], 0,0,rank,lsize);
- BlasMatrix<Element> S_bottom (SigmaBase[i], rank,0,m-rank,m);
+ BlasMatrix<Field> S_top_left (SigmaBase[i], 0,0,rank,lsize);
+ BlasMatrix<Field> S_bottom (SigmaBase[i], rank,0,m-rank,m);
// deal with the left part of kth slice of S_bottom
- BlasMatrix<Element> Sbk_left (S_bottom,l*rank,0,rank, lsize);
+ BlasMatrix<Field> Sbk_left (S_bottom,l*rank,0,rank, lsize);
_BMD.axmyin(Sbk_left, Gk, S_top_left);
// deal with the right part of kth slice of S_bottom
if (rsize > 0){
- BlasMatrix<Element> Sbk_right(S_bottom,l*rank,lsize,rank, rsize);
+ BlasMatrix<Field> Sbk_right(S_bottom,l*rank,lsize,rank, rsize);
_MD.negin(Sbk_right);
}
}
for (size_t i=maxs+1;i<maxk+1;++i){
- BlasMatrix<Element> S_bottom(SigmaBase[i], rank,0,m-rank,m);
- BlasMatrix<Element> Sbk(S_bottom,l*rank,0,rank, m);
+ BlasMatrix<Field> S_bottom(SigmaBase[i], rank,0,m-rank,m);
+ BlasMatrix<Field> Sbk(S_bottom,l*rank,0,rank, m);
_MD.negin(Sbk);
}
}
if( q_last > 0) {
// get last part of G
- BlasMatrix<Element> G_last(G,q*rank,0,q_last,rank);
+ BlasMatrix<Field> G_last(G,q*rank,0,q_last,rank);
size_t maxk=0;
for(size_t d=m-q_last;d<m;++d)
maxk=std::max(maxk, degree[*(Qt.getPointer()+d)]);
maxk=std::min(maxk,SigmaBase.size()-1);
for (size_t i=0;i<maxs+1;++i){
- BlasMatrix<Element> S_top_left (SigmaBase[i], 0,0,rank,lsize);
- BlasMatrix<Element> S_bottom (SigmaBase[i], rank,0,m-rank,m);
+ BlasMatrix<Field> S_top_left (SigmaBase[i], 0,0,rank,lsize);
+ BlasMatrix<Field> S_bottom (SigmaBase[i], rank,0,m-rank,m);
// deal with the left part of kth slice of S_bottom
- BlasMatrix<Element> Sb_last_left (S_bottom,q*rank,0,q_last, lsize);
+ BlasMatrix<Field> Sb_last_left (S_bottom,q*rank,0,q_last, lsize);
_BMD.axmyin(Sb_last_left, G_last, S_top_left);
// deal with the right part of kth slice of S_bottom
if (rsize > 0){
- BlasMatrix<Element> Sb_last_right(S_bottom,q*rank,lsize,q_last, rsize);
+ BlasMatrix<Field> Sb_last_right(S_bottom,q*rank,lsize,q_last, rsize);
_MD.negin(Sb_last_right);
}
}
for (size_t i=maxs+1;i<maxk+1;++i){
- BlasMatrix<Element> S_bottom(SigmaBase[i], rank,0,m-rank,m);
- BlasMatrix<Element> Sb_last(S_bottom,q*rank,0,q_last, m);
+ BlasMatrix<Field> S_bottom(SigmaBase[i], rank,0,m-rank,m);
+ BlasMatrix<Field> Sb_last(S_bottom,q*rank,0,q_last, m);
_MD.negin(Sb_last);
}
}
// undo Permutation of sigma Base
for (size_t i=0;i<SigmaBase.size();++i) {
- if (nbr_triv > rank)
+ if (nbr_triv > (int)rank)
_BMD.mulin_left(SigmaBase[i], PTrT);
if (!QisTrivial)
_BMD.mulin_right(Q, SigmaBase[i]);
@@ -1744,21 +1740,21 @@ namespace LinBox
chrono.clear();
chrono.start();
#endif
- /*
+#if 0
// Update Residual (only monomials greater than k-1)
for (size_t i=k;i<length;++i){
- _BMD.mulin_right(BPerm1,Residual[i]);
- //_BMD.mulin_right(invL,Residual[i]);
+ _BMD.mulin_right(BPerm1,Residual[i]);
+ //_BMD.mulin_right(invL,Residual[i]);
- // try optimization
- _BMD.mulin_right(Qt, Residual[i]);
- BlasMatrix<Element> R_top(Residual[i], 0,0,rank,n);
- BlasMatrix<Element> R_bottom(Residual[i], rank,0,m-rank,n);
- _BMD.axmyin(R_bottom, G, R_top);
+ // try optimization
+ _BMD.mulin_right(Qt, Residual[i]);
+ BlasMatrix<Field> R_top(Residual[i], 0,0,rank,n);
+ BlasMatrix<Field> R_bottom(Residual[i], rank,0,m-rank,n);
+ _BMD.axmyin(R_bottom, G, R_top);
- _BMD.mulin_right(Q, Residual[i]);
+ _BMD.mulin_right(Q, Residual[i]);
}
- */
+#endif
#ifdef _BM_TIMING
chrono.stop();
ttResidueUp+=chrono;
@@ -1784,10 +1780,10 @@ namespace LinBox
for (size_t i=0;i<rank;++i){
for (int j= (int) size-2;j>=0; --j){
for (size_t l=0;l<m;++l)
- _F.assign(SigmaBase[j+1].refEntry(*(Qt.getPointer()+i),l), SigmaBase[j].getEntry(*(Qt.getPointer()+i),l));
+ _field.assign(SigmaBase[j+1].refEntry(*(Qt.getPointer()+i),l), SigmaBase[j].getEntry(*(Qt.getPointer()+i),l));
}
for (size_t l=0;l<m;++l)
- _F.assign(SigmaBase[0].refEntry(*(Qt.getPointer()+i),l),zero);
+ _field.assign(SigmaBase[0].refEntry(*(Qt.getPointer()+i),l),_field.zero);
}
#ifdef _BM_TIMING
chrono.stop();
@@ -1800,7 +1796,7 @@ namespace LinBox
for (size_t i=0;i<rank;++i){
for (int j= (int) length-2;j>= (int) k; j--){
for (size_t l=0;l<n;++l)
- _F.assign(Residual[j+1].refEntry(*(Qt.getPointer()+i),l), Residual[j].getEntry(*(Qt.getPointer()+i),l));
+ _field.assign(Residual[j+1].refEntry(*(Qt.getPointer()+i),l), Residual[j].getEntry(*(Qt.getPointer()+i),l));
}
}
*/
@@ -1839,8 +1835,6 @@ namespace LinBox
size_t m,n;
m = PowerSerie[0].rowdim();
n = PowerSerie[0].coldim();
- Element one;
- _F.init(one,1UL);
const Coefficient ZeroSigma(m,m);
const Coefficient ZeroSerie(m,n);
PowerSerie.resize(degree, ZeroSerie);
@@ -1848,7 +1842,7 @@ namespace LinBox
if (degree == 0) {
Coefficient Identity(m,m);
for (size_t i=0;i< m;++i)
- Identity.setEntry(i,i,one);
+ Identity.setEntry(i,i,_field.one);
SigmaBase[0]=Identity;
}
else {
@@ -1887,7 +1881,7 @@ namespace LinBox
new_PM_Basis(Sigma1, Serie1, degree1, defect);
//new_PM_Basis(Sigma1, PowerSerie, degree1, defect);
- size_t S1size= Sigma1.size();
+ // size_t S1size= (size_t)Sigma1.size();
#ifdef _BM_TIMING
tUpdateSerie.clear();
@@ -1906,7 +1900,7 @@ namespace LinBox
Serie[i] = PowerSerie[i];
PM_domain.midproduct(Serie2, Sigma1, Serie);
- //ClassicMulDomain<Field, std::vector<Coefficient> > CM_domain(_F);
+ //ClassicMulDomain<Field, std::vector<Coefficient> > CM_domain(_field);
//CM_domain.midproduct(Serie2, Sigma1, Serie);
Serie2.resize(degree2, ZeroSerie);
*/
@@ -2029,13 +2023,13 @@ namespace LinBox
for (size_t i=0;i<m-1;++i){
std::cout<<"[";
for (size_t j=0;j<n-1;++j)
- _F.write(std::cout,C.getEntry(i,j))<<",";
- _F.write(std::cout,C.getEntry(i,n-1))<<"] , ";
+ _field.write(std::cout,C.getEntry(i,j))<<",";
+ _field.write(std::cout,C.getEntry(i,n-1))<<"] , ";
}
std::cout<<"[";
for (size_t j=0;j<n-1;++j)
- _F.write(std::cout,C.getEntry(m-1,j))<<",";
- _F.write(std::cout, C.getEntry(m-1,n-1))<<"]])]); ";
+ _field.write(std::cout,C.getEntry(m-1,j))<<",";
+ _field.write(std::cout, C.getEntry(m-1,n-1))<<"]])]); ";
}
@@ -2052,26 +2046,26 @@ namespace LinBox
for (size_t i=0;i<m-1;++i){
std::cout<<"[";
for (size_t j=0;j<n-1;++j)
- _F.write(std::cout,P[k].getEntry(i,j))<<",";
- _F.write(std::cout, P[k].getEntry(i,n-1))<<"] , ";
+ _field.write(std::cout,P[k].getEntry(i,j))<<",";
+ _field.write(std::cout, P[k].getEntry(i,n-1))<<"] , ";
}
std::cout<<"[";
for (size_t j=0;j<n-1;++j)
- _F.write(std::cout,P[k].getEntry(m-1,j))<<",";
- _F.write(std::cout, P[k].getEntry(m-1,n-1))<<"]]) , ";
+ _field.write(std::cout,P[k].getEntry(m-1,j))<<",";
+ _field.write(std::cout, P[k].getEntry(m-1,n-1))<<"]]) , ";
}
std::cout<<"Matrix([";
for (size_t i=0;i<m-1;++i){
std::cout<<"[";
for (size_t j=0;j<n-1;++j)
- _F.write(std::cout,P[P.size()-1].getEntry(i,j))<<",";
- _F.write(std::cout, P[P.size()-1].getEntry(i,n-1))<<"] , ";
+ _field.write(std::cout,P[P.size()-1].getEntry(i,j))<<",";
+ _field.write(std::cout, P[P.size()-1].getEntry(i,n-1))<<"] , ";
}
std::cout<<"[";
for (size_t j=0;j<n-1;++j)
- _F.write(std::cout,P[P.size()-1].getEntry(m-1,j))<<",";
- _F.write(std::cout, P[P.size()-1].getEntry(m-1,n-1))<<"]])]); \n\n";
+ _field.write(std::cout,P[P.size()-1].getEntry(m-1,j))<<",";
+ _field.write(std::cout, P[P.size()-1].getEntry(m-1,n-1))<<"]])]); \n\n";
}
@@ -2083,3 +2077,12 @@ namespace LinBox
#endif //__LINBOX_sigma_basis_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/sigmabasis.doxy b/linbox/algorithms/sigmabasis.doxy
index cce1083..68c3aae 100644
--- a/linbox/algorithms/sigmabasis.doxy
+++ b/linbox/algorithms/sigmabasis.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** @ingroup algorithms
@defgroup sigmabase Sigma-basis
diff --git a/linbox/algorithms/signature.h b/linbox/algorithms/signature.h
index cd3bd0b..bc2c274 100644
--- a/linbox/algorithms/signature.h
+++ b/linbox/algorithms/signature.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
* Written by Zhendong Wan
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,23 +17,22 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_signature_H
#define __LINBOX_signature_H
/* Function related to the signature computation of symmetric matrices */
-#include <linbox/field/modular-double.h>
-#include <linbox/field/modular-int32.h>
-#include <linbox/algorithms/cra-early-multip.h>
+#include "linbox/field/modular.h"
+#include "linbox/algorithms/cra-early-multip.h"
#include <fflas-ffpack/ffpack/ffpack.h>
-#include <linbox/randiter/random-prime.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/algorithms/blas-domain.h>
-#include <linbox/solutions/minpoly.h>
+#include "linbox/randiter/random-prime.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/algorithms/blas-domain.h"
+#include "linbox/solutions/minpoly.h"
namespace LinBox
{
@@ -191,7 +191,7 @@ namespace LinBox
//std::cout << "Debug begin with input matrix:\n";
//M. write (std::cout);
typedef typename Matrix::Field Ring;
- typedef typename Ring::Element Integer;
+ typedef typename Ring::Element Integer_t;
typedef Modular<double> Field;
typedef Field::Element Element;
@@ -201,7 +201,7 @@ namespace LinBox
FieldTraits<Field>::maxModulus(mmodulus);
long bit1 = (long) floor (log((double)mmodulus)/M_LN2);
long bit2 = (long) floor (log(sqrt(double(4503599627370496LL/n)))/M_LN2);
- RandomPrimeIterator primeg(bit1 < bit2 ? bit1 : bit2);
+ RandomPrimeIterator primeg(unsigned(bit1 < bit2 ? bit1 : bit2));
Field::Element* FA = new Field::Element[n*n];
size_t* P= new size_t[n], *PQ = new size_t[n];
@@ -210,12 +210,12 @@ namespace LinBox
Field::Element* p; Field::Element tmp;
EarlyMultipCRA< Field > cra(3UL);
- Integer m = 1;
+ Integer_t m = 1;
std::vector<Field::Element> v(n);
size_t j = 0;
Field K2;
bool faithful = true;
- typename Matrix::ConstRawIterator raw_p;
+ typename Matrix::ConstIterator raw_p;
do {
// get a prime.
@@ -225,11 +225,11 @@ namespace LinBox
K2 = K1;
//clog << "Computing blackbox matrix mod " << prime;
- for (p = FA, raw_p = M. rawBegin(); p != FA + (n*n); ++ p, ++ raw_p)
+ for (p = FA, raw_p = M. Begin(); p != FA + (n*n); ++ p, ++ raw_p)
K1. init (*p, *raw_p);
//clog << "\rComputing lup mod " << prime << ". ";
- FFPACK::LUdivine(K1, FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, n, n, FA, n, P, PQ, FFPACK::FfpackLQUP);
+ FFPACK::LUdivine((typename Field::Father_t)K1, FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, n, n, FA, n, P, PQ, FFPACK::FfpackLQUP);
faithful = true;
for ( j = 0, P_p = P, PQ_p = PQ; j < n; ++ j, ++ P_p, ++ PQ_p)
@@ -251,13 +251,13 @@ namespace LinBox
while (! cra.terminated() ){
// get a prime.
++primeg; while(cra.noncoprime(*primeg)) ++primeg;
- Field K(*primeg);
+ Field K3(*primeg);
//clog << "Computing blackbox matrix mod " << prime;
- for (p = FA, raw_p = M. rawBegin(); p != FA + (n*n); ++ p, ++ raw_p)
- K. init (*p, *raw_p);
+ for (p = FA, raw_p = M. Begin(); p != FA + (n*n); ++ p, ++ raw_p)
+ K3. init (*p, *raw_p);
//clog << "\rComputing lup mod " << prime << ". ";
- FFPACK::LUdivine(K, FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, n, n, FA, n, P, PQ, FFPACK::FfpackLQUP);
+ FFPACK::LUdivine((typename Field::Father_t)K3, FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, n, n, FA, n, P, PQ, FFPACK::FfpackLQUP);
faithful = true;
for ( j = 0, P_p = P, PQ_p = PQ; j < n; ++ j, ++ P_p, ++ PQ_p)
@@ -271,17 +271,19 @@ namespace LinBox
continue;
}
- K. init (tmp, 1UL);
+ K3. init (tmp, 1UL);
for (j = 0, vp = v.begin(); vp != v.end(); ++j, ++vp) {
- K.mulin(tmp, *(FA + (j * n + j)));
- K.assign(*vp, tmp);
+ K3.mulin(tmp, *(FA + (j * n + j)));
+ K3.assign(*vp, tmp);
}
- // std::cout << "Faithful image:[";
- // for (int l = 0; l < v. size(); ++ l)
- // std::cout << v[l] << ", ";
- // std::cout << "]\n";
- cra. progress(K, v);
+#if 0
+ std::cout << "Faithful image:[";
+ for (int l = 0; l < v. size(); ++ l)
+ std::cout << v[l] << ", ";
+ std::cout << "]\n";
+#endif
+ cra. progress(K3, v);
}
delete[] FA;
@@ -302,9 +304,9 @@ namespace LinBox
typedef Modular<int32_t> Field;
// typedef Modular<double> Field;
typedef Field::Element Element;
- typedef DenseMatrix<Field> FMatrix;
+ typedef BlasMatrix<Field> FMatrix;
RandomPrimeIterator primeg(20);
- Field F (*primeg);
+ Field F ((unsigned long)*primeg);
FMatrix FM(F, IM.rowdim(), IM.coldim());
//std::cout << "Random prime " << p << "\n";
@@ -317,7 +319,7 @@ namespace LinBox
typedef FMatrix::Row Row;
//the index is 0-based.
int i = 0;
- int n = M. rowdim();
+ int n = (int) M. rowdim();
std::vector<int> P(n);
for (i = 0; i < n; ++ i)
@@ -382,24 +384,24 @@ namespace LinBox
return v;
}
- // This assumes Matrix is DenseMatrix
+ // This assumes Matrix is BlasMatrix
// (that it's rawiterator will go thru n^2 values row by row.)
template <class Matrix>
static long rank_random (const Matrix& M)
{
typedef typename Matrix::Field Ring;
- typedef typename Ring::Element Integer;
+ // typedef typename Ring::Element Integer_t;
typedef Modular<double> Field;
typedef Field::Element Element;
- int n = M. rowdim();
+ int n = (int)M. rowdim();
integer mmodulus;
FieldTraits<Field>::maxModulus(mmodulus);
long bit1 = (long) floor (log((double)mmodulus)/M_LN2);
long bit2 = (long) floor (log(sqrt(double(4503599627370496LL/n)))/M_LN2);
- RandomPrimeIterator primeg(bit1 < bit2 ? bit1 : bit2);
+ RandomPrimeIterator primeg((unsigned)(bit1 < bit2 ? bit1 : bit2));
Field::Element* FA = new Field::Element[n*n], *p;
@@ -407,11 +409,11 @@ namespace LinBox
// Compute the rank mod that prime. Accumulate into v with CRA.
Field K(*primeg);
- typename Matrix::ConstRawIterator raw_p;
- for (p = FA, raw_p = M. rawBegin(); p != FA + (n*n); ++ p, ++ raw_p)
+ typename Matrix::ConstIterator raw_p;
+ for (p = FA, raw_p = M. Begin(); p != FA + (n*n); ++ p, ++ raw_p)
K. init (*p, *raw_p);
- long r = FFPACK::Rank( K, n, n, FA, n);
+ long r = FFPACK::Rank((typename Field::Father_t) K, n, n, FA, n);
delete[] FA;
return r;
@@ -422,3 +424,12 @@ namespace LinBox
} //end of namespace LinBox
#endif //__LINBOX_signature_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/smith-form-adaptive.h b/linbox/algorithms/smith-form-adaptive.h
index f32b078..ed0a425 100644
--- a/linbox/algorithms/smith-form-adaptive.h
+++ b/linbox/algorithms/smith-form-adaptive.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
* Written by bds and zw
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_smith_form_adaptive_H
@@ -30,8 +31,8 @@
*/
#include <vector>
-#include <linbox/integer.h>
-#include <linbox/blackbox/dense.h>
+#include "linbox/integer.h"
+#include "linbox/matrix/blas-matrix.h"
namespace LinBox
{
@@ -44,13 +45,13 @@ namespace LinBox
static const int NPrime;// = 25;
/* Compute the local smith form at prime p, when modular (p^e) fits in long
- * Should work with SparseMatrix and DenseMatrix
+ * Should work with SparseMatrix and BlasMatrix
*/
template <class Matrix>
static void compute_local_long (std::vector<integer>& s, const Matrix& A, long p, long e);
/* Compute the local smith form at prime p, when modular (p^e) doesnot fit in long
- * Should work with SparseMatrix and DenseMatrix
+ * Should work with SparseMatrix and BlasMatrix
*/
template <class Matrix>
static void compute_local_big (std::vector<integer>& s, const Matrix& A, long p, long e);
@@ -63,14 +64,14 @@ namespace LinBox
/* Compute the k-smooth part of the invariant factor, where k = 100.
* @param sev is the exponent part ...
* By local smith form and rank computation
- * Should work with SparseMatrix and DenseMatrix
+ * Should work with SparseMatrix and BlasMatrix
*/
template <class Matrix>
static void smithFormSmooth (std::vector<integer>& s, const Matrix& A, long r, const std::vector<long>& sev);
/* Compute the k-rough part of the invariant factor, where k = 100.
* By EGV+ algorithm or Iliopoulos' algorithm for Smith form.
- * Should work with DenseMatrix
+ * Should work with BlasMatrix
*/
template <class Matrix>
static void smithFormRough (std::vector<integer>& s, const Matrix& A, integer m );
@@ -78,7 +79,7 @@ namespace LinBox
/* Compute the Smith form via valence algorithms
* Compute the local Smith form at each possible prime
* r >= 2;
- * Should work with SparseMatrix and DenseMatrix
+ * Should work with SparseMatrix and BlasMatrix
*/
template <class Matrix>
static void smithFormVal (std::vector<integer>&s, const Matrix& A, long r, const std::vector<long>& sev);
@@ -87,17 +88,29 @@ namespace LinBox
*
* Compute the largest invariant factor, then, based on that,
* compute the rough and smooth part, separately.
- * Should work with SparseMatrix and DenseMatrix
+ * Should work with SparseMatrix and BlasMatrix
*/
template <class Matrix>
static void smithForm (std::vector<integer>& s, const Matrix& A);
/** Specialization for dense case*/
+ // template <class IRing>
+ // static void smithForm (std::vector<integer>& s, const BlasMatrix<IRing>& A);
template <class IRing>
- static void smithForm (std::vector<integer>& s, const DenseMatrix<IRing>& A);
+ static void smithForm (std::vector<integer>& s, const BlasMatrix<IRing>& A);
+
};
const long SmithFormAdaptive::prime[] = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97};
const int SmithFormAdaptive::NPrime = 25;
}
-#include <linbox/algorithms/smith-form-adaptive.inl>
+#include "linbox/algorithms/smith-form-adaptive.inl"
#endif //__LINBOX_smith_form_adaptive_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/smith-form-adaptive.inl b/linbox/algorithms/smith-form-adaptive.inl
index 84a2989..c5461f8 100644
--- a/linbox/algorithms/smith-form-adaptive.inl
+++ b/linbox/algorithms/smith-form-adaptive.inl
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* authors: bds and zw
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -27,30 +28,29 @@
#include <math.h>
#include <vector>
-#include <linbox/linbox-config.h>
-#include <linbox/integer.h>
-#include <linbox/util/debug.h>
-#include <linbox/field/PIR-modular-int32.h>
-#include <linbox/field/local2_32.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/algorithms/smith-form-iliopoulos.h>
-#include <linbox/algorithms/smith-form-local.h>
-#include <linbox/algorithms/rational-solver-adaptive.h>
-#include <linbox/algorithms/last-invariant-factor.h>
-#include <linbox/algorithms/one-invariant-factor.h>
-#include <linbox/algorithms/matrix-rank.h>
-#include <linbox/algorithms/matrix-hom.h>
-#include <linbox/blackbox/random-matrix.h>
-#include <linbox/blackbox/scompose.h>
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/util/debug.h"
+#include "linbox/field/PIR-modular-int32.h"
+#include "linbox/field/local2_32.h"
+#include "linbox/algorithms/smith-form-iliopoulos.h"
+#include "linbox/algorithms/smith-form-local.h"
+#include "linbox/algorithms/rational-solver-adaptive.h"
+#include "linbox/algorithms/last-invariant-factor.h"
+#include "linbox/algorithms/one-invariant-factor.h"
+#include "linbox/algorithms/matrix-rank.h"
+#include "linbox/algorithms/matrix-hom.h"
+#include "linbox/blackbox/random-matrix.h"
+#include "linbox/blackbox/scompose.h"
#include <fflas-ffpack/ffpack/ffpack.h>
-#include <linbox/algorithms/smith-form-binary.h>
-#include <linbox/algorithms/smith-form-adaptive.inl>
-#include <linbox/solutions/valence.h>
+#include "linbox/algorithms/smith-form-binary.h"
+#include "linbox/algorithms/smith-form-adaptive.inl"
+#include "linbox/solutions/valence.h"
#ifdef __LINBOX_HAVE_NTL
-#include <linbox/field/PIR-ntl-ZZ_p.h>
+#include "linbox/field/PIR-ntl-ZZ_p.h"
#endif
namespace LinBox
@@ -61,9 +61,9 @@ namespace LinBox
template <class Matrix>
void SmithFormAdaptive::compute_local_long (std::vector <integer>& s, const Matrix& A, long p, long e)
{
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
- int order = A. rowdim() < A. coldim() ? A. rowdim() : A. coldim();
+ int order = (int)(A. rowdim() < A. coldim() ? A. rowdim() : A. coldim());
linbox_check ((s. size() >= (unsigned long)order) && (p > 0) && ( e >= 0));
if (e == 0) return;
@@ -72,7 +72,7 @@ namespace LinBox
Local2_32 R;
std::list <Local2_32::Element> l;
SmithFormLocal<Local2_32> SF;
- DenseMatrix <Local2_32> A_local(R, A.rowdim(),A.coldim());
+ BlasMatrix <Local2_32> A_local(R, A.rowdim(),A.coldim());
MatrixHom::map (A_local, A, R);
SF (l, A_local, R);
std::list <Local2_32::Element>::iterator l_p;
@@ -87,13 +87,13 @@ namespace LinBox
Modular<double> F (p); Modular<double>::Element elt;
int n = A. rowdim(); int m = A. coldim();
Modular<double>::Element* A_local = new Modular<double>::Element [n * m];
- typename Matrix::ConstRawIndexedIterator rawi_p;
- typename Matrix::ConstRawIterator raw_p;
+ typename Matrix::ConstIndexedIterator rawi_p;
+ typename Matrix::ConstIterator raw_p;
Modular<double>::Element* A_local_p;
for (A_local_p = A_local; A_local_p != A_local + (n*m); ++ A_local_p)
F. init (*A_local_p, 0);
integer tmp;
- for (rawi_p = A. rawIndexedBegin(), raw_p = A. rawBegin(), A_local_p = A_local; rawi_p != A. rawIndexedEnd(); ++ rawi_p, ++ raw_p, ++ A_local_p) {
+ for (rawi_p = A. IndexedBegin(), raw_p = A. Begin(), A_local_p = A_local; rawi_p != A. IndexedEnd(); ++ rawi_p, ++ raw_p, ++ A_local_p) {
//F. init (*A_local_p, *raw_p);
A. field(). convert (tmp, *raw_p);
F. init (elt, tmp);
@@ -110,9 +110,10 @@ namespace LinBox
delete[] A_local;
#endif
typedef Modular<int32_t> Field;
- typedef DenseMatrix<Field> FMatrix;
+ typedef BlasMatrix<Field> FMatrix;
MatrixRank<typename Matrix::Field, Field> MR;
- Field F(p); FMatrix A_local(A, F);
+ Field F((unsigned long)p);
+ FMatrix A_local(A, F);
long rank = MR. rankIn (A_local);
std::vector <integer>::iterator s_p;
@@ -124,10 +125,13 @@ namespace LinBox
}
else {
report << " Compute local smith at " << p <<'^' << e << " using PIRModular<int32_t>\n";
- long m = 1; int i = 0; for (i = 0; i < e; ++ i) m *= p;
+ long m = 1;
+ int i = 0;
+ for (i = 0; i < e; ++ i)
+ m *= p;
typedef PIRModular<int32_t> PIR;
- PIR R(m);
- DenseMatrix <PIR> A_local(R, A.rowdim(), A.coldim());
+ PIR R((unsigned int)m);
+ BlasMatrix <PIR> A_local(R, A.rowdim(), A.coldim());
SmithFormLocal <PIR> SF;
std::list <PIR::Element> l;
MatrixHom::map (A_local, A, R);
@@ -148,8 +152,8 @@ namespace LinBox
void SmithFormAdaptive::compute_local_big (std::vector<integer>& s, const Matrix& A, long p, long e)
{
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
- int order = A. rowdim() < A. coldim() ? A. rowdim() : A. coldim();
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
+ int order = (int)(A. rowdim() < A. coldim() ? A. rowdim() : A. coldim());
linbox_check ((s. size() >= (unsigned long) order) && (p > 0) && ( e >= 0));
integer T; T = order; T <<= 20; T = pow (T, (int) sqrt((double)order));
NTL::ZZ m; NTL::conv(m, 1); int i = 0; for (i = 0; i < e; ++ i) m *= p;
@@ -157,7 +161,7 @@ namespace LinBox
if (1) {
report << " Compute local Smith at " << p << '^' << e << " over PIR-ntl-ZZ_p\n";
PIR_ntl_ZZ_p R(m);
- DenseMatrix <PIR_ntl_ZZ_p> A_local(R, A.rowdim(), A.coldim());
+ BlasMatrix <PIR_ntl_ZZ_p> A_local(R, A.rowdim(), A.coldim());
SmithFormLocal <PIR_ntl_ZZ_p> SF;
std::list <PIR_ntl_ZZ_p::Element> l;
MatrixHom::map (A_local, A, R);
@@ -197,8 +201,8 @@ namespace LinBox
compute_local_big (s, A, p, e);
// normalize the answer
- for (std::vector<integer>::iterator p = s. begin(); p != s. end(); ++ p)
- *p = gcd (*p, m);
+ for (std::vector<integer>::iterator p_it = s. begin(); p_it != s. end(); ++ p_it)
+ *p_it = gcd (*p_it, m);
}
/* Compute the k-smooth part of the invariant factor, where k = 100.
@@ -210,9 +214,9 @@ namespace LinBox
void SmithFormAdaptive::smithFormSmooth (std::vector<integer>& s, const Matrix& A, long r, const std::vector<long>& sev)
{
//....
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
report << "Computation the k-smooth part of the invariant factors starts(via local and rank):" << std::endl;
- int order = A. rowdim() < A. coldim() ? A. rowdim() : A. coldim();
+ int order = (int)(A. rowdim() < A. coldim() ? A. rowdim() : A. coldim());
linbox_check (s. size() >= (unsigned long)order);
std::vector<long>::const_iterator sev_p; const long* prime_p; std::vector<integer>::iterator s_p;
std::vector<integer> local(order); std::vector<integer>::iterator local_p;
@@ -227,7 +231,8 @@ namespace LinBox
int extra = 1;
do {
- if ((*prime_p == 2) && (*sev_p < 32)) extra = 32 - *sev_p;
+ if ((*prime_p == 2) && (*sev_p < 32))
+ extra = 32 -(int) *sev_p;
integer m = 1;
for (int i = 0; i < *sev_p + extra; ++ i) m *= * prime_p;
report << " Compute the local smith form mod " << *prime_p <<"^" << *sev_p + extra << std::endl;
@@ -254,9 +259,9 @@ namespace LinBox
void SmithFormAdaptive::smithFormRough (std::vector<integer>& s, const Matrix& A, integer m)
{
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
report << "Compuation of the k-rough part f the invariant factors starts(via EGV+ or Iliopolous):\n";
- int order = A. rowdim() < A. coldim() ? A. rowdim() : A. coldim();
+ int order = (int)(A. rowdim() < A. coldim() ? A. rowdim() : A. coldim());
integer T; T = order; T <<= 20; T = pow (T, (int) sqrt((double)order));
linbox_check ((s. size() >= (unsigned long)order) && (m > 0));
if (m == 1)
@@ -264,7 +269,7 @@ namespace LinBox
else if ( m <= FieldTraits< PIRModular<int32_t> >::maxModulus() ) {
report << " Elimination starts:\n";
PIRModular<int32_t> R (m);
- DenseMatrix<PIRModular<int32_t> > A_ilio(R, A.rowdim(), A.coldim());
+ BlasMatrix<PIRModular<int32_t> > A_ilio(R, A.rowdim(), A.coldim());
MatrixHom::map (A_ilio, A, R);
SmithFormIliopoulos::smithFormIn (A_ilio);
int i; std::vector<integer>::iterator s_p;
@@ -295,7 +300,7 @@ namespace LinBox
else {
report << " Elimination start:\n";
PIR_ntl_ZZ_p R (m);
- DenseMatrix<PIR_ntl_ZZ_p> A_ilio(R, A.rowdim(), A.coldim());
+ BlasMatrix<PIR_ntl_ZZ_p> A_ilio(R, A.rowdim(), A.coldim());
MatrixHom::map (A_ilio, A, R);
SmithFormIliopoulos::smithFormIn (A_ilio);
int i; std::vector<integer>::iterator s_p;
@@ -321,9 +326,9 @@ namespace LinBox
void SmithFormAdaptive::smithFormVal (std::vector<integer>&s, const Matrix& A, long r, const std::vector<long>& sev)
{
//....
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
report << "Computation the local smith form at each possible prime:\n";
- int order = A. rowdim() < A. coldim() ? A. rowdim() : A. coldim();
+ int order = (int)(A. rowdim() < A. coldim() ? A. rowdim() : A. coldim());
linbox_check (s. size() >= (unsigned long)order);
std::vector<long>::const_iterator sev_p; const long* prime_p; std::vector<integer>::iterator s_p;
std::vector<integer> local(order); std::vector<integer>::iterator local_p;
@@ -371,17 +376,17 @@ namespace LinBox
template <class Matrix>
void SmithFormAdaptive::smithForm (std::vector<integer>& s, const Matrix& A)
{
- //commentator.start ("Smith Form starts", "Smithform");
+ //commentator().start ("Smith Form starts", "Smithform");
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
report << "Computation of the invariant factors starts (via an adaptive alg):" << std::endl;
// compute the rank over a random prime field.
- int order = A. rowdim() < A. coldim() ? A. rowdim() : A. coldim();
+ int order = (A. rowdim() < A. coldim()) ? (int)A. rowdim() : (int)A. coldim();
report << "Computation of the rank starts:\n";
typedef typename Matrix::Field Ring;
unsigned long r;
- MatrixRank<Ring, Modular<int> > MR;
+ MatrixRank<Ring, Modular<int32_t> > MR;
r = MR. rank (A);
report << " Matrix rank over a random prime field: " << r << '\n';
report << "Computation of the rank finished.\n";
@@ -389,10 +394,10 @@ namespace LinBox
std::vector<long> e(NPrime); std::vector<long>::iterator e_p;
report <<" Compute the degree of min poly of AA^T: \n";
- typedef Modular<int> Field;
+ typedef Modular<int32_t> Field;
integer Val; Field::Element v; unsigned long degree;
RandomPrimeIterator rg ((int)(log( (double)(FieldTraits<Field>::maxModulus()) ) / M_LN2 - 2));
- Field F (*rg);
+ Field F ((unsigned long)*rg);
typename MatrixHomTrait<Matrix, Field>::value_type Ap(F, A.rowdim(), A.coldim());
MatrixHom::map (Ap, A, F);
Valence::one_valence (v, degree, Ap);
@@ -427,9 +432,9 @@ namespace LinBox
typedef OneInvariantFactor<Ring, LIF, SCompose, RandomMatrix> OIF;
OIF oif; oif. setThreshold (4); oif.getLastInvariantFactor().setThreshold (6);
typename Ring::Element _lif, _bonus; integer lif, bonus;
- //Chnage A to DenseMatrix
+ //Chnage A to BlasMatrix
Ring R(A. field());
- DenseMatrix<Ring> DA(R,A.rowdim(),A.coldim());
+ BlasMatrix<Ring> DA(R,A.rowdim(),A.coldim());
MatrixHom::map (DA, A, R);
do {
oif. oneInvariantFactor_Bonus (_lif, _bonus, DA, (int)r);
@@ -477,7 +482,7 @@ namespace LinBox
*s_p = *smooth_p * *rough_p;
report << "Computation of the invariant factors ends." << std::endl;
- //commentator. stop ("done", NULL, "Smithform");
+ //commentator().stop ("done", NULL, "Smithform");
}
/* Compute the Smith form of a dense matrix
@@ -487,19 +492,19 @@ namespace LinBox
* then based on that, compute the rough and smooth part, seperately.
*/
template <class IRing>
- void SmithFormAdaptive::smithForm (std::vector<integer>& s, const DenseMatrix<IRing>& A)
+ void SmithFormAdaptive::smithForm (std::vector<integer>& s, const BlasMatrix<IRing>& A)
{
- //commentator.start ("Smith Form starts", "Smithform");
+ //commentator().start ("Smith Form starts", "Smithform");
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, PROGRESS_REPORT);
report << "Computation of the invariant factors starts (via an adaptive alg):" << std::endl;
// compute the rank over a random prime field.
- int order = A. rowdim() < A. coldim() ? A. rowdim() : A. coldim();
+ int order = (int)(A. rowdim() < A. coldim() ? A. rowdim() : A. coldim());
report << "Computation of the rank starts:\n";
- typedef typename DenseMatrix<IRing>::Field Ring;
+ typedef typename BlasMatrix<IRing>::Field Ring;
unsigned long r;
- MatrixRank<Ring, Modular<int> > MR;
+ MatrixRank<Ring, Modular<int32_t> > MR;
r = MR. rank (A);
report << " Matrix rank over a random prime field: " << r << '\n';
report << "Computation of the rank finished.\n";
@@ -507,11 +512,11 @@ namespace LinBox
std::vector<long> e(NPrime); std::vector<long>::iterator e_p;
report <<" Compute the degree of min poly of AA^T: \n";
- typedef Modular<int> Field;
+ typedef Modular<int32_t> Field;
integer Val; Field::Element v; unsigned long degree;
RandomPrimeIterator rg ((int)(log( (double)(FieldTraits<Field>::maxModulus()) ) / M_LN2 - 2));
- Field F (*rg);
- typename MatrixHomTrait<DenseMatrix<IRing>, Field>::value_type Ap(F,A.rowdim(),A.coldim());
+ Field F ((unsigned long)*rg);
+ typename MatrixHomTrait<BlasMatrix <IRing>, Field>::value_type Ap(F,A.rowdim(),A.coldim());
MatrixHom::map (Ap, A, F);
Valence::one_valence (v, degree, Ap);
report <<" Degree of minial polynomial of AA^T = " << degree << '\n';
@@ -545,7 +550,7 @@ namespace LinBox
typedef OneInvariantFactor<Ring, LIF, SCompose, RandomMatrix> OIF;
OIF oif; oif. setThreshold (10); oif.getLastInvariantFactor().setThreshold (6);
typename Ring::Element _lif, _bonus; integer lif, bonus;
- //Chnage A to DenseMatrix
+ //Chnage A to BlasMatrix
do {
oif. oneInvariantFactor_Bonus (_lif, _bonus, A, (int)r);
A. field(). convert (lif, _lif); A. field(). convert (bonus, _bonus);
@@ -591,9 +596,19 @@ namespace LinBox
*s_p = *smooth_p * *rough_p;
report << "Computation of the invariant factors ends." << std::endl;
- //commentator. stop ("done", NULL, "Smithform");
+ //commentator().stop ("done", NULL, "Smithform");
}
+
}
#endif //__LINBOX_smith_form_adaptive_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/smith-form-binary.h b/linbox/algorithms/smith-form-binary.h
index 2279987..63dc753 100644
--- a/linbox/algorithms/smith-form-binary.h
+++ b/linbox/algorithms/smith-form-binary.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
* Written by Zhendong Wan
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_smith_form_binary_H
@@ -29,9 +30,9 @@
*/
-#include <linbox/util/debug.h>
-#include <linbox/algorithms/default.h>
-#include <linbox/util/commentator.h>
+#include "linbox/util/debug.h"
+#include "linbox/algorithms/default.h"
+#include "linbox/util/commentator.h"
namespace LinBox
{
@@ -107,7 +108,7 @@ namespace LinBox
// check if there are enough spaces in sf to store all invariant factors of A
linbox_check(sf.size() >= (A.rowdim() <= A.coldim() ? A.rowdim() : A.coldim()));
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
typename Vector::iterator p;
@@ -171,7 +172,7 @@ namespace LinBox
}
- oif.oneInvariantFactor(sf[Ar - 1], A, Ar, PrimeL);
+ oif.oneInvariantFactor(sf[Ar - 1], A, (int)Ar, PrimeL);
report << "Biggest invariant factor = ";
@@ -180,7 +181,7 @@ namespace LinBox
report << '\n' << std::flush;
// binary search smith form
- smithFormBinarySearch (sf, A, 1, Ar, PrimeL);
+ smithFormBinarySearch (sf, A, 1, (int)Ar, PrimeL);
report << "Smith Form:[ ";
@@ -222,9 +223,9 @@ namespace LinBox
r.init(fif,0);
- typename IMatrix::ConstRawIterator A_p;
+ typename IMatrix::ConstIterator A_p;
- for (A_p = A.rawBegin(); A_p != A.rawEnd(); ++ A_p) {
+ for (A_p = A.Begin(); A_p != A.End(); ++ A_p) {
if (!r.isZero(*A_p)) {
r.gcd(fif, fif, *A_p);
@@ -244,7 +245,7 @@ namespace LinBox
// filter out primes in PRIME from lif
for ( Prime_p = PrimeL.begin(); Prime_p != PrimeL.end(); ++ Prime_p) {
- r.init (p, *Prime_p);
+ r.init (p,(unsigned long) *Prime_p);
do {
r.quoRem(quo,rem,fif,p);
@@ -271,7 +272,7 @@ namespace LinBox
{
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Binary Search invariant factors [" << i << ", "<< j << "]\n " << std::flush;
@@ -322,7 +323,7 @@ namespace LinBox
// check if there are enough spaces in sf to store all invariant factors of A
linbox_check(sf.size() >= (A.rowdim() <= A.coldim() ? A.rowdim() : A.coldim()));
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
typename Vector::iterator p;
@@ -439,7 +440,7 @@ namespace LinBox
{
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Binary Search invariant factors [" << i << ", "<< j << "]\n " << std::flush;
@@ -485,3 +486,12 @@ namespace LinBox
}
#endif //__LINBOX_smith_form_binary_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/smith-form-iliopoulos.h b/linbox/algorithms/smith-form-iliopoulos.h
index 7d4791a..47231b9 100644
--- a/linbox/algorithms/smith-form-iliopoulos.h
+++ b/linbox/algorithms/smith-form-iliopoulos.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
*
* Author: Zhendong Wan
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,18 +17,17 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_smith_form_iliopoulos_H
#define __LINBOX_smith_form_iliopoulos_H
-#include <linbox/util/debug.h>
-#include <linbox/vector/vector-domain.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/blackbox/submatrix-traits.h>
+#include "linbox/util/debug.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/blackbox/submatrix-traits.h"
namespace LinBox
{
@@ -406,12 +406,13 @@ namespace LinBox
eliminationCol (A, r);
}
-
while (!check(A, r));
- typename SubMatrixTraits<Matrix>::value_type
- sub(A, (unsigned int)1, (unsigned int)1,
- A.rowdim() - 1, A.coldim() - 1);
+ typedef typename SubMatrixTraits<Matrix>::value_type sub_mat_t ;
+
+ sub_mat_t sub(A,
+ (unsigned int)1, (unsigned int)1,
+ A.rowdim() - 1, A.coldim() - 1);
diagonalizationIn(sub, r);
@@ -439,7 +440,7 @@ namespace LinBox
diagonalizationIn(A, r);
- int min = A.rowdim() <= A.coldim() ? A.rowdim() : A.coldim();
+ int min = (int)(A.rowdim() <= A.coldim() ? A.rowdim() : A.coldim());
int i, j;
@@ -481,3 +482,12 @@ namespace LinBox
#endif //__LINBOX_smith_form_iliopoulos_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/smith-form-local.h b/linbox/algorithms/smith-form-local.h
index 13bb1e9..fa2f161 100644
--- a/linbox/algorithms/smith-form-local.h
+++ b/linbox/algorithms/smith-form-local.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/localsmith.h
* Copyright(C) LinBox
*
@@ -7,7 +5,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_smith_form_local_H
@@ -17,7 +33,8 @@
#include <list>
//#include <algorithm>
-#include "linbox/matrix/dense-submatrix.h"
+// #include "linbox/field/multimod-field.h"
+#include "linbox/matrix/blas-matrix.h"
namespace LinBox
{
@@ -25,7 +42,7 @@ namespace LinBox
/**
\brief Smith normal form (invariant factors) of a matrix over a local ring.
- The matrix must be a DenseMatrix over a LocalPID.
+ The matrix must be a BlasMatrix over a LocalPID.
A localPID has the standard ring/field arithmetic functions plus gcdin().
*/
@@ -74,7 +91,8 @@ namespace LinBox
if ( p != A.rowBegin() )
swap_ranges(A.rowBegin()->begin(), A.rowBegin()->end(), p->begin());
if ( q != p->begin() )
- swap_ranges(A.colBegin()->begin(), A.colBegin()->end(), (A.colBegin() + (q - p->begin()))->begin());
+ swap_ranges(A.colBegin()->begin(), A.colBegin()->end(),
+ (A.colBegin() +(int) (q - p->begin()))->begin());
// eliminate step - crude and for dense only - fix later
// Want to use a block method or "left looking" elimination.
@@ -89,13 +107,14 @@ namespace LinBox
for ( q = p->begin() + 1, r = A.rowBegin()->begin() + 1, f = *(p -> begin()); q != p->end(); ++q, ++r )
R.axpyin( *q, f, *r );
- DenseSubmatrix<Elt> Ap(A, 1, 1, A.rowdim() - 1, A.coldim() - 1);
+ BlasMatrix<LocalPID> Ap(A, 1, 1, A.rowdim() - 1, A.coldim() - 1);
L.push_back(d);
return smithStep(L, d, Ap, R);
}
else {
- typename Matrix::RawIterator p;
- for (p = A.rawBegin(); p != A.rawEnd(); ++p) R.divin(*p, g);
+ typename Matrix::Iterator p_it;
+ for (p_it = A.Begin(); p_it != A.End(); ++p_it)
+ R.divin(*p_it, g);
return smithStep(L, R.mulin(d, g), A, R);
}
}
@@ -104,5 +123,14 @@ namespace LinBox
} // end LinBox
-#include <linbox/algorithms/smith-form-local2.h>
+#include "linbox/algorithms/smith-form-local2.inl"
#endif // __LINBOX_smith_form_local_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/smith-form-local2.h b/linbox/algorithms/smith-form-local2.h
deleted file mode 100644
index d3701bb..0000000
--- a/linbox/algorithms/smith-form-local2.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/algorithms/localsmith.h
- * Copyright (C) LinBox
- *
- * Written by David Saunders
- *
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-#ifndef __LINBOX_smith_form_local2_H
-#define __LINBOX_smith_form_local2_H
-
-
-#include <vector>
-#include <list>
-//#include <algorithm>
-
-#include "linbox/matrix/dense-submatrix.h"
-#include "linbox/field/local2_32.h"
-
-namespace LinBox
-{
-
- /**
- \brief Smith normal form (invariant factors) of a matrix over a local ring.
- */
- template<class LocalRing>
- class SmithFormLocal;
-
- template <>
- class SmithFormLocal<Local2_32>
- {
- public:
- typedef Local2_32 LocalPID;
- typedef LocalPID::Element Elt;
-
- template<class Matrix>
- std::list<Elt>& operator()(std::list<Elt>& L, Matrix& A, const LocalPID& R)
- { Elt d; R.init(d, 1);
- return smithStep(L, d, A, R);
- }
-
- template<class Matrix>
- std::list<Elt>&
- smithStep(std::list<Elt>& L, Elt& d, Matrix& A, const LocalPID& R)
- {
- if ( A.rowdim() == 0 || A.coldim() == 0 )
- return L;
-
- LocalPID::Exponent g = LocalPID::Exponent(32); //R.init(g, 0); // must change to 2^31 maybe.
- typename Matrix::RowIterator p;
- typename Matrix::Row::iterator q, r;
- for ( p = A.rowBegin(); p != A.rowEnd(); ++p)
- {
- for (q = p->begin(); q != p->end(); ++q)
- {
- R.gcdin(g, *q);
- if ( R.isUnit(g) ) break;
- }
- if ( R.isUnit(g) ) break;
- }
- //std::cout << "g = " << (int)g <<"\n";
- if ( R.isZero(g) )
- {
- // std::cout << " R.isZero(g) is used\n";
- // std::cout << A.rowdim() << " " << A.coldim() << "\n";
- L.insert(L.end(),
- (A.rowdim() < A.coldim()) ? A.rowdim() : A.coldim(),
- 0
- );
- return L;
- }
- if ( p != A.rowEnd() ) // g is a unit and,
- // because this is a local ring, value at which this first happened
- // also is a unit.
- {
- if ( p != A.rowBegin() )
- swap_ranges(A.rowBegin()->begin(), A.rowBegin()->end(),
- p->begin());
- if ( q != p->begin() )
- swap_ranges(A.colBegin()->begin(), A.colBegin()->end(),
- (A.colBegin() + (q - p->begin()))->begin());
-
- // eliminate step - crude and for dense only - fix later
- // Want to use a block method or "left looking" elimination.
- //std::cout << " Value of A[0][0]: " << *(A.rowBegin() -> begin()) <<"\n";
- Elt f; R.inv(f, *(A.rowBegin()->begin() ) );
- R.negin(f);
- // normalize first row to -1, ...
- //std::cout << "f = " << f << "\n";
- //A.write(std::cout);
-
- for ( q = A.rowBegin()->begin() /*+ 1*/; q != A.rowBegin()->end(); ++q)
- R.mulin(*q, f);
- //
- // eliminate in subsequent rows
- for ( p = A.rowBegin() + 1; p != A.rowEnd(); ++p)
- for ( q = p->begin() + 1, r = A.rowBegin()->begin() + 1, f = *(p -> begin());
- q != p->end(); ++q, ++r )
- R.axpyin( *q, f, *r );
-
- DenseSubmatrix<Elt> Ap(A, 1, 1, A.rowdim() - 1, A.coldim() - 1);
- L.push_back(d);
- return smithStep(L, d, Ap, R);
- }
- else
- {
- typename Matrix::RawIterator p;
- for (p = A.rawBegin(); p != A.rawEnd(); ++p) R.divin(*p, g);
- return smithStep(L, R.mulin(d, g), A, R);
- }
- }
-
- }; // end SmithFormLocal
-
-} // end LinBox
-
-#endif // __LINBOX_smith_form_local2_H
diff --git a/linbox/algorithms/smith-form-local2.inl b/linbox/algorithms/smith-form-local2.inl
new file mode 100644
index 0000000..83cfab3
--- /dev/null
+++ b/linbox/algorithms/smith-form-local2.inl
@@ -0,0 +1,138 @@
+/* linbox/algorithms/localsmith.h
+ * Copyright (C) LinBox
+ *
+ * Written by David Saunders
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+#ifndef __LINBOX_smith_form_local2_H
+#define __LINBOX_smith_form_local2_H
+
+
+#include <vector>
+#include <list>
+//#include <algorithm>
+
+#include "linbox/field/local2_32.h"
+
+namespace LinBox
+{
+
+ /**
+ \brief Smith normal form (invariant factors) of a matrix over a local ring.
+ */
+ template<class LocalRing>
+ class SmithFormLocal;
+
+ template <>
+ class SmithFormLocal<Local2_32>
+ {
+ public:
+ typedef Local2_32 LocalPIR;
+ typedef LocalPIR::Element Elt;
+
+ template<class Matrix>
+ std::list<Elt>& operator()(std::list<Elt>& L, Matrix& A, const LocalPIR& R)
+ { Elt d; R.init(d, 1);
+ Elt *p = &(A[0][0]);
+ return smithStep(L, d, p, A.rowdim(), A.coldim(), A.getStride(), R);
+ }
+
+ std::list<Elt>&
+ smithStep(std::list<Elt>& L, Elt& d, Elt* Ap, size_t m, size_t n, size_t stride, const LocalPIR& R)
+ {
+ if ( m == 0 || n == 0 )
+ return L;
+
+ LocalPIR::Exponent g = LocalPIR::Exponent(32); //R.init(g, 0); // must change to 2^31 maybe.
+ size_t i, j, k;
+ /* Arguably this search order should be reversed to increase the likelyhood of no col swap,
+ assuming row swaps cheaper. Not so, however on my example. -bds 11Nov */
+ for ( i = 0; i != m; ++i)
+ {
+ for (j = 0; j != n; ++j)
+ {
+ R.gcdin(g, Ap[i*stride + j]);
+ if ( R.isUnit(g) ) break;
+ }
+ if ( R.isUnit(g) ) break;
+ }
+ if ( R.isZero(g) )
+ {
+ L.insert(L.end(), (m < n) ? m : n, 0);
+ return L;
+ }
+ if ( i != m ) // g is a unit and, because this is a local ring,
+ // value at which this first happened also is a unit.
+ { // put pivot in 0,0 position
+ if ( i != 0 ) // swap rows
+ std::swap_ranges(Ap, Ap+n, Ap + i*stride);
+ if ( j != 0 ) // swap cols
+ for(k = 0; k != m; ++k)
+ std::swap(Ap[k*stride + 0], Ap[k*stride + j]);
+
+ // elimination step - crude and for dense only - fix later
+ // Want to use a block method or "left looking" elimination.
+ Elt f; R.inv(f, Ap[0*stride + 0] );
+ R.negin(f);
+
+ // normalize first row to -1, ...
+ for ( j = 0; j != n; ++j)
+ R.mulin(Ap[0*stride + j], f);
+
+ // eliminate in subsequent rows
+ for ( i = 1; i != m; ++i)
+ {
+ f = Ap[i*stride + 0];
+ for ( j = 0; j != n; ++j)
+ R.axpyin( Ap[i*stride +j], f, Ap[0*stride +j] );
+ }
+ L.push_back(d);
+ return smithStep(L, d, Ap + stride+1,m-1, n-1, stride, R);
+ }
+ else
+ {
+ for ( i = 0; i != m; ++i)
+ for ( j = 0; j != n; ++j)
+ {
+ R.divin(Ap[i*stride + j], g);
+ }
+ return smithStep(L, R.mulin(d, g), Ap, m, n, stride, R);
+ }
+ }
+
+ }; // end SmithFormLocal
+
+} // end LinBox
+
+#endif // __LINBOX_smith_form_local2_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/smith-form-sparseelim-local.h b/linbox/algorithms/smith-form-sparseelim-local.h
index a689fef..f108890 100644
--- a/linbox/algorithms/smith-form-sparseelim-local.h
+++ b/linbox/algorithms/smith-form-sparseelim-local.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) Givaro Team 1999
* Copyright (C) LinBox
* Written by JG Dumas
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -28,21 +29,36 @@
#include <map>
#include <givaro/givconfig.h> // for Signed_Trait
-#include <linbox/algorithms/gauss.h>
+#include "linbox/algorithms/gauss.h"
+
+
+// LINBOX_pp_gauss_steps_OUT outputs elimination steps
+#ifdef LINBOX_pp_gauss_steps_OUT
+
+// LINBOX_PRANK_OUT outputs intermediate ranks
+#ifndef LINBOX_PRANK_OUT
+#define LINBOX_PRANK_OUT
+#endif
+
+#endif
+
namespace LinBox
{
-#if 0
- template<class T, template <class X> class Container>
- std::ostream& operator<< (std::ostream& o, const Container<T>& C) {
- for(typename Container<T>::const_iterator refs = C.begin();
- refs != C.end() ;
- ++refs )
- o << (*refs) << " " ;
- return o << std::endl;
- }
-#endif
+ template <bool Boolean> struct Boolean_Trait;
+ template <> struct Boolean_Trait<true> {
+ typedef int BooleanType; // int does not matter, only that it differs from float
+ };
+ template <> struct Boolean_Trait<false> {
+ typedef float BooleanType;// float does not matter, only that it differs from int
+ };
+
+ enum {
+ PRIVILEGIATE_NO_COLUMN_PIVOTING = 1,
+ PRIVILEGIATE_REDUCING_FILLIN = 2,
+ PRESERVE_UPPER_MATRIX = 4
+ };
/** \brief Repository of functions for rank modulo a prime power by elimination
on sparse matrices.
@@ -72,71 +88,89 @@ namespace LinBox
// --------------------------------------------
// Modulo operators
template<class Modulu>
- bool isNZero(const Modulu& a ) { return (bool)a ;}
-
-#ifdef GIVARO_PRANK_OUT
-#ifndef GIVARO_JRANK_OUT
-#define GIVARO_JRANK_OUT
-#endif
-#endif
-
+ bool isNZero(const Modulu& a ) const { return (bool)a ;}
+ template<class Modulu>
+ bool isZero(const Modulu& a ) const { return a == 0UL;}
- template<class Ring>
- Ring MY_Zpz_bezout(Ring a, Ring b, Ring& u)
+ template<class Modulo, class Modulo2>
+ Modulo& MY_Zpz_inv (Modulo& u1, const Modulo2 a, const Modulo2 _p) const
{
- Ring u1,u3 ;
- Ring v1,v3 ;
- u1 = 1 ; u3 = a ;
- v1 = 0 ; v3 = b ;
- while (v3 != 0)
- {
- Ring q , t1 ,t3 ;
- q = u3 / v3 ;
- t1 = u1 - q * v1 ; t3 = u3 - q * v3 ;
- u1 = v1 ; u3 = v3 ; v1 = t1 ; v3 = t3 ;
- }
- u = u1 ;
- return u3 ;
- } ;
-
+ u1 = Modulo(1UL);
+ Modulo r0(_p), r1(a);
+ Modulo q(r0/r1);
+
+ r0 -= q * r1;
+ if ( isZero(r0) ) return u1;
+ Modulo u0 = q;
+
+ q = r1/r0;
+ r1 -= q * r0;
+
+ while ( isNZero(r1) ) {
+ u1 += q * u0;
+
+ q = r0/r1;
+ r0 -= q * r1;
+ if ( isZero(r0) ) return u1;
+ u0 += q * u1;
+
+ q = r1/r0;
+ r1 -= q * r0;
+
+ }
+
+ return u1=_p-u0;
+ }
template<class Modulo, class Modulo2>
- Modulo MY_Zpz_inv (const Modulo a, const Modulo2 pp)
+ Modulo MY_Zpz_inv (const Modulo a, const Modulo2 _p) const
{
- typedef Modulo Ring;
- if (a == 1) return a;
- if (a == -1) return a;
- Ring u, d;
- d = MY_Zpz_bezout(Ring(a),Ring(pp),u) ;
-
- if (d == -1) { u = -u; }
- if (u <0) u += pp ;
- return u ;
+ Modulo u1; return MY_Zpz_inv(u1,a,_p);
}
-
- template<class Ring, class Ring2>
- Ring MY_gcd(Ring a, Ring2 b)
- {
- Ring q,r,d;
- Ring ma=a, mb=b;
- while (mb != 0) {
- q = ma / mb;
- r = ma - q * mb;
- ma = mb;
- mb = r;
- }
- return ma;
- };
-
template<class Ring1, class Ring2>
- bool MY_divides(Ring1 a, Ring2 b)
+ bool MY_divides(Ring1 a, Ring2 b) const
{
return (!(b%a));
- };
+ }
// ------------------------------------------------
// Pivot Searchers and column strategy
// ------------------------------------------------
+ template<class Modulo, class Vecteur>
+ void SameColumnPivoting(Modulo PRIME, const Vecteur& lignepivot, unsigned long& indcol, long& indpermut, Boolean_Trait<false>::BooleanType ) {}
+
+
+ template<class Modulo, class Vecteur>
+ void SameColumnPivoting(Modulo PRIME, const Vecteur& lignepivot, unsigned long& indcol, long& indpermut, Boolean_Trait<true>::BooleanType ) {
+ // Try first in the same column
+ unsigned long nj = lignepivot.size() ;
+ if (nj && (indcol == lignepivot[0].first) && (! this->MY_divides(PRIME,lignepivot[0].second) ) ) {
+ indpermut = indcol;
+ ++indcol;
+ }
+ }
+
+ template<class Modulo, class BB, class Mmap>
+ bool SameColumnPivotingTrait(Modulo PRIME, unsigned long& p, const BB& LigneA, const Mmap& psizes, unsigned long& indcol, long& indpermut, Boolean_Trait<false>::BooleanType ) {
+ // Do not try first in the same column
+ return false;
+ }
+
+ template<class Modulo, class BB, class Mmap>
+ bool SameColumnPivotingTrait(Modulo PRIME, unsigned long& p, const BB& LigneA, const Mmap& psizes, unsigned long& indcol, long& c, Boolean_Trait<true>::BooleanType truetrait) {
+ c=-2;
+ for( typename Mmap::const_iterator iter = psizes.begin(); iter != psizes.end(); ++iter) {
+ p = (*iter).second;
+ SameColumnPivoting(PRIME, LigneA[p], indcol, c, truetrait ) ;
+ if (c > -2 ) break;
+ }
+ if (c > -2)
+ return true;
+ else
+ return false;
+
+ }
+
template<class Vecteur>
void CherchePivot( Vecteur& lignepivot, unsigned long& indcol , long& indpermut )
{
@@ -145,7 +179,7 @@ namespace LinBox
indpermut= lignepivot[0].first;
if (indpermut != indcol)
lignepivot[0].first = (indcol);
- indcol++ ;
+ ++indcol;
}
else
indpermut = -1;
@@ -203,6 +237,14 @@ namespace LinBox
+ template<class Vecteur>
+ void PreserveUpperMatrixRow(Vecteur& ligne, Boolean_Trait<true>::BooleanType ) {}
+
+ template<class Vecteur>
+ void PreserveUpperMatrixRow(Vecteur& ligne, Boolean_Trait<false>::BooleanType ) {
+ ligne = Vecteur(0);
+ }
+
template<class Modulo, class Vecteur, class De>
void FaireElimination( Modulo MOD,
@@ -260,12 +302,16 @@ namespace LinBox
unsigned long m=1;
unsigned long l(0);
// A[i,k] <-- A[i,k] / A[k,k]
- lignecourante[0].second = ( ((UModulo)( ( MOD-(lignecourante[0].second) ) * ( MY_Zpz_inv( lignepivot[0].second, MOD) ) ) ) % (UModulo)MOD ) ;
- F headcoeff = lignecourante[0].second ;
+ // lignecourante[0].second = ( ((UModulo)( ( MOD-(lignecourante[0].second) ) * ( MY_Zpz_inv( lignepivot[0].second, MOD) ) ) ) % (UModulo)MOD ) ;
+ // F headcoeff = lignecourante[0].second;
+ F headcoeff = MOD-(lignecourante[0].second);
+ UModulo invpiv; MY_Zpz_inv(invpiv, lignepivot[0].second, MOD);
+ headcoeff *= invpiv;
+ headcoeff %= (UModulo)MOD ;
+ lignecourante[0].second = headcoeff;
--columns[ lignecourante[0].first ];
unsigned long j_piv;
- F tmp;
for(;l<npiv;++l)
if (lignepivot[l].first > k) break;
// for all j such that (j>k) and A[k,j]!=0
@@ -276,16 +322,23 @@ namespace LinBox
*ci++ = lignecourante[m++];
// if A[i,j]!=0, then A[i,j] <-- A[i,j] - A[i,k]*A[k,j]
if ((m<nj) && (lignecourante[m].first == j_piv)) {
- lignecourante[m].second = ( ((UModulo)( headcoeff * lignepivot[l].second + lignecourante[m].second ) ) % (UModulo)MOD );
+ //lignecourante[m].second = ( ((UModulo)( headcoeff * lignepivot[l].second + lignecourante[m].second ) ) % (UModulo)MOD );
+ lignecourante[m].second += ( headcoeff * lignepivot[l].second );
+ lignecourante[m].second %= (UModulo)MOD;
if (isNZero(lignecourante[m].second))
*ci++ = lignecourante[m++];
else
--columns[ lignecourante[m++].first ];
// m++;
}
- else if (isNZero(tmp = ((UModulo)(headcoeff * lignepivot[l].second)) %(UModulo)MOD)) {
- ++columns[j_piv];
- *ci++ = E(j_piv, tmp );
+ else {
+ F tmp(headcoeff);
+ tmp *= lignepivot[l].second;
+ tmp %= (UModulo)MOD;
+ if (isNZero(tmp)) {
+ ++columns[j_piv];
+ *ci++ = E(j_piv, tmp );
+ }
}
}
// if A[k,j]=0, then A[i,j] <-- A[i,j]
@@ -321,10 +374,10 @@ namespace LinBox
// Rank calculators, defining row strategy
// ------------------------------------------------------
- template<class Modulo, class BB, class D, class Container>
+ template<class Modulo, class BB, class D, class Container, bool PrivilegiateNoColumnPivoting, bool PreserveUpperMatrix>
void gauss_rankin(Modulo FMOD, Modulo PRIME, Container& ranks, BB& LigneA, const size_t Ni, const size_t Nj, const D& density_trait)
{
- commentator.start ("Gaussian elimination with reordering modulo a prime power",
+ commentator().start ("Gaussian elimination with reordering modulo a prime power",
"PRGE", Ni);
ranks.resize(0);
@@ -332,7 +385,7 @@ namespace LinBox
typedef typename BB::Row Vecteur;
Modulo MOD = FMOD;
-#ifdef GIVARO_PRANK_OUT
+#ifdef LINBOX_PRANK_OUT
std::cerr << "Elimination mod " << MOD << std::endl;
#endif
@@ -346,8 +399,8 @@ namespace LinBox
unsigned long k=0,rs=0;
for(; k<tmp.size(); ++k) {
Modulo r = tmp[k].second;
- if ((r <0) || (r >= MOD)) r = r % MOD ;
- if (r <0) r = r + MOD ;
+ if ((r <0) || (r >= MOD)) r %= MOD ;
+ if (r <0) r += MOD ;
if (isNZero(r)) {
++col_density[ tmp[k].first ];
toto[rs] =tmp[k];
@@ -360,7 +413,6 @@ namespace LinBox
// LigneA[jj].reactualsize(Nj);
}
- Vecteur Vzer(0);
unsigned long last = Ni-1;
long c(0);
@@ -371,7 +423,7 @@ namespace LinBox
for (unsigned long k=0; k<last;++k) {
- if ( ! (k % maxout) ) commentator.progress (k);
+ if ( ! (k % maxout) ) commentator().progress (k);
unsigned long p=k;
@@ -382,58 +434,71 @@ namespace LinBox
for(p=k; p<Ni; ++p)
psizes.insert( psizes.end(), std::pair<long,long>( LigneA[p].size(), p) );
-#if 0
-#ifdef GIVARO_PRANK_OUT
- std::cerr << "------------ ordered rows -----------" << std::endl;
+#ifdef LINBOX_pp_gauss_steps_OUT
+ std::cerr << "------------ ordered rows " << k << " -----------" << std::endl;
for( std::multimap< long, long >::const_iterator iter = psizes.begin(); iter != psizes.end(); ++iter)
{
- std::cerr << (*iter).first << " : " << (*iter).second << std::endl;
+ std::cerr << (*iter).second << " : #" << (*iter).first << std::endl;
}
- std::cerr << "--------------------------------------" << std::endl;
-#endif
+ std::cerr << "---------------------------------------" << std::endl;
#endif
+
+ if ( SameColumnPivotingTrait(PRIME, p, LigneA, psizes, indcol, c, typename Boolean_Trait<PrivilegiateNoColumnPivoting>::BooleanType() ) )
+ break;
+
for( typename std::multimap< long, long >::const_iterator iter = psizes.begin(); iter != psizes.end(); ++iter) {
p = (*iter).second;
+
CherchePivot( PRIME, LigneA[p], indcol, c , col_density) ;
if (c > -2 ) break;
}
if (c > -2) break;
for(unsigned long ii=k;ii<Ni;++ii)
- for(unsigned long jj=LigneA[ii].size();jj--;)
- LigneA[ii][jj].second = ( LigneA[ii][jj].second / PRIME);
- MOD = MOD / PRIME;
+ for(unsigned long jjj=LigneA[ii].size();jjj--;)
+ LigneA[ii][jjj].second /= PRIME;
+ MOD /= PRIME;
ranks.push_back( indcol );
++ind_pow;
-#ifdef GIVARO_PRANK_OUT
+#ifdef LINBOX_PRANK_OUT
std::cerr << "Rank mod " << (unsigned long)PRIME << "^" << ind_pow << " : " << indcol << std::endl;
if (MOD == 1) std::cerr << "wattadayada inhere ?" << std::endl;
#endif
}
if (p != k) {
+#ifdef LINBOX_pp_gauss_steps_OUT
+ std::cerr << "------------ permuting rows " << p << " and " << k << " ---" << std::endl;
+#endif
Vecteur vtm = LigneA[k];
LigneA[k] = LigneA[p];
LigneA[p] = vtm;
}
+#ifdef LINBOX_pp_gauss_steps_OUT
+ if (c != (long(indcol)-1L))
+ std::cerr << "------------ permuting cols " << (indcol-1) << " and " << c << " ---" << std::endl;
+#endif
if (c != -1)
for(unsigned long l=k + 1; l < Ni; ++l)
FaireElimination(MOD, LigneA[l], LigneA[k], indcol, c, col_density);
- // LigneA.write(cout << "step[" << k << "], pivot: " << c << std::endl) << endl;
-
-#ifndef GIVARO_PRANK_OUT
- LigneA[k] = Vzer;
+#ifdef LINBOX_pp_gauss_steps_OUT
+ LigneA.write(cerr << "step[" << k << "], pivot: " << c << std::endl) << endl;
#endif
+
+ PreserveUpperMatrixRow(LigneA[k], typename Boolean_Trait<PreserveUpperMatrix>::BooleanType());
}
- CherchePivot( PRIME, LigneA[last], indcol, c, col_density );
+
+ c = -2;
+ SameColumnPivoting(PRIME, LigneA[last], indcol, c, typename Boolean_Trait<PrivilegiateNoColumnPivoting>::BooleanType() );
+ if (c == -2) CherchePivot( PRIME, LigneA[last], indcol, c, col_density );
while( c == -2) {
ranks.push_back( indcol );
- for(long jj=LigneA[last].size();jj--;)
- LigneA[last][jj].second = ( LigneA[last][jj].second / PRIME);
+ for(long jjj=LigneA[last].size();jjj--;)
+ LigneA[last][jjj].second /= PRIME;
MOD /= PRIME;
CherchePivot( PRIME, LigneA[last], indcol, c, col_density );
}
@@ -443,25 +508,40 @@ namespace LinBox
}
// ranks.push_back(indcol);
-#ifdef GIVARO_JRANK_OUT
+#ifdef LINBOX_pp_gauss_steps_OUT
+ LigneA.write(cerr << "step[" << Ni-1 << "], pivot: " << c << std::endl) << endl;
+#endif
+#ifdef LINBOX_PRANK_OUT
std::cerr << "Rank mod " << (unsigned long)FMOD << " : " << indcol << std::endl;
#endif
- commentator.stop ("done", 0, "PRGE");
+ commentator().stop ("done", 0, "PRGE");
}
template<class Modulo, class BB, class D, class Container>
- void prime_power_rankin (Modulo FMOD, Modulo PRIME, Container& ranks, BB& SLA, const size_t Ni, const size_t Nj, const D& density_trait)
+ void prime_power_rankin (Modulo FMOD, Modulo PRIME, Container& ranks, BB& SLA, const size_t Ni, const size_t Nj, const D& density_trait, int StaticParameters=0)
{
- gauss_rankin(FMOD,PRIME,ranks, SLA, Ni, Nj, density_trait);
+ if (PRIVILEGIATE_NO_COLUMN_PIVOTING & StaticParameters) {
+ if (PRESERVE_UPPER_MATRIX & StaticParameters) {
+ gauss_rankin<Modulo,BB,D,Container,true,true>(FMOD,PRIME,ranks, SLA, Ni, Nj, density_trait);
+ } else {
+ gauss_rankin<Modulo,BB,D,Container,true,false>(FMOD,PRIME,ranks, SLA, Ni, Nj, density_trait);
+ }
+ } else {
+ if (PRESERVE_UPPER_MATRIX & StaticParameters) {
+ gauss_rankin<Modulo,BB,D,Container,false,true>(FMOD,PRIME,ranks, SLA, Ni, Nj, density_trait);
+ } else {
+ gauss_rankin<Modulo,BB,D,Container,false,false>(FMOD,PRIME,ranks, SLA, Ni, Nj, density_trait);
+ }
+ }
}
template<class Modulo, class Matrix, template<class, class> class Container, template<class> class Alloc>
- Container<std::pair<size_t,size_t>, Alloc<std::pair<size_t,size_t> > >& operator()(Container<std::pair<size_t,size_t>, Alloc<std::pair<size_t,size_t> > >& L, Matrix& A, Modulo FMOD, Modulo PRIME)
+ Container<std::pair<size_t,size_t>, Alloc<std::pair<size_t,size_t> > >& operator()(Container<std::pair<size_t,size_t>, Alloc<std::pair<size_t,size_t> > >& L, Matrix& A, Modulo FMOD, Modulo PRIME, int StaticParameters=0)
{
Container<size_t, Alloc<size_t> > ranks;
- prime_power_rankin( FMOD, PRIME, ranks, A, A.rowdim(), A.coldim(), std::vector<size_t>());
+ prime_power_rankin( FMOD, PRIME, ranks, A, A.rowdim(), A.coldim(), std::vector<size_t>(),StaticParameters);
L.resize( 0 ) ;
size_t MOD = 1;
size_t num = 0, diff;
@@ -482,3 +562,12 @@ namespace LinBox
} // end of LinBox namespace
#endif //__LINBOX_pp_gauss_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/smith-form-sparseelim-poweroftwo.h b/linbox/algorithms/smith-form-sparseelim-poweroftwo.h
new file mode 100644
index 0000000..636045a
--- /dev/null
+++ b/linbox/algorithms/smith-form-sparseelim-poweroftwo.h
@@ -0,0 +1,563 @@
+/* algorithms/smith-form-sparseelim-poweroftwo.h
+ * Copyright (C) LinBox
+ * Written by JG Dumas
+ * Time-stamp: <06 Apr 12 11:50:12 Jean-Guillaume.Dumas at imag.fr>
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+
+#ifndef __LINBOX_pp_gauss_poweroftwo_H
+#define __LINBOX_pp_gauss_poweroftwo_H
+
+#include <map>
+#include <givaro/givconfig.h> // for Signed_Trait
+#include "linbox/algorithms/smith-form-sparseelim-local.h"
+
+// LINBOX_pp_gauss_steps_OUT outputs elimination steps
+#ifdef LINBOX_pp_gauss_steps_OUT
+
+// LINBOX_PRANK_OUT outputs intermediate ranks
+# ifndef LINBOX_PRANK_OUT
+# define LINBOX_PRANK_OUT
+# endif
+
+#endif
+
+
+namespace LinBox
+{
+
+ /** \brief Repository of functions for rank modulo a prime power by elimination
+ * on sparse matrices.
+ */
+ template<typename UnsignedIntType>
+ class PowerGaussDomainPowerOfTwo {
+ typedef UnsignedIntType UInt_t;
+ typedef UnsignedIntType Element;
+ const Element zero;
+ const Element one;
+ public:
+
+ /** \brief The field parameter is the domain
+ * over which to perform computations
+ */
+ PowerGaussDomainPowerOfTwo () : zero(0U), one(1U) {}
+
+ //Copy constructor
+ ///
+ PowerGaussDomainPowerOfTwo (const PowerGaussDomainPowerOfTwo &M) {}
+
+
+
+ // --------------------------------------------
+ // Modulo operators
+ bool isNZero(const UInt_t& a ) const { return (bool)a ;}
+ bool isZero(const UInt_t& a ) const { return a == 0U;}
+ bool isOne(const UInt_t& a ) const { return a == 1U;}
+ bool isOdd(const UInt_t& b) const {
+ return (bool)(b & 1U);
+ }
+
+ bool MY_divides(const UInt_t& a, const UInt_t& b) const {
+ return (!(b%a));
+ }
+
+ UInt_t& MY_Zpz_inv (UInt_t& u1, const UInt_t& a, const size_t exponent, const UInt_t& TWOTOEXPMONE) const {
+ static const UInt_t ttep2(TWOTOEXPMONE+3);
+ if (this->isOne(a)) return u1=this->one;
+ REQUIRE( (one<<exponent) == (TWOTOEXPMONE+1) );
+ REQUIRE( a <= TWOTOEXPMONE );
+ REQUIRE( (a & 1) );
+ u1=ttep2-a; // 2-a
+ UInt_t xmone(a-1);
+ for(size_t i=2; i<exponent; i<<=1) {
+ xmone *= xmone;
+ xmone &= TWOTOEXPMONE;
+ u1 *= ++xmone; --xmone;
+ u1 &= TWOTOEXPMONE;
+ }
+ ENSURE( ((a * u1) & TWOTOEXPMONE) == 1 );
+ return u1;
+ }
+
+// UInt_t& MY_Zpz_inv (UInt_t& u1, const UInt_t a, const UInt_t _p) const {
+// u1 = 1UL;
+// UInt_t r0(_p), r1(a);
+// UInt_t q(r0/r1);
+
+// r0 -= q * r1;
+// if ( this->isZero(r0) ) return u1;
+// UInt_t u0 = q;
+
+// q = r1/r0;
+// r1 -= q * r0;
+
+// while ( this->isNZero(r1) ) {
+// u1 += q * u0;
+
+// q = r0/r1;
+// r0 -= q * r1;
+// if ( this->isZero(r0) ) return u1;
+// u0 += q * u1;
+
+// q = r1/r0;
+// r1 -= q * r0;
+
+// }
+
+// return u1=_p-u0;
+// }
+
+// UInt_t MY_Zpz_inv (const UInt_t a, const UInt_t _p) const {
+// UInt_t u1; return MY_Zpz_inv(u1,a,_p);
+// }
+
+
+ // ------------------------------------------------
+ // Pivot Searchers and column strategy
+ // ------------------------------------------------
+ template<class Vecteur>
+ void SameColumnPivoting(const Vecteur& lignepivot, unsigned long& indcol, long& indpermut, Boolean_Trait<false>::BooleanType ) {}
+
+
+ template<class Vecteur>
+ void SameColumnPivoting(const Vecteur& lignepivot, unsigned long& indcol, long& indpermut, Boolean_Trait<true>::BooleanType ) {
+ // Try first in the same column
+ unsigned long nj = lignepivot.size() ;
+ if (nj && (indcol == lignepivot[0].first) && (this->isOdd(lignepivot[0].second) ) ) {
+ indpermut = indcol;
+ ++indcol;
+ }
+ }
+
+ template<class BB, class Mmap>
+ bool SameColumnPivotingTrait(unsigned long& p, const BB& LigneA, const Mmap& psizes, unsigned long& indcol, long& indpermut, Boolean_Trait<false>::BooleanType ) {
+ // Do not try first in the same column
+ return false;
+ }
+
+ template<class BB, class Mmap>
+ bool SameColumnPivotingTrait(unsigned long& p, const BB& LigneA, const Mmap& psizes, unsigned long& indcol, long& c, Boolean_Trait<true>::BooleanType truetrait) {
+ c=-2;
+ for( typename Mmap::const_iterator iter = psizes.begin(); iter != psizes.end(); ++iter) {
+ p = (*iter).second;
+ SameColumnPivoting(LigneA[p], indcol, c, truetrait ) ;
+ if (c > -2 ) break;
+ }
+ if (c > -2)
+ return true;
+ else
+ return false;
+
+ }
+
+ template<class Vecteur>
+ void CherchePivot( Vecteur& lignepivot, unsigned long& indcol , long& indpermut ) {
+ unsigned long nj = lignepivot.size() ;
+ if (nj) {
+ indpermut= lignepivot[0].first;
+ if (indpermut != indcol)
+ lignepivot[0].first = (indcol);
+ ++indcol;
+ }
+ else
+ indpermut = -1;
+ }
+
+
+
+ template<class Vecteur, class D>
+ void CherchePivot(Vecteur& lignepivot, unsigned long& indcol , long& indpermut, D& columns ) {
+ typedef typename Vecteur::value_type E;
+ long nj = lignepivot.size() ;
+ if (nj) {
+ indpermut = lignepivot[0].first;
+ long pp=0;
+ for(;pp<nj;++pp)
+ if (this->isOdd(lignepivot[pp].second) ) break;
+
+ if (pp < nj) {
+ long ds = columns[ lignepivot[pp].first ],dl,p=pp,j=pp;
+ for(++j;j<nj;++j)
+ if ( ( (dl=columns[lignepivot[j].first] ) < ds ) && (this->isOdd(lignepivot[j].second) ) ) {
+ ds = dl;
+ p = j;
+ }
+ if (p != 0) {
+ if (indpermut == (long)indcol) {
+ UInt_t ttm = lignepivot[p].second;
+ indpermut = lignepivot[p].first;
+ lignepivot[p].second = (lignepivot[0].second);
+ lignepivot[0].second = (ttm);
+ }
+ else {
+ E ttm = lignepivot[p];
+ indpermut = ttm.first;
+ for(long m=p;m;--m)
+ lignepivot[m] = lignepivot[m-1];
+ lignepivot[0] = ttm;
+ }
+ }
+ if (indpermut != (long)indcol)
+ lignepivot[0].first = (indcol);
+ indcol++ ;
+ for(j=nj;j--;)
+ --columns[ lignepivot[j].first ];
+ }
+ else
+ indpermut = -2;
+ }
+ else
+ indpermut = -1;
+ }
+
+ template<class Vecteur>
+ void PreserveUpperMatrixRow(Vecteur& ligne, Boolean_Trait<true>::BooleanType ) {}
+
+ template<class Vecteur>
+ void PreserveUpperMatrixRow(Vecteur& ligne, Boolean_Trait<false>::BooleanType ) {
+ ligne = Vecteur(0);
+ }
+
+
+ template<class Vecteur, class De>
+ void FaireElimination( const size_t EXPONENT, const UInt_t& TWOK, const UInt_t& TWOKMONE,
+ Vecteur& lignecourante,
+ const Vecteur& lignepivot,
+ const long& indcol,
+ const long& indpermut,
+ De& columns) {
+
+ // typedef typename Vecteur::coefficientSpace F;
+ // typedef typename Vecteur::value_types E;
+ typedef typename Vecteur::value_type E;
+
+ unsigned long k = indcol - 1;
+ unsigned long nj = lignecourante.size() ;
+ if (nj) {
+ unsigned long j_head(0);
+ for(; j_head<nj; ++j_head)
+ if (long(lignecourante[j_head].first) >= indpermut) break;
+ unsigned long bjh(j_head-1);
+ if ((j_head<nj) && (long(lignecourante[j_head].first) == indpermut)) {
+ // -------------------------------------------
+ // Permutation
+ if (indpermut != (long)k) {
+ if (lignecourante[0].first == k) {
+ // non zero <--> non zero
+ UInt_t tmp = lignecourante[0].second ;
+ lignecourante[0].second = (lignecourante[j_head].second );
+ lignecourante[j_head].second = (tmp);
+ }
+ else {
+ // zero <--> non zero
+ E tmp = lignecourante[j_head];
+ --columns[ tmp.first ];
+ ++columns[k];
+ tmp.first = (k);
+ for(long l=j_head; l>0; l--)
+ lignecourante[l] = lignecourante[l-1];
+ lignecourante[0] = tmp;
+ }
+ j_head = 0;
+ }
+ // -------------------------------------------
+ // Elimination
+ unsigned long npiv = lignepivot.size();
+ Vecteur construit(nj + npiv);
+ // construit : <-- ci
+ // courante : <-- m
+ // pivot : <-- l
+ typedef typename Vecteur::iterator Viter;
+ Viter ci = construit.begin();
+ unsigned long m=1;
+ unsigned long l(0);
+ // A[i,k] <-- A[i,k] / A[k,k]
+ UInt_t headcoeff = TWOK-(lignecourante[0].second);
+// UInt_t invpiv; MY_Zpz_inv(invpiv, lignepivot[0].second, TWOK);
+ UInt_t invpiv; MY_Zpz_inv(invpiv, lignepivot[0].second, EXPONENT, TWOKMONE);
+ headcoeff *= invpiv;
+ headcoeff &= TWOKMONE ;
+// lignecourante[0].second = ( ((UModulo)( ( MOD-(lignecourante[0].second) ) * ( MY_Zpz_inv( lignepivot[0].second, MOD) ) ) ) % (UModulo)MOD ) ;
+// UInt_t headcoeff = lignecourante[0].second ;
+ --columns[ lignecourante[0].first ];
+
+ unsigned long j_piv;
+ for(;l<npiv;++l)
+ if (lignepivot[l].first > k) break;
+ // for all j such that (j>k) and A[k,j]!=0
+ for(;l<npiv;++l) {
+ j_piv = lignepivot[l].first;
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ for (;(m<nj) && (lignecourante[m].first < j_piv);)
+ *ci++ = lignecourante[m++];
+ // if A[i,j]!=0, then A[i,j] <-- A[i,j] - A[i,k]*A[k,j]
+ if ((m<nj) && (lignecourante[m].first == j_piv)) {
+// lignecourante[m].second = ( ((UModulo)( headcoeff * lignepivot[l].second + lignecourante[m].second ) ) % (UModulo)MOD );
+ lignecourante[m].second += ( headcoeff * lignepivot[l].second );
+ lignecourante[m].second &= TWOKMONE;
+ if (isNZero(lignecourante[m].second))
+ *ci++ = lignecourante[m++];
+ else
+ --columns[ lignecourante[m++].first ];
+ // m++;
+ }
+ else {
+ UInt_t tmp(headcoeff);
+ tmp *= lignepivot[l].second;
+ tmp &= TWOKMONE;
+ if (isNZero(tmp)) {
+ ++columns[j_piv];
+ *ci++ = E(j_piv, tmp );
+ }
+ }
+ }
+ // if A[k,j]=0, then A[i,j] <-- A[i,j]
+ for (;m<nj;)
+ *ci++ = lignecourante[m++];
+
+ construit.erase(ci,construit.end());
+ lignecourante = construit;
+ }
+ else
+ // -------------------------------------------
+ // Permutation
+ if (indpermut != (long)k) {
+ unsigned long l(0);
+ for(; l<nj; ++l)
+ if (lignecourante[l].first >= k) break;
+ if ((l<nj) && (lignecourante[l].first == k)) {
+ // non zero <--> zero
+ E tmp = lignecourante[l];
+ --columns[tmp.first ];
+ ++columns[indpermut];
+ tmp.first = (indpermut);
+ for(;l<bjh;l++)
+ lignecourante[l] = lignecourante[l+1];
+ lignecourante[bjh] = tmp;
+ } // else
+ // zero <--> zero
+ }
+ }
+ }
+
+ // ------------------------------------------------------
+ // Rank calculators, defining row strategy
+ // ------------------------------------------------------
+
+ template<class BB, class D, class Container, bool PrivilegiateNoColumnPivoting, bool PreserveUpperMatrix>
+ void gauss_rankin(size_t EXPONENTMAX, Container& ranks, BB& LigneA, const size_t Ni, const size_t Nj, const D& density_trait)
+ {
+ commentator().start ("Gaussian elimination with reordering modulo a prime power of 2",
+ "PRGEPo2", Ni);
+
+ ranks.resize(0);
+
+ typedef typename BB::Row Vecteur;
+ size_t EXPONENT = EXPONENTMAX;
+ UInt_t TWOK(1UL); TWOK <<= EXPONENT;
+ UInt_t TWOKMONE(TWOK); --TWOKMONE;
+
+#ifdef LINBOX_PRANK_OUT
+ std::cerr << "Elimination mod " << TWOK << std::endl;
+#endif
+
+ D col_density(Nj);
+
+ // assignment of LigneA with the domain object
+ size_t jj;
+ for(jj=0; jj<Ni; ++jj) {
+ Vecteur tmp = LigneA[jj];
+ Vecteur toto(tmp.size());
+ unsigned long k=0,rs=0;
+ for(; k<tmp.size(); ++k) {
+ UInt_t r = tmp[k].second;
+// if (r <0) r %= TWOK ;
+// if (r <0) r += TWOK ;
+ if (r >= TWOK) r &= TWOKMONE;
+ if (isNZero(r)) {
+ ++col_density[ tmp[k].first ];
+ toto[rs] =tmp[k];
+ toto[rs].second = ( r );
+ ++rs;
+ }
+ }
+ toto.resize(rs);
+ LigneA[jj] = toto;
+ // LigneA[jj].reactualsize(Nj);
+
+ }
+
+ unsigned long last = Ni-1;
+ long c(0);
+ unsigned long indcol(0);
+ unsigned long ind_pow = 1;
+ unsigned long maxout = Ni/100; maxout = (maxout<10 ? 10 : (maxout>1000 ? 1000 : maxout) );
+ unsigned long thres = Ni/maxout; thres = (thres >0 ? thres : 1);
+
+
+ for (unsigned long k=0; k<last;++k) {
+ if ( ! (k % maxout) ) commentator().progress (k);
+
+
+ unsigned long p=k;
+ for(;;) {
+
+
+ std::multimap< long, long > psizes;
+ for(p=k; p<Ni; ++p)
+ psizes.insert( psizes.end(), std::pair<long,long>( LigneA[p].size(), p) );
+
+#ifdef LINBOX_pp_gauss_steps_OUT
+ std::cerr << "------------ ordered rows " << k << " -----------" << std::endl;
+ for( std::multimap< long, long >::const_iterator iter = psizes.begin(); iter != psizes.end(); ++iter)
+ {
+ std::cerr << (*iter).second << " : #" << (*iter).first << std::endl;
+ }
+ std::cerr << "---------------------------------------" << std::endl;
+#endif
+
+
+
+ if ( SameColumnPivotingTrait(p, LigneA, psizes, indcol, c, typename Boolean_Trait<PrivilegiateNoColumnPivoting>::BooleanType() ) )
+ break;
+
+ for( typename std::multimap< long, long >::const_iterator iter = psizes.begin(); iter != psizes.end(); ++iter) {
+ p = (*iter).second;
+
+ CherchePivot( LigneA[p], indcol, c , col_density) ;
+ if (c > -2 ) break;
+ }
+
+ if (c > -2) break;
+ for(unsigned long ii=k;ii<Ni;++ii)
+ for(unsigned long jjj=LigneA[ii].size();jjj--;)
+ LigneA[ii][jjj].second >>= 1;
+ --EXPONENT;
+ TWOK >>= 1;
+ TWOKMONE >>=1;
+ ranks.push_back( indcol );
+ ++ind_pow;
+#ifdef LINBOX_PRANK_OUT
+ std::cerr << "Rank mod 2^" << ind_pow << " : " << indcol << std::endl;
+ if (TWOK == 1) std::cerr << "wattadayada inhere ?" << std::endl;
+#endif
+
+ }
+ if (p != k) {
+#ifdef LINBOX_pp_gauss_steps_OUT
+ std::cerr << "------------ permuting rows " << p << " and " << k << " ---" << std::endl;
+#endif
+ Vecteur vtm = LigneA[k];
+ LigneA[k] = LigneA[p];
+ LigneA[p] = vtm;
+ }
+#ifdef LINBOX_pp_gauss_steps_OUT
+ if (c != (long(indcol)-1L))
+ std::cerr << "------------ permuting cols " << (indcol-1) << " and " << c << " ---" << std::endl;
+#endif
+ if (c != -1)
+ for(unsigned long l=k + 1; l < Ni; ++l)
+ FaireElimination(EXPONENT, TWOK, TWOKMONE, LigneA[l], LigneA[k], indcol, c, col_density);
+
+
+#ifdef LINBOX_pp_gauss_steps_OUT
+ LigneA.write(cerr << "step[" << k << "], pivot: " << c << std::endl) << endl;
+#endif
+
+ PreserveUpperMatrixRow(LigneA[k], typename Boolean_Trait<PreserveUpperMatrix>::BooleanType());
+ }
+
+ c = -2;
+ SameColumnPivoting(LigneA[last], indcol, c, typename Boolean_Trait<PrivilegiateNoColumnPivoting>::BooleanType() );
+ if (c == -2) CherchePivot( LigneA[last], indcol, c, col_density );
+ while( c == -2) {
+ ranks.push_back( indcol );
+ for(long jjj=LigneA[last].size();jjj--;)
+ LigneA[last][jjj].second >>= 1;
+ TWOK >>= 1;
+ CherchePivot( LigneA[last], indcol, c, col_density );
+ }
+ while( TWOK > 1) {
+ TWOK >>= 1;
+ ranks.push_back( indcol );
+ }
+
+ // ranks.push_back(indcol);
+#ifdef LINBOX_pp_gauss_steps_OUT
+ LigneA.write(cerr << "step[" << Ni-1 << "], pivot: " << c << std::endl) << endl;
+#endif
+#ifdef LINBOX_PRANK_OUT
+ std::cerr << "Rank mod 2^" << EXPONENT << " : " << indcol << std::endl;
+#endif
+ commentator().stop ("done", 0, "PRGEPo2");
+
+ }
+
+ template<class BB, class D, class Container>
+ void prime_power_rankin (size_t EXPONENT, Container& ranks, BB& SLA, const size_t Ni, const size_t Nj, const D& density_trait, int StaticParameters=0) {
+ if (PRIVILEGIATE_NO_COLUMN_PIVOTING & StaticParameters) {
+ if (PRESERVE_UPPER_MATRIX & StaticParameters) {
+ gauss_rankin<BB,D,Container,true,true>(EXPONENT,ranks, SLA, Ni, Nj, density_trait);
+ } else {
+ gauss_rankin<BB,D,Container,true,false>(EXPONENT,ranks, SLA, Ni, Nj, density_trait);
+ }
+ } else {
+ if (PRESERVE_UPPER_MATRIX & StaticParameters) {
+ gauss_rankin<BB,D,Container,false,true>(EXPONENT,ranks, SLA, Ni, Nj, density_trait);
+ } else {
+ gauss_rankin<BB,D,Container,false,false>(EXPONENT,ranks, SLA, Ni, Nj, density_trait);
+ }
+ }
+ }
+
+
+ template<class Matrix, template<class, class> class Container, template<class> class Alloc>
+ Container<std::pair<size_t,UInt_t>, Alloc<std::pair<size_t,UInt_t> > >& operator()(Container<std::pair<size_t,UInt_t>, Alloc<std::pair<size_t,UInt_t> > >& L, Matrix& A, size_t EXPONENT, int StaticParameters=0) {
+ Container<size_t, Alloc<size_t> > ranks;
+ prime_power_rankin( EXPONENT, ranks, A, A.rowdim(), A.coldim(), std::vector<size_t>(),StaticParameters);
+ L.resize( 0 ) ;
+ UInt_t MOD(1);
+ size_t num = 0, diff;
+ for( typename Container<size_t, Alloc<size_t> >::const_iterator it = ranks.begin(); it != ranks.end(); ++it) {
+ diff = *it-num;
+ if (diff > 0)
+ L.push_back( std::pair<size_t,UInt_t>(*it-num,MOD) );
+ MOD <<= 1;
+ num = *it;
+ }
+ return L;
+ }
+
+ };
+
+
+
+} // end of LinBox namespace
+
+#endif //__LINBOX_pp_gauss_poweroftwo_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/toeplitz-det.h b/linbox/algorithms/toeplitz-det.h
index 1fe09a8..3070da6 100644
--- a/linbox/algorithms/toeplitz-det.h
+++ b/linbox/algorithms/toeplitz-det.h
@@ -1,12 +1,13 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +15,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -51,7 +52,7 @@ namespace LinBox
( res, CField.powin( F.leadCoeff( temp, f2 ),
F.deg(f1) - F.deg(fi) ) );
if( !((F.deg(f2)-F.deg(f1))%2) && !((F.deg(f1)-n)%2) )
- sign *= -1;
+ sign = (short)-sign;
f1 = f2;
f2 = fi;
}
@@ -74,3 +75,12 @@ namespace LinBox
} // end of namespace LinBox
#endif //__LINBOX_toeplitz_det_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/triangular-solve-gf2.h b/linbox/algorithms/triangular-solve-gf2.h
index f6ec95e..824a69d 100644
--- a/linbox/algorithms/triangular-solve-gf2.h
+++ b/linbox/algorithms/triangular-solve-gf2.h
@@ -1,10 +1,26 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* ===================================================================
* Copyright(C) LinBox 2008
* Written by Jean-Guillaume Dumas
* Triangular Solve
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
* Time-stamp: <01 Oct 09 15:38:25 Jean-Guillaume.Dumas at imag.fr>
* ===================================================================
*/
@@ -27,7 +43,7 @@ namespace LinBox
typedef GF2 Field;
const GF2 F2;
- commentator.start ("Sparse Elimination Upper Triangular Solve over GF(2)", "utrsmGF2");
+ commentator().start ("Sparse Elimination Upper Triangular Solve over GF(2)", "utrsmGF2");
typename Vector2::const_iterator vec=b.begin();
typename Vector1::iterator res=x.begin();
@@ -86,7 +102,7 @@ namespace LinBox
// if (! consistant) throw LinboxError ("upperTriangularSolveBinary returned INCONSISTENT");
linbox_check( consistant );
- commentator.stop ("done", NULL, "utrsmGF2");
+ commentator().stop ("done", NULL, "utrsmGF2");
return x;
}
@@ -99,7 +115,7 @@ namespace LinBox
typedef _Matrix Matrix;
const GF2 F2;
- commentator.start ("Sparse Elimination Lower Triangular Unitary Solve over GF2", "ltrsmGF2");
+ commentator().start ("Sparse Elimination Lower Triangular Unitary Solve over GF2", "ltrsmGF2");
typename Vector2::const_iterator vec=b.begin();
typename Vector1::iterator res=x.begin();
@@ -117,10 +133,19 @@ namespace LinBox
F2.assign(*res,tmp);
}
- commentator.stop ("done", NULL, "ltrsmGF2");
+ commentator().stop ("done", NULL, "ltrsmGF2");
return x;
}
}
#endif //__LINBOX_tri_solve_gf2_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/triangular-solve.h b/linbox/algorithms/triangular-solve.h
index 0c56fb3..435ffb8 100644
--- a/linbox/algorithms/triangular-solve.h
+++ b/linbox/algorithms/triangular-solve.h
@@ -1,9 +1,25 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* ===================================================================
* Copyright(C) 2008 LinBox
* Triangular Solve
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
* Time-stamp: <16 Jun 10 14:21:18 Jean-Guillaume.Dumas at imag.fr>
* ===================================================================
*/
@@ -25,20 +41,18 @@ namespace LinBox
typedef typename Matrix::Field Field;
const Field& F = U.field();
- commentator.start ("Sparse Elimination Upper Triangular Solve", "utrsm");
+ commentator().start ("Sparse Elimination Upper Triangular Solve", "utrsm");
typename Vector2::const_iterator vec=b.begin();
typename Vector1::iterator res=x.begin();
typename Matrix::ConstRowIterator row=U.rowBegin();
- // Find last constrained values of x, U and b
- // for( ; (res != x.end()) && (row != U.rowEnd()); ++res, ++row, ++vec) { }
- size_t last = U.coldim();
- if( b.size() < last ) last = b.size();
- res += last;
- row += last;
- vec += last;
-
+ // Assume U has form (U1, X | 0, 0), where U1 is invertible.
+ // Discover the rank of U so as to use the bottom of x to seed the solution.
+ for(row = U.rowEnd()-1; row >= U.rowBegin() && row->size() == 0; --row);
+ row++; // now points to first zero row of U.
+ res += row - U.rowBegin();
+ vec += row - U.rowBegin();
bool consistant = true;
for(typename Vector2::const_iterator bcheck=vec; bcheck != b.end(); ++bcheck) {
@@ -86,7 +100,7 @@ namespace LinBox
}
if (! consistant) throw LinboxError ("upperTriangularSolve returned INCONSISTENT");
- commentator.stop ("done", NULL, "utrsm");
+ commentator().stop ("done", NULL, "utrsm");
return x;
}
@@ -98,7 +112,7 @@ namespace LinBox
const _Matrix &U,
const Vector2& b)
{
- commentator.start ("SparseElim UpperTriang Sparse Solve", "uSPt");
+ commentator().start ("SparseElim UpperTriang Sparse Solve", "uSPt");
x.resize(0);
@@ -119,7 +133,7 @@ namespace LinBox
VectorDomain<Field> VD(F);
- long i=rank;
+ long i=(long)rank;
for(--i; (vec >= b.begin()) && (i>=0); --i,--row) {
if (row->size()) {
typename Field::Element tmp;
@@ -131,7 +145,7 @@ namespace LinBox
}
if (! F.isZero(tmp)) {
F.divin(tmp,row->front().second);
- x.insert(x.begin(), typename Vector1::value_type(i, tmp));
+ x.insert(x.begin(), typename Vector1::value_type((unsigned)i, tmp));
}
}
}
@@ -142,14 +156,14 @@ namespace LinBox
if (! F.isZero(tmp)) {
F.negin(tmp);
F.divin(tmp,row->front().second);
- x.insert(x.begin(), typename Vector1::value_type(i, tmp));
+ x.insert(x.begin(), typename Vector1::value_type((unsigned)i, tmp));
}
}
}
}
// if (! consistant) throw LinboxError ("upperTriangularSparseSolve returned INCONSISTENT");
- commentator.stop ("done", NULL, "uSPt");
+ commentator().stop ("done", NULL, "uSPt");
return x;
}
@@ -165,7 +179,7 @@ namespace LinBox
typedef typename Matrix::Field Field;
const Field& F = L.field();
- commentator.start ("Sparse Elimination Lower Triangular Unitary Solve", "ltrsm");
+ commentator().start ("Sparse Elimination Lower Triangular Unitary Solve", "ltrsm");
typename Vector2::const_iterator vec=b.begin();
typename Vector1::iterator res=x.begin();
@@ -181,9 +195,18 @@ namespace LinBox
F.assign(*res,tmp);
}
- commentator.stop ("done", NULL, "ltrsm");
+ commentator().stop ("done", NULL, "ltrsm");
return x;
}
}
#endif //__LINBOX_triangular_solve_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/varprec-cra-early-multip.h b/linbox/algorithms/varprec-cra-early-multip.h
index d89d8d3..5f5ccda 100644
--- a/linbox/algorithms/varprec-cra-early-multip.h
+++ b/linbox/algorithms/varprec-cra-early-multip.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/rational-reconstruction-base.h
* Copyright (C) 2009 Anna Marszalek
*
* Written by Anna Marszalek <aniau at astronet.pl>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_varprec_cra_multip_single_H
@@ -399,7 +400,7 @@ namespace LinBox
std::vector< LazyProduct >::iterator _mod_it = FullMultipCRA<Domain>::RadixPrimeProd_.end();// list of prime products
std::vector< std::vector<Integer> >::iterator _tab_it = FullMultipCRA<Domain>::RadixResidues_.end();// list of residues as vectors of size 1
std::vector< bool >::iterator _occ_it = FullMultipCRA<Domain>::RadixOccupancy_.end();//flags of occupied fields
- int n = FullMultipCRA<Domain>::RadixOccupancy_.size();
+ int n = (int)FullMultipCRA<Domain>::RadixOccupancy_.size();
//std::vector<Integer> ri(1); LazyProduct mi; double di;
//could be much faster if max occupandy is stored
int prev_shelf=0, shelf = 0; Integer prev_residue_=0;
@@ -409,20 +410,21 @@ namespace LinBox
++shelf;
if (*_occ_it) {
Integer D = _mod_it->operator()();
- Vect e(vfactor_.size());
- inverse(e,vfactor_,D);
- productin(e,*_tab_it,D);
- productin(e,vmultip_,D);
+ Vect e_v(vfactor_.size());
+ inverse(e_v,vfactor_,D);
+ productin(e_v,*_tab_it,D);
+ productin(e_v,vmultip_,D);
Integer z;
- dot(z,D, e, randv);
+ dot(z,D, e_v, randv);
prev_residue_ = EarlySingleCRA<Domain>::residue_;
EarlySingleCRA<Domain>::progress(D,z);
- if (prev_residue_ == EarlySingleCRA<Domain>::residue_ )
+ if (prev_residue_ == EarlySingleCRA<Domain>::residue_ ) {
EarlySingleCRA<Domain>::occurency_ = EarlySingleCRA<Domain>::occurency_ + (shelf - prev_shelf);
+ }
if ( EarlySingleCRA<Domain>::terminated() ) {
return true;
}
@@ -556,3 +558,12 @@ namespace LinBox
#endif //__LINBOX_varprec_cra_multip_single_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/varprec-cra-early-single.h b/linbox/algorithms/varprec-cra-early-single.h
index 2490dd1..ee290c1 100644
--- a/linbox/algorithms/varprec-cra-early-single.h
+++ b/linbox/algorithms/varprec-cra-early-single.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/rational-reconstruction-base.h
* Copyright (C) 2009 Anna Marszalek
*
* Written by Anna Marszalek <aniau at astronet.pl>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_varprec_cra_early_single_H
@@ -285,7 +286,7 @@ namespace LinBox
std::vector< LazyProduct >::iterator _mod_it = FullMultipCRA<Domain>::RadixPrimeProd_.end(); // list of prime products
std::vector< std::vector<Integer> >::iterator _tab_it = FullMultipCRA<Domain>::RadixResidues_.end(); // list of residues as vectors of size 1
std::vector< bool >::iterator _occ_it = FullMultipCRA<Domain>::RadixOccupancy_.end(); //flags of occupied fields
- int n= FullMultipCRA<Domain>::RadixOccupancy_.size();
+ int n= (int) FullMultipCRA<Domain>::RadixOccupancy_.size();
//std::vector<Integer> ri(1); LazyProduct mi; double di;//nie wiem
// could be much faster if max occupandy is stored
--_mod_it; --_tab_it; --_occ_it;
@@ -294,19 +295,21 @@ namespace LinBox
++shelf;
if (*_occ_it) {
Integer D = _mod_it->operator()();
- Integer e;
+ Integer e_i;
- inv(e,factor_,D);
- e *= (_tab_it->front());
- e *=multip_;
- e %=D ;
+ inv(e_i,factor_,D);
+ //!@todo use faster mul/mod here !
+ Integer::mulin(e_i, (_tab_it->front()));
+ Integer::mulin(e_i, multip_);
+ e_i %=D ;
prev_residue_ = EarlySingleCRA<Domain>::residue_;
- EarlySingleCRA<Domain>::progress(D,e);
+ EarlySingleCRA<Domain>::progress(D,e_i);
- if (prev_residue_ == EarlySingleCRA<Domain>::residue_ )
+ if (prev_residue_ == EarlySingleCRA<Domain>::residue_ ) {
EarlySingleCRA<Domain>::occurency_ = EarlySingleCRA<Domain>::occurency_ + (shelf - prev_shelf);
+ }
@@ -326,3 +329,12 @@ namespace LinBox
#endif //__LINBOX_varprec_cra_early_single_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/vector-fraction.h b/linbox/algorithms/vector-fraction.h
index 255e48e..af94e3a 100644
--- a/linbox/algorithms/vector-fraction.h
+++ b/linbox/algorithms/vector-fraction.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/vector-fraction.h
* Copyright (C) 2004 David Pritchard
*
* Written by David Pritchard <daveagp at mit.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,18 +17,18 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_vector_fraction_H
#define __LINBOX_vector_fraction_H
-#include <linbox/linbox-config.h>
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
#include <stdio.h>
-#include <linbox/vector/vector-traits.h>
-#undef _D
+#include "linbox/vector/vector-traits.h"
namespace LinBox
{
@@ -47,7 +48,7 @@ namespace LinBox
D.gcd(gcd, frac.first, frac.second);
D.divin(frac.first, gcd);
D.divin(frac.second, gcd);
- };
+ }
/** utility function to gcd-in a vector of elements over a domain */
//this could be replaced by a fancier version that combines elements linearly at random
@@ -86,7 +87,7 @@ namespace LinBox
Vector numer;
Element denom;
- const Domain& _D;
+ const Domain& _domain;
Element zero;
/**
@@ -96,7 +97,7 @@ namespace LinBox
VectorFraction(const Domain& D, FVector& frac
//,bool alreadyReduced = false
) :
- _D(D)
+ _domain(D)
{
bool alreadyReduced = false;
typename FVector::iterator i;
@@ -123,7 +124,7 @@ namespace LinBox
/** allocating constructor, returns [0, 0, ... 0]/1 */
VectorFraction(const Domain& D, size_t n) :
- _D(D)
+ _domain(D)
{
D.init(zero, 0);
D.init(denom, 1);
@@ -136,7 +137,7 @@ namespace LinBox
/** copy constructor */
VectorFraction(const VectorFraction<Domain>& VF) :
- _D(VF._D)
+ _domain(VF._domain)
{
copy(VF);
}
@@ -144,24 +145,24 @@ namespace LinBox
/** copy without construction */
void copy(const VectorFraction<Domain>& VF)
{
- //assumes _D = VF._D
+ //assumes _domain = VF._domain
denom = VF.denom;
numer.resize(VF.numer.size());
typename Vector::iterator i;
typename Vector::const_iterator j;
for (i=numer.begin(), j=VF.numer.begin(); i!=numer.end(); i++, j++)
- _D.assign(*i, *j);
+ _domain.assign(*i, *j);
}
/** clear and resize without construction */
void clearAndResize(size_t size)
{
- _D.init(denom, 1);
+ _domain.init(denom, 1);
typename Vector::iterator i;
numer.resize(size);
for (i=numer.begin(); i!=numer.end(); i++)
- _D.init(*i, 0);
+ _domain.init(*i, 0);
}
/**
@@ -172,22 +173,22 @@ namespace LinBox
*/
bool combineSolution(const VectorFraction<Domain>& other)
{
- if (_D.isDivisor(other.denom, denom)) return false;
- if (_D.isDivisor(denom, other.denom)) {
+ if (_domain.isDivisor(other.denom, denom)) return false;
+ if (_domain.isDivisor(denom, other.denom)) {
denom = other.denom;
numer = other.numer;
return true;
}
Element s, t, g;
- _D.xgcd(g, s, t, denom, other.denom);
- if (_D.areEqual(g, denom)) ; //do nothing
+ _domain.xgcd(g, s, t, denom, other.denom);
+ if (_domain.areEqual(g, denom)) ; //do nothing
else {
denom = g;
typename Vector::iterator it=numer.begin();
typename Vector::const_iterator io=other.numer.begin();
for (; it != numer.end(); it++, io++) {
- _D.mulin(*it, s);
- _D.axpyin(*it, t, *io);
+ _domain.mulin(*it, s);
+ _domain.axpyin(*it, t, *io);
}
return true;
}
@@ -205,11 +206,11 @@ namespace LinBox
{
//this means that new solution won't reduce g
- if (_D.isDivisor(other.denom, g)) return false;
+ if (_domain.isDivisor(other.denom, g)) return false;
//short-circuit in case the new solution is completely better than old one
Element _dtmp;
- if (_D.isDivisor(g, _D.gcd(_dtmp, denBound, other.denom))) {
+ if (_domain.isDivisor(g, _domain.gcd(_dtmp, denBound, other.denom))) {
denom = other.denom;
numer = other.numer;
g = _dtmp;
@@ -217,27 +218,27 @@ namespace LinBox
}
Element A, g2, lincomb;
- _D.gcd(g, other.denom, g); //we know this reduces g
+ _domain.gcd(g, other.denom, g); //we know this reduces g
// find A s.t. gcd(denBound, denom + A*other.denom) = g
// strategy: pick random values of A <= d(y_0)
integer tmp;
- _D.convert(tmp, denBound);
- typename Domain::RandIter randiter(_D, tmp); //seed omitted
+ _domain.convert(tmp, denBound);
+ typename Domain::RandIter randiter(_domain, tmp); //seed omitted
// TODO: I don't think this random iterator has high-quality low order bits, which are needed
do {
randiter.random(A);
- _D.assign(lincomb, denom);
- _D.axpyin(lincomb, A, other.denom);
- _D.gcd(g2, lincomb, denBound);
+ _domain.assign(lincomb, denom);
+ _domain.axpyin(lincomb, A, other.denom);
+ _domain.gcd(g2, lincomb, denBound);
}
- while (!_D.areEqual(g, g2));
+ while (!_domain.areEqual(g, g2));
- _D.assign(denom, lincomb);
+ _domain.assign(denom, lincomb);
typename Vector::iterator it=numer.begin();
typename Vector::const_iterator io=other.numer.begin();
for (; it != numer.end(); it++, io++)
- _D.axpyin(*it, A, *io);
+ _domain.axpyin(*it, A, *io);
return true;
}
@@ -252,10 +253,10 @@ namespace LinBox
const Element& n2, const Element d2)
{
//this means that new solution won't reduce g
- if (_D.isDivisor(d1, d2)) return false;
+ if (_domain.isDivisor(d1, d2)) return false;
//short-circuit in case the new solution is completely better than old one
- if (_D.isDivisor(d2, d1)) {
+ if (_domain.isDivisor(d2, d1)) {
copy(other);
n1 = n2;
d1 = d2;
@@ -264,33 +265,33 @@ namespace LinBox
Element A, g, l, n1d2_g, n2d1_g, lincomb, g2, tmpe, one;
- _D.gcd(g, d1, d2); //compute gcd
- _D.mul(l, d1, d2);
- _D.divin(l, g); //compute lcm
+ _domain.gcd(g, d1, d2); //compute gcd
+ _domain.mul(l, d1, d2);
+ _domain.divin(l, g); //compute lcm
- _D.div(n1d2_g, d2, g);
- _D.mulin(n1d2_g, n1); //compute n1.d2/g
- _D.div(n2d1_g, d1, g);
- _D.mulin(n2d1_g, n2); //compute n2.d1/g
+ _domain.div(n1d2_g, d2, g);
+ _domain.mulin(n1d2_g, n1); //compute n1.d2/g
+ _domain.div(n2d1_g, d1, g);
+ _domain.mulin(n2d1_g, n2); //compute n2.d1/g
// find A s.t. gcd(denBound, denom + A*other.denom) = g
// strategy: pick random values of A <= lcm(d(denom), d(other.denom))
integer tmp;
- _D.mul(tmpe, denom, other.denom);
- _D.convert(tmp, tmpe);
- _D.init(one, 1);
- typename Domain::RandIter randiter(_D, tmp); //seed omitted
+ _domain.mul(tmpe, denom, other.denom);
+ _domain.convert(tmp, tmpe);
+ _domain.init(one, 1);
+ typename Domain::RandIter randiter(_domain, tmp); //seed omitted
// TODO: I don't think this random iterator has high-quality low order bits, which are needed
do {
randiter.random(A);
- _D.assign(lincomb, n1d2_g);
- _D.axpyin(lincomb, A, n2d1_g);
- _D.gcd(g2, lincomb, l);
+ _domain.assign(lincomb, n1d2_g);
+ _domain.axpyin(lincomb, A, n2d1_g);
+ _domain.gcd(g2, lincomb, l);
}
- while (!_D.areEqual(one, g2));
+ while (!_domain.areEqual(one, g2));
this->axpyin(A, other);
- _D.lcmin(d1, d2);
+ _domain.lcmin(d1, d2);
return true;
}
@@ -302,28 +303,28 @@ namespace LinBox
VectorFraction<Domain>& axpyin(Element& a, const VectorFraction<Domain>& x)
{
Element a_prime, gcd_a_xdenom, xdenom_prime;
- _D.gcd(gcd_a_xdenom, a, x.denom);
- _D.div(a_prime, a, gcd_a_xdenom);
- _D.div(xdenom_prime, x.denom, gcd_a_xdenom);
+ _domain.gcd(gcd_a_xdenom, a, x.denom);
+ _domain.div(a_prime, a, gcd_a_xdenom);
+ _domain.div(xdenom_prime, x.denom, gcd_a_xdenom);
Element cdf; //common denominator factor; multiply both sides by this and divide at end
- _D.gcd(cdf, denom, xdenom_prime);
- _D.divin(denom, cdf);
- _D.divin(xdenom_prime, cdf);
+ _domain.gcd(cdf, denom, xdenom_prime);
+ _domain.divin(denom, cdf);
+ _domain.divin(xdenom_prime, cdf);
// we perform numer[i] = xdenom_prime * numer[i] + a_prime * denom * x.denom[i]
// so multiply denom into a_prime and save a multiplication on each entry
- _D.mulin(a_prime, denom);
+ _domain.mulin(a_prime, denom);
typename Vector::iterator i = this->numer.begin();
typename Vector::const_iterator j = x.numer.begin();
for (; i != this->numer.end(); i++, j++) {
- _D.mulin(*i, xdenom_prime);
- _D.axpyin(*i, a_prime, *j);
+ _domain.mulin(*i, xdenom_prime);
+ _domain.axpyin(*i, a_prime, *j);
}
- _D.mulin(denom, cdf);
- _D.mulin(denom, xdenom_prime);
+ _domain.mulin(denom, cdf);
+ _domain.mulin(denom, xdenom_prime);
simplify();
return *this;
}
@@ -346,8 +347,8 @@ namespace LinBox
typename Vector::const_iterator it=numer.begin();
typename FVector::iterator ir=result.begin();
for (; it != numer.end(); it++, ir++) {
- _D.assign(ir->first, *it);
- _D.assign(ir->second, denom);
+ _domain.assign(ir->first, *it);
+ _domain.assign(ir->second, denom);
}
return result;
}
@@ -357,12 +358,12 @@ namespace LinBox
{
typename Vector::iterator i;
Element gcd;
- _D.init(gcd, denom);
- vectorGcdIn(gcd, _D, numer);
+ _domain.init(gcd, denom);
+ vectorGcdIn(gcd, _domain, numer);
- _D.divin(denom, gcd);
+ _domain.divin(denom, gcd);
for (i=numer.begin(); i!=numer.end(); i++)
- _D.divin(*i, gcd);
+ _domain.divin(*i, gcd);
return (*this);
}
};
@@ -370,3 +371,12 @@ namespace LinBox
}
#endif //__LINBOX_vector_fraction_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/whisart_trace.h b/linbox/algorithms/whisart_trace.h
index 8549a1b..9875bb9 100644
--- a/linbox/algorithms/whisart_trace.h
+++ b/linbox/algorithms/whisart_trace.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/cra-domain.h
* Copyright (C) 1999-2010 The LinBox group
*
* Time-stamp: <19 Apr 10 18:35:14 Jean-Guillaume.Dumas at imag.fr>
* Computes the trace of D1 B D2 B^T D1 or D1 B^T D2 B D1
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,16 +18,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_whisart_trace_H
#define __LINBOX_whisart_trace_H
+#include "linbox/field/modular.h"
#include "linbox/blackbox/compose.h"
#include "linbox/blackbox/transpose.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/blackbox/sparse.h"
#include "linbox/blackbox/lambda-sparse.h"
// #include "linbox/blackbox/subrowmatrix.h"
@@ -35,36 +36,37 @@
namespace LinBox
{
- // Trait to show whether or not the BB class has a RawIndexed iterator
- template<class BB> struct RawIndexedCategory;
+ // Trait to show whether or not the BB class has a Indexed iterator
+ template<class BB> struct IndexedCategory;
/// limited doc so far
- namespace RawIndexedTags
+ namespace IndexedTags
{
- struct HasRawIndexed{};
- struct NoRawIndexed{};
- };
+ struct HasIndexed{};
+ struct NoIndexed{};
+ }
- template<class BB> struct RawIndexedCategory {
- typedef RawIndexedTags::NoRawIndexed Tag;
+ template<class BB> struct IndexedCategory {
+ typedef IndexedTags::NoIndexed Tag;
};
template<class Field>
- struct RawIndexedCategory< DenseMatrix<Field> > {
- typedef RawIndexedTags::HasRawIndexed Tag; };
+ struct IndexedCategory< BlasMatrix<Field> > {
+ typedef IndexedTags::HasIndexed Tag; };
+
template<class Field, class Row>
- struct RawIndexedCategory< LambdaSparseMatrix<Field,Row> > {
- typedef RawIndexedTags::HasRawIndexed Tag; };
+ struct IndexedCategory< LambdaSparseMatrix<Field,Row> > {
+ typedef IndexedTags::HasIndexed Tag; };
template<class Field, class Row>
- struct RawIndexedCategory< SparseMatrix<Field,Row> > {
- typedef RawIndexedTags::HasRawIndexed Tag; };
+ struct IndexedCategory< SparseMatrix<Field,Row> > {
+ typedef IndexedTags::HasIndexed Tag; };
#if 0
template<class Matrix, class MatrixCategory>
- struct RawIndexedCategory< SubRowMatrix<Matrix,MatrixCategory> > {
- typedef RawIndexedTags::HasRawIndexed Tag;
+ struct IndexedCategory< SubRowMatrix<Matrix,MatrixCategory> > {
+ typedef IndexedTags::HasIndexed Tag;
};
#endif
@@ -78,7 +80,7 @@ namespace LinBox
const BB& A,
const LinBox::Diagonal<Field>& InD)
{
- return WhisartTrace(trace, F, ExtD, A, InD, typename RawIndexedCategory<BB>::Tag() );
+ return WhisartTrace(trace, F, ExtD, A, InD, typename IndexedCategory<BB>::Tag() );
}
template<class Field, class BB>
@@ -89,7 +91,7 @@ namespace LinBox
const BB& A,
const LinBox::Diagonal<Field>& InD)
{
- return WhisartTraceTranspose(trace, F, ExtD, A, InD, typename RawIndexedCategory<BB>::Tag() );
+ return WhisartTraceTranspose(trace, F, ExtD, A, InD, typename IndexedCategory<BB>::Tag() );
}
template<class Field, class BB>
@@ -98,7 +100,7 @@ namespace LinBox
const Field& F,
const LinBox::Diagonal<Field>& ExtD,
const BB& A,
- const LinBox::Diagonal<Field>& InD, RawIndexedTags::NoRawIndexed t)
+ const LinBox::Diagonal<Field>& InD, IndexedTags::NoIndexed t)
{
// Trace of ExtD B InD B^T ExtD
typedef Compose<Diagonal<Field>, BB > C_DB;
@@ -120,7 +122,7 @@ namespace LinBox
const LinBox::Diagonal<Field>& ExtD,
const BB& A,
const LinBox::Diagonal<Field>& InD,
- RawIndexedTags::NoRawIndexed t)
+ IndexedTags::NoIndexed t)
{
// Trace of ExtD A^T InD A ExtD
Transpose<BB> AT (&A);
@@ -144,14 +146,16 @@ namespace LinBox
const LinBox::Diagonal<Field>& ExtD,
const BB& A,
const LinBox::Diagonal<Field>& InD,
- RawIndexedTags::HasRawIndexed )
+ IndexedTags::HasIndexed )
{
// Trace of ExtD B InD B^T ExtD
// is sum ExtD_i^2 B_{i,j} InD_j
F.init(tr, 0);
- for(typename BB::ConstRawIndexedIterator it = A.rawIndexedBegin();
- it != A.rawIndexedEnd(); ++it) {
- typename Field::Element tmp,e,i; F.init(tmp);F.init(e);F.init(i);
+ for(typename BB::ConstIndexedIterator it = A.IndexedBegin();
+ it != A.IndexedEnd(); ++it) {
+ typename Field::Element tmp,e,i;
+ F.init(tmp);
+ F.init(e);F.init(i);
F.mul(tmp,it.value(),it.value());
ExtD.getEntry(e, it.rowIndex(),it.rowIndex());
InD.getEntry(i, it.colIndex(),it.colIndex());
@@ -170,16 +174,18 @@ namespace LinBox
const LinBox::Diagonal<Field>& ExtD,
const BB& A,
const LinBox::Diagonal<Field>& InD,
- RawIndexedTags::HasRawIndexed )
+ IndexedTags::HasIndexed )
{
// Trace of ExtD B^T InD B ExtD
// is sum ExtD_j^2 B_{i,j} InD_i
F.init(tr, 0);
- for(typename BB::ConstRawIndexedIterator it = A.rawIndexedBegin();
- it != A.rawIndexedEnd(); ++it) {
+ for(typename BB::ConstIndexedIterator it = A.IndexedBegin();
+ it != A.IndexedEnd(); ++it) {
typename Field::Element tmp,e,i;
- F.init(tmp);F.init(e);F.init(i);
+ F.init(tmp,0UL);
+ F.init(e,0UL);
+ F.init(i,0UL);
F.mul(tmp, it.value(),it.value());
ExtD.getEntry(e, it.colIndex(),it.colIndex());
@@ -198,3 +204,12 @@ namespace LinBox
}
#endif //__LINBOX_whisart_trace_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/wiedemann.doxy b/linbox/algorithms/wiedemann.doxy
index 5eb4d13..f436303 100644
--- a/linbox/algorithms/wiedemann.doxy
+++ b/linbox/algorithms/wiedemann.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** @ingroup algorithms
@defgroup wiedemann Wiedemann
diff --git a/linbox/algorithms/wiedemann.h b/linbox/algorithms/wiedemann.h
index 9de6628..b3d9180 100644
--- a/linbox/algorithms/wiedemann.h
+++ b/linbox/algorithms/wiedemann.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/wiedemann.h
* Copyright (C) 2002 Zhendong Wan
* Copyright (C) 2002 Bradford Hovinen
@@ -37,7 +35,25 @@
* which one to use in different circumstances
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_wiedemann_H
@@ -78,10 +94,10 @@ namespace LinBox
typename Field::RandIter i (A.field());
unsigned long deg;
- commentator.start ("Wiedemann Minimal polynomial", "minpoly");
+ commentator().start ("Wiedemann Minimal polynomial", "minpoly");
if (A.coldim() != A.rowdim()) {
- commentator.report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "Virtually squarize matrix" << std::endl;
+ commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "Virtually squarize matrix" << std::endl;
Squarize<Blackbox> B(&A);
BlackboxContainer<Field, Squarize<Blackbox> > TF (&B, A.field(), i);
@@ -103,20 +119,20 @@ namespace LinBox
WD.minpoly (P, deg);
#ifdef INCLUDE_TIMING
- commentator.report (Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
+ commentator().report (Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
<< "Time required for applies: " << TF.applyTime () << std::endl;
- commentator.report (Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
+ commentator().report (Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
<< "Time required for dot products: " << TF.dotTime () << std::endl;
- commentator.report (Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
+ commentator().report (Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
<< "Time required for discrepency: " << WD.discrepencyTime () << std::endl;
- commentator.report (Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
+ commentator().report (Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
<< "Time required for LSR fix: " << WD.fixTime () << std::endl;
#endif // INCLUDE_TIMING
}
- commentator.stop ("done", NULL, "minpoly");
+ commentator().stop ("done", NULL, "minpoly");
return P;
}
@@ -130,7 +146,7 @@ namespace LinBox
#include "linbox/blackbox/sparse.h"
#include "linbox/field/modular.h"
#include "linbox/algorithms/matrix-hom.h"
-#include "linbox/field/givaro-extension.h"
+#include "linbox/field/givaro.h"
#include "linbox/field/map.h"
namespace LinBox
@@ -149,7 +165,7 @@ namespace LinBox
if (a != c) {
unsigned long extend = (unsigned long)FF_EXPONENT_MAX(a,(integer)LINBOX_EXTENSION_DEGREE_MAX);
if (extend > 1) {
- commentator.report (Commentator::LEVEL_ALWAYS,INTERNAL_WARNING) << "Extension of degree " << extend << std::endl;
+ commentator().report (Commentator::LEVEL_ALWAYS,INTERNAL_WARNING) << "Extension of degree " << extend << std::endl;
GivaroExtension<Field> EF( F, extend);
typedef typename Blackbox::template rebind< GivaroExtension<Field> >::other FBlackbox;
@@ -168,7 +184,7 @@ namespace LinBox
else {
unsigned long extend = (unsigned long)FF_EXPONENT_MAX(c,(integer)LINBOX_EXTENSION_DEGREE_MAX);
if (extend > 1) {
- commentator.report (Commentator::LEVEL_ALWAYS,INTERNAL_WARNING) << "Word size extension : " << extend << std::endl;
+ commentator().report (Commentator::LEVEL_ALWAYS,INTERNAL_WARNING) << "Word size extension : " << extend << std::endl;
GivaroGfq EF( (unsigned long)c, extend);
typedef typename Blackbox::template rebind< GivaroGfq >::other FBlackbox;
FBlackbox Ap(A, EF);
@@ -193,7 +209,7 @@ namespace LinBox
const RingCategories::ModularTag &tag,
const Method::ExtensionWiedemann& M)
{
- commentator.report (Commentator::LEVEL_ALWAYS,INTERNAL_WARNING) << " WARNING, no extension available, returning only a factor of the minpoly\n";
+ commentator().report (Commentator::LEVEL_ALWAYS,INTERNAL_WARNING) << " WARNING, no extension available, returning only a factor of the minpoly\n";
return minpoly(P, A, tag, Method::Wiedemann (M));
}
}
@@ -224,7 +240,7 @@ namespace LinBox
* options for the solver
*/
WiedemannSolver (const Field &F, const WiedemannTraits &traits) :
- _traits (traits), _F (F), _randiter (F), _VD (F)
+ _traits (traits), _field (F), _randiter (F), _VD (F)
{}
/*! Constructor with a random iterator.
@@ -237,7 +253,7 @@ namespace LinBox
WiedemannSolver (const Field &F,
const WiedemannTraits &traits,
typename Field::RandIter r) :
- _traits (traits), _F (F), _randiter (r), _VD (F)
+ _traits (traits), _field (F), _randiter (r), _VD (F)
{}
/// \ingroup algorithms
@@ -344,8 +360,8 @@ namespace LinBox
// Make an m x m lambda-sparse matrix, c.f. Mulders (2000)
SparseMatrix<Field> *makeLambdaSparseMatrix (size_t m);
- WiedemannTraits _traits;
- const Field &_F;
+ WiedemannTraits _traits;
+ const Field &_field;
typename Field::RandIter _randiter;
VectorDomain<Field> _VD;
};
@@ -356,3 +372,12 @@ namespace LinBox
#endif // __LINBOX_wiedemann_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/algorithms/wiedemann.inl b/linbox/algorithms/wiedemann.inl
index 291ea03..6c98ce5 100644
--- a/linbox/algorithms/wiedemann.inl
+++ b/linbox/algorithms/wiedemann.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/wiedemann.inl
* Copyright (C) 2002 Zhendong Wan
* Copyright (C) 2002 Bradford Hovinen
@@ -31,7 +29,25 @@
* which one to use in different circumstances
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_wiedemann_INL
@@ -68,13 +84,13 @@ namespace LinBox
(b.size () == A.rowdim ()));
linbox_check (_traits.singular () != WiedemannTraits::NONSINGULAR || A.coldim () == A.rowdim ());
- commentator.start ("Solving linear system (Wiedemann)", "WiedemannSolver::solve");
+ commentator().start ("Solving linear system (Wiedemann)", "WiedemannSolver::solve");
WiedemannTraits::SingularState singular = _traits.singular ();
if (A.rowdim() != A.coldim() ) _traits.singular (singular = WiedemannTraits::SINGULAR);
ReturnStatus status = FAILED;
- unsigned int tries = _traits.maxTries ();
+ unsigned int tries = (int)_traits.maxTries ();
unsigned long r = (unsigned long) -1;
@@ -95,9 +111,9 @@ namespace LinBox
break;
case SINGULAR:
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "System found to be singular. Reverting to nonsingular solver." << std::endl;
- tries = _traits.maxTries ();
+ tries = (int)_traits.maxTries ();
singular = WiedemannTraits::SINGULAR;
break;
default:
@@ -131,7 +147,7 @@ namespace LinBox
{
if (r == (unsigned long) -1) {
rank (r, A);
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Rank of A = " << r << std::endl;
}
@@ -160,10 +176,10 @@ namespace LinBox
}
if (status == FAILED)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Maximum tries exceeded with no resolution. Giving up." << std::endl;
- commentator.stop ("done", NULL, "WiedemannSolver::solve");
+ commentator().stop ("done", NULL, "WiedemannSolver::solve");
return status;
}
@@ -179,7 +195,7 @@ namespace LinBox
typedef std::vector<typename Field::Element> Polynomial;
typedef typename Polynomial::iterator PolyIterator;
- commentator.start ("Solving nonsingular system (Wiedemann)", "WiedemannSolver::solveNonsingular");
+ commentator().start ("Solving nonsingular system (Wiedemann)", "WiedemannSolver::solveNonsingular");
Polynomial m_A;
Vector z;
@@ -192,70 +208,70 @@ namespace LinBox
minpoly(m_A, A,RingCategories::ModularTag(), Method::Blackbox(_traits) );
}
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Minimal polynomial of degree " << (m_A.size()-1) << std::endl;
if (m_A.size() < 50) {
report << "Minimal polynomial coefficients: ";
_VD.write (report, m_A) << std::endl;
}
- if (_F.isZero (m_A.front ())) {
- commentator.stop ("singular", "System found to be singular",
+ if (_field.isZero (m_A.front ())) {
+ commentator().stop ("singular", "System found to be singular",
"WiedemannSolver::solveNonsingular");
return SINGULAR;
}
{
- commentator.start ("Preparing polynomial for application");
+ commentator().start ("Preparing polynomial for application");
PolyIterator iter = m_A.begin ();
while (++iter != m_A.end ()) {
- _F.divin (*iter, m_A.front ());
- _F.negin (*iter);
+ _field.divin (*iter, m_A.front ());
+ _field.negin (*iter);
}
- commentator.stop ("done");
+ commentator().stop ("done");
}
{
- commentator.start ("Applying polynomial via Horner's rule", NULL, m_A.size () - 1);
+ commentator().start ("Applying polynomial via Horner's rule", NULL, m_A.size () - 1);
_VD.mul (x, b, m_A.back ());
VectorWrapper::ensureDim (z, A.rowdim ());
- for (int i = m_A.size () - 1; --i > 0;) {
+ for (int i = (int) m_A.size () - 1; --i > 0;) {
if ((m_A.size () - i) & (0xff == 0))
- commentator.progress (m_A.size () - i);
+ commentator().progress (m_A.size () - i);
A.apply (z, x);
_VD.axpy (x, m_A[i], b, z);
}
- commentator.stop ("done");
+ commentator().stop ("done");
}
if (_traits.checkResult ()) {
- commentator.start ("Checking whether Ax=b");
+ commentator().start ("Checking whether Ax=b");
A.apply (z, x);
if (_VD.areEqual (z, b))
ret = true;
else {
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
- _VD.write(report << "x is ", x) << std::endl;
- _VD.write(report << "b is ", b) << std::endl;
- _VD.write(report << "Ax is " , z) << std::endl;
+ std::ostream& Report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ _VD.write(Report << "x is ", x) << std::endl;
+ _VD.write(Report << "b is ", b) << std::endl;
+ _VD.write(Report << "Ax is " , z) << std::endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret));
+ commentator().stop (MSG_STATUS (ret));
}
- commentator.stop (MSG_STATUS (ret), NULL, "WiedemannSolver::solveNonsingular");
+ commentator().stop (MSG_STATUS (ret), NULL, "WiedemannSolver::solveNonsingular");
if (!ret)
return FAILED;
@@ -272,7 +288,7 @@ namespace LinBox
Vector &u,
unsigned long r)
{
- commentator.start ("Solving singular system (Wiedemann)", "WiedemannSolver::solveSingular");
+ commentator().start ("Solving singular system (Wiedemann)", "WiedemannSolver::solveSingular");
Vector Ax;
ReturnStatus status = OK, sfrs = OK;
@@ -281,16 +297,16 @@ namespace LinBox
switch (_traits.preconditioner ()) {
case WiedemannTraits::BUTTERFLY:
{
- commentator.start ("Constructing butterfly preconditioner");
+ commentator().start ("Constructing butterfly preconditioner");
CekstvSwitchFactory<Field> factory (_randiter);
typedef Butterfly<Field, CekstvSwitch<Field> > ButterflyP;
- ButterflyP P(_F, A.rowdim (), factory);
- ButterflyP Q(_F, A.coldim (), factory);
+ ButterflyP P(_field, A.rowdim (), factory);
+ ButterflyP Q(_field, A.coldim (), factory);
Compose< Blackbox, ButterflyP > AQ(&A, &Q);
Compose< ButterflyP, Compose< Blackbox, ButterflyP > > PAQ(&P, &AQ);
- commentator.stop ("done");
+ commentator().stop ("done");
sfrs = findRandomSolution (PAQ, x, b, r, &P, &Q);
break;
@@ -298,7 +314,7 @@ namespace LinBox
case WiedemannTraits::SPARSE:
{
- commentator.start ("Constructing sparse preconditioner");
+ commentator().start ("Constructing sparse preconditioner");
SparseMatrix<Field> *P, *QT;
P = makeLambdaSparseMatrix (A.rowdim ());
@@ -308,7 +324,7 @@ namespace LinBox
Compose< Blackbox, Transpose< SparseMatrix<Field> > > AQ(&A, &Q);
Compose< SparseMatrix<Field>, Compose< Blackbox, Transpose< SparseMatrix<Field> > > > PAQ(P, &AQ);
- commentator.stop ("done");
+ commentator().stop ("done");
sfrs = findRandomSolution (PAQ, x, b, r, P, &Q);
@@ -316,7 +332,7 @@ namespace LinBox
}
case WiedemannTraits::TOEPLITZ:
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Toeplitz preconditioner not implemented yet. Sorry." << std::endl;
break;
@@ -337,7 +353,7 @@ namespace LinBox
switch (sfrs) {
case BAD_PRECONDITIONER:
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Preconditioned matrix did not have generic rank profile" << std::endl;
status = BAD_PRECONDITIONER;
@@ -368,19 +384,19 @@ namespace LinBox
}
if (status == OK && _traits.checkResult ()) {
- commentator.start ("Checking system solution");
+ commentator().start ("Checking system solution");
VectorWrapper::ensureDim (Ax, A.rowdim ());
A.apply (Ax, x);
if (_VD.areEqual (Ax, b))
- commentator.stop ("passed");
+ commentator().stop ("passed");
else {
- commentator.stop ("FAILED");
+ commentator().stop ("FAILED");
if (_traits.certificate ()) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Computed system solution is not correct. "
<< "Attempting to find certificate of inconsistency." << std::endl;
@@ -396,7 +412,7 @@ namespace LinBox
}
}
- commentator.stop ("done", NULL, "WiedemannSolver::solveSingular");
+ commentator().stop ("done", NULL, "WiedemannSolver::solveSingular");
return status;
}
@@ -411,12 +427,12 @@ namespace LinBox
const Prec1 *P,
const Prec2 *Q)
{
- commentator.start ("Solving singular system with generic rank profile (Wiedemann)",
+ commentator().start ("Solving singular system with generic rank profile (Wiedemann)",
"WiedemannSolver::findRandomSolution");
Vector v, Avpb, PAvpb, bp, xp, Qinvx;
- RandomDenseStream<Field, Vector> stream (_F, _randiter, A.coldim ());
+ RandomDenseStream<Field, Vector> stream (_field, _randiter, A.coldim ());
VectorWrapper::ensureDim (v, A.coldim ());
VectorWrapper::ensureDim (Avpb, A.rowdim ());
@@ -424,7 +440,7 @@ namespace LinBox
VectorWrapper::ensureDim (bp, r);
{
- commentator.start ("Preparing right hand side");
+ commentator().start ("Preparing right hand side");
stream >> v;
A.apply (Avpb, v);
@@ -438,16 +454,16 @@ namespace LinBox
_VD.copy (bp, Avpb, 0, r);
}
- commentator.stop ("done");
+ commentator().stop ("done");
}
Submatrix<Blackbox> Ap (&A, 0, 0, r, r);
switch (solveNonsingular (Ap, xp, bp, false)) {
case SINGULAR:
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Leading principal minor was found to be singular." << std::endl;
- commentator.stop ("bad preconditioner", "System was not well-conditioned",
+ commentator().stop ("bad preconditioner", "System was not well-conditioned",
"WiedemannSolver::findRandomSolution");
return BAD_PRECONDITIONER;
@@ -469,7 +485,7 @@ namespace LinBox
_VD.subin (x, v);
- commentator.stop ("done", NULL, "WiedemannSolver::findRandomSolution");
+ commentator().stop ("done", NULL, "WiedemannSolver::findRandomSolution");
return OK;
}
@@ -480,11 +496,11 @@ namespace LinBox
WiedemannSolver<Field>::findNullspaceElement (Vector &x,
const Blackbox &A)
{
- commentator.start ("Finding a nullspace element (Wiedemann)", "WiedemannSolver::findNullspaceElement");
+ commentator().start ("Finding a nullspace element (Wiedemann)", "WiedemannSolver::findNullspaceElement");
Vector v, Av, PAv, vp, xp, Qinvx;
- RandomDenseStream<Field, Vector> stream (_F, _randiter, A.coldim ());
+ RandomDenseStream<Field, Vector> stream (_field, _randiter, A.coldim ());
unsigned long r = (A.coldim () < A.rowdim ()) ? A.coldim () : A.rowdim ();
@@ -494,7 +510,7 @@ namespace LinBox
ReturnStatus status;
{
- commentator.start ("Constructing right hand side");
+ commentator().start ("Constructing right hand side");
stream >> v;
A.apply (Av, v);
@@ -504,7 +520,7 @@ namespace LinBox
_VD.copy (vp, Av, 0, r);
}
- commentator.stop ("done");
+ commentator().stop ("done");
}
if (A.coldim () < A.rowdim ()) {
@@ -521,16 +537,16 @@ namespace LinBox
status = solveNonsingular (A, x, Av, false);
if (status == SINGULAR) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Leading principal minor was found to be singular." << std::endl;
- commentator.stop ("bad preconditioner", "System not well-conditioned",
+ commentator().stop ("bad preconditioner", "System not well-conditioned",
"WiedemannSolver::findNullspaceElement");
return BAD_PRECONDITIONER;
}
_VD.subin (x, v);
- commentator.stop ("done", NULL, "WiedemannSolver::findNullspaceElement");
+ commentator().stop ("done", NULL, "WiedemannSolver::findNullspaceElement");
return OK;
}
@@ -541,7 +557,7 @@ namespace LinBox
const Blackbox &A,
const Vector &b)
{
- commentator.start ("Obtaining certificate of inconsistency (Wiedemann)",
+ commentator().start ("Obtaining certificate of inconsistency (Wiedemann)",
"WiedemannSolver::certifyInconsistency");
Vector PTinvu;
@@ -556,17 +572,17 @@ namespace LinBox
cert_traits.singular (WiedemannTraits::SINGULAR);
cert_traits.maxTries (1);
- WiedemannSolver solver (_F, cert_traits, _randiter);
+ WiedemannSolver solver (_field, cert_traits, _randiter);
Transpose<Blackbox> AT (&A);
solver.findNullspaceElement (u, AT);
_VD.dot (uTb, u, b);
- if (!_F.isZero (uTb))
+ if (!_field.isZero (uTb))
ret = true;
- commentator.stop (MSG_STATUS (ret), NULL, "WiedemannSolver::certifyInconsistency");
+ commentator().stop (MSG_STATUS (ret), NULL, "WiedemannSolver::certifyInconsistency");
return ret;
}
@@ -578,18 +594,18 @@ namespace LinBox
const double LAMBDA = 3;
integer card;
- _F.cardinality (card);
+ _field.cardinality (card);
double init_p = 1.0 - 1.0 / (double) card;
double log_m = LAMBDA * log ((double) m) / M_LN2;
double new_p;
- SparseMatrix<Field> *P = new SparseMatrix<Field> (_F, m, m);
+ SparseMatrix<Field> *P = new SparseMatrix<Field> (_field, m, m);
- RandomSparseStream<Field> stream (_F, _randiter, init_p, m, m);
+ RandomSparseStream<Field> stream (_field, _randiter, init_p, m, m);
for (unsigned int i = 0; i < m; ++i) {
- new_p = log_m / (m - i + 1);
+ new_p = log_m / double(m - i + 1);
if (init_p < new_p)
stream.setP (init_p);
@@ -606,3 +622,12 @@ namespace LinBox
#endif // __LINBOX_wiedemann_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/archetypes.doxy b/linbox/archetypes.doxy
index a101bf4..7a8982b 100644
--- a/linbox/archetypes.doxy
+++ b/linbox/archetypes.doxy
@@ -1,3 +1,25 @@
+/* Copyright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+
/** \page Archetypes Archetypes in LinBox
\brief %LinBox uses common object interfaces and archetypical instantiations.
diff --git a/linbox/blackbox/Makefile.am b/linbox/blackbox/Makefile.am
index 7e5bb3c..f267eb8 100644
--- a/linbox/blackbox/Makefile.am
+++ b/linbox/blackbox/Makefile.am
@@ -1,6 +1,24 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
pkgincludesubdir=$(pkgincludedir)/blackbox
BASIC_HDRS = \
@@ -20,9 +38,8 @@ BASIC_HDRS = \
transpose.h \
sum.h \
diagonal.h \
+ diagonal-gf2.h \
moore-penrose.h \
- dense.h \
- dense.inl \
direct-sum.h \
null-matrix.h \
matrix-blackbox.h \
@@ -42,7 +59,6 @@ BASIC_HDRS = \
blackbox-interface.h \
random-matrix.h \
lambda-sparse.h \
- blas-blackbox.h \
polynomial.h \
block-hankel.h \
block-toeplitz.h \
diff --git a/linbox/blackbox/Makefile.in b/linbox/blackbox/Makefile.in
index e0005b7..c60bb8f 100644
--- a/linbox/blackbox/Makefile.in
+++ b/linbox/blackbox/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,10 +15,47 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -41,12 +78,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -54,7 +94,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -63,20 +106,26 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__pkgincludesub_HEADERS_DIST = archetype.h factory.h butterfly.h \
hilbert.h compose.h permutation.h squarize.h sparse1.h \
sparse.h sparse.inl scalar-matrix.h submatrix.h inverse.h \
- transpose.h sum.h diagonal.h moore-penrose.h dense.h dense.inl \
+ transpose.h sum.h diagonal.h diagonal-gf2.h moore-penrose.h \
direct-sum.h null-matrix.h matrix-blackbox.h dif.h companion.h \
frobenius.h zero-one.h zero-one.inl zo.h zo.inl zo-gf2.h \
zo-gf2.inl quad-matrix.h triplesbb.h apply.h \
submatrix-traits.h random-matrix-traits.h scompose.h \
blackbox-interface.h random-matrix.h lambda-sparse.h \
- blas-blackbox.h polynomial.h block-hankel.h block-toeplitz.h \
+ polynomial.h block-hankel.h block-toeplitz.h \
block-hankel-inverse.h jit-matrix.h rational-matrix-factory.h \
toeplitz.h ntl-hankel.h ntl-sylvester.h toeplitz.inl \
ntl-hankel.inl ntl-sylvester.inl
@@ -85,9 +134,29 @@ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
-pkgincludesubHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkgincludesub_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -99,6 +168,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -122,10 +192,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -146,10 +218,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -158,6 +235,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -174,6 +253,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -236,10 +316,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
pkgincludesubdir = $(pkgincludedir)/blackbox
BASIC_HDRS = \
archetype.h \
@@ -258,9 +334,8 @@ BASIC_HDRS = \
transpose.h \
sum.h \
diagonal.h \
+ diagonal-gf2.h \
moore-penrose.h \
- dense.h \
- dense.inl \
direct-sum.h \
null-matrix.h \
matrix-blackbox.h \
@@ -280,7 +355,6 @@ BASIC_HDRS = \
blackbox-interface.h \
random-matrix.h \
lambda-sparse.h \
- blas-blackbox.h \
polynomial.h \
block-hankel.h \
block-toeplitz.h \
@@ -321,9 +395,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/blackbox/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps linbox/blackbox/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/blackbox/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/blackbox/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -341,6 +415,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -349,21 +424,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludesubdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)"
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludesubHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- $(pkgincludesubHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
done
uninstall-pkgincludesubHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
- done
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -377,7 +456,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -385,29 +464,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -428,13 +512,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -455,16 +543,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -550,6 +644,7 @@ uninstall-am: uninstall-pkgincludesubHEADERS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/linbox/blackbox/apply.h b/linbox/blackbox/apply.h
index d5c1b22..b133b0a 100644
--- a/linbox/blackbox/apply.h
+++ b/linbox/blackbox/apply.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
* Author: Zhendong Wan
* Modified by Pascal Giorgi
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -30,26 +31,27 @@
#ifndef __LINBOX_apply_H
#define __LINBOX_apply_H
-#include <linbox/linbox-config.h>
-#include <linbox/integer.h>
-#include <linbox/util/debug.h>
-#include <linbox/field/multimod-field.h>
-#include <linbox/field/hom.h>
-#include <linbox/randiter/multimod-randomprime.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/blackbox/sparse.h>
-#include <linbox/blackbox/blas-blackbox.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/algorithms/lifting-container.h>
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/util/debug.h"
+// #if defined(__LINBOX_field_multimod_field_H) && !defined(__LINBOX_blas_matrix_domain_H)
+// #error "you need to include \"multimod-field.h\" before \"blas-domain.h\""
+// #endif
+#include "linbox/field/multimod-field.h"
+#include "linbox/field/hom.h"
+#include "linbox/randiter/multimod-randomprime.h"
+#include "linbox/blackbox/sparse.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/algorithms/lifting-container.h"
#include <vector>
-#include <linbox/util/timer.h>
+#include "linbox/util/timer.h"
-#ifdef __LINBOX_BLAS_AVAILABLE
+// #ifdef __LINBOX_BLAS_AVAILABLE
#include <fflas-ffpack/fflas/fflas.h>
-#endif
+// #endif
//#define DEBUG_CHUNK_SETUP
//#define DEBUG_CHUNK_APPLY
@@ -86,23 +88,23 @@ namespace LinBox
typedef std::vector<Element> Vector;
BlasApply(const Domain& D) :
- _D(D), _MD(D)
+ _domain(D), _MD(D)
{
- _D.characteristic(_prime);
- _D.init(_one,1UL);
- _D.init(_zero,0UL);
+ _domain.characteristic(_prime);
+ _domain.init(_one,1UL);
+ _domain.init(_zero,0UL);
}
//#ifdef __LINBOX_BLAS_AVAILABLE
- inline Vector& applyV(Vector &y,
- const BlasMatrix<Element> &A,
- const Vector &x) const
+ inline Vector& applyV(Vector &y,
+ const BlasMatrix<Domain> &A,
+ const Vector &x) const
{
if (( _prime > 0) && ( _prime < 67108863)) {
- FFLAS::fgemv( _D, FFLAS::FflasNoTrans,
+ FFLAS::fgemv((typename Domain::Father_t) _domain, FFLAS::FflasNoTrans,
A.rowdim(), A.coldim(),
_one,
A.getPointer(), A.getStride(),
@@ -116,14 +118,14 @@ namespace LinBox
return y;
}
- inline Vector& applyVTrans(Vector &y,
- BlasMatrix<Element> &A,
- const Vector &x) const
+ inline Vector& applyVTrans(Vector &y,
+ BlasMatrix<Domain> &A,
+ const Vector &x) const
{
if (( _prime > 0) && ( _prime < 67108863)) {
- FFLAS::fgemv( _D, FFLAS::FflasTrans,
+ FFLAS::fgemv((typename Domain::Father_t) _domain, FFLAS::FflasTrans,
A.rowdim(), A.coldim(),
_one,
A.getPointer(), A.getStride(),
@@ -132,14 +134,14 @@ namespace LinBox
&y[0],1);
}
else {
- TransposeMatrix<const BlasMatrix<Element> > B(A);
+ TransposeMatrix<const BlasMatrix<Domain> > B(A);
_MD.vectorMul (y, B, x);
}
return y;
}
inline Vector& applyVspecial (Vector &y,
- BlasMatrix<Element> &A,
+ BlasMatrix<Domain> &A,
const Vector &x) const
{//toto
@@ -152,13 +154,13 @@ namespace LinBox
for (size_t i=0;i<m;++i)
for (size_t j=0;j<n;++j)
- _D.convert(*(At_dbl+i+j*m), A.refEntry(i,j));
+ _domain.convert(*(At_dbl+i+j*m), A.refEntry(i,j));
integer tmp;
bool use_neg=false;
size_t maxword=0;
for (size_t i=0;i<n;++i){
- _D.convert(tmp,x[i]);
+ _domain.convert(tmp,x[i]);
if (tmp <0)
use_neg = true;
if ( maxword < tmp.size())
@@ -171,7 +173,7 @@ namespace LinBox
memset(xdbl, 0, sizeof(double)*n*maxword);
for (size_t i=0;i<n;++i){
- _D.convert(tmp,x[i]);
+ _domain.convert(tmp,x[i]);
double * ptr= xdbl+i;
if (tmp == 0)
*ptr=0;
@@ -201,8 +203,8 @@ namespace LinBox
double *ydbl= new double[maxword*m];
cblas_dgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans,
- maxword,m,n, 1,
- xdbl,n, At_dbl, m, 0, ydbl, m);
+ (int) maxword,(int) m,(int) n, 1,
+ xdbl,(int) n, At_dbl, (int) m, 0, ydbl, (int) m);
delete At_dbl;
delete xdbl;
@@ -218,7 +220,7 @@ namespace LinBox
for (size_t j=0;j< maxword;j=j+2){
if (!use_neg || j< maxword-1){
long long mask = static_cast<long long>(ydbl[j*m+i]);
- *((long long*) ptr) |= mask;
+ *(reinterpret_cast<long long*>(ptr) ) |= mask;
ptr+=4;
}
}
@@ -226,14 +228,14 @@ namespace LinBox
for (size_t j=1;j< maxword;j=j+2){
if (!use_neg || j< maxword-1){
long long mask = static_cast<long long>(ydbl[j*m+i]);
- *((long long*) ptr) |= mask;
+ *(reinterpret_cast<long long*>(ptr) ) |= mask;
ptr+=4;
}
}
}
for (size_t i=0; i<m; i++) {
- LinBox::integer result, tmp;
+ LinBox::integer result, tmp2;
if (use_neg) {
result = -ydbl[(maxword-1)*m+i];
result <<= (maxword-1)*32;
@@ -241,12 +243,12 @@ namespace LinBox
else
result = 0;
- importWords(tmp, rclen, -1, 1, 0, 0, combined1+i*rclen);
- result += tmp;
- importWords(tmp, rclen, -1, 1, 0, 0, combined2+i*rclen);
- result += tmp;
+ importWords(tmp2, (size_t)rclen, -1, 1, 0, 0, combined1+i*rclen);
+ result += tmp2;
+ importWords(tmp2, (size_t)rclen, -1, 1, 0, 0, combined2+i*rclen);
+ result += tmp2;
- _D.init(y[i], result);
+ _domain.init(y[i], result);
}
delete[] ydbl;
delete[] combined1;
@@ -257,7 +259,7 @@ namespace LinBox
private:
- Domain _D;
+ Domain _domain;
integer _prime;
Element _one,_zero;
MatrixDomain<Domain> _MD;
@@ -273,27 +275,29 @@ namespace LinBox
typedef typename Domain::Element Element;
typedef std::vector<Element> Vector;
- MatrixApplyDomain(const Domain& D, const IMatrix &M) :
- _D(D), _M(M)
+ MatrixApplyDomain(const Domain& D, const IMatrix &Mat) :
+ _domain(D), _matM(Mat)
{}
void setup(LinBox::integer prime){}
Vector& applyV(Vector& y, Vector& x, Vector& z) const
- { return _M.apply(y,x);}
+ {
+ return _matM.apply(y,x);
+ }
Vector& applyVTrans(Vector& y, Vector& x, Vector&z) const
- {return _M.applyTranspose(y,x);}
+ {return _matM.applyTranspose(y,x);}
private:
- Domain _D;
- const IMatrix &_M;
+ Domain _domain;
+ const IMatrix &_matM;
};
// special function to split an integer matrix in q-adic representation in an array of double
template <class Domain, class IMatrix>
- void create_MatrixQadic (const Domain &D, const IMatrix &M, double *chunks, size_t num_chunks, const integer shift=0);
+ void create_MatrixQadic (const Domain &D, const IMatrix &Mat, double *chunks, size_t num_chunks, const integer shift=0);
// special function to split an integer vector in q-adic representation in an array of double
@@ -302,7 +306,7 @@ namespace LinBox
// special function to split an integer matrix in an RNS representation in an array of double
template <class Domain, class IMatrix>
- void create_MatrixRNS (const MultiModDouble& F, const Domain &D, const IMatrix &M, double *chunks);
+ void create_MatrixRNS (const MultiModDouble& F, const Domain &D, const IMatrix &Mat, double *chunks);
// special function to split an integer vector in an RNS representation in an array of double
@@ -323,9 +327,11 @@ namespace LinBox
typedef IMatrix Matrix;
- BlasMatrixApplyDomain(const Domain& D, const IMatrix &M) :
- _D(D), _M(M), _MD(D), _m(M.rowdim()), _n(M.coldim())
- { _switcher= Classic;_rns=NULL;}
+ BlasMatrixApplyDomain(const Domain& D, const IMatrix &Mat) :
+ _domain(D), _matM(Mat), _MD(D), _m(Mat.rowdim()), _n(Mat.coldim())
+ {
+ _switcher= Classic;_rns=NULL;
+ }
~BlasMatrixApplyDomain ()
@@ -341,7 +347,7 @@ namespace LinBox
ApplyChoice setup(LinBox::integer prime)
{ //setup
- _D.init(_prime,prime);
+ _domain.init(_prime,prime);
_apply.clear();
_convert_data.clear();
_convert_result.clear();
@@ -353,9 +359,9 @@ namespace LinBox
LinBox::integer tmp=0, maxValue=0;
size_t maxBitSize = 0;
use_neg = false;
- typename Matrix::ConstRawIterator it = _M.rawBegin();
+ typename Matrix::ConstIterator it = _matM.Begin();
for (size_t i=0; i<_m*_n; i++, ++it) {
- _D.convert(tmp, *it);
+ _domain.convert(tmp, *it);
if (tmp <0) {
use_neg = 1;
tmp=-tmp;
@@ -416,7 +422,7 @@ namespace LinBox
maxBitSize+=1;
}
// compute the number of chunk
- if (maxValue*prime*_M.coldim() < integer("9007199254740992")){
+ if (maxValue*prime*_matM.coldim() < integer("9007199254740992")){
num_chunks=1;
use_neg=false;
}
@@ -432,7 +438,7 @@ namespace LinBox
shift= use_neg? maxValue : integer(0);
- create_MatrixQadic(_D, _M, chunks, num_chunks, shift);
+ create_MatrixQadic(_domain, _matM, chunks, num_chunks, shift);
#ifdef DEBUG_CHUNK_SETUP
std::cout<<std::endl;
@@ -458,7 +464,7 @@ namespace LinBox
// convert integer matrix to double matrix
chunks = new double[_m*_n];
memset(chunks, 0, sizeof(double)*_m*_n);
- create_MatrixQadic (_D, _M, chunks, 1);
+ create_MatrixQadic (_domain, _matM, chunks, 1);
// if the matrix has negative entries
if (use_neg){
@@ -493,7 +499,7 @@ namespace LinBox
// convert integer matrix to rns double matrix
chunks = new double[_m*_n*_rns->size()];
memset(chunks, 0, sizeof(double)*_m*_n*_rns->size());
- create_MatrixRNS(*_rns, _D, _M, chunks);
+ create_MatrixRNS(*_rns, _domain, _matM, chunks);
// allocate memory for the rns vector
vchunks = new double[_n*_rns->size()];
@@ -501,12 +507,12 @@ namespace LinBox
// prepare special CRT
Element g, s, q, zero,one,two;
_q= _rns->getCRTmodulo();
- _D.init(q,_q);_D.init(zero,0UL);_D.init(one,1UL);_D.init(two,2UL);
- _D.xgcd(g, _inv_q, s, q, _prime);
- if (_D.compare(_inv_q, zero)<0 ) _D.addin(_inv_q,_prime);
- _D.mul(_pq,_prime,q);
- _D.sub(_h_pq,_pq, one);
- _D.divin(_h_pq, two);
+ _domain.init(q,_q);_domain.init(zero,0UL);_domain.init(one,1UL);_domain.init(two,2UL);
+ _domain.xgcd(g, _inv_q, s, q, _prime);
+ if (_domain.compare(_inv_q, zero)<0 ) _domain.addin(_inv_q,_prime);
+ _domain.mul(_pq,_prime,q);
+ _domain.sub(_h_pq,_pq, one);
+ _domain.divin(_h_pq, two);
break;
@@ -515,7 +521,7 @@ namespace LinBox
#endif
#ifdef DEBUG_CHUNK_APPLY
std::cout<<"A: \n";
- _M.write(std::cout);
+ _matM.write(std::cout);
#endif
return _switcher;
@@ -538,27 +544,27 @@ namespace LinBox
switch(_switcher) {//switch
case Classic:
- _MD.vectorMul (y, _M, x);
+ _MD.vectorMul (y, _matM, x);
break;
case MatrixQadic:
{// mqadic
#if 0
temp fix
- _MD.vectorMul (y, _M, x);
+ _MD.vectorMul (y, _matM, x);
break;
#endif
double* dx = new double[_n];
for (size_t i=0; i<_n; i++) {
- _D.convert(dx[i], x[i]);
+ _domain.convert(dx[i], x[i]);
}
if (num_chunks == 1) {
double *ctd = new double[_m];
- cblas_dgemv(CblasRowMajor, CblasNoTrans, _m, _n,
- 1, chunks, _n, dx, 1, 0, ctd, 1);
+ cblas_dgemv(CblasRowMajor, CblasNoTrans, (int) _m, (int) _n,
+ 1, chunks, (int) _n, dx, 1, 0, ctd, 1);
for (size_t i=0;i<_n;++i)
- _D.init(y[i],ctd[i]);
+ _domain.init(y[i],ctd[i]);
delete[] ctd;
delete[] dx;
}
@@ -572,12 +578,12 @@ namespace LinBox
* + BBBBDDDDFFFF00 of
* also note that we need separate blocks for positive and negative entries)
*/
- int rc = (52 / chunk_size) + 1; //constant at 4 for now
+ int rc = int(52 / chunk_size) + 1; //constant at 4 for now
/*
* rclen: number of bytes in each of these OR-ed vectors
* needs room to hold (max long long) << (num_chunks * chunksize)
*/
- int rclen = num_chunks*2 + 5;
+ int rclen = (int)num_chunks*2 + 5;
unsigned char* combined = new unsigned char[rc*_n*rclen];
memset(combined, 0, rc*_n*rclen);
@@ -602,7 +608,9 @@ namespace LinBox
std::cout<<"- A.x chunk---------------------\n";
#endif
for (size_t i=0; i<num_chunks; i++) {
- cblas_dgemv(CblasRowMajor, CblasNoTrans, _m, _n, 1, chunks + (_m*_n*i), _n, dx, 1, 0, ctd, 1);
+ cblas_dgemv(CblasRowMajor, CblasNoTrans,
+ (int) _m, (int) _n, 1,
+ chunks + (_m*_n*i),(int) _n, dx, 1, 0, ctd, 1);
#ifdef DEBUG_CHUNK_APPLY
for (size_t j=0;j<_n;j++)
std::cout<<integer(*(ctd+j))<<",";
@@ -616,7 +624,7 @@ namespace LinBox
bitDest += rclen*((i % rc)*_n+j);
long long mask = static_cast<long long>(ctd[j]);
bitDest += 2*i;
- *((long long*) bitDest) |= mask;
+ *(reinterpret_cast<long long*>(bitDest) ) |= mask;
}
}
delete[] dx;
@@ -633,21 +641,21 @@ namespace LinBox
for (int j=0; j<rc; j++) {
unsigned char* thispos = combined + rclen*(j*_n+i);
- importWords(tmp, rclen, -1, 1, 0, 0, thispos);
+ importWords(tmp, (size_t)rclen, -1, 1, 0, 0, thispos);
result += tmp;
}
- _D.init(y[i], result);
+ _domain.init(y[i], result);
}
// shift back the result
if (use_neg) {
Element acc;
- _D.init(acc,0);
+ _domain.init(acc,0);
for (size_t i=0;i<x.size();++i)
- _D.addin(acc,x[i]);
- _D.mulin(acc,shift);
+ _domain.addin(acc,x[i]);
+ _domain.mulin(acc,shift);
for (size_t i=0;i<y.size();++i)
- _D.subin(y[i], acc);
+ _domain.subin(y[i], acc);
}
delete[] combined;
delete[] ctd;
@@ -678,17 +686,17 @@ namespace LinBox
double *ctd= new double[_m*num_chunks];
if (chunk_size >=32)
- create_VectorQadic_32 (_D, x, vchunks, num_chunks);
+ create_VectorQadic_32 (_domain, x, vchunks, num_chunks);
else
- create_VectorQadic (_D, x, vchunks, num_chunks);
+ create_VectorQadic (_domain, x, vchunks, num_chunks);
#ifdef TIMING_APPLY
chrono.stop();
_convert_data+=chrono;
chrono.clear();
chrono.start();
#endif
- cblas_dgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, _m, num_chunks, _n, 1.,
- chunks, _n, vchunks, num_chunks, 0., ctd, num_chunks);
+ cblas_dgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, (int) _m, (int) num_chunks, (int) _n, 1.,
+ chunks, (int) _n, vchunks, (int) num_chunks, 0., ctd, (int) num_chunks);
#ifdef TIMING_APPLY
chrono.stop();
@@ -728,25 +736,25 @@ namespace LinBox
unsigned char* BitDest = combined+chunk_byte*k;
for (size_t j=k; j< num_chunks; j+=rc){
long long mask = static_cast<long long>(ctd[i*num_chunks+j]);
- *((long long*) BitDest) |= mask;
+ *(reinterpret_cast<long long*>(BitDest) ) |= mask;
BitDest+=rc*chunk_byte;
}
- importWords(val, rclen, -1, 1, 0, 0, combined);
+ importWords(val, (size_t)rclen, -1, 1, 0, 0, combined);
result+=val;
}
- _D.init(y[i], result);
+ _domain.init(y[i], result);
}
// shift back the result
if (use_neg) {
Element acc;
- _D.init(acc,0);
+ _domain.init(acc,0);
for (size_t i=0;i<x.size();++i)
- _D.addin(acc,x[i]);
- _D.mulin(acc,shift);
+ _domain.addin(acc,x[i]);
+ _domain.mulin(acc,shift);
for (size_t i=0;i<y.size();++i)
- _D.subin(y[i], acc);
+ _domain.subin(y[i], acc);
}
delete[] combined;
@@ -776,7 +784,7 @@ namespace LinBox
//memset(vchunks, 0, sizeof(double)*_n*rns_size);
// create rns vector
- create_VectorRNS (*_rns, _D, x, vchunks);
+ create_VectorRNS (*_rns, _domain, x, vchunks);
// allocate memory for the result
double *ctd= new double[_m*rns_size];
@@ -788,8 +796,8 @@ namespace LinBox
#endif
// perform multiplication componentwise
for (size_t i=0;i< rns_size; ++i)
- cblas_dgemv(CblasRowMajor, CblasNoTrans, _m, _n,
- 1, chunks+i*_m*_n, _n, vchunks+i*_n, 1, 0, ctd+i*_m, 1);
+ cblas_dgemv(CblasRowMajor, CblasNoTrans, (int) _m, (int) _n,
+ 1, chunks+i*_m*_n, (int) _n, vchunks+i*_n, 1, 0, ctd+i*_m, 1);
#ifdef TIMING_APPLY
chrono.stop();
_apply+=chrono;
@@ -831,7 +839,7 @@ namespace LinBox
for (size_t i=0;i<rns_size;++i)
_rns->getBase(i).init(tmp[i], ctd[j+i*_m]);
_rns->convert(res, tmp);
- _D.init(y[j], res);
+ _domain.init(y[j], res);
//if (y[j] > hmod) y[j]-=mod;
}
delete[] ctd;
@@ -851,11 +859,11 @@ namespace LinBox
Element y_cur, b_cur;
// finish crt according to b
for (size_t i=0;i<_m;++i){
- _D.rem(b_cur, b[i], _prime);
- _D.sub(y_cur, b_cur, y[i]);//std::cout<<"(b-y): "<<y_cur<<std::endl;
- _D.mulin(y_cur, _inv_q);//std::cout<<"((b-y)/q): "<<y_cur<<std::endl;
- _D.remin(y_cur, _prime);//std::cout<<"((b-y)/q mod p): "<<y_cur<<std::endl;
- _D.axpyin(y[i],_q, y_cur);//std::cout<<"y+p((b-y)/q mod p): "<<y[i]<<std::endl;
+ _domain.rem(b_cur, b[i], _prime);
+ _domain.sub(y_cur, b_cur, y[i]);//std::cout<<"(b-y): "<<y_cur<<std::endl;
+ _domain.mulin(y_cur, _inv_q);//std::cout<<"((b-y)/q): "<<y_cur<<std::endl;
+ _domain.remin(y_cur, _prime);//std::cout<<"((b-y)/q mod p): "<<y_cur<<std::endl;
+ _domain.axpyin(y[i],_q, y_cur);//std::cout<<"y+p((b-y)/q mod p): "<<y[i]<<std::endl;
if ( y[i] > _h_pq) y[i]-=_pq;
}
/*
@@ -887,7 +895,7 @@ namespace LinBox
Vector& applyVTrans(Vector& y, Vector& x) const
{
- TransposeMatrix<IMatrix> B(_M);
+ TransposeMatrix<IMatrix> B(_matM);
return _MD.vectorMul (y, B, x);
}
@@ -900,18 +908,18 @@ namespace LinBox
linbox_check( Y.coldim() == X.coldim());
if (!use_chunks){
- _MD.mul (Y, _M, X);
+ _MD.mul (Y, _matM, X);
}
else{
size_t _k= X.coldim();
double* dX = new double[_n*_k];
for (size_t i=0; i<_n; i++)
for(size_t j=0;j<_k;++j)
- _D.convert(dX[i*_k+j], X.getEntry(i,j));
+ _domain.convert(dX[i*_k+j], X.getEntry(i,j));
#ifdef DEBUG_CHUNK_APPLYM
cout << "X: ";
- X.write(cout,_D);
+ X.write(cout,_domain);
cout << endl;
#endif
@@ -919,12 +927,12 @@ namespace LinBox
if (num_chunks == 1) {
double *ctd = new double[_m*_k];
cblas_dgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans,
- _m,_k,_n, 1,
- chunks,_n, dX, _k, 0, ctd, _k);
+ (int) _m,(int) _k,(int) _n, 1,
+ chunks,(int) _n, dX, (int) _k, 0, ctd, (int) _k);
for (size_t i=0;i<_m;++i)
for (size_t j=0;j<_k;++j)
- _D.init(Y.refEntry(i,j),ctd[i*_k+j]);
+ _domain.init(Y.refEntry(i,j),ctd[i*_k+j]);
delete[] ctd;
delete[] dX;
}
@@ -939,12 +947,12 @@ namespace LinBox
* also note that we need separate blocks for positive and negative entries)
*/
- int rc = (52 / chunk_size) + 1; //constant at 4 for now
+ int rc = int(52 / chunk_size) + 1; //constant at 4 for now
//rclen: number of bytes in each of these OR-ed vectors
// needs room to hold (max long long) << (num_chunks * chunksize)
- int rclen = num_chunks*2 + 5;
+ int rclen = (int)num_chunks*2 + 5;
// cout << "rc= " << rc << ", rclen = " << rclen << endl;
@@ -958,8 +966,8 @@ namespace LinBox
for (size_t i=0; i<num_chunks; i++) {
cblas_dgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans,
- _m,_k,_n, 1,
- chunks+(_m*_n*i),_n, dX, _k, 0, ctd, _k);
+ (int) _m,(int) _k,(int) _n, 1,
+ chunks+(_m*_n*i),(int) _n, dX, (int) _k, 0, ctd, (int) _k);
if (!use_neg || i<num_chunks-1)
for (size_t j=0; j<_m*_k; j++) {
@@ -968,7 +976,7 @@ namespace LinBox
bitDest += rclen*((i % rc)*_m*_k+j);
long long mask = static_cast<long long>(ctd[j]);
bitDest += 2*i;
- *((long long*) bitDest) |= mask;
+ *(reinterpret_cast<long long*>(bitDest) ) |= mask;
}
}
@@ -988,7 +996,7 @@ namespace LinBox
for (int j=0; j<rc; j++) {
unsigned char* thispos = combined + rclen*(j*_m*_k+i);
- importWords(tmp, rclen, -1, 1, 0, 0, thispos);
+ importWords(tmp, (size_t)rclen, -1, 1, 0, 0, thispos);
result += tmp;
#ifdef DEBUG_CHUNK_APPLYM
cout << "rc[" << j << "," << i << "]:" << tmp << endl;
@@ -998,7 +1006,7 @@ namespace LinBox
cout << "v2[" << i << "]:" << result << endl;
#endif
- _D.init(*(Y.getWritePointer()+i), result);
+ _domain.init(*(Y.getWritePointer()+i), result);
}
delete[] combined;
delete[] ctd;
@@ -1010,8 +1018,8 @@ namespace LinBox
protected:
- Domain _D;
- const IMatrix &_M;
+ Domain _domain;
+ const IMatrix &_matM;
MatrixDomain<Domain> _MD;
size_t _m;
size_t _n;
@@ -1034,45 +1042,34 @@ namespace LinBox
};
-#ifndef __INTEL_COMPILER
- template<>
- #endif
+// #if !defined (__INTEL_COMPILER) && !defined(__clang__)
+// template<>
+// #endif
template <class Domain>
- class MatrixApplyDomain<Domain, BlasMatrix<typename Domain::Element> > : public BlasMatrixApplyDomain<Domain, BlasMatrix<typename Domain::Element> > {
+ class MatrixApplyDomain<Domain, BlasMatrix<Domain> > : public BlasMatrixApplyDomain<Domain, BlasMatrix<Domain> > {
public:
- MatrixApplyDomain (const Domain &D, const BlasMatrix<typename Domain::Element> &M) :
- BlasMatrixApplyDomain<Domain, BlasMatrix<typename Domain::Element> > (D,M)
+ MatrixApplyDomain (const Domain &D, const BlasMatrix<Domain> &Mat) :
+ BlasMatrixApplyDomain<Domain, BlasMatrix<Domain> > (D,Mat)
{}
};
-#ifndef __INTEL_COMPILER
- template<>
- #endif
- template <class Domain>
- class MatrixApplyDomain<Domain, DenseMatrix<Domain> > : public BlasMatrixApplyDomain<Domain, DenseMatrix<Domain> > {
-
- public:
- MatrixApplyDomain (const Domain &D, const DenseMatrix<Domain> &M) :
- BlasMatrixApplyDomain<Domain, DenseMatrix<Domain> > (D,M)
- {}
- };
-
-
-#ifndef __INTEL_COMPILER
- template<>
- #endif
+#if 0
+// #ifndef __INTEL_COMPILER
+ // template<>
+// #endif
template <class Domain>
- class MatrixApplyDomain<Domain, BlasBlackbox<Domain> > :
- public BlasMatrixApplyDomain<Domain, BlasBlackbox<Domain> > {
+ class MatrixApplyDomain<Domain, BlasMatrix<Domain> > :
+ public BlasMatrixApplyDomain<Domain, BlasMatrix<Domain> > {
public:
- MatrixApplyDomain (const Domain &D, const BlasBlackbox<Domain> &M) :
- BlasMatrixApplyDomain<Domain, BlasBlackbox<Domain> > (D,M)
+ MatrixApplyDomain (const Domain &D, const BlasMatrix<Domain> &Mat) :
+ BlasMatrixApplyDomain<Domain, BlasMatrix<Domain> > (D,Mat)
{}
};
+#endif
@@ -1081,17 +1078,17 @@ namespace LinBox
*/
template <class Domain, class IMatrix>
void create_MatrixQadic (const Domain &D,
- const IMatrix &M,
+ const IMatrix &Mat,
double *chunks,
size_t num_chunks,
const integer shift)
{
- typename IMatrix::ConstRawIterator it= M.rawBegin();
+ typename IMatrix::ConstIterator it= Mat.Begin();
size_t m,n,mn;
- m = M.rowdim();
- n = M.coldim();
+ m = Mat.rowdim();
+ n = Mat.coldim();
mn = m*n;
size_t tmpsize, tmpbitsize, j;
@@ -1464,14 +1461,14 @@ namespace LinBox
template <class Domain, class IMatrix>
void create_MatrixRNS (const MultiModDouble &F,
const Domain &D,
- const IMatrix &M,
+ const IMatrix &Mat,
double *chunks)
{
size_t rns_size= F.size();
- typename IMatrix::ConstRawIterator it = M.rawBegin();
- size_t mn = M.rowdim()*M.coldim();
+ typename IMatrix::ConstIterator it = Mat.Begin();
+ size_t mn = Mat.rowdim()*Mat.coldim();
integer tmp;
for (size_t i=0; i< mn; ++i, ++it){
@@ -1506,3 +1503,12 @@ namespace LinBox
#endif // __LINBOX_apply_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/archetype.h b/linbox/blackbox/archetype.h
index aee00bb..f9a620e 100644
--- a/linbox/blackbox/archetype.h
+++ b/linbox/blackbox/archetype.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/archetype.h
* Copyright (C) 1999-2005 William J Turner,
* 2001 Bradford Hovinen
@@ -8,7 +6,25 @@
* Bradford Hovinen <hovinen at cis.udel.edu>
* and bds.
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*!@file blackbox/archetype.h
@@ -206,3 +222,12 @@ matrix transpose times vector product. )
#endif // __LINBOX_blackbox_archetype_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/blackbox-interface.h b/linbox/blackbox/blackbox-interface.h
index 750c3a9..9be1ebc 100644
--- a/linbox/blackbox/blackbox-interface.h
+++ b/linbox/blackbox/blackbox-interface.h
@@ -1,10 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/blackbox-interface.h
* Copyright (C) 2002 LinBox
* Written by David Saunders
*
- * For licensing information see COPYING
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_blackbox_interface_H
@@ -19,21 +33,34 @@ namespace LinBox
* The LinBox @link BlackboxInterface at endlink common object @link Interfaces interface at endlink.
* The blackbox interface includes the public members defined in the archetype.
*/
- /**
- * \brief This blackbox base class exists solely to aid documentation organization.
-
- * For the general blackbox member function documentation consult the @link blackbox Archetype at endlink. For specific properties of individual representations consult the specific blackbox classes.
+ /** @internal
+ * \brief This blackbox base class exists solely to aid documentation
+ * organization.
+ * @details
+ * For the general blackbox member function documentation consult the
+ * @link blackbox Archetype at endlink. For specific properties of
+ * individual representations consult the specific blackbox classes.
+ * @bug if it is for doc purposes, there are other ways !
*/
class BlackboxInterface {
- /*
+#if 0
public:
// this just demo's that some declarations could be here.
typedef ElementArchetype Element;
virtual Element& mul(Element& c, const Element& a, const Element& b) const = 0;
- */
+#endif
};// empty class so doc++ makes a nice hierarchy.
} // namespace LinBox
#endif // __LINBOX_blackbox_interface_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/blackbox.doxy b/linbox/blackbox/blackbox.doxy
index 2bec333..bbb13d0 100644
--- a/linbox/blackbox/blackbox.doxy
+++ b/linbox/blackbox/blackbox.doxy
@@ -1,3 +1,25 @@
+/* Copyright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+
/** \ingroup linbox
\defgroup blackbox blackbox
\brief These matrix classes adhere to the simple blackbox interface.
diff --git a/linbox/blackbox/blas-blackbox.h b/linbox/blackbox/blas-blackbox.h
deleted file mode 100644
index 1c65520..0000000
--- a/linbox/blackbox/blas-blackbox.h
+++ /dev/null
@@ -1,430 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/blackbox/blas-blackbox.h
- * Copyright (C) 2004 Pascal Giorgi
- *
- * Written by :
- * Pascal Giorgi pascal.giorgi at ens-lyon.fr
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __LINBOX_blas_blackbox_H
-#define __LINBOX_blas_blackbox_H
-
-#include <linbox/matrix/blas-matrix.h>
-#include <fflas-ffpack/fflas/fflas.h>
-#include <linbox/matrix/matrix-domain.h>
-#include <linbox/field/hom.h>
-#include <linbox/field/multimod-field.h>
-#include <linbox/util/matrix-stream.h>
-
-namespace LinBox
-{
-
- template <class Field>
- bool checkBlasApply(const Field &F, size_t n) {
-
- integer chara, card;
- F.characteristic(chara);
- F.cardinality(card);
-
- if ((chara != card) || chara == 0)
- return false;
- else
- if (n*chara*chara < integer("9007199254740992"))
- return true;
- else
- return false;
- }
-
-
- /** Dense matrix representation for BLAS based elimination.
- * \ingroup blackbox
- *
- * A BlasBlackbox can be constructed from any blackbox matrix. This costs n blackbox
- * matrix vector products in general, but is efficiently done from a DenseMatrix
- * or SparseMatrix.
- */
- template <class _Field>
- class BlasBlackbox : public BlasMatrix<typename _Field::Element> {
-
- public:
-
- typedef _Field Field;
- typedef typename Field::Element Element;
- typedef BlasBlackbox<_Field> Self_t;
-
- BlasBlackbox (const Field& F) :
- _F(F), _MD(F), _VD(F)
- {
- _F.init(_One,1UL) ;
- _F.init(_Zero,0UL);
- _use_fflas=false;
- }
-
- BlasBlackbox (const Field& F, const size_t m, const size_t n) :
- BlasMatrix<Element> (m,n), _F(F), _MD(F), _VD(F), _row(m) , _col(n)
- {
- _F.init(_One,1UL);
- _F.init(_Zero,0UL);
- typename BlasMatrix<Element>::RawIterator it = this->rawBegin();
- for (; it != this->rawEnd(); ++it)
- _F.init(*it, 0);
- _use_fflas= checkBlasApply(_F, _col);
- }
-
- BlasBlackbox(MatrixStream<Field> &ms) :
- BlasMatrix<Element> (ms), _F(ms.getField()), _MD(ms.getField()), _VD(ms.getField())
- {
- ms.getRows(_row);
- ms.getColumns(_col);
- _use_fflas= checkBlasApply(_F, _col);
- }
-
- // copy
- BlasBlackbox (const Field& F, BlasMatrix<Element>& M) :
- BlasMatrix<Element> (M), _F(F), _MD(F) , _VD(F), _row(M.rowdim()), _col(M.coldim())
- {
- _F.init(_One,1UL),
- _F.init(_Zero,0UL);
- _use_fflas= checkBlasApply(_F, _col);
- }
-
- template< class Blackbox >
- BlasBlackbox (const Blackbox& M) :
- BlasMatrix<Element> (M), _F(M.field()), _MD(M.field()), _VD(M.field()), _row(M.rowdim()), _col(M.coldim())
- {
- _F.init( _One, 1UL );
- _F.init( _Zero, 0UL );
- _use_fflas= checkBlasApply(_F, _col);
- }
-
- BlasBlackbox (const BlasBlackbox<Field>& M) :
- BlasMatrix< Element> (M), _F(M._F), _MD(M._F), _VD(M._F),
- _row(M._row), _col(M._col), _One(M._One), _Zero(M._Zero)
- {
- _use_fflas= checkBlasApply(_F, _col);
- }
-
- BlasBlackbox (const BlasBlackbox<Field>& M, const size_t i0, const size_t j0, const size_t m, const size_t n) :
- BlasMatrix< Element> (M,i0,j0,m,n), _F(M._F), _MD(M._F), _VD(M._F),
- _row(m), _col(n), _One(M._One), _Zero(M._Zero)
- {
- _use_fflas= checkBlasApply(_F, _col);
- }
-
- BlasBlackbox (const Field &F, const BlasBlackbox<Field>& M) :
- BlasMatrix< Element> (M), _F(M._F), _MD(M._F), _VD(F),
- _row(M._row), _col(M._col), _One(M._One), _Zero(M._Zero)
- {
- _use_fflas= checkBlasApply(_F, _col);
- }
-
- template <class Vector1, class Vector2>
- Vector1& apply (Vector1& y, const Vector2& x) const
- {
-
- if (_use_fflas){
-
- FFLAS::fgemv( _F, FFLAS::FflasNoTrans,
- this->_row, this->_col,
- this->_One,
- this->_ptr, this->_stride,
- &x[0],1,
- this->_Zero,
- &y[0],1);
- }
- else {
- _MD. vectorMul (y, *this, x);
-#if 0
- typename BlasMatrix<Element>::ConstRowIterator i = this->rowBegin ();
- typename Vector1::iterator j = y.begin ();
-
- for (; j != y.end (); ++j, ++i)
- _VD.dot (*j, *i, x);
-#endif
- }
- return y;
- }
-
- template <class Vector1, class Vector2>
- Vector1& applyTranspose (Vector1& y, const Vector2& x) const
- {
-
- if (_use_fflas)
- FFLAS::fgemv( this->_F, FFLAS::FflasTrans,
- this->_row, this->_col,
- this->_One,
- this->_ptr, this->_stride,
- &x[0],1,
- this->_Zero,
- &y[0],1);
-
- else {
- typename BlasMatrix<Element>::ConstColIterator i = this->colBegin ();
- typename Vector1::iterator j = y.begin ();
-
- for (; j != y.end (); ++j, ++i)
- _VD.dot (*j, x, *i);
- }
-
- return y;
- }
-
- template<typename _Tp1>
- struct rebind {
- typedef BlasBlackbox<_Tp1> other;
-
- void operator() (other & Ap, const Self_t& A, const _Tp1& F)
- {
- typedef typename BlasMatrix<Element>::ConstRawIterator ConstRawIterator ;
- ConstRawIterator A_p;
- typename other::RawIterator Ap_p;
- Hom<Field, _Tp1> hom(A. field(), F);
- for (A_p = A. rawBegin(), Ap_p = Ap.rawBegin();
- A_p != A. rawEnd(); ++ A_p, ++ Ap_p)
- hom.image (*Ap_p, *A_p);
- }
- };
-
- template<typename _Tp1>
- BlasBlackbox(const BlasBlackbox<_Tp1>& M, const Field& F) :
- BlasMatrix<Element>(M.rowdim(),M.coldim()),
- _F(F),_MD(F),_VD(F),
- _row(M.rowdim()), _col(M.coldim()),
- _One(F.one), _Zero(F.zero)
- {
- _use_fflas = checkBlasApply(F, M.coldim());
- typename BlasBlackbox<_Tp1>::template rebind<Field>() (*this, M, F);
- }
-
- size_t rowdim() const {return _row;}
-
- size_t coldim() const {return _col;}
-
- const Field &field() const {return _F;}
- Field &field() {return const_cast<Field&>(_F);}
-
- /** Read the blackbox from an input stream
- * @param file Input stream from which to read
- */
- std::istream &read (std::istream &file)
- {
- return BlasMatrix<Element>::read(file, _F);
-
- }
-
- /** Write the blackbox to an output stream
- * @param os Output stream to which to write
- */
- std::ostream &write (std::ostream &os) const
- {
- return DenseSubmatrix<Element>::write(os, _F);
- }
-
-
- protected:
-
- const Field & _F;
- MatrixDomain<Field> _MD;
- VectorDomain<Field> _VD;
- size_t _row,_col;
- Element _One,_Zero;
- bool _use_fflas;
-
-
- }; // end of class BlasBlackbox
-
- template <class Field>
- struct MatrixTraits< BlasBlackbox<Field> > {
- typedef BlasBlackbox<Field> MatrixType;
- typedef typename MatrixCategories::RowColMatrixTag MatrixCategory;
- };
-
- template <class Field>
- struct MatrixTraits< const BlasBlackbox<Field> > {
- typedef const BlasBlackbox<Field> MatrixType;
- typedef typename MatrixCategories::RowColMatrixTag MatrixCategory;
- };
-
- template <class Field>
- class MatrixContainerTrait<BlasBlackbox<Field> > {
- public:
- typedef MatrixContainerCategory::BlasContainer Type;
- };
-
- template <class Field>
- class MatrixContainerTrait<const BlasBlackbox<Field> > {
- public:
- typedef MatrixContainerCategory::BlasContainer Type;
- };
-
- template<>
- class BlasBlackbox<MultiModDouble> {
-
-
- public:
-
- typedef MultiModDouble Field;
- typedef std::vector<double> Element;
- typedef BlasBlackbox<MultiModDouble> Self_t;
-
- //BlasBlackbox () {}
-
- BlasBlackbox (const MultiModDouble& F) :
- _F(F) , _rep(F.size()), _entry(F.size())
- {}
-
- BlasBlackbox (const Field& F, size_t m, size_t n, bool alloc=true) :
- _F(F), _row(m) , _col(n) , _rep(F.size()), _entry(F.size())
- {
- for (size_t i=0;i<_rep.size();++i)
- if (alloc)_rep[i] = new BlasBlackbox<Modular<double> > (F.getBase(i), m, n);
- }
-
- BlasBlackbox (const BlasBlackbox<MultiModDouble> & A):
- _F(A._F),_row(A._row), _col(A._col),
- _rep(A._rep.size()), _entry(A._entry)
- {
-
- for (size_t i=0;i<_rep.size();++i)
- _rep[i]= new BlasBlackbox<Modular<double> > (const_cast<BlasBlackbox<Modular<double> >& >( *A._rep[i]));
- }
-
-
- const BlasBlackbox<MultiModDouble>& operator=(const BlasBlackbox<MultiModDouble> & A)
- {
- _F = A._F;
- _row = A._row;
- _col = A._col;
- _rep = std::vector<BlasBlackbox<Modular<double> >* >(A._rep.size());
- _entry = A._entry;
- for (size_t i=0;i<_rep.size();++i)
- _rep[i]= new BlasBlackbox<Modular<double> > (const_cast<BlasBlackbox<Modular<double> >& >( *A._rep[i]));
- return *this;
- }
-
-
- ~BlasBlackbox() {for (size_t i=0; i< _rep.size();++i) {delete _rep[i];} }
-
- template <class Vector1, class Vector2>
- Vector1& apply (Vector1& y, const Vector2& x) const
- {
- for (size_t i=0;i<_rep.size();++i) {
- std::vector<double> x_tmp(x.size()), y_tmp(y.size());
- for (size_t j=0;j<x.size();++j)
- x_tmp[j]= x[j][i];
-
- _rep[i]->apply(y_tmp, x_tmp);
-
- for (size_t j=0;j<y.size();++j){
- y[j][i]=y_tmp[j];
-
- }
- }
-
- return y;
- }
-
- template <class Vector1, class Vector2>
- Vector1& applyTranspose (Vector1& y, const Vector2& x) const
- {
- for (size_t i=0;i<_rep.size();++i) {
- std::vector<double> x_tmp(x.size()), y_tmp(y.size());
- for (size_t j=0;j<x.size();++j)
- x_tmp[i]= x[j][i];
-
- _rep[i]->applyTranspose(y_tmp, x_tmp);
-
- for (size_t j=0;j<y.size();++j)
- y[j][i]=y_tmp[i];
- }
-
- return y;
- }
-
-#if 0
- template<typename _Tp1>
- struct rebind
- {
- typedef BlasBlackbox<_Tp1> other;
-
- void operator() (other *& Ap, const Self_t& A, const _Tp1& F) {
- Ap = new other(F, A.rowdim(), A.coldim());
- Hom<Field, _Tp1> hom(A. field(), F);
-
- hom.image (*Ap_p, *A_p);
- }
- };
-#endif
-
- size_t rowdim() const {return _row;}
-
- size_t coldim() const {return _col;}
-
-
- const Field &field() const {return _F;}
-
-
- std::ostream& write(std::ostream& os) const
- {
- for (size_t i=0;i<_rep.size();++i)
- _rep[i]->write(os);
- return os;
- }
-
-
- void setEntry (size_t , size_t j, const Element &a_ij)
- {
- for (size_t i=0; i< _rep.size();++i)
- _rep[i]->setEntry(i,j,a_ij[i]);
- }
-
-
- const Element& getEntry (size_t , size_t j)
- {
- for (size_t i=0; i< _rep.size();++i)
- _entry[i]=_rep[i]->getEntry(i,j);
- return _entry;
- }
-
- BlasBlackbox<Modular<double> >*& getMatrix(size_t i) {return _rep[i];}
-
- protected:
-
- MultiModDouble _F;
- const std::vector<MatrixDomain<Modular<double> > > _MD;
- size_t _row,_col;
- Element _One,_Zero;
- std::vector<BlasBlackbox<Modular<double> >* > _rep;
- std::vector<double> _entry;
- };
-
- template <>
- class MatrixContainerTrait<BlasBlackbox<MultiModDouble> > {
- public:
- typedef MatrixContainerCategory::Blackbox Type;
- };
-
-
-
-} // end of namespace LinBox
-
-#endif //__LINBOX_blas_blackbox_H
-
diff --git a/linbox/blackbox/block-hankel-inverse.h b/linbox/blackbox/block-hankel-inverse.h
index 9742c19..5740711 100644
--- a/linbox/blackbox/block-hankel-inverse.h
+++ b/linbox/blackbox/block-hankel-inverse.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/block-hankel-inverse.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi pgiorgi at uwaterlo.ca
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -29,11 +30,11 @@
//#define __CHECK_SIGMA_BASIS
-#include <linbox/algorithms/sigma-basis.h>
-#include <linbox/blackbox/block-hankel.h>
-//#include <linbox/blackbox/block-toeplitz.h>
-#include <linbox/blackbox/compose.h>
-#include <linbox/vector/vector-domain.h>
+#include "linbox/algorithms/sigma-basis.h"
+#include "linbox/blackbox/block-hankel.h"
+//#include "linbox/blackbox/block-toeplitz.h"
+#include "linbox/blackbox/compose.h"
+#include "linbox/vector/vector-domain.h"
//#define PADEMATRIX
@@ -49,7 +50,7 @@ namespace LinBox
typedef typename Field::Element Element;
typedef BlasMatrix<Element> Coefficient;
private:
- Field _F;
+ Field _field;
VectorDomain<Field> _VD;
BlockHankel<Field> *_H1;
BlockHankel<Field> *_T1;
@@ -65,7 +66,7 @@ namespace LinBox
// all different elements in the Hankel representation
// vector is of odd size and represent the 1st column and last row append together
BlockHankelInverse(const Field &F, const std::vector<BlasMatrix<Element> > &P) :
- _F(F), _VD(F), _BMD(F)
+ _field(F), _VD(F), _BMD(F)
{
//write_maple("UAV",P);
@@ -75,7 +76,7 @@ namespace LinBox
size_t colblock = rowblock;
_row = _col = colblock*block;
Element one;
- _F.init(one, 1UL);
+ _field.init(one, 1UL);
_numblock=rowblock;
_block= block;
@@ -235,7 +236,7 @@ namespace LinBox
rev_poly.erase(rev_poly.begin());
- _H1 = new BlockHankel<Field> (_F, rev_poly, BlockHankelTag::up); // V
+ _H1 = new BlockHankel<Field> (_field, rev_poly, BlockHankelTag::up); // V
rev_poly.resize(SRP2.size());
const BlasMatrix<Element> Zero(block,block);
@@ -246,12 +247,12 @@ namespace LinBox
- _H2 = new BlockHankel<Field> (_F, rev_poly, BlockHankelTag::up); // Q
+ _H2 = new BlockHankel<Field> (_field, rev_poly, BlockHankelTag::up); // Q
- _T1 = new BlockHankel<Field> (_F, SLP1, BlockHankelTag::up); // Qstar
+ _T1 = new BlockHankel<Field> (_field, SLP1, BlockHankelTag::up); // Qstar
SLP2.erase(SLP2.begin());
- _T2 = new BlockHankel<Field> (_F, SLP2, BlockHankelTag::up); // Vstar
+ _T2 = new BlockHankel<Field> (_field, SLP2, BlockHankelTag::up); // Vstar
}
@@ -275,7 +276,7 @@ namespace LinBox
// reverse y according to block structure
for (size_t i=0; i< _numblock; ++i)
for (size_t j=0;j<_block;++j){
- _F.assign(rev_y[(_numblock-i-1)*_block+j], y[i*_block+j]);
+ _field.assign(rev_y[(_numblock-i-1)*_block+j], y[i*_block+j]);
}
_T1->apply(z1, rev_y);
@@ -298,7 +299,7 @@ namespace LinBox
size_t coldim() const { return _col;}
- const Field& field() const { return _F;}
+ const Field& field() const { return _field;}
protected:
@@ -313,7 +314,7 @@ namespace LinBox
std::cout<<defect[i]<<",";
std::cout<<"\n";
for (size_t i=0;i<SigmaBase.size();++i)
- SigmaBase[i].write(std::cout,_F);
+ SigmaBase[i].write(std::cout,_field);
#endif
// take the block rows which have lowest defect
@@ -341,7 +342,7 @@ namespace LinBox
size_t idx=0;
for (size_t i=0; i<2*block;++i){
for (size_t j=0;j<2*block;++j)
- if (!_F.isZero(SigmaBase[0].getEntry(i,j))){
+ if (!_field.isZero(SigmaBase[0].getEntry(i,j))){
notnull[idx]=i;
++idx;
break;
@@ -380,7 +381,7 @@ namespace LinBox
std::cout<<"\n";
for (size_t i=0;i<SigmaBase.size();++i)
- SigmaBase[i].write(std::cout,_F);
+ SigmaBase[i].write(std::cout,_field);
#endif
// take the m rows which have lowest defect
@@ -408,7 +409,7 @@ namespace LinBox
size_t idx=0;
for (size_t i=0; i<2*block;++i){
for (size_t j=0;j<2*block;++j)
- if (!_F.isZero(SigmaBase[0].getEntry(i,j))){
+ if (!_field.isZero(SigmaBase[0].getEntry(i,j))){
notnull[idx]=i;
++idx;
break;
@@ -455,26 +456,26 @@ namespace LinBox
for (size_t i=0;i<m-1;++i){
std::cout<<"[";
for (size_t j=0;j<n-1;++j)
- _F.write(std::cout,P[k].getEntry(i,j))<<",";
- _F.write(std::cout, P[k].getEntry(i,n-1))<<"] , ";
+ _field.write(std::cout,P[k].getEntry(i,j))<<",";
+ _field.write(std::cout, P[k].getEntry(i,n-1))<<"] , ";
}
std::cout<<"[";
for (size_t j=0;j<n-1;++j)
- _F.write(std::cout,P[k].getEntry(m-1,j))<<",";
- _F.write(std::cout, P[k].getEntry(m-1,n-1))<<"]]) , ";
+ _field.write(std::cout,P[k].getEntry(m-1,j))<<",";
+ _field.write(std::cout, P[k].getEntry(m-1,n-1))<<"]]) , ";
}
std::cout<<"Matrix([";
for (size_t i=0;i<m-1;++i){
std::cout<<"[";
for (size_t j=0;j<n-1;++j)
- _F.write(std::cout,P[P.size()-1].getEntry(i,j))<<",";
- _F.write(std::cout, P[P.size()-1].getEntry(i,n-1))<<"] , ";
+ _field.write(std::cout,P[P.size()-1].getEntry(i,j))<<",";
+ _field.write(std::cout, P[P.size()-1].getEntry(i,n-1))<<"] , ";
}
std::cout<<"[";
for (size_t j=0;j<n-1;++j)
- _F.write(std::cout,P[P.size()-1].getEntry(m-1,j))<<",";
- _F.write(std::cout, P[P.size()-1].getEntry(m-1,n-1))<<"]])]; \n";
+ _field.write(std::cout,P[P.size()-1].getEntry(m-1,j))<<",";
+ _field.write(std::cout, P[P.size()-1].getEntry(m-1,n-1))<<"]])]; \n";
}
@@ -488,3 +489,12 @@ namespace LinBox
#endif //__LINBOX_block_hankel_inverse_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/block-hankel.h b/linbox/blackbox/block-hankel.h
index b68c859..175c861 100644
--- a/linbox/blackbox/block-hankel.h
+++ b/linbox/blackbox/block-hankel.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/block-hankel.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi pgiorgi at uwaterlo.ca
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,19 +17,19 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_bb_block_hankel_H
#define __LINBOX_bb_block_hankel_H
#include <vector>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/vector/vector-domain.h>
-#include <linbox/algorithms/blas-domain.h>
-#include <linbox/util/debug.h>
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/algorithms/blas-domain.h"
+#include "linbox/util/debug.h"
//#define BHANKEL_TIMER
@@ -50,12 +51,12 @@ namespace LinBox
const typename Field::Element &a)
{
R= P[0];
- typename BlasMatrix<typename Field::Element>::RawIterator it_R;
- typename BlasMatrix<typename Field::Element>::ConstRawIterator it_P;
+ typename BlasMatrix<typename Field::Element>::Iterator it_R;
+ typename BlasMatrix<typename Field::Element>::ConstIterator it_P;
for (size_t k=1; k<P.size(); ++k){
- it_R = R.rawBegin();
- it_P = P[k].rawBegin();
- for (;it_R != R.rawEnd(); ++it_R, ++it_P){
+ it_R = R.Begin();
+ it_P = P[k].Begin();
+ for (;it_R != R.End(); ++it_R, ++it_P){
F.mulin(*it_R, a);
F.addin(*it_R, *it_P);
}
@@ -78,8 +79,8 @@ namespace LinBox
for (size_t i=0; i<block;++i)
F.assign(E[i], P[P.size()-block+i]);
- for (int i=numblock-2; i>=0;--i)
- for (size_t j= block*i; j< block*(i+1); ++j){
+ for (size_t i=numblock-1; i--;)
+ for (size_t j= (size_t)block*i; j< (size_t) block*(i+1); ++j){
idx= j%block;
F.mulin(E[idx], a);
F.addin(E[idx], P[j]);
@@ -158,7 +159,7 @@ namespace LinBox
typename std::list<typename Field::Element>::const_reverse_iterator rit=L.rbegin();
F.assign(P[i][deg-2],*rit);
++rit;
- for (int j=deg-3; j>=0;--j, ++rit)
+ for (int j= (int) deg-3; j>=0;--j, ++rit)
F.axpy(P[i][j], a, P[i][j+1], *rit);
}
@@ -437,3 +438,12 @@ namespace LinBox
#endif //__LINBOX_bb_block_hankel_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/block-toeplitz.h b/linbox/blackbox/block-toeplitz.h
index f13b663..b546534 100644
--- a/linbox/blackbox/block-toeplitz.h
+++ b/linbox/blackbox/block-toeplitz.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/block-toeplitz.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi pgiorgi at uwaterlo.ca
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,20 +17,20 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_block_toeplitz_H
#define __LINBOX_block_toeplitz_H
#include <vector>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/vector/vector-domain.h>
-#include <linbox/algorithms/blas-domain.h>
-#include <linbox/util/debug.h>
-#include <linbox/blackbox/block-hankel.h>
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/algorithms/blas-domain.h"
+#include "linbox/util/debug.h"
+#include "linbox/blackbox/block-hankel.h"
namespace LinBox
{
@@ -53,3 +54,12 @@ namespace LinBox
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/butterfly.h b/linbox/blackbox/butterfly.h
index dd6740c..6c16a06 100644
--- a/linbox/blackbox/butterfly.h
+++ b/linbox/blackbox/butterfly.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/butterfly.h
* Copyright (C) 1999-2001 William J Turner,
* 2001 Bradford Hovinen
@@ -24,14 +22,32 @@
*
* -----------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
#ifndef __LINBOX_butterfly_H
#define __LINBOX_butterfly_H
#include <vector>
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
/*! @file blackbox/butterfly.h
*/
@@ -72,7 +88,7 @@ namespace LinBox
/** No-Op Constructor
*/
Butterfly (const Field &F, size_t n) :
- _F (F), _VD (F), _n (n)
+ _field (F), _VD (F), _n (n)
{}
@@ -130,11 +146,10 @@ namespace LinBox
OutVector& applyTranspose (OutVector& y, const InVector& x) const;
template<typename _Tp1, typename _Sw1 = typename Switch::template rebind<_Tp1>::other>
- struct rebind
- {
+ struct rebind {
typedef Butterfly<_Tp1, _Sw1> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F) {
+ void operator() (other & Ap, const Self_t& A) {
// other LAp(F,A._n);
Ap.n_vec() = A.n_vec();
Ap.l_vec() = A.l_vec();
@@ -144,7 +159,7 @@ namespace LinBox
for( ; sit != A.switchesEnd(); ++sit) {
_Sw1 newsw;
- typename Switch::template rebind<_Tp1>() (newsw, *sit, F, A._F);
+ typename Switch::template rebind<_Tp1>() (newsw, *sit, Ap.field(), A._field);
Ap.switches().push_back( newsw );
}
// Ap = new other(LAp);
@@ -153,9 +168,9 @@ namespace LinBox
template<typename _Tp1, typename _Sw1>
Butterfly (const Butterfly<_Tp1,_Sw1>& B, const Field &F) :
- _F (F), _VD (F), _n (B.rowdim())
+ _field (F), _VD (F), _n (B.rowdim())
{
- typename Butterfly<_Tp1,_Sw1>::template rebind<Field>() (*this, B, F);
+ typename Butterfly<_Tp1,_Sw1>::template rebind<Field>() (*this, B);
}
@@ -176,7 +191,7 @@ namespace LinBox
{ return _n; }
const Field& field() const
- {return _F;}
+ {return _field;}
// Required for rebind
@@ -201,7 +216,7 @@ namespace LinBox
// Field over which we are working
- const Field _F;
+ const Field _field;
VectorDomain<Field> _VD;
// Number of rows and columns of square matrix.
@@ -228,7 +243,7 @@ namespace LinBox
template <class Field, class Switch>
inline Butterfly<Field, Switch>::Butterfly (const Field &F, size_t n, typename Switch::Factory &factory) :
- _F (F), _VD (F), _n (n)
+ _field (F), _VD (F), _n (n)
{
buildIndices ();
@@ -246,7 +261,7 @@ namespace LinBox
_VD.copy (y, x);
for (; idx_iter != _indices.end (); ++idx_iter, ++switch_iter)
- switch_iter->apply (_F, y[idx_iter->first], y[idx_iter->second]);
+ switch_iter->apply (_field, y[idx_iter->first], y[idx_iter->second]);
return y;
}
@@ -261,7 +276,7 @@ namespace LinBox
_VD.copy (y, x);
for (; idx_iter != _indices.rend (); ++idx_iter, ++switch_iter)
- switch_iter->applyTranspose (_F, y[idx_iter->first], y[idx_iter->second]);
+ switch_iter->applyTranspose (_field, y[idx_iter->first], y[idx_iter->second]);
return y;
}
@@ -373,9 +388,9 @@ namespace LinBox
{
size_t n = x.size ();
- commentator.start ("Setting butterfly switches", "setButterfly");
+ commentator().start ("Setting butterfly switches", "setButterfly");
- std::ostream &report = commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
report << "Called set switches with vector of size " << n
<< " and offset " << j << std::endl;
@@ -383,14 +398,14 @@ namespace LinBox
// return empty vector if zero or one elements in x because
// no switching will be done.
if (x.size () <= 1) {
- commentator.indent (report);
+ commentator().indent (report);
report << "No switches needed. Returning with empty vector." << std::endl;
- commentator.stop ("done");
+ commentator().stop ("done");
return std::vector<bool> ();
}
- commentator.indent (report);
+ commentator().indent (report);
report << "Counting the number of switches that exist." << std::endl;
// break inputs into groups of size powers of 2.
@@ -402,7 +417,7 @@ namespace LinBox
n_p != 0;
value >>= 1, l_p++, n_p <<= 1)
{
- commentator.indent (report);
+ commentator().indent (report);
report << " looping at value = " << value
<< ", l_p = " << l_p
<< ", n_p = " << n_p << std::endl;
@@ -411,7 +426,7 @@ namespace LinBox
l_vec.push_back (l_p);
n_vec.push_back (n_p);
- commentator.indent (report);
+ commentator().indent (report);
report << " inserted value = " << value
<< ", l_p = " << l_p
<< ", n_p = " << n_p << std::endl;
@@ -428,18 +443,18 @@ namespace LinBox
for (size_t jj = 0; jj <= ii; jj++)
s += n_vec[jj];
- commentator.indent (report);
+ commentator().indent (report);
report << "There are a total of " << s << " switches" << std::endl;
// Set largest power of 2 in decomposition of n = x.size ()
size_t n_p (*n_vec.rbegin ());
- commentator.indent (report);
+ commentator().indent (report);
report << "Found largest power of 2 in decomposition of " << n
<< " as n_p = " << n_p << std::endl;
if ( (n != n_p) && (j != 0) ) {
- commentator.indent (report);
+ commentator().indent (report);
report << "Non-zero offset " << j
<< " used with non-power size."
<< "Offset reset to zero." << std::endl;
@@ -452,7 +467,7 @@ namespace LinBox
if (n == n_p) {
n_p /= 2; // >> is not portable!
- commentator.indent (report);
+ commentator().indent (report);
report << "n = " << n << " is a power of two. "
<< "Resetting n_p to be half of n: n_p = " << n_p << std::endl;
}
@@ -473,7 +488,7 @@ namespace LinBox
iter++)
if (*iter) r++;
- commentator.indent (report);
+ commentator().indent (report);
report << "The vector x will be broken into two sub-vectors,"
<< "x_1 = x[0,...," << n - n_p - 1 << "] and x_2 = x["
<< n - n_p << ",...," << n - 1 << "]."
@@ -485,19 +500,19 @@ namespace LinBox
<< ") = [" << j << "," << j + r - 1<< "]." << std::endl;
if (r == 0) {
- commentator.indent (report);
+ commentator().indent (report);
report << "There are no true Elements in x, so the recursion is"
<< "being broken and a vector of false flags returned." << std::endl;
- commentator.stop ("done");
+ commentator().stop ("done");
return std::vector<bool> (s, false);
}
else if (r == n) {
- commentator.indent (report);
+ commentator().indent (report);
report << "There are no false Elements in x, so the recursion is"
<< "being broken and a vector of false flags returned." << std::endl;
- commentator.stop ("done");
+ commentator().stop ("done");
return std::vector<bool> (s, false);
}
@@ -525,7 +540,7 @@ namespace LinBox
size_t s_2 = 0;
- if (commentator.isPrinted (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)) {
+ if (commentator().isPrinted (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)) {
if (j + r < n - n_p)
s_2 = 0;
else {
@@ -543,7 +558,7 @@ namespace LinBox
size_t s_3 = ((j + r) > n) ? j + r - n : 0;
- commentator.indent (report);
+ commentator().indent (report);
report << "The number of Elements in each of the three blocks of "
<< "true Elements in the end result are"
<< "s_1 = " << s_1
@@ -555,12 +570,12 @@ namespace LinBox
std::vector<bool> y_1, y_2, y_3 = std::vector<bool> (n - n_p, false);
if ((s_1 + s_3) == r_1) {
- commentator.indent (report);
+ commentator().indent (report);
report << "Case I: s_1 + s_3 == r_1 and s_2 == r - r_1."
<< "No Elements are moved between the two sub-vectors." << std::endl;
if (j < (n - n_p)) {
- commentator.indent (report);
+ commentator().indent (report);
report << " A: j < (n - n_p). j_1 = j = " << j << ", j_2 = 0";
y_1 = setButterfly (std::vector<bool>(x.begin (), x.begin () + (n - n_p)), j);
@@ -568,7 +583,7 @@ namespace LinBox
}
else {
- commentator.indent (report);
+ commentator().indent (report);
report << " A: j >= (n - n_p). j_1 = 0, j_2 = j - (n - n_p) = "
<< j - (n - n_p) << std::endl;
@@ -579,14 +594,14 @@ namespace LinBox
}
}
else if ((s_1 + s_3) > r_1) {
- commentator.indent (report);
+ commentator().indent (report);
report << "Case II: s_1 + s_3 > r_1 and s_2 < r - r_1."
<< "Elements are moved from the right sub-vector to the left." << std::endl;
// This means that s_2 < n_p, so either s_1 = 0 or s_3 = 0 (or both).
if (j < (n - n_p)) {
- commentator.indent (report);
+ commentator().indent (report);
report << " A: j < (n - n_p). j_1 = j, j_2 = 2*n_p + j + r_1 - n = "
<< 2*n_p + j + r_1 - n << std::endl;
@@ -601,7 +616,7 @@ namespace LinBox
*iter = true;
}
else {
- commentator.indent (report);
+ commentator().indent (report);
report << " A: j >= (n - n_p). j_1 = j + r - n - r_1 = "
<< j + r - n - r_1 << ", j_2 = j - (n - n_p) = "
<< j - (n - n_p) << std::endl;
@@ -619,7 +634,7 @@ namespace LinBox
}
}
else if ((s_1 + s_3) < r_1) {
- commentator.indent (report);
+ commentator().indent (report);
report << "Case III: s_1 + s_3 < r_1 and s_2 > r - r_1."
<< "Elements are moved from the left sub-vector to the right." << std::endl;
@@ -628,7 +643,7 @@ namespace LinBox
// reason, this case is not considered when n != 2*n_p (when j = 0).
if (j < (n - n_p)) {
- commentator.indent (report);
+ commentator().indent (report);
report << " A: j < (n - n_p). j_1 = j = " << j
<< ", j_2 = j + r_1 - n + n_p = " << j + r_1 - n + n_p << std::endl;
// In this case, s_1 > 0, so s_3 = 0, and wrap-around cannot occur.
@@ -642,7 +657,7 @@ namespace LinBox
*iter = true;
}
else {
- commentator.indent (report);
+ commentator().indent (report);
report << " A: j >= (n - n_p). j_1 = j + r - n_p - r_1 = "
<< j + r - n_p - r_1 << ", j_2 = j - (n - n_p) = "
<< j - (n - n_p) << std::endl;
@@ -665,7 +680,7 @@ namespace LinBox
y.insert (y.end (), y_2.begin (), y_2.end ());
y.insert (y.end (), y_3.begin (), y_3.end ());
- commentator.indent (report);
+ commentator().indent (report);
report << "The output vector for n = " << n << " has " << y.size ()
<< " entries."
<< " " << y_1.size () << " from the first sub-vector"
@@ -675,14 +690,14 @@ namespace LinBox
<< "-------------------------- " << std::endl;
for (size_t i = 0; i < y.size (); i++) {
- commentator.indent (report);
+ commentator().indent (report);
report << " " << i << ": " << y[i] << std::endl;
}
- commentator.indent (report);
+ commentator().indent (report);
report << "-------------------------- " << std::endl;
- commentator.stop ("done");
+ commentator().stop ("done");
return y;
@@ -693,3 +708,12 @@ namespace LinBox
#endif // __LINBOX_butterfly_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/companion.h b/linbox/blackbox/companion.h
index 8f14d54..6ee04e5 100644
--- a/linbox/blackbox/companion.h
+++ b/linbox/blackbox/companion.h
@@ -1,16 +1,30 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/companion.h
* Copyright(c) LinBox
*
* Written by David Saunders <saunders at cis.udel.edu>
- * See COPYING for licence information
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_companion_H
#define __LINBOX_companion_H
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
#include "linbox/blackbox/triplesbb.h"
#include <vector>
@@ -28,15 +42,17 @@ namespace LinBox
template<class Polynomial>
Companion(const Field& F =Field(), const Polynomial& P =Polynomial(1)) :
TriplesBB<Field>(F, P.size()-1, P.size()-1)
- { size_t n = P.size() - 1;
+ {
+ size_t n = P.size() - 1;
const size_t indexbase = 1;
typename Field::Element one; F.init(one, 1);
- for (size_t i = 1; i < n; ++i) addEntry(one, i+indexbase, i-1+indexbase);
- for (size_t i = 0; i < n; ++i)
- { typename Field::Element x;
+ for (size_t i = 1; i < n; ++i)
+ this->addEntry(one, i+indexbase, i-1+indexbase);
+ for (size_t i = 0; i < n; ++i) {
+ typename Field::Element x;
F.init(x, 0);
F.neg(x, P[i]);
- addEntry(x, i+indexbase, n-1+indexbase);
+ this->addEntry(x, i+indexbase, n-1+indexbase);
}
}// Companion cstor
@@ -78,12 +94,13 @@ namespace LinBox
const size_t indexbase = 1;
typename Field::Element one; F.init(one, 1);
- for (size_t i = 1; i < n; ++i) addEntry(one, i+indexbase, i-1+indexbase);
+ for (size_t i = 1; i < n; ++i)
+ this->addEntry(one, i+indexbase, i-1+indexbase);
for (size_t i = 0; i < n; ++i)
{ typename Field::Element x;
F.init(x, 0);
F.neg(x, p[i]);
- addEntry(x, i+indexbase, n-1+indexbase);
+ this->addEntry(x, i+indexbase, n-1+indexbase);
}
}
@@ -105,3 +122,12 @@ namespace LinBox
#endif //__LINBOX_companion_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/compose.h b/linbox/blackbox/compose.h
index 844db65..9578a66 100644
--- a/linbox/blackbox/compose.h
+++ b/linbox/blackbox/compose.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/compose.h
* Copyright (C) 1999-2001 William J Turner,
* 2001 Bradford Hovinen
@@ -7,10 +5,13 @@
* Written by William J Turner <wjturner at math.ncsu.edu>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_compose_H
@@ -29,7 +30,8 @@
#include "linbox/util/debug.h"
#include "linbox/linbox-config.h"
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
+#include "linbox/matrix/blas-matrix.h"
namespace LinBox
{
@@ -108,12 +110,14 @@ namespace LinBox
/** Copy constructor.
* Copies the composed matrix (a small handle). The underlying two matrices
* are not copied.
- * @param[in] M blackbox to copy.
+ * @param[in] Mat blackbox to copy.
*/
- Compose (const Compose<Blackbox1, Blackbox2>& M) :
- _A_ptr ( M._A_ptr), _B_ptr ( M._B_ptr)
+ Compose (const Compose<Blackbox1, Blackbox2>& Mat) :
+ _A_ptr ( Mat._A_ptr), _B_ptr ( Mat._B_ptr)
//{ VectorWrapper::ensureDim (_z, _A_ptr->coldim ()); }
- { _z.resize(_A_ptr->coldim());}
+ {
+ _z.resize(_A_ptr->coldim());
+ }
/// Destructor
~Compose () {}
@@ -172,10 +176,10 @@ namespace LinBox
typename Blackbox2::template rebind<_Tp2>::other
> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F)
+ void operator() (other & Ap, const Self_t& A)
{
- typename Blackbox1::template rebind<_Tp1> () ( Ap.getLeftData(), *(A.getLeftPtr()), F);
- typename Blackbox2::template rebind<_Tp2> () ( Ap.getRightData(), *(A.getRightPtr()), F);
+ typename Blackbox1::template rebind<_Tp1> () ( Ap.getLeftData(), *(A.getLeftPtr()));
+ typename Blackbox2::template rebind<_Tp2> () ( Ap.getRightData(), *(A.getRightPtr()));
}
};
@@ -210,15 +214,21 @@ namespace LinBox
}
/// The field.
const Field& field() const
- {return _B_ptr->field();}
+ {
+ return _B_ptr->field();
+ }
/// accessor to the blackboxes
const Blackbox1* getLeftPtr() const
- {return _A_ptr;}
+ {
+ return _A_ptr;
+ }
/// accessor to the blackboxes
const Blackbox2* getRightPtr() const
- {return _B_ptr;}
+ {
+ return _B_ptr;
+ }
protected:
@@ -331,17 +341,16 @@ namespace LinBox
}
template<typename _Tp1>
- struct rebind
- {
+ struct rebind {
typedef Compose<typename Blackbox::template rebind<_Tp1>::other, typename Blackbox::template rebind<_Tp1>::other> other;
- void operator() (other *& Ap, const Self_t& A, const _Tp1& F) {
+ void operator() (other *& Ap, const Self_t& A) {
std::vector<typename other::Blackbox *> newPtrV;
typename std::vector<typename other::Blackbox *>::iterator np;
typename std::vector<const Blackbox* >::const_iterator bp;
for( bp = A._BlackboxL.begin(), np = newPtrV.begin();
bp != A._BlackboxL.end(); ++bp, ++np) {
- typename Blackbox::template rebind<_Tp1> () (*np, *(*bp), F);
+ typename Blackbox::template rebind<_Tp1> () (*np, *(*bp));
}
Ap = new other(newPtrV);
}
@@ -392,7 +401,6 @@ namespace LinBox
} // namespace LinBox
// was compose-traits.h (by Zhendong Wan)
-#include <linbox/blackbox/dense.h>
namespace LinBox
{
@@ -405,11 +413,13 @@ namespace LinBox
/// used in smith-binary, for example
template<class Field>
- class ComposeTraits<DenseMatrix<Field> > {
+ class ComposeTraits< BlasMatrix<Field> > {
public:
// define the return value type
- typedef DenseMatrix<Field> value_type; };
+ typedef BlasMatrix<Field> value_type;
+ };
+
}
@@ -467,7 +477,7 @@ namespace LinBox
{
linbox_check (A_data != (Blackbox1 *) 0);
linbox_check (B_data != (Blackbox2 *) 0);
- linbox_check (A_data.coldim () == B_data.rowdim ());
+ linbox_check (A_data->coldim () == B_data->rowdim ());
// VectorWrapper::ensureDim (_z, _A_data.coldim ());
_z.resize(_A_data.coldim());
@@ -478,9 +488,11 @@ namespace LinBox
* are not copied.
* \param M matrix to be copied.
*/
- ComposeOwner (const ComposeOwner<Blackbox1, Blackbox2>& M) :
- _A_data ( M.getLeftData()), _B_data ( M.getRightData())
- { _z.resize(_A_data.coldim());}
+ ComposeOwner (const ComposeOwner<Blackbox1, Blackbox2>& Mat) :
+ _A_data ( Mat.getLeftData()), _B_data ( Mat.getRightData())
+ {
+ _z.resize(_A_data.coldim());
+ }
/// Destructor
@@ -531,30 +543,30 @@ namespace LinBox
typename Blackbox2::template rebind<_Tp2>::other
> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F) {
- typename Blackbox1::template rebind<_Tp1> () ( Ap.getLeftData(), A.getLeftData(), F);
- typename Blackbox2::template rebind<_Tp2> () ( Ap.getRightData(), A.getRightData(), F);
+ void operator() (other & Ap, const Self_t& A) {
+ typename Blackbox1::template rebind<_Tp1> () ( Ap.getLeftData(), A.getLeftData());
+ typename Blackbox2::template rebind<_Tp2> () ( Ap.getRightData(), A.getRightData());
}
};
template<typename _BBt1, typename _BBt2, typename Field>
- ComposeOwner (const Compose<_BBt1, _BBt2> &M, const Field& F) :
- _A_data(*(M.getLeftPtr()), F),
- _B_data(*(M.getRightPtr()), F),
+ ComposeOwner (const Compose<_BBt1, _BBt2> &Mat, const Field& F) :
+ _A_data(*(Mat.getLeftPtr()), F),
+ _B_data(*(Mat.getRightPtr()), F),
_z(_A_data.coldim())
{
- typename Compose<_BBt1, _BBt2>::template rebind<Field>()(*this,M,F);
+ typename Compose<_BBt1, _BBt2>::template rebind<Field>()(*this,Mat);
}
template<typename _BBt1, typename _BBt2, typename Field>
- ComposeOwner (const ComposeOwner<_BBt1, _BBt2> &M, const Field& F) :
- _A_data(M.getLeftData(), F),
- _B_data(M.getRightData(), F) ,
+ ComposeOwner (const ComposeOwner<_BBt1, _BBt2> &Mat, const Field& F) :
+ _A_data(Mat.getLeftData(), F),
+ _B_data(Mat.getRightData(), F) ,
_z(_A_data.coldim())
{
- typename ComposeOwner<_BBt1, _BBt2>::template rebind<Field>()(*this,M,F);
+ typename ComposeOwner<_BBt1, _BBt2>::template rebind<Field>()(*this,Mat);
}
@@ -607,3 +619,12 @@ namespace LinBox
#endif // __LINBOX_compose_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/dense.h b/linbox/blackbox/dense.h
deleted file mode 100644
index cb7ddaa..0000000
--- a/linbox/blackbox/dense.h
+++ /dev/null
@@ -1,382 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/blackbox/dense.h
- * Copyright (C) 2001 B. David Saunders,
- * 2001-2002 Bradford Hovinen,
- * 2002 Zhendong Wan
- *
- * Written by B. David Saunders <saunders at cis.udel.edu>,
- * Bradford Hovinen <hovinen at cis.udel.edu>,
- * Zhendong Wan <wan at mail.eecis.udel.edu>
- *
- * evolved from dense-matrix.h by -bds, Zhendong Wan
- *
- * --------------------------------------------------------
- * 2002-10-27 Bradford Hovinen <hovinen at cis.udel.edu>
- *
- * Split out container/iterator functionality into DenseMatrixBase
- * --------------------------------------------------------
- * 2002-08-09 Bradford Hovinen <hovinen at cis.udel.edu>
- *
- * Renamed file from dense-matrix1.h to dense.h
- * --------------------------------------------------------
- *
- * See COPYING for license information
- */
-
-/** @file blackbox/dense.h
- * @ingroup blackbox
- * @brief NO DOC
-*/
-
-#ifndef __LINBOX_blackbox_dense_H
-#define __LINBOX_blackbox_dense_H
-
-#include <iostream>
-#include <vector>
-#include <fstream>
-
-#include "linbox/vector/subiterator.h"
-#include "linbox/vector/subvector.h"
-#include "linbox/vector/stream.h"
-#include "linbox/vector/vector-domain.h"
-#include "linbox/matrix/dense.h"
-#include <linbox/matrix/matrix-domain.h>
-#include <linbox/blackbox/blackbox-interface.h>
-#include <linbox/blackbox/factory.h>
-#include <linbox/field/hom.h>
-#include "linbox/util/matrix-stream.h"
-
-#ifdef __LINBOX_PARALLEL
-#include <linbox/blackbox/blackbox_parallel.h>
-#endif
-
-
-namespace LinBox
-{
-
- /** \brief Blackbox interface to dense matrix representation.
-
- * This is a class of dense matrices
- * templatized by the \link LinBox::FieldArchetype field \endlink
- in which the elements
- * reside. The matrix is stored as a one dimensional STL vector of
- * the elements, in row major order. The interface provides for iteration
- * over rows and over columns.
- *
- * The class conforms to the \link Archetypes archetype \endlink for
- \link LinBox::BlackboxArchetype blackboxes \endlink and for the
- \link LinBox::DenseMatrixBase dense matrix container \endlink.
- *
- * Currently, only dense vectors are supported when doing matrix-vector
- * applies.
- *
- * @param _Field a LinBox field class
- \ingroup blackbox
- */
- template <class _Field>
- class DenseMatrix : public BlackboxInterface, public DenseMatrixBase<typename _Field::Element> {
- public:
-
-#ifdef __LINBOX_PARALLEL
- BB_list_list sub_list;
-#endif
-
- typedef _Field Field;
- typedef typename Field::Element Element;
- typedef DenseMatrix<_Field> Self_t;
- typedef typename DenseMatrixBase<typename _Field::Element>::RawIterator RawIterator;
- typedef typename DenseMatrixBase<typename _Field::Element>::ConstRawIterator ConstRawIterator;
- typedef typename DenseMatrixBase<typename _Field::Element>::RawIndexedIterator RawIndexedIterator;
- typedef typename DenseMatrixBase<typename _Field::Element>::ConstRawIndexedIterator ConstRawIndexedIterator;
-
- DenseMatrix (const Field& F) :
- _F(F) , _MD(F), _AT (*this)
- {}
-
- /** Constructor of a m by n matrix with initial entries which are the
- * default constructor value of the field's element type.
- * @param F the field of entries; passed so that arithmetic may be done on elements.
- * @param m row dimension
- * @param n column dimension
- */
- DenseMatrix (const Field &F, size_t m, size_t n) :
- DenseMatrixBase<Element> (m, n), _F (F), _MD (F), _AT (*this)
- {}
-
- /** Constructor of a m by n matrix with entries created by a random iterator.
- * @param F the field of entries; passed so that arithmetic may be done on elements.
- * @param m row dimension
- * @param n column dimension
- * @param iter random iterator
- */
- template<class RandIter>
- DenseMatrix (const Field &F, size_t m, size_t n, const RandIter &iter) :
- DenseMatrixBase<Element> (m, n), _F (F), _MD (F), _AT (*this)
- {
- for (typename std::vector<typename Field::Element>::iterator p = DenseMatrixBase<Element>::_rep.begin (); p != DenseMatrixBase<Element>::_rep.end (); ++p)
- iter.random (*p);
- }
-
- /** Constructor using a finite vector stream (stream of the rows).
- * @param F The field of entries; passed so that arithmetic may be done
- * on elements.
- * @param stream A vector stream to use as a source of vectors for this
- * matrix
- */
- template <class StreamVector>
- DenseMatrix (const Field &F, VectorStream<StreamVector> &stream) :
- DenseMatrixBase<Element> (stream.size (), stream.dim ()), _F (F), _MD (F), _AT (*this)
- {
- StreamVector tmp;
- typename DenseMatrixBase<Element>::RowIterator p;
-
- VectorWrapper::ensureDim (tmp, stream.dim ());
-
- VectorDomain<Field> _VD(F);
-
- for (p = DenseMatrixBase<Element>::rowBegin (); p != DenseMatrixBase<Element>::rowEnd (); ++p) {
- stream >> tmp;
- _VD.copy (*p, tmp);
- }
- }
-
- /** Constructor from a MatrixStream
- * @param ms A matrix stream properly initialized
- */
- DenseMatrix( MatrixStream<Field>& ms ) :
- DenseMatrixBase<Element>(ms), _F( ms.getField() ), _MD( ms.getField() ), _AT(*this)
- { }
-
- /** Constructor from a DenseMatrixBase. Copies all matrix data.
- * @param F Field over which this matrix' arithmetic will be.
- * @param M This will contain a complete copy of \ref DenseMatrixBase M.
- */
- DenseMatrix (const Field &F, DenseMatrixBase<Element> &M) :
- DenseMatrixBase<Element> (M), _F (F), _MD (F), _AT (*this)
- {}
-
- /// Copies <i>all</i> matrix data.
- DenseMatrix (const DenseMatrix &M) :
- DenseMatrixBase<Element> (M), _F (M._F), _MD (M._F), _AT (*this)
- {}
-
-
- /** Assignment operator makes a complete copy.
- */
- DenseMatrix<Field>& operator= (const DenseMatrix<Field>& M)
- {
- (*this)._rep = M._rep;
- (*this)._rows = M._rows;
- (*this)._cols = M._cols;
- (*this)._MD = const_cast<MatrixDomain<Field>&>(M._MD);
- (*this)._F = const_cast<Field&>(M._F);
- return (*this);
- }
-
-
- template<typename _Tp1>
- struct rebind {
- typedef DenseMatrix<_Tp1> other;
-
- void operator() (other & Ap, const Self_t& A, const _Tp1& F)
- {
- // Ap = new other(F, A.rowdim(), A.coldim());
- typename Self_t::ConstRawIterator A_p;
- typename other::RawIterator Ap_p;
- Hom<Field, _Tp1> hom(A. field(), F);
- for (A_p = A. rawBegin(), Ap_p = Ap.rawBegin();
- A_p != A. rawEnd(); ++ A_p, ++ Ap_p)
- hom.image (*Ap_p, *A_p);
- }
- };
-
- template<typename _Tp1>
- DenseMatrix (const DenseMatrix<_Tp1> &M, const Field& F) :
- DenseMatrixBase<Element> (M.rowdim(),M.coldim()), _F (F), _MD (F), _AT (*this)
- {
- typename DenseMatrix<_Tp1>::template rebind<Field>()(*this, M, F);
- }
-
-
-
- /*- Get the number of rows in the matrix
- * @return Number of rows in matrix
- */
- size_t rowdim () const
- { return DenseMatrixBase<Element>::rowdim (); }
-
- /*- Get the number of columns in the matrix
- * @return Number of columns in matrix
- */
- size_t coldim () const
- { return DenseMatrixBase<Element>::coldim (); }
-
- /** Retrieve the field over which this matrix is defined
- * @return Reference to the underlying field
- */
- const Field &field () const
- { return _F;}
-
- Field &field ()
- { return _F;}
-
- /*- @name Input and output
- */
-
- //@{
-
- /** Read the matrix from an input stream.
- * @param is Input stream from which to read
- */
- std::istream& read (std::istream &is)
- { return DenseMatrixBase<Element>::read (is, _F); }
-
- /** Write the matrix to an output stream
- * @param os Output stream to which to write
- */
- std::ostream &write (std::ostream &os = std::cout) const
- {
- return DenseMatrixBase<Element>::write (os, _F);
- }
-
- //@}
-
-
- /*- @name Black box interface
- */
-
- //@{
-
- /** Generic matrix-vector apply.
- * \f$y = A \cdot x\f$
- * This version of apply allows use of arbitrary input and output vector
- * types.
- * @param[out] y Output vector
- * @param[in] x Input vector
- * @return Reference to output vector
- */
- template<class Vect1, class Vect2>
- Vect1 &apply (Vect1 &y, const Vect2 &x) const;
-
- /** Generic in-place apply.
- * \f$y = A \cdot y\f$.
- * This version of in-place apply allows use of an arbitrary vector
- * type. Because it performs allocation and copying, it is not
- * recommended for general use.
- * @param y Input vector
- * @return Reference to output vector
- */
- template<class Vect1>
- Vect1 &applyIn (Vect1 &y) const
- {
- std::vector<Element> x (y.begin (),y.end ());
- apply (y,x);
- return y;
- }
-
- /** Generic matrix-vector transpose apply.
- * \f$y = A^T \cdot x\f$.
- * This version of applyTranspose allows use of arbitrary input and
- * output vector types
- * @param y Output vector
- * @param x Input vector
- * @return Reference to output vector
- */
- template<class Vect1, class Vect2>
- Vect1 &applyTranspose (Vect1 &y, const Vect2 &x) const;
-
- /** Generic in-place transpose apply.
- * \f$y = A^T \cdot y\f$.
- * This version of in-place transpose apply allows use of an arbitrary
- * vector type. Because it performs allocation and copying, it is not
- * recommended for general use.
- * @param y Input vector
- * @return Reference to output vector
- */
- template<class Vect>
- Vect &applyTransposeIn (Vect &y) const
- {
- std::vector<Element> x (y.begin (), y.end ());
- applyTranspose (y, x);
- return y;
- }
-
-
- /// destructor
- ~DenseMatrix ( ) {
-
-#ifdef __LINBOX_PARALLEL
-
- BB_list_list::iterator p;
-
- BB_list::iterator e_p;
-
- for (p = sub_list. begin(); p != sub_list. end(); ++ p)
-
- for (e_p = p -> second. begin();
- e_p != p -> second. end(); ++ e_p) {
-
- Thread::terminate_thread (*e_p);
-
- delete (*e_p);
- }
-
-#endif
- }
-
- //@}
-
- protected:
-
- //const Field _F;
- Field _F;
- MatrixDomain<Field> _MD;
- TransposeMatrix<DenseMatrix<Field> > _AT;
- };
-
- template <class Field>
- struct MatrixTraits< DenseMatrix<Field> >
- {
- typedef DenseMatrix<Field> MatrixType;
- typedef typename MatrixCategories::RowMatrixTag MatrixCategory;
- };
-
- template <class Field>
- struct MatrixTraits< const DenseMatrix<Field> > {
- typedef const DenseMatrix<Field> MatrixType;
- typedef typename MatrixCategories::RowMatrixTag MatrixCategory;
- };
-
- /** Dense matrix factory.
- * This class inherits \ref BlackboxFactory and provides a method for using a
- * \ref DenseMatrixBase object with integer or rational data type as input to
- * the high-level intger and rational solutions functions.
- */
-
- template< class Field, class BElement >
- class DenseMatrixFactory : public BlackboxFactory<Field,DenseMatrix<Field> > {
- private:
- const DenseMatrixBase<BElement>& _A;
-
- public:
- DenseMatrixFactory( const DenseMatrixBase<BElement> &A ) :
- _A(A)
- {}
-
- DenseMatrix<Field>* makeBlackbox( const Field& F );
-
- integer& maxNorm( integer& res );
-
- integer& hadamardBound( integer& res ) const;
-
- size_t rowdim() { return _A.rowdim(); }
- size_t coldim() { return _A.coldim(); }
- };
-
-}
-
-#include "dense.inl"
-
-#endif // __LINBOX_blackbox_dense_H
-
diff --git a/linbox/blackbox/dense.inl b/linbox/blackbox/dense.inl
deleted file mode 100644
index 62edcb6..0000000
--- a/linbox/blackbox/dense.inl
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/blackbox/dense.inl
- * Copyright (C) 2001 B. David Saunders,
- * 2001-2002 Bradford Hovinen,
- * 2002 Zhendong Wan
- *
- * Written by B. David Saunders <saunders at cis.udel.edu>,
- * Bradford Hovinen <hovinen at cis.udel.edu>,
- * Zhendong Wan <wan at mail.eecis.udel.edu>
- *
- * evolved from dense-matrix.h by -bds, Zhendong Wan
- *
- * --------------------------------------------------------
- * 2002-10-27 Bradford Hovinen <hovinen at cis.udel.edu>
- *
- * Split out container/iterator functionality into DenseMatrixBase
- * --------------------------------------------------------
- * 2002-08-09 Bradford Hovinen <hovinen at cis.udel.edu>
- *
- * Renamed file from dense-matrix1.C to dense.inl
- * --------------------------------------------------------
- *
- * See COPYING for license information
- */
-
-#ifndef __LINBOX_blackbox_dense_INL
-#define __LINBOX_blackbox_dense_INL
-
-#include <iostream>
-#include <vector>
-#include <fstream>
-
-#include "linbox/blackbox/dense.h"
-#include "linbox/util/debug.h"
-
-namespace LinBox
-{
-
- template <class Field>
- template<class Vect1, class Vect2>
- Vect1& DenseMatrix<Field>::apply (Vect1& y, const Vect2& x) const
- {
-
-#ifdef __LINBOX_PARALLEL
-
- return BlackboxParallel (y, *this, x, BBBase::Apply);
-#else
-
- _MD. vectorMul (y, *this, x);
-
-#endif
- return y;
- }
-
-
- template <class Field>
- template<class Vect1, class Vect2>
- Vect1& DenseMatrix<Field>::applyTranspose (Vect1& y, const Vect2& x) const
- {
-
-#ifdef __LINBOX_PARALLEL
-
- return BlackboxParallel (y, *this, x, BBBase::ApplyTranspose);
-#else
-
- return _MD.vectorMul (y, _AT, x);
-#endif
-
- }
-
- template< class Field, class BElement >
- DenseMatrix<Field>*
- DenseMatrixFactory<Field,BElement>::makeBlackbox( const Field& F )
- {
- DenseMatrixBase<typename Field::Element> newBase ( rowdim(), coldim() );
-
- typename DenseMatrixBase<BElement>::ConstRawIterator i;
- typename DenseMatrixBase<typename Field::Element>::RawIterator j;
-
- for( i = _A.rawBegin(), j = newBase.rawBegin();
- i != _A.rawEnd(), j != newBase.rawEnd();
- ++i, ++j )
- F.init( *j, *i );
-
- return new DenseMatrix<Field>( F, newBase );
- }
-
- template< class Field, class BElement >
- integer& DenseMatrixFactory<Field,BElement>::maxNorm( integer& res )
- {
- typename DenseMatrixBase<BElement>::ConstRawIterator i;
- res = 0L;
- integer tmp;
-
- for( i = _A.rawBegin(); i != _A.rawEnd(); ++i ) {
- tmp = abs( *i );
- if( res < tmp ) res = tmp;
- }
-
- return res;
- }
-
- template< class Field, class BElement >
- integer& DenseMatrixFactory<Field,BElement>::hadamardBound(integer& res) const
- {
- typename DenseMatrixBase<BElement>::ConstRowIterator r;
- typename DenseMatrixBase<BElement>::ConstRow::const_iterator c;
-
- res = 1L;
- integer temp;
-
- for( r = _A.rowBegin(); r != _A.rowEnd(); ++r ) {
- temp = 0;
- for( c = r->begin(); c != r->end(); ++c )
- temp += static_cast<integer>((*c)) * (*c);
- res *= temp;
- }
-
- res = sqrt(res);
- return res;
- }
-
-} // namespace LinBox
-
-#endif // __LINBOX_blackbox_dense_INL
-
diff --git a/linbox/blackbox/diagonal-gf2.h b/linbox/blackbox/diagonal-gf2.h
new file mode 100644
index 0000000..d613e98
--- /dev/null
+++ b/linbox/blackbox/diagonal-gf2.h
@@ -0,0 +1,149 @@
+/* linbox/blackbox/diagonal-gf2.h
+ * Copyright (C) 1999-2001 William J Turner,
+ * 2001 Bradford Hovinen
+ *
+ * Written by William J Turner <wjturner at math.ncsu.edu>,
+ * Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * ------------------------------------
+ * Modified by Dmitriy Morozov <linbox at foxcub.org>. May 28, 2002.
+ *
+ * Added parametrization of VectorCategory tags by VectorTraits. See
+ * vector-traits.h for more details.
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/*! @file blackbox/diagonal-gf2.h
+ * @ingroup blackbox
+ * @brief Random diagonal matrices and diagonal matrices
+ * Class especially meant for diagonal precondtionners
+ */
+
+#ifndef __LINBOX_diagonal_gf2_H
+#define __LINBOX_diagonal_gf2_H
+
+#include "linbox/field/gf2.h"
+#include "linbox/blackbox/diagonal.h"
+
+namespace LinBox
+{
+ template <>
+ class Diagonal<GF2, VectorTraits<Vector<GF2>::Dense>::VectorCategory> : public BlackboxArchetype {
+ public:
+
+ typedef GF2 Field;
+ typedef Vector<GF2>::Dense Vector;
+ typedef BlackboxArchetype Blackbox;
+ typedef bool Element;
+
+ Diagonal (const Field &, const BitVector &y) :
+ _v (y)
+ {}
+
+ /// The field.
+ const Field& field() const
+ {
+ return *(new GF2());
+ }
+
+ Blackbox *clone() const
+ {
+ return new Diagonal (*this);
+ }
+
+
+ template <class OutVector, class InVector>
+ OutVector& apply (OutVector& y, const InVector& x) const
+ {
+ linbox_check (y.size () == x.size ());
+ linbox_check (y.size () == _v.size ());
+ typename InVector::const_iterator j1 = x.begin();
+ typename OutVector::iterator i = y.begin();
+ BitVector::const_iterator j2 = _v.begin();
+ for (; i != y.end (); ++i, ++j1, ++j2)
+ *i = *j1 & *j2;
+ return y;
+ }
+
+ Vector& apply (Vector& y, const Vector& x) const
+ {
+ linbox_check (y.size () == x.size ());
+ linbox_check (y.size () == _v.size ());
+
+ BitVector::word_iterator i = y.wordBegin ();
+ BitVector::const_word_iterator j1 = x.wordBegin (), j2 = _v.wordBegin ();
+
+ for (; i != y.wordEnd (); ++i, ++j1, ++j2)
+ *i = *j1 & *j2;
+
+ return y;
+ }
+
+ template <class OutVector, class InVector>
+ OutVector& applyTranspose (OutVector& y, const InVector& x) const
+ {
+ return apply (y, x);
+ }
+
+ size_t rowdim () const
+ {
+ return _v.size ();
+ }
+
+ size_t coldim () const
+ {
+ return _v.size ();
+ }
+
+ /** Get an entry and store it in the given value
+ * @param x Element in which to store result
+ * @param i Row index
+ * @param j Column index
+ * @return Reference to x
+ */
+ Element &getEntry (Element &x, size_t i, size_t j) const
+ {
+ return (i==j?x=this->_v[i]:x=false);
+ }
+
+ private:
+
+ // Bit vector of elements
+ BitVector _v;
+
+ }; // template <Field, Vector> class Diagonal<DenseVectorTag>
+
+}
+
+#endif // __LINBOX_diagonal_gf2_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/diagonal.h b/linbox/blackbox/diagonal.h
index b9c3860..24e6321 100644
--- a/linbox/blackbox/diagonal.h
+++ b/linbox/blackbox/diagonal.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/diagonal.h
* Copyright (C) 1999-2001 William J Turner,
* 2001 Bradford Hovinen
@@ -15,7 +13,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file blackbox/diagonal.h
@@ -102,7 +118,7 @@ namespace LinBox
void randomNonsingular();
/// \brief the field of the entries
- const Field& field() const{ return _F; }
+ const Field& field() const{ return _field; }
/** Get an entry and store it in the given value.
* This form is more in the LinBox style and is provided for interface
@@ -113,7 +129,7 @@ namespace LinBox
* @return Reference to x
*/
Element &getEntry (Element &x, size_t i, size_t j) const {
- return (i==j?_F.assign(x,_v[i]):_F.init(x,0));
+ return (i==j?_field.assign(x,_v[i]):_field.init(x,0));
}
@@ -121,10 +137,10 @@ namespace LinBox
struct rebind {
typedef Diagonal<_Tp1, VectorCategories::DenseVectorTag> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F)
+ void operator() (other & Ap, const Self_t& A)
{
- Hom<typename Self_t::Field, _Tp1> hom(A.field(), F);
+ Hom<typename Self_t::Field, _Tp1> hom(A.field(), Ap.field());
typename std::vector<typename _Tp1::Element>::iterator nit = Ap.getData().begin();
typename std::vector<Element>::const_iterator oit = A.getData().begin();
@@ -136,9 +152,9 @@ namespace LinBox
template<typename _Tp1, typename _Vc1>
Diagonal(const Diagonal<_Tp1,_Vc1>& D, const Field& F) :
- _F(F), _n(D.rowdim()), _v(D.rowdim())
+ _field(F), _n(D.rowdim()), _v(D.rowdim())
{
- typename Diagonal<_Tp1,_Vc1>::template rebind<Field>() (*this, D, F);
+ typename Diagonal<_Tp1,_Vc1>::template rebind<Field>() (*this, D);
}
@@ -147,7 +163,7 @@ namespace LinBox
std::ostream& write(std::ostream& out) {
out << "diag(";
for (typename std::vector<Element>::iterator p = _v.begin(); p != _v.end(); ++p)
- _F.write(out, *p) << ", ";
+ _field.write(out, *p) << ", ";
return out << "\b\b)";
}
@@ -157,7 +173,7 @@ namespace LinBox
private:
// Field for arithmetic
- Field _F;
+ Field _field;
// Number of rows and columns of square matrix.
size_t _n;
@@ -191,7 +207,7 @@ namespace LinBox
size_t rowdim(void) const { return _n; }
size_t coldim(void) const { return _n; }
- const Field& field() const {return _F;}
+ const Field& field() const {return _field;}
/** Get an entry and store it in the given value.
* This form is more in the LinBox style and is provided for interface
* compatibility with other parts of the library
@@ -202,7 +218,7 @@ namespace LinBox
*/
Element &getEntry (Element &x, size_t i, size_t j) const
{
- return (i==j?_F.assign(x,_v[i]):_F.init(x));
+ return (i==j?_field.assign(x,_v[i]):_field.init(x));
}
@@ -225,7 +241,7 @@ namespace LinBox
template<typename _Tp1, typename _Vc1>
Diagonal(const Diagonal<_Tp1,_Vc1>& D, const Field& F) :
- _F(F), _n(D.rowdim()), _v(D.rowdim())
+ _field(F), _n(D.rowdim()), _v(D.rowdim())
{
typename Diagonal<_Tp1,_Vc1>::template rebind<Field>() (*this, D, F);
}
@@ -239,7 +255,7 @@ namespace LinBox
private:
// Field for arithmetic
- Field _F;
+ Field _field;
// Number of rows and columns of square matrix.
size_t _n;
@@ -275,7 +291,7 @@ namespace LinBox
size_t rowdim(void) const { return _n; }
size_t coldim(void) const { return _n; }
- const Field field() const { return _F; }
+ const Field field() const { return _field; }
/** Get an entry and store it in the given value.
* This form is more in the LinBox style and is provided for interface
@@ -287,7 +303,7 @@ namespace LinBox
*/
Element &getEntry (Element &x, size_t i, size_t j) const
{
- return (i==j?_F.assign(x,_v[i]):_F.init(x));
+ return (i==j?_field.assign(x,_v[i]):_field.init(x));
}
@@ -309,7 +325,7 @@ namespace LinBox
template<typename _Tp1, typename _Vc1>
Diagonal(const Diagonal<_Tp1,_Vc1>& D, const Field& F) :
- _F(F), _n(D.rowdim()), _v(D.rowdim())
+ _field(F), _n(D.rowdim()), _v(D.rowdim())
{
typename Diagonal<_Tp1,_Vc1>::template rebind<Field>() (*this, D, F);
}
@@ -322,7 +338,7 @@ namespace LinBox
private:
// Field for arithmetic
- Field _F;
+ Field _field;
// Number of rows and columns of square matrix.
size_t _n;
@@ -337,7 +353,7 @@ namespace LinBox
template <class Field>
inline Diagonal<Field, VectorCategories::DenseVectorTag >::Diagonal(const Field F,
const std::vector<typename Field::Element>& v) :
- _F(F), _n(v.size()), _v(v)
+ _field(F), _n(v.size()), _v(v)
{}
@@ -351,7 +367,7 @@ namespace LinBox
inline Diagonal<_Field, VectorCategories::DenseVectorTag>::Diagonal(const Field F,
const size_t n,
bool nonsing) :
- _F(F), _n(n), _v(n)
+ _field(F), _n(n), _v(n)
{
typename Field::RandIter r(F);
typedef typename std::vector<typename Field::Element>::iterator iter;
@@ -366,7 +382,7 @@ namespace LinBox
inline Diagonal<Field, VectorCategories::DenseVectorTag >::Diagonal(const Field F,
const size_t n,
typename Field::RandIter& iter) :
- _F(F), _n(n), _v(n)
+ _field(F), _n(n), _v(n)
{
#if 0
for (typename std::vector<typename Field::Element>::iterator
@@ -380,7 +396,7 @@ namespace LinBox
template <class _Field>
inline void Diagonal<_Field, VectorCategories::DenseVectorTag>::random()
{
- typename Field::RandIter r(_F);
+ typename Field::RandIter r(_field);
typedef typename std::vector<typename Field::Element>::iterator iter;
for (iter i = _v.begin(); i < _v.end(); ++i)
r.random(*i);
@@ -390,10 +406,10 @@ namespace LinBox
template <class _Field>
inline void Diagonal<_Field, VectorCategories::DenseVectorTag>::randomNonsingular()
{
- typename Field::RandIter r(_F);
+ typename Field::RandIter r(_field);
typedef typename std::vector<typename Field::Element>::iterator iter;
for (iter i = _v.begin(); i < _v.end(); ++i)
- while (_F.isZero(r.random(*i))) ;
+ while (_field.isZero(r.random(*i))) ;
}
/*! generic apply.
@@ -421,7 +437,7 @@ namespace LinBox
for (y_iter = y.begin ();
y_iter != y.end ();
y_iter++, v_iter++, x_iter++)
- _F.mul (*y_iter, *v_iter, *x_iter);
+ _field.mul (*y_iter, *v_iter, *x_iter);
return y;
} // Vector& Diagonal<DenseVectorTag>::apply(Vector& y, const Vector&) const
@@ -435,7 +451,7 @@ namespace LinBox
template <class Field>
inline Diagonal<Field, VectorCategories::SparseSequenceVectorTag >::Diagonal(const Field F,
const std::vector<typename Field::Element>& v) :
- _F(F), _n(v.size()), _v(v)
+ _field(F), _n(v.size()), _v(v)
{}
/** apply for sparse sequence vectors.
@@ -453,8 +469,8 @@ namespace LinBox
// create field elements and size_t to be used in calculations
size_t i;
Element zero, entry;
- _F.init (zero, 0);
- _F.init (entry, 0);
+ _field.init (zero, 0);
+ _field.init (entry, 0);
// Create iterators for input and stored vectors
typename std::vector<Element>::const_iterator v_iter;
@@ -468,8 +484,8 @@ namespace LinBox
// of stored vector and insert non-zero elements into output vector
for (x_iter = x.begin (); x_iter != x.end (); x_iter++) {
i = (*x_iter).first;
- _F.mul (entry, *(v_iter + i), (*x_iter).second);
- if (!_F.isZero (entry)) y.push_back ( std::pair<size_t, Element>(i, entry));
+ _field.mul (entry, *(v_iter + i), (*x_iter).second);
+ if (!_field.isZero (entry)) y.push_back ( std::pair<size_t, Element>(i, entry));
}
return y;
@@ -483,7 +499,7 @@ namespace LinBox
*/
template <class Field>
inline Diagonal<Field, VectorCategories::SparseAssociativeVectorTag >::Diagonal(const Field F, const std::vector<typename Field::Element>& v) :
- _F(F), _n(v.size()), _v(v)
+ _field(F), _n(v.size()), _v(v)
{}
/** apply for sparse associative vectors.
@@ -501,8 +517,8 @@ namespace LinBox
// create field elements and size_t to be used in calculations
size_t i;
Element zero, entry;
- _F.init (zero, 0);
- _F.init (entry, 0);
+ _field.init (zero, 0);
+ _field.init (entry, 0);
// Create iterators for input and stored vectors
typename std::vector<Element>::const_iterator v_iter;
@@ -517,8 +533,8 @@ namespace LinBox
for (x_iter = x.begin (); x_iter != x.end (); x_iter++)
{
i = x_iter->first;
- _F.mul (entry, *(v_iter + i), (*x_iter).second);
- if (!_F.isZero (entry)) y.insert (y.end (), std::pair<size_t, Element>(i, entry));
+ _field.mul (entry, *(v_iter + i), (*x_iter).second);
+ if (!_field.isZero (entry)) y.insert (y.end (), std::pair<size_t, Element>(i, entry));
}
return y;
@@ -528,3 +544,12 @@ namespace LinBox
#endif // __LINBOX_diagonal_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/dif.h b/linbox/blackbox/dif.h
index 7781443..da939f0 100644
--- a/linbox/blackbox/dif.h
+++ b/linbox/blackbox/dif.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/dif.h
* Copyright (c) 2010 LinBox
* transmuted from linbox/blackbox/sum.h by bds
@@ -11,7 +9,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_dif_H
@@ -19,7 +35,7 @@
#include "linbox/vector/vector-domain.h"
#include "linbox/util/debug.h"
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
// Namespace in which all LinBox library code resides
namespace LinBox
@@ -144,14 +160,16 @@ namespace LinBox
template<typename _Tp1, typename _Tp2 = _Tp1>
struct rebind {
+ // DiffOwner ???
typedef Dif<
typename Blackbox1::template rebind<_Tp1>::other,
typename Blackbox2::template rebind<_Tp2>::other
> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F) {
- typename Blackbox1::template rebind<_Tp1> () ( *(Ap._A_ptr), *(A._A_ptr), F);
- typename Blackbox2::template rebind<_Tp2> () ( *(Ap._B_ptr), *(A._B_ptr), F);
+ void operator() (other & Ap, const Self_t& A)
+ {
+ typename Blackbox1::template rebind<_Tp1> () ( *(Ap._A_ptr), *(A._A_ptr));
+ typename Blackbox2::template rebind<_Tp2> () ( *(Ap._B_ptr), *(A._B_ptr));
}
};
@@ -189,3 +207,12 @@ namespace LinBox
#endif // __LINBOX_dif_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/direct-sum.h b/linbox/blackbox/direct-sum.h
index d009e2a..4796706 100644
--- a/linbox/blackbox/direct-sum.h
+++ b/linbox/blackbox/direct-sum.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
* Written by
* David Saunders
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,20 +18,20 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_direct_sum_H
#define __LINBOX_direct_sum_H
-#include <linbox/blackbox/null-matrix.h>
-#include <linbox/vector/vector-traits.h>
-#include <linbox/blackbox/blackbox-interface.h>
-#include <linbox/vector/subvector.h>
-#include <linbox/matrix/matrix-domain.h>
-#include <linbox/vector/light_container.h>
+#include "linbox/blackbox/null-matrix.h"
+#include "linbox/vector/vector-traits.h"
+#include "linbox/blackbox/blackbox-interface.h"
+#include "linbox/vector/subvector.h"
+#include "linbox/matrix/matrix-domain.h"
+#include "linbox/vector/light_container.h"
namespace LinBox
{
@@ -188,10 +189,10 @@ namespace LinBox
typename Blackbox2::template rebind<_Tp2>::other
> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F)
+ void operator() (other & Ap, const Self_t& A)
{
- typename Blackbox1::template rebind<_Tp1> () ( Ap.getLeftData(), *(A.getLeftPtr()), F);
- typename Blackbox2::template rebind<_Tp2> () ( Ap.getRightData(), *(A.getRightPtr()), F);
+ typename Blackbox1::template rebind<_Tp1> () ( Ap.getLeftData(), *(A.getLeftPtr()));
+ typename Blackbox2::template rebind<_Tp2> () ( Ap.getRightData(), *(A.getRightPtr()));
}
};
@@ -282,12 +283,12 @@ namespace LinBox
> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F) {
+ void operator() (other & Ap, const Self_t& A) {
typename other::ListBB_t::iterator itp = Ap.getDataSum().begin();
typename Self_t::ListBB_t::const_iterator it = A.getSum().begin();
for( ; it != A.getSum().end(); ++itp,++it)
- typename Blackbox::template rebind<_Tp1>()( *itp, *(*it), F);
+ typename Blackbox::template rebind<_Tp1>()( *itp, *(*it) );
}
};
@@ -305,8 +306,8 @@ namespace LinBox
const Subvector<typename InVector::const_iterator> x1(x.begin() + offset_x, x.begin() + (offset_x + (*bp)->coldim()));
Subvector<typename OutVector::iterator> y1(y.begin() + offset_y, y.begin() + (offset_y + (*bp)->rowdim()));
(*bp)->apply(y1,x1);
- offset_x += (*bp)->coldim();
- offset_y += (*bp)->rowdim();
+ offset_x += (int) (*bp)->coldim();
+ offset_y += (int) (*bp)->rowdim();
}
return y;
@@ -325,8 +326,8 @@ namespace LinBox
const Subvector<typename InVector::const_iterator> x1(x.begin() + offset_x, x.begin() + (offset_x + (*bp)->rowdim()));
Subvector<typename OutVector::iterator> y1(y.begin() + offset_y, y.begin() + (offset_y + (*bp)->coldim()));
(*bp)->applyTranspose(y1,x1);
- offset_x += (*bp)->rowdim();
- offset_y += (*bp)->coldim();
+ offset_x += (int) (*bp)->rowdim();
+ offset_y += (int) (*bp)->coldim();
}
return y;
}
@@ -361,18 +362,18 @@ namespace LinBox
template <class Matrix> struct MatrixTraits;
- #ifndef __INTEL_COMPILER
- template<>
- #endif
+// #if !defined __INTEL_COMPILER && !defined(__clang__)
+ // template<>
+// #endif
template <class BB1, class BB2>
struct MatrixTraits< DirectSum<BB1, BB2> > {
typedef DirectSum<BB1, BB2> MatrixType;
typedef MatrixCategories::BlackboxTag MatrixCategory;
};
-#ifndef __INTEL_COMPILER
- template<>
- #endif
+// #if !defined __INTEL_COMPILER && !defined(__clang__)
+ // template<>
+// #endif
template <class BB1, class BB2>
struct MatrixTraits< const DirectSum<BB1, BB2> > {
typedef const DirectSum<BB1, BB2> MatrixType;
@@ -380,7 +381,7 @@ namespace LinBox
};
-}; // namespace LinBox
+} // namespace LinBox
namespace LinBox
@@ -468,16 +469,15 @@ namespace LinBox
}
template<typename _Tp1, typename _Tp2 = _Tp1>
- struct rebind
- {
+ struct rebind {
typedef DirectSumOwner<
typename Blackbox1::template rebind<_Tp1>::other,
typename Blackbox2::template rebind<_Tp2>::other
> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F) {
- typename Blackbox1::template rebind<_Tp1> () ( Ap.getLeftData(), A.getLeftData(), F);
- typename Blackbox2::template rebind<_Tp2> () ( Ap.getRightData(), A.getRightData(), F);
+ void operator() (other & Ap, const Self_t& A) {
+ typename Blackbox1::template rebind<_Tp1> () ( Ap.getLeftData(), A.getLeftData());
+ typename Blackbox2::template rebind<_Tp2> () ( Ap.getRightData(), A.getRightData());
}
};
@@ -488,7 +488,7 @@ namespace LinBox
_A_data(*(M.getLeftPtr()), F),
_B_data(*(M.getRightPtr()), F)
{
- typename DirectSum<_BBt1, _BBt2>::template rebind<Field,Field>()(*this, M, F);
+ typename DirectSum<_BBt1, _BBt2>::template rebind<Field,Field>()(*this, M);
}
template<typename _BBt1, typename _BBt2, typename Field>
@@ -496,7 +496,7 @@ namespace LinBox
_A_data(M.getLeftData(), F),
_B_data(M.getRightData(), F)
{
- typename DirectSumOwner<_BBt1, _BBt2>::template rebind<Field,Field>()(*this, M, F);
+ typename DirectSumOwner<_BBt1, _BBt2>::template rebind<Field,Field>()(*this, M);
}
@@ -580,21 +580,20 @@ namespace LinBox
{}
template<typename _Tp1>
- struct rebind
- {
+ struct rebind {
typedef DirectSumOwner<
typename Blackbox::template rebind<_Tp1>::other,
typename Blackbox::template rebind<_Tp1>::other
> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F) {
+ void operator() (other & Ap, const Self_t& A) {
typename other::ListBB_t::iterator itp = Ap.getDataSum().begin();
typename Self_t::ListBB_t::const_iterator it = A.getDataSum().begin();
for( ; it != A.getDataSum().end(); ++itp,++it)
- typename Blackbox::template rebind<_Tp1>()( *(itp->get()), *(*it), F);
+ typename Blackbox::template rebind<_Tp1>()( *(itp->get()), *(*it));
}
};
@@ -603,14 +602,14 @@ namespace LinBox
DirectSumOwner (const DirectSum<_BBt> &M, const Field& F) :
_VB_data( M.size() ), m( M.rowdim() ), n( M.coldim())
{
- typename DirectSum<_BBt>::template rebind<Field>()(*this, M, F);
+ typename DirectSum<_BBt>::template rebind<Field>()(*this, M);
}
template<typename _BBt, typename Field>
DirectSumOwner (const DirectSumOwner<_BBt> &M, const Field& F) :
_VB_data( M.size() ), m( M.rowdim() ), n( M.coldim())
{
- typename DirectSumOwner<_BBt>::template rebind<Field>()(*this, M, F);
+ typename DirectSumOwner<_BBt>::template rebind<Field>()(*this, M);
}
@@ -626,8 +625,8 @@ namespace LinBox
const Subvector<typename InVector::const_iterator> x1(x.begin() + offset_x, x.begin() + (offset_x + bp->coldim()));
Subvector<typename OutVector::iterator> y1(y.begin() + offset_y, y.begin() + (offset_y + bp->rowdim()));
bp->apply(y1,x1);
- offset_x += bp->coldim();
- offset_y += bp->rowdim();
+ offset_x += (int) bp->coldim();
+ offset_y += (int) bp->rowdim();
}
return y;
@@ -646,8 +645,8 @@ namespace LinBox
const Subvector<typename InVector::const_iterator> x1(x.begin() + offset_x, x.begin() + (offset_x + bp->rowdim()));
Subvector<typename OutVector::iterator> y1(y.begin() + offset_y, y.begin() + (offset_y + bp->coldim()));
bp->applyTranspose(y1,x1);
- offset_x += bp->rowdim();
- offset_y += bp->coldim();
+ offset_x += (int)bp->rowdim();
+ offset_y += (int)bp->coldim();
}
return y;
}
@@ -668,7 +667,8 @@ namespace LinBox
ListBB_t& getDataSum() { return _VB_data; }
const ListBB_t& getDataSum() const { return _VB_data; }
- size_t size() const {
+ size_t size() const
+ {
return this->_VB_data.size();
}
@@ -682,8 +682,17 @@ namespace LinBox
-}; // namespace LinBox
+} // namespace LinBox
#endif // __LINBOX_direct_sum_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/factory.h b/linbox/blackbox/factory.h
index 4df465d..82dda32 100644
--- a/linbox/blackbox/factory.h
+++ b/linbox/blackbox/factory.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/factory.h
* Copyright (C) 2002 LinBox
*
@@ -7,7 +5,25 @@
*
* ------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
#ifndef __LINBOX_blackbox_factory_H
@@ -77,3 +93,12 @@ namespace LinBox
#endif // __LINBOX_blackbox_factory_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/frobenius.h b/linbox/blackbox/frobenius.h
index 5d3674f..c3871e0 100644
--- a/linbox/blackbox/frobenius.h
+++ b/linbox/blackbox/frobenius.h
@@ -1,10 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linobx/blackbox/frobenuis.h
* Copyright(c) 2010 LinBox
* Written by Austin Lobo <alobo at cis.udel.edu> and
* B.D. Saunders <saunders at cis.udel.edu>
- * See COPYING for licence information
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file blackbox/frobenius.h
@@ -15,7 +29,7 @@
#ifndef __LINBOX_frobenius_H
#define __LINBOX_frobenius_H
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
#include "linbox/blackbox/companion.h"
#include "linbox/blackbox/direct-sum.h"
#include <vector>
@@ -83,3 +97,12 @@ namespace LinBox
#endif //__LINBOX_frobenius_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/hilbert.h b/linbox/blackbox/hilbert.h
index db1b95c..79dc467 100644
--- a/linbox/blackbox/hilbert.h
+++ b/linbox/blackbox/hilbert.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/hilbert.h
* Copyright (C) 2006 John P. May, B. David Saunders
*
@@ -10,7 +8,25 @@
* The original hilbert.h, providing one of the first blackbox examples, but not using the JIT feature,
* was written by Will Turner.
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file blackbox/hilbert.h
@@ -22,7 +38,7 @@
#define __LINBOX_hilbert_H
#include <vector>
-#include <linbox/blackbox/jit-matrix.h>
+#include "linbox/blackbox/jit-matrix.h"
namespace LinBox
@@ -42,11 +58,11 @@ namespace LinBox
/// return 1/(i+j+2), zero based indexing.
Element& operator()(Element &entry, size_t i, size_t j) const
{
- return entry = _H[i+j+1];
+ return entry = _vecH[i+j+1];
}
private:
- std::vector<Element> _H;
+ std::vector<Element> _vecH;
}; // Hilbert_JIT_Entry
@@ -58,12 +74,12 @@ namespace LinBox
F.init(one, 1);
F.init(temp, 0);
- _H = std::vector<Element>(m+n, temp);
+ _vecH = std::vector<Element>(m+n, temp);
typename std::vector<Element>::iterator iter;
- // the ith entry of _H = 1/(i+1)
- for (iter=_H.begin(); iter != _H.end(); iter++) {
+ // the ith entry of _vecH = 1/(i+1)
+ for (iter=_vecH.begin(); iter != _vecH.end(); iter++) {
F.addin(temp, one);
F.inv(*iter, temp);
}
@@ -98,3 +114,12 @@ namespace LinBox
#endif //__LINBOX_hilbert_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/inverse.h b/linbox/blackbox/inverse.h
index a7571c2..6d9b266 100644
--- a/linbox/blackbox/inverse.h
+++ b/linbox/blackbox/inverse.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/inverse.h
* Copyright (C) 2001 Bradford Hovinen
*
* Written by Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,15 +17,15 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_inverse_H
#define __LINBOX_inverse_H
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
#include "linbox/blackbox/transpose.h"
#include "linbox/vector/vector-domain.h"
#include "linbox/solutions/minpoly.h"
@@ -115,7 +116,7 @@ namespace LinBox
field().mul (_minpoly[i-1], _mp1[i], a0);
}
- int n = _minpoly.size () - 1;
+ int n = (int) _minpoly.size () - 1;
_VD.mul (y, x, _minpoly[n]);
@@ -158,7 +159,7 @@ namespace LinBox
field().mul (_transposeMinpoly[i-1], _mp1[i], a0);
}
- int n = _transposeMinpoly.size () - 1;
+ int n = (int) _transposeMinpoly.size () - 1;
_VD.mul (y, x, _transposeMinpoly[n]);
@@ -213,3 +214,12 @@ namespace LinBox
#endif // __LINBOX_inverse_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/jit-matrix.h b/linbox/blackbox/jit-matrix.h
index 7b457e6..5662418 100644
--- a/linbox/blackbox/jit-matrix.h
+++ b/linbox/blackbox/jit-matrix.h
@@ -1,17 +1,33 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/jit-matrix.h
* Copyright (c) LinBox
*
* bds, jpm
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_jitmatrix_H
#define __LINBOX_jitmatrix_H
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
namespace LinBox
{
@@ -62,7 +78,7 @@ namespace LinBox
JIT_Matrix (_Field& F, const size_t m, const size_t n,
const JIT_EntryGenerator& JIT) :
- _F(F), _m(m), _n(n), _gen(JIT)
+ _field(F), _m(m), _n(n), _gen(JIT)
{};
template<class OutVector, class InVector>
@@ -75,12 +91,12 @@ namespace LinBox
//OutVector& applyTranspose (OutVector& y, const InVector& x) const;
size_t rowdim (void) const { return _m; }
size_t coldim (void) const { return _n; }
- const Field& field() const { return _F; }
+ const Field& field() const { return _field; }
protected:
// Field for arithmetic
- Field _F;
+ Field _field;
// Number of rows and columns of matrix.
size_t _m;
@@ -97,14 +113,15 @@ namespace LinBox
template <class Field, class JIT_EntryGenerator>
template <class OutVector, class InVector>
inline OutVector& JIT_Matrix<Field, JIT_EntryGenerator>::apply (OutVector& y, const InVector& x)
- { Element entry; _F.init(entry);
- for (size_t i = 0; i < _m; ++i)
- { _F.init(y[i], 0);
- for (size_t j = 0; j < _n; ++j)
- {
+ {
+ Element entry;
+ _field.init(entry,0);
+ for (size_t i = 0; i < _m; ++i) {
+ _field.init(y[i], 0);
+ for (size_t j = 0; j < _n; ++j) {
_gen(entry, i, j);
- _F.axpyin (y[i], entry, x[j]);
+ _field.axpyin (y[i], entry, x[j]);
}
}
return y;
@@ -114,11 +131,14 @@ namespace LinBox
template <class Field, class JIT_EntryGenerator>
template <class OutVector, class InVector>
inline OutVector& JIT_Matrix<Field, JIT_EntryGenerator>::applyTranspose (OutVector& y, const InVector& x)
- { Element entry; _F.init(entry);
- for (size_t i = 0; i < _m; ++i)
- { _F.init(y[i], 0);
- for (size_t j = 0; j < _n; ++j)
- { _F.axpyin ( y[i], x[j], _gen(entry, j, i) ); }
+ {
+ Element entry;
+ _field.init(entry,0);
+ for (size_t i = 0; i < _m; ++i) {
+ _field.init(y[i], 0);
+ for (size_t j = 0; j < _n; ++j) {
+ _field.axpyin ( y[i], x[j], _gen(entry, j, i) );
+ }
}
return y;
} // applyTranspose
@@ -150,3 +170,12 @@ namespace LinBox
#endif // __LINBOX_jitmatrix_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/lambda-sparse.h b/linbox/blackbox/lambda-sparse.h
index 6f5798d..ea7d224 100644
--- a/linbox/blackbox/lambda-sparse.h
+++ b/linbox/blackbox/lambda-sparse.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/lambda-sparse.h
* Copyright (C) 2004 Pascal Giorgi
*
* Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,20 +17,20 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_lambda_sparse_H
#define __LINBOX_lambda_sparse_H
-#include <linbox/blackbox/sparse.h>
-#include <linbox/blackbox/archetype.h>
-#include <linbox/vector/stream.h>
-#include <linbox/vector/vector-traits.h>
-#include <linbox/integer.h>
+#include "linbox/blackbox/sparse.h"
+#include "linbox/blackbox/archetype.h"
+#include "linbox/vector/stream.h"
+#include "linbox/vector/vector-traits.h"
+#include "linbox/integer.h"
namespace LinBox
{
@@ -115,12 +116,12 @@ namespace LinBox
SparseMatrix<Field,Row> (F,L.rowdim(),L.coldim())
{
- //typename LambdaSparseMatrix<_Ring,_IRow>::ConstRawIterator Liter = L.rawBegin();
- typename LambdaSparseMatrix<_Ring,_IRow>::ConstRawIndexedIterator Literindex = L.rawIndexedBegin();
+ //typename LambdaSparseMatrix<_Ring,_IRow>::ConstIterator Liter = L.Begin();
+ typename LambdaSparseMatrix<_Ring,_IRow>::ConstIndexedIterator Literindex = L.IndexedBegin();
integer tmp;
_Ring r= L.field();
- for (; Literindex!=L.rawIndexedEnd(); ++Literindex) {
+ for (; Literindex!=L.IndexedEnd(); ++Literindex) {
r.convert(tmp,*Literindex);
F.init(refEntry(Literindex.rowIndex(),Literindex.colIndex()),tmp);
}
@@ -133,12 +134,12 @@ namespace LinBox
{
typename Field::Element max;
// Dan Roche 7-20-04 added typename here to stop compiler warning
- typename LambdaSparseMatrix<_Field,_Row>::ConstRawIterator iter= this->rawBegin();
+ typename LambdaSparseMatrix<_Field,_Row>::ConstIterator iter= this->Begin();
max = *iter;
- for (; iter != this->rawEnd(); ++iter)
+ for (; iter != this->End(); ++iter)
if (*iter > max) max=*iter;
- this->_F.convert(norm,max);
+ this->_field.convert(norm,max);
return norm;
}
@@ -152,3 +153,12 @@ namespace LinBox
#endif //__LINBOX_lambda_sparse_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/matrix-blackbox.h b/linbox/blackbox/matrix-blackbox.h
index f9d3ade..76ceaee 100644
--- a/linbox/blackbox/matrix-blackbox.h
+++ b/linbox/blackbox/matrix-blackbox.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/matrix-blackbox.h
* Copyright (C) 2003 Bradford Hovinen
*
@@ -7,17 +5,34 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_matrix_blackbox_H
#define __LINBOX_matrix_blackbox_H
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
#include "linbox/blackbox/archetype.h"
#include "linbox/matrix/matrix-domain.h"
#include "linbox/matrix/sparse.h"
-#include "linbox/matrix/dense.h"
#include "linbox/field/rebind.h"
// Namespace in which all LinBox library code resides
@@ -49,8 +64,8 @@ namespace LinBox
* @param F Field over which entries exist
* @param rep Matrix from which to construct the black box
*/
- MatrixBlackbox (const Field &F, Matrix &rep) :
- _F (F), _MD (F), _A (rep)
+ MatrixBlackbox (const Field &F, Matrix &Rep) :
+ _field (F), _MD (F), _matA (Rep)
{}
/** Constructor with size
@@ -62,7 +77,7 @@ namespace LinBox
* @param n Column dimension
*/
MatrixBlackbox (const Field &F, size_t m, size_t n) :
- _F (F), _MD (F), _A (m, n)
+ _field (F), _MD (F), _matA (F, m, n)
{}
/** Constructor
@@ -75,13 +90,13 @@ namespace LinBox
*/
template <class Row>
MatrixBlackbox (const Field &F, VectorStream<Row> &stream) :
- _F (F), _MD (F), _A (stream)
+ _field (F), _MD (F), _matA (stream)
{}
/** Copy constructor
*/
MatrixBlackbox (const MatrixBlackbox &B) :
- _F (B._F), _MD (B._F), _A (B._A)
+ _field (B._field), _MD (B._field), _matA (B._matA)
{}
/** Destructor. */
@@ -110,7 +125,7 @@ namespace LinBox
*/
template <class Vector1, class Vector2>
inline Vector1 &apply (Vector1 &y, const Vector2 &x) const
- { return _MD.vectorMul (y, _A, x); }
+ { return _MD.vectorMul (y, _matA, x); }
/** Matrix-vector product
* \f$y = A x\f$.
@@ -129,7 +144,7 @@ namespace LinBox
*/
template <class Vector1, class Vector2>
inline Vector1 &applyTranspose (Vector1 &y, const Vector2 &x) const
- { return _MD.vectorMul (y, TransposeMatrix<const Matrix> (_A), x); }
+ { return _MD.vectorMul (y, TransposeMatrix<const Matrix> (_matA), x); }
/** Transpose matrix-vector product
* \f$y = A^T x\f$.
@@ -144,45 +159,54 @@ namespace LinBox
* @return integer number of rows of SparseMatrix0Base matrix.
*/
inline size_t rowdim () const
- { return _A.rowdim (); }
+ { return _matA.rowdim (); }
/** Retreive column dimensions of Sparsemat matrix.
* @return integer number of columns of SparseMatrix0Base matrix.
*/
inline size_t coldim () const
- { return _A.coldim (); }
+ { return _matA.coldim (); }
/** Read the matrix from a stream
* @param is Input stream from which to read the matrix
* @return Reference to input stream
*/
inline std::istream &read (std::istream &is)
- { return _MD.read (is, _A); }
+ { return _MD.read (is, _matA); }
/** Write the matrix to a stream
* @param os Output stream to which to write the matrix
* @return Reference to output stream
*/
inline std::ostream &write (std::ostream &os) const
- { return _MD.write (os, _A); }
+ { return _MD.write (os, _matA); }
/** Return a reference to the base field
*/
- inline const Field &field () const { return _F;}
+ inline const Field &field () const { return _field;}
/** Return a reference to the underlying representation
*/
- inline Matrix &rep () { return _A; }
+ inline Matrix &rep () { return _matA; }
private:
- const Field &_F; // Field used for all arithmetic
+ const Field &_field; // Field used for all arithmetic
MatrixDomain<Field> _MD; // Matrix domain for matrix-vector
// operations
- Matrix _A; // Underlying matrix representation
+ Matrix _matA; // Underlying matrix representation
};
} // namespace LinBox
#endif // __LINBOX_matrix_blackbox_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/moore-penrose.h b/linbox/blackbox/moore-penrose.h
index f7848ba..62fe954 100644
--- a/linbox/blackbox/moore-penrose.h
+++ b/linbox/blackbox/moore-penrose.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/moore-penrose.h
* Copyright (C) 2001 Bradford Hovinen
*
* Written by Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,15 +17,15 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_moore_penrose_H
#define __LINBOX_moore_penrose_H
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
#include "linbox/blackbox/submatrix.h"
#include "linbox/blackbox/inverse.h"
#include "linbox/blackbox/transpose.h"
@@ -74,48 +75,48 @@ namespace LinBox
* @param rank
*/
MoorePenrose (const Blackbox *A, size_t rank) :
- _A (A), _rank (rank)
+ _matA (A), _rank (rank)
{
- _B1 = new Submatrix<Blackbox> (_A, 0, 0, rank, rank);
- _F = new Submatrix<Blackbox> (_A, 0, 0, _A->rowdim (), rank);
- _GG = new Submatrix<Blackbox> (_A, 0, 0, rank, _A->coldim ());
- _FT = new Transpose<Submatrix<Blackbox> > (_F);
- _GT = new Transpose<Submatrix<Blackbox> > (_GG);
- _FTF = new Compose<Transpose<Submatrix<Blackbox> >,Submatrix<Blackbox> > (_FT, _F);
- _GGT = new Compose<Submatrix<Blackbox>, Transpose<Submatrix<Blackbox> > > (_GG, _GT);
- _FTFinv = new Inverse<Compose<Transpose<Submatrix<Blackbox> >,Submatrix<Blackbox> > > ( _FTF);
- _GGTinv = new Inverse<Compose<Submatrix<Blackbox>, Transpose<Submatrix<Blackbox> > > > ( _GGT);
- }
+ _matB1 = new Submatrix<Blackbox> (_matA, 0, 0, rank, rank);
+ _matF = new Submatrix<Blackbox> (_matA, 0, 0, _matA->rowdim (), rank);
+ _matGG = new Submatrix<Blackbox> (_matA, 0, 0, rank, _matA->coldim ());
+ _matFT = new Transpose<Submatrix<Blackbox> > (_matF);
+ _matGT = new Transpose<Submatrix<Blackbox> > (_matGG);
+ _matFTF = new Compose<Transpose<Submatrix<Blackbox> >,Submatrix<Blackbox> > (_matFT, _matF);
+ _matGGT = new Compose<Submatrix<Blackbox>, Transpose<Submatrix<Blackbox> > > (_matGG, _matGT);
+ _matFTFinv = new Inverse<Compose<Transpose<Submatrix<Blackbox> >,Submatrix<Blackbox> > > ( _matFTF);
+ _matGGTinv = new Inverse<Compose<Submatrix<Blackbox>, Transpose<Submatrix<Blackbox> > > > ( _matGGT);
+ }
/** Copy constructor
*/
MoorePenrose (const MoorePenrose &A) :
- _A (A._A),
- _B1 (A._B1),
- _F (A._F),
- _GG (A._GG),
- _FT (A._FT),
- _GT (A._GT),
- _FTF (A._FTF),
- _GGT (A._GGT),
- _FTFinv (A._FTFinv),
- _GGTinv (A._GGTinv),
- _rank (A._rank)
+ _matA ( A._matA),
+ _matB1 ( A._matB1),
+ _matF ( A._matF),
+ _matGG ( A._matGG),
+ _matFT ( A._matFT),
+ _matGT ( A._matGT),
+ _matFTF ( A._matFTF),
+ _matGGT ( A._matGGT),
+ _matFTFinv ( A._matFTFinv),
+ _matGGTinv ( A._matGGTinv),
+ _rank ( A._rank)
{}
/** Destructor
*/
~MoorePenrose ()
{
- delete _GGTinv;
- delete _FTFinv;
- delete _GGT;
- delete _FTF;
- delete _GT;
- delete _FT;
- delete _GG;
- delete _F;
- delete _B1;
+ delete _matGGTinv;
+ delete _matFTFinv;
+ delete _matGGT;
+ delete _matFTF;
+ delete _matGT;
+ delete _matFT;
+ delete _matGG;
+ delete _matF;
+ delete _matB1;
}
@@ -135,11 +136,11 @@ namespace LinBox
InVector _z1 (_rank);
InVector _z2 (_rank);
- _F->applyTranspose (_z1, x);
- _FTFinv->apply (_z2, _z1);
- _B1->apply (_z1, _z2);
- _GGTinv->apply (_z2, _z1);
- _GG->applyTranspose (y, _z2);
+ _matF->applyTranspose (_z1, x);
+ _matFTFinv->apply (_z2, _z1);
+ _matB1->apply (_z1, _z2);
+ _matGGTinv->apply (_z2, _z1);
+ _matGG->applyTranspose (y, _z2);
return y;
}
@@ -159,11 +160,11 @@ namespace LinBox
InVector _z1 (_rank);
InVector _z2 (_rank);
- _GG->apply (_z1, x);
- _GGTinv->applyTranspose (_z2, _z1);
- _B1->applyTranspose (_z1, _z2);
- _FTFinv->applyTranspose (_z2, _z1);
- _F->apply (y, _z2);
+ _matGG->apply (_z1, x);
+ _matGGTinv->applyTranspose (_z2, _z1);
+ _matB1->applyTranspose (_z1, _z2);
+ _matFTFinv->applyTranspose (_z2, _z1);
+ _matF->apply (y, _z2);
return y;
}
@@ -174,29 +175,33 @@ namespace LinBox
* @return integer number of _rows of black box matrix.
*/
size_t rowdim (void) const
- { return _A->coldim (); }
+ {
+ return _matA->coldim ();
+ }
/** Retreive _column dimensions of BlackBox matrix.
* Required by abstract base class.
* @return integer number of _columns of black box matrix.
*/
size_t coldim (void) const
- { return _A->rowdim (); }
+ {
+ return _matA->rowdim ();
+ }
- const Field& field() { return _A -> field(); }
+ const Field& field() { return _matA -> field(); }
private:
- const Blackbox *_A;
- Submatrix<Blackbox> *_B1;
- Submatrix<Blackbox> *_F;
- Submatrix<Blackbox> *_GG;
- Transpose<Submatrix<Blackbox> > *_FT;
- Transpose<Submatrix<Blackbox> > *_GT;
- Compose<Transpose<Submatrix<Blackbox> >,Submatrix<Blackbox> > *_FTF;
- Compose<Submatrix<Blackbox>, Transpose<Submatrix<Blackbox> > > *_GGT;
- Inverse<Compose<Transpose<Submatrix<Blackbox> >,Submatrix<Blackbox> > > *_FTFinv;
- Inverse<Compose<Submatrix<Blackbox>, Transpose<Submatrix<Blackbox> > > > *_GGTinv;
+ const Blackbox * _matA;
+ Submatrix<Blackbox> * _matB1;
+ Submatrix<Blackbox> * _matF;
+ Submatrix<Blackbox> * _matGG;
+ Transpose<Submatrix<Blackbox> > *_matFT;
+ Transpose<Submatrix<Blackbox> > *_matGT;
+ Compose<Transpose<Submatrix<Blackbox> >,Submatrix<Blackbox> > * _matFTF;
+ Compose<Submatrix<Blackbox>, Transpose<Submatrix<Blackbox> > > * _matGGT;
+ Inverse<Compose<Transpose<Submatrix<Blackbox> >,Submatrix<Blackbox> > > * _matFTFinv;
+ Inverse<Compose<Submatrix<Blackbox>, Transpose<Submatrix<Blackbox> > > > * _matGGTinv;
size_t _rank;
};
@@ -205,3 +210,12 @@ namespace LinBox
#endif // __LINBOX_moore_penrose_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/ntl-hankel.h b/linbox/blackbox/ntl-hankel.h
index c85711a..41bec72 100644
--- a/linbox/blackbox/ntl-hankel.h
+++ b/linbox/blackbox/ntl-hankel.h
@@ -1,18 +1,32 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* *******************************************************************
* ntl-hankel.h
* Copyright (C) 2003 Austin Lobo, B. David Saunders
* Template for Hankel specification for ntl Arithmetic
* Linbox version 2001 and 2002 from a version
* Designed by A.Lobo and B.D. Saunders in 4/98
- * see COPYING for licence information
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+*/
#ifndef __LINBOX_ntl_hankel_H
#define __LINBOX_ntl_hankel_H
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
#include "toeplitz.h" // we inherit everything from ntl-toeplitz
//#define DBGMSGS 1
@@ -68,7 +82,16 @@ namespace LinBox
} // namespace Linbox
-#include <linbox/blackbox/ntl-hankel.inl>
+#include "linbox/blackbox/ntl-hankel.inl"
#endif //__LINBOX_ntl_hankel_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/ntl-hankel.inl b/linbox/blackbox/ntl-hankel.inl
index 1a8c76b..8eb82fa 100644
--- a/linbox/blackbox/ntl-hankel.inl
+++ b/linbox/blackbox/ntl-hankel.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* ntl-hankel.inl NTL_Hankel.cpp file
* Copyright (C) 2003 Austin Lobo, B. David Saunders
@@ -13,8 +11,24 @@
* are manipulated in fields and rings according to the arithmetic
* in the ntl package from V. Shoup
*
- * see COPYING for license information
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
* Everything is in the Linbox namespace by virtue of the #include
* in ntl-Hankel.h
*-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+*/
@@ -142,7 +156,7 @@ namespace LinBox
template <class Field>
void Hankel<Field>::print( char *outFileName) const
{
- int i, j, N;
+ // int i, j, N;
std::cout << "Printing hankel matrix to " << outFileName << std::endl;
@@ -168,13 +182,13 @@ namespace LinBox
template <class Field>
void Hankel<Field>::setToUniModLT()
{
- int L = (this->rowDim-1)<<1;
+ int L = int(this->rowDim-1)<<1;
this->shape.shape(BlackboxSpecifier::UNIMOD_LT);
Element one,zero;
this->K.init(one,1);
this->K.init(zero,0);
- for (int i=this->rowDim-1; i <= L; i++ ) {
+ for (int i= int(this->rowDim)-1; i <= L; i++ ) {
// zero out the below-diagonal entries
this->P.setCoeff(this->pdata,i,zero);
}
@@ -247,7 +261,7 @@ namespace LinBox
#ifdef DBGMSGS
std::cout <<"pxOut is " << pxOut << std::endl;
#endif
- int N = this->rowdim();
+ int N = (int)this->rowdim();
for ( int i= 0; i < N; i++)
this->P.getCoeff(v_out[N-1-i], pxOut, N-1+i);
@@ -276,3 +290,12 @@ namespace LinBox
} // namespace LinBox
#endif //__LINBOX_bb_ntl_hankel_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/ntl-sylvester.h b/linbox/blackbox/ntl-sylvester.h
index d099765..958cc32 100644
--- a/linbox/blackbox/ntl-sylvester.h
+++ b/linbox/blackbox/ntl-sylvester.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* ntl-sylvester.h
* Copyright (C) 2003 Austin Lobo, B. David Saunders
@@ -7,7 +5,23 @@
* Template for sylvester matrix specification for ntl Arithmetic,
* for polynomials in one variable.
* Linbox version 2003
- * See COPYING for licence information
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+*/
#ifndef __LINBOX_ntl_sylvester_H
@@ -19,7 +33,7 @@
#include <NTL/ZZ_pX.h>
#include <NTL/ZZ_p.h>
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
#include "linbox/vector/vector-traits.h"
namespace LinBox
@@ -82,7 +96,16 @@ namespace LinBox
};// End, Sylvester
}
-#include <linbox/blackbox/ntl-sylvester.inl>
+#include "linbox/blackbox/ntl-sylvester.inl"
#endif //__LINBOX_ntl_sylvester_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/ntl-sylvester.inl b/linbox/blackbox/ntl-sylvester.inl
index 86b9d1c..e007e8e 100644
--- a/linbox/blackbox/ntl-sylvester.inl
+++ b/linbox/blackbox/ntl-sylvester.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* ntl-sylvester.h
* Copyright (C) 2003 Austin Lobo, B. David Saunders
@@ -8,7 +6,23 @@
* for polynomials in one variable.
* Linbox version 2003
*
- * See COPYING for licence information
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+*/
#ifndef __LINBOX_bb_ntl_sylvester_INL
@@ -362,3 +376,12 @@ namespace LinBox
#endif //__LINBOX_bb_ntl_sylvester_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/null-matrix.h b/linbox/blackbox/null-matrix.h
index d82d253..8e4e72d 100644
--- a/linbox/blackbox/null-matrix.h
+++ b/linbox/blackbox/null-matrix.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by
* zhendong wan
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,17 +18,17 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_bb_nullmatrix_H
#define __LINBOX_bb_nullmatrix_H
-#include <linbox/util/debug.h>
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/util/debug.h"
+#include "linbox/blackbox/blackbox-interface.h"
namespace LinBox
{
@@ -91,3 +92,12 @@ public:
#endif //__LINBOX_bb_nullmatrix_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/permutation.h b/linbox/blackbox/permutation.h
index bf58db8..ad4b3ba 100644
--- a/linbox/blackbox/permutation.h
+++ b/linbox/blackbox/permutation.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/permutation.h
* Copyright (C) 2001 Bradford Hovinen
*
* Written by Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_bb_permutation_H
@@ -34,7 +35,7 @@
#include "linbox/util/debug.h"
#include "linbox/linbox-config.h"
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
#ifdef __LINBOX_XMLENABLED
@@ -58,7 +59,7 @@ namespace LinBox
*/
template<class _Field, class _Storage = __LINBOX_PERMUTATION_STORAGE >
class Permutation : public BlackboxInterface {
- const _Field& _F;
+ const _Field& _field;
public:
typedef Permutation<_Field, _Storage> Self_t;
typedef _Storage Storage;
@@ -71,7 +72,7 @@ namespace LinBox
* @param indices Vector of indices representing the permutation
*/
Permutation (Storage & indices, const Field& F = Field()) :
- _F(F), _indices (indices)
+ _field(F), _indices (indices)
{}
/** Constructor from a dimension.
@@ -80,7 +81,7 @@ namespace LinBox
* @param F
*/
Permutation (int n, const Field& F = Field()) :
- _F(F)
+ _field(F)
{
identity(n);
}
@@ -98,8 +99,8 @@ namespace LinBox
* Creates new black box objects in dynamic memory.
* @param M constant reference to compose black box matrix
*/
- Permutation (const Permutation &M) :
- _F(M._F),_indices (M._indices)
+ Permutation (const Permutation &Mat) :
+ _field(Mat._field),_indices (Mat._indices)
{}
#ifdef __LINBOX_XMLENABLED
@@ -140,7 +141,7 @@ namespace LinBox
linbox_check (y.size () == _indices.size ());
for (i = 0; i < x.size(); ++i)
- _F.assign(y[i], x[_indices[i]]);
+ _field.assign(y[i], x[_indices[i]]);
return y;
}
@@ -166,7 +167,7 @@ namespace LinBox
linbox_check (y.size () == _indices.size ());
for (i = 0; i < _indices.size (); ++i)
- _F.assign(y[_indices[i]], x[i]);
+ _field.assign(y[_indices[i]], x[i]);
return y;
}
@@ -215,7 +216,7 @@ namespace LinBox
}
- const Field& field() { return _F; }
+ const Field& field() { return _field; }
#ifdef __LINBOX_XMLENABLED
@@ -248,7 +249,7 @@ namespace LinBox
{
// for (typename Storage::const_iterator it=_indices.begin(); it!=_indices.end(); ++it)
// std::cerr << *it << ' ';
- typename Field::Element one, zero; _F.init(one,1UL);_F.init(zero,0UL);
+ typename Field::Element one, zero; _field.init(one,1UL);_field.init(zero,0UL);
os << "[";
bool firstrow=true;
long nmu = _indices.size()-1;
@@ -262,13 +263,13 @@ namespace LinBox
long i=0;
for( ; i< *it ; ++i) {
- _F.write(os, zero);
+ _field.write(os, zero);
if (i < nmu) os << ',';
}
- _F.write(os, one);
+ _field.write(os, one);
if (i < nmu) os << ',';
for(++i ; i< static_cast<long>(_indices.size()) ; ++i) {
- _F.write(os, zero);
+ _field.write(os, zero);
if (i < nmu) os << ',';
}
os << " ]";
@@ -291,3 +292,12 @@ namespace LinBox
#endif // __LINBOX_bb_permutation_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/polynomial.h b/linbox/blackbox/polynomial.h
index 634c699..f9f8603 100644
--- a/linbox/blackbox/polynomial.h
+++ b/linbox/blackbox/polynomial.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/polynomial.h
* Copyright (C) 2005 Cl'ement Pernet
*
* Written by Cl'ement Pernet <Clement.Pernet at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,16 +17,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_bb_polynomial_H
#define __LINBOX_bb_polynomial_H
-#include <linbox/blackbox/blackbox-interface.h>
-#include <linbox/vector/vector-domain.h>
+#include "linbox/blackbox/blackbox-interface.h"
+#include "linbox/vector/vector-domain.h"
// Namespace in which all LinBox library code resides
namespace LinBox
{
@@ -66,10 +67,10 @@ namespace LinBox
/** Copy constructor.
* Creates new black box objects in dynamic memory.
- * @param M constant reference to compose black box matrix
+ * @param Mat constant reference to compose black box matrix
*/
- PolynomialBB (const PolynomialBB<Blackbox, Polynomial> &M) :
- _A_ptr(M._A_ptr), _P_ptr(M._P_ptr), _VD(M._VD)
+ PolynomialBB (const PolynomialBB<Blackbox, Polynomial> &Mat) :
+ _A_ptr(Mat._A_ptr), _P_ptr(Mat._P_ptr), _VD(Mat._VD)
{
}
@@ -205,16 +206,16 @@ namespace LinBox
{}
PolynomialBBOwner (const Blackbox *A_data, const Polynomial * P_data) :
- _A_data(*A_data), _P_data(*P_data), _VD(A_data.field())
+ _A_data(*A_data), _P_data(*P_data), _VD(A_data->field())
{
}
/** Copy constructor.
* Creates new black box objects in dynamic memory.
- * @param M constant reference to compose black box matrix
+ * @param Mat constant reference to compose black box matrix
*/
- PolynomialBBOwner (const PolynomialBBOwner<Blackbox, Polynomial> &M) :
- _A_data(M._A_data), _P_data(M._P_data), _VD(M._VD)
+ PolynomialBBOwner (const PolynomialBBOwner<Blackbox, Polynomial> &Mat) :
+ _A_data(Mat._A_data), _P_data(Mat._P_data), _VD(Mat._VD)
{
}
@@ -284,22 +285,22 @@ namespace LinBox
};
template<typename _BBt, typename _Polt, typename Field>
- PolynomialBBOwner (const PolynomialBB<_BBt, _Polt> &M, const Field& F) :
+ PolynomialBBOwner (const PolynomialBB<_BBt, _Polt> &Mat, const Field& F) :
_VD(F),
- _A_data(*(M.getBlackbox()), F),
- _P_data(*(M.getPolynomial()), F)
+ _A_data(*(Mat.getBlackbox()), F),
+ _P_data(*(Mat.getPolynomial()), F)
{
- typename _BBt::template rebind<Field>()(_A_data, *(M.getBlackbox()), F);
- typename _Polt::template rebind<Field>()(_P_data, *(M.getPolynomial()), F);
+ typename _BBt::template rebind<Field>()(_A_data, *(Mat.getBlackbox()));
+ typename _Polt::template rebind<Field>()(_P_data, *(Mat.getPolynomial()), F);
}
template<typename _BBt, typename _Polt, typename Field>
- PolynomialBBOwner (const PolynomialBBOwner<_BBt, _Polt> &M, const Field& F) :
- _A_data(M.getDataBlackbox(), F),
- _P_data(M.getDataPolynomial(), F)
+ PolynomialBBOwner (const PolynomialBBOwner<_BBt, _Polt> &Mat, const Field& F) :
+ _A_data(Mat.getDataBlackbox(), F),
+ _P_data(Mat.getDataPolynomial(), F)
{
- typename _BBt::template rebind<Field>()(_A_data, M.getDataBlackbox(), F);
- typename _Polt::template rebind<Field>()(_P_data, M.getDataPolynomial(), F);
+ typename _BBt::template rebind<Field>()(_A_data, Mat.getDataBlackbox(), F);
+ typename _Polt::template rebind<Field>()(_P_data, Mat.getDataPolynomial(), F);
}
@@ -340,3 +341,12 @@ namespace LinBox
#endif // __LINBOX_bb_polynomial_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/quad-matrix.h b/linbox/blackbox/quad-matrix.h
index 401c750..1fc9dd4 100644
--- a/linbox/blackbox/quad-matrix.h
+++ b/linbox/blackbox/quad-matrix.h
@@ -1,26 +1,41 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/quad-matrix.h
* Copyright (C) 2006 LinBox
* Written by -bds, hui wang
- * see COPYING for license information
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_quad_matrix_H
#define __LINBOX_quad_matrix_H
+
#include <algorithm>
-#include <linbox/field/hom.h>
+#include "linbox/field/hom.h"
#include <vector>
#include <iterator>
//#include "linbox/vector/vector-traits.h"
#include "linbox/util/debug.h"
#include "linbox/linbox-config.h"
-#include <linbox/blackbox/blackbox-interface.h>
-#include <linbox/blackbox/scalar-matrix.h>
-#include <linbox/blackbox/zo.h>
-//#include <linbox/blackbox/side-by-side.h>
-//#include <linbox/blackbox/over-under.h>
+#include "linbox/blackbox/blackbox-interface.h"
+#include "linbox/blackbox/scalar-matrix.h"
+#include "linbox/blackbox/zo.h"
+//#include "linbox/blackbox/side-by-side.h"
+//#include "linbox/blackbox/over-under.h"
namespace LinBox
{
@@ -60,7 +75,7 @@ namespace LinBox
static const unsigned int smallThreshold = 60000;
protected:
- _Field _F;
+ _Field _field;
public:
typedef _Field Field;
@@ -199,16 +214,16 @@ namespace LinBox
{
out << "sidebyside(";
const SideBySide<Field> *A(static_cast< const SideBySide<Field>* >(_BBp));
- (A->_L)->write(out) << ", ";
- (A->_R)->write(out) << ") ";
+ (A->_quadLeft)->write(out) << ", ";
+ (A->_quadRight)->write(out) << ") ";
break;
}
case ou:
{
out << "overunder(";
const OverUnder<Field> *A(static_cast< const OverUnder<Field>* >(_BBp));
- (A->_U)->write(out) << ", ";
- (A->_D)->write(out) << ") ";
+ (A->_quadUp)->write(out) << ", ";
+ (A->_quadDown)->write(out) << ") ";
break;
}
}
@@ -415,12 +430,12 @@ namespace LinBox
class SideBySide {
typedef ZOQuad<Field> Quad;
public://temp
- const Quad *_L, *_R;
+ const Quad *_quadLeft, *_quadRight;
public:
SideBySide(const Quad* A, const Quad* B) :
- _L(A), _R(B)
+ _quadLeft(A), _quadRight(B)
{}
- //~SideBySide() {delete _L; delete _R;}
+ //~SideBySide() {delete _quadLeft; delete _quadRight;}
template <typename InVector, typename OutVector>
OutVector& apply(OutVector& y, const InVector& x) const
@@ -428,14 +443,14 @@ namespace LinBox
{
std::vector<typename Field::Element> z(y.size());
VectorDomain<Field> VD(field());
- //std::vector<typename Field::Element> x_1( x.begin(), x.begin() + _L->coldim() );
- //std::vector<typename Field::Element> x_2( x.begin() + _L->coldim(), x.end() );
- Subvector<typename InVector::const_iterator> x_1(x.begin(), x.begin()+_L->coldim());
- Subvector<typename InVector::const_iterator> x_2(x.begin()+_L->coldim(), x.end());
+ //std::vector<typename Field::Element> x_1( x.begin(), x.begin() + _quadLeft->coldim() );
+ //std::vector<typename Field::Element> x_2( x.begin() + _quadLeft->coldim(), x.end() );
+ Subvector<typename InVector::const_iterator> x_1(x.begin(), x.begin()+_quadLeft->coldim());
+ Subvector<typename InVector::const_iterator> x_2(x.begin()+_quadLeft->coldim(), x.end());
//std::cout << " side-by-side apply size of x: " << x.size() << " " << " size of y: " << y.size() << endl;
//std::cout << " side-by-side apply size of x_1: " << x_1.size() << " " << " size of x_2: " << x_2.size() << endl;
- _L->apply (y, x_1);
- _R->apply (z, x_2);
+ _quadLeft->apply (y, x_1);
+ _quadRight->apply (z, x_2);
VD.addin(y, z);
return y;
@@ -445,46 +460,46 @@ namespace LinBox
OutVector& applyTranspose(OutVector& y, const InVector& x) const
//OutVector& applyTranspose(OutVector& y, const InVector& x)
{
- //std::vector<typename Field::Element> y_1( y.begin(), y.begin() + _L->coldim() );
- //std::vector<typename Field::Element> y_2( y.begin() + _L->coldim(), y.end() );
- Subvector<typename OutVector::iterator, typename OutVector::const_iterator> y_1(y.begin(), y.begin()+_L->coldim());
- Subvector<typename OutVector::iterator, typename OutVector::const_iterator> y_2(y.begin()+_L->coldim(), y.end());
- _L->applyTranspose (y_1, x);
- _R->applyTranspose (y_2, x);
+ //std::vector<typename Field::Element> y_1( y.begin(), y.begin() + _quadLeft->coldim() );
+ //std::vector<typename Field::Element> y_2( y.begin() + _quadLeft->coldim(), y.end() );
+ Subvector<typename OutVector::iterator, typename OutVector::const_iterator> y_1(y.begin(), y.begin()+_quadLeft->coldim());
+ Subvector<typename OutVector::iterator, typename OutVector::const_iterator> y_2(y.begin()+_quadLeft->coldim(), y.end());
+ _quadLeft->applyTranspose (y_1, x);
+ _quadRight->applyTranspose (y_2, x);
copy(y_1.begin(), y_1.end(), y.begin());
copy(y_2.begin(), y_2.end(), y.begin() + y_1.size());
return y;
}
- size_t rowdim()const{return _L->rowdim();}
- size_t coldim()const{return _L->coldim() + _R->coldim();}
- const Field& field()const {return _L->field();}
+ size_t rowdim()const{return _quadLeft->rowdim();}
+ size_t coldim()const{return _quadLeft->coldim() + _quadRight->coldim();}
+ const Field& field()const {return _quadLeft->field();}
};
template <typename Field>
class OverUnder {
typedef ZOQuad<Field> Quad;
public://temp
- const Quad *_U, *_D;
+ const Quad *_quadUp, *_quadDown;
public:
OverUnder(const Quad* A, const Quad* B) :
- _U(A), _D(B)
+ _quadUp(A), _quadDown(B)
{}
- //~OverUnder() {delete _U; delete _D;}
+ //~OverUnder() {delete _quadUp; delete _quadDown;}
template <typename InVector, typename OutVector>
OutVector& apply(OutVector& y, const InVector& x) const
//OutVector& apply(OutVector& y, const InVector& x)
{
- //std::vector<typename Field::Element> y_1( y.begin(), y.begin() + _U->rowdim() );
- //std::vector<typename Field::Element> y_2( y.begin() + _U->rowdim(), y.end() );
- Subvector<typename OutVector::iterator, typename OutVector::const_iterator> y_1(y.begin(), y.begin()+_U->rowdim());
- Subvector<typename OutVector::iterator, typename OutVector::const_iterator> y_2(y.begin()+_U->rowdim(), y.end());
+ //std::vector<typename Field::Element> y_1( y.begin(), y.begin() + _quadUp->rowdim() );
+ //std::vector<typename Field::Element> y_2( y.begin() + _quadUp->rowdim(), y.end() );
+ Subvector<typename OutVector::iterator, typename OutVector::const_iterator> y_1(y.begin(), y.begin()+_quadUp->rowdim());
+ Subvector<typename OutVector::iterator, typename OutVector::const_iterator> y_2(y.begin()+_quadUp->rowdim(), y.end());
//if ((_A_ptr == 0) || (_B_ptr == 0)) { throw error }
//std::cout << " over-under apply size of x: " << x.size() << " " << " size of y: " << y.size() << endl;
//std::cout << " over-under apply size of y_1: " << y_1.size() << " " << " size of y_2: " << y_2.size() << endl;
- _U->apply (y_1, x);
- _D->apply (y_2, x);
+ _quadUp->apply (y_1, x);
+ _quadDown->apply (y_2, x);
//copy(y_1.begin(), y_1.end(), y.begin());
//copy(y_2.begin(), y_2.end(), y.begin() + y_1.size());
@@ -497,24 +512,33 @@ namespace LinBox
{
std::vector<typename Field::Element> z(y.size());
VectorDomain<Field> VD(field());
- std::vector<typename Field::Element> x_1( x.begin(), x.begin() + _U->rowdim() );
- std::vector<typename Field::Element> x_2( x.begin() + _U->rowdim(), x.end() );
- //Subvector<typename InVector::iterator, typename InVector::const_iterator> x_1(x.begin(), x.begin()+_U->rowdim());
- //Subvector<typename InVector::iterator, typename InVector::const_iterator> x_2(x.begin()+_U->rowdim(), x.end());
- _U->applyTranspose (y, x_1);
- _D->applyTranspose (z, x_2);
+ std::vector<typename Field::Element> x_1( x.begin(), x.begin() + _quadUp->rowdim() );
+ std::vector<typename Field::Element> x_2( x.begin() + _quadUp->rowdim(), x.end() );
+ //Subvector<typename InVector::iterator, typename InVector::const_iterator> x_1(x.begin(), x.begin()+_quadUp->rowdim());
+ //Subvector<typename InVector::iterator, typename InVector::const_iterator> x_2(x.begin()+_quadUp->rowdim(), x.end());
+ _quadUp->applyTranspose (y, x_1);
+ _quadDown->applyTranspose (z, x_2);
VD.addin(y, z);
return y;
}
- size_t coldim() const{return _U->coldim();}
- size_t rowdim() const{return _U->rowdim() + _D->rowdim();}
- const Field& field() const {return _U->field();}
+ size_t coldim() const{return _quadUp->coldim();}
+ size_t rowdim() const{return _quadUp->rowdim() + _quadDown->rowdim();}
+ const Field& field() const {return _quadUp->field();}
};
// similar class OverUnder<Field>
-}; //namespace LinBox
+} //namespace LinBox
#endif // __LINBOX_quad_matrix_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/random-matrix-traits.h b/linbox/blackbox/random-matrix-traits.h
index 61dd11b..5c24619 100644
--- a/linbox/blackbox/random-matrix-traits.h
+++ b/linbox/blackbox/random-matrix-traits.h
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Author: Zhendong Wan
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_random_matrix_traits_H
@@ -35,3 +36,12 @@ namespace LinBox
#endif // __LINBOX_random_matrix_traits_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/random-matrix.h b/linbox/blackbox/random-matrix.h
index 11a77fa..03d40db 100644
--- a/linbox/blackbox/random-matrix.h
+++ b/linbox/blackbox/random-matrix.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Author: Zhendong Wan
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -26,9 +27,8 @@
#ifndef __LINBOX_blackbox_random_matrix_H
#define __LINBOX_blackbox_random_matrix_H
-#include <linbox/blackbox/blackbox-interface.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/blackbox/sparse.h>
+#include "linbox/blackbox/blackbox-interface.h"
+#include "linbox/blackbox/sparse.h"
namespace LinBox
{
@@ -49,17 +49,17 @@ namespace LinBox
// constructor a random dense matrix, whose entries are random
template<class Field>
- static DenseMatrix<Field>*& randomMatrix( DenseMatrix<Field>*& Ap,
+ static BlasMatrix<Field>*& randomMatrix( BlasMatrix<Field>*& Ap,
const Field& f,
int rowdim, int coldim )
{
- Ap = new DenseMatrix<Field>(f, rowdim, coldim);
- typename DenseMatrix<Field>::RawIterator Ap_p;
+ Ap = new BlasMatrix<Field>(f, rowdim, coldim);
+ typename BlasMatrix<Field>::Iterator Ap_p;
typename Field::Element zero, one, elt;
f. init (one, 1); f. init (zero, 0);
- for (Ap_p = Ap -> rawBegin(); Ap_p != Ap -> rawEnd(); ++ Ap_p)
+ for (Ap_p = Ap -> Begin(); Ap_p != Ap -> End(); ++ Ap_p)
f. assign (*Ap_p, zero);
if (rowdim < coldim)
@@ -83,6 +83,7 @@ namespace LinBox
return Ap;
}
+
// constructor a very special random sparse matrix
// [I, R] or [I, R]^t, where R is a sparse random matrix.
template<class Field>
@@ -159,3 +160,12 @@ namespace LinBox
#endif //__LINBOX_blabbox_random_matrix_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/rational-matrix-factory.h b/linbox/blackbox/rational-matrix-factory.h
index 0dee7d4..55e34b7 100644
--- a/linbox/blackbox/rational-matrix-factory.h
+++ b/linbox/blackbox/rational-matrix-factory.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/rational-matrix-factory.h
* Copyright (C) 2009 Anna Marszalek
*
* Written by Anna Marszalek <aniau at astronet.pl>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,309 +17,322 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_rational_dense_factory_H
#define __LINBOX_rational_dense_factory_H
-#include <linbox/blackbox/factory.h>
-#include <linbox/blackbox/dense.h>
-//#include <linbox/matrix/dense.h>
-//#include <linbox/field/gmp-rational.h>
-#include <linbox/field/PID-integer.h>
-#include <linbox/integer.h>
+#include "linbox/blackbox/factory.h"
+//#include "linbox/field/gmp-rational.h"
+#include "linbox/field/PID-integer.h"
+#include "linbox/integer.h"
#include <vector>
namespace LinBox
{
-/*
- * aniau at astronet.pl 06/2009
- * Given rational matrix _A, computes parameters needed to found best (usually integer) representation:
- * See: denominator, rationalNorm, normAtilde, normAprim, getOmega
- * See others: maxNorm, hadamard
- * Computes the representation
- * See: makeAtilde, makeAprim
- * Works with dense matrices, needs sparse spcialization (due to use of row::iterator)
- */
+ /*
+ * aniau at astronet.pl 06/2009
+ * Given rational matrix _matA, computes parameters needed to found best (usually integer) representation:
+ * See: denominator, rationalNorm, normAtilde, normAprim, getOmega
+ * See others: maxNorm, hadamard
+ * Computes the representation
+ * See: makeAtilde, makeAprim
+ * Works with dense matrices, needs sparse spcialization (due to use of row::iterator)
+ */
-template<class Integers, class Rationals, class QMatrix>
-class RationalMatrixFactory //: public DenseMatrixFactory<Integers,typename Rationals::Element >
-{
-//typedef GMPRationalField Rationals;
-typedef typename Rationals::Element Quotient;
-//typedef PID_integer Integers;
-//typedef typename PID_integer::Element Integer;
-//
-
- private:
- const QMatrix* _A;
- const Rationals Q;
-
- mutable size_t rat_omega;
- mutable size_t omega;
- mutable Integer denA; //once computed becomes constant
- mutable std::vector<Integer> denAi; //once computed becomes constant
-
- public:
-
- RationalMatrixFactory(const QMatrix* A) :
- Q(), denAi(A->rowdim(),1)
- {rat_omega = 0; omega = 0; denA = 1; _A = A;}
-
- size_t rowdim() { return _A->rowdim(); }
- size_t coldim() { return _A->coldim(); }
-
- typedef typename QMatrix::ConstRawIterator ConstRawIterator;
- typedef typename QMatrix::ConstRowIterator RowIterator;
-
- double maxNorm(double& res) const {
- typename QMatrix::ConstRawIterator i;
- res = 0.0;
- double tmp;
-
- for( i = _A->rawBegin(); i != _A->rawEnd(); ++i ) {
- Integer d,n; Q.get_den(d,*i);Q.get_num(n,*i);
- tmp = abs( (double)(n)/(double)(d) );
- if( res < tmp ) res = tmp;
- }
- return res;
- }
-
- double hadamardBound(double& res) const {
- typename QMatrix::ConstRowIterator r;
- typename QMatrix::ConstRow::const_iterator c;
-
- res = 1.0;
- double temp;
-
- for( r = _A->rowBegin(); r != _A->rowEnd(); ++r ) {
- temp = 0.0;
- for( c = r->begin(); c != r->end(); ++c ) {
- Integer d,n; Q.get_den(d,*c);Q.get_num(n,*c);
- double a = (double) n / (double) d;
- temp = temp + (a* a);
- }
- res *= temp;
- }
- res = sqrt(res);
- return res;
- }
+ template<class Integers, class Rationals, class QMatrix>
+ class RationalMatrixFactory /*: public MatrixFactory<Integers,typename Rationals::Element >*/ {
+ //typedef GMPRationalField Rationals;
+ typedef typename Rationals::Element Quotient;
+ //typedef PID_integer Integers;
+ //typedef typename PID_integer::Element Integer;
+ //
-//rational specialization
+ private:
+ const QMatrix* _matA;
+ const Rationals _ratField;
- /*
- * Returns the common denominator denA of _A
- */
- Integer& denominator(Integer& da) const {
- if (denA ==1 ) {
- ConstRawIterator i;
- //denA = 1L;
- for (i = _A->rawBegin (); i != _A->rawEnd (); ++i) {
- Integer d; Q.get_den(d,*i);
- lcm(denA,denA,d);
- }
- }
- return da=denA;;
- }
+ mutable size_t _ratOmega;
+ mutable size_t _omega;
+ mutable Integer _denA; //once computed becomes constant
+ mutable std::vector<Integer> _denAi; //once computed becomes constant
- /*
- * returns common denominator denAi[i] of i-th row
- */
- Integer& denominator(Integer& di, const int i) const {
- if (denAi[i]==1) {
- typedef typename QMatrix::ConstRow::const_iterator EltIterator;
- for (size_t j=0; j < _A->coldim(); ++j) {
- Integer d; Q.get_den(d,_A->getEntry(i,j));
- lcm(denAi[i],denAi[i],d);
+ public:
+
+ RationalMatrixFactory(const QMatrix* A) :
+ _ratField(), _denAi(A->rowdim(),1)
+ {_ratOmega = 0; _omega = 0; _denA = 1; _matA = A;}
+
+ size_t rowdim() { return _matA->rowdim(); }
+ size_t coldim() { return _matA->coldim(); }
+
+ typedef typename QMatrix::ConstIterator ConstIterator;
+ typedef typename QMatrix::ConstRowIterator RowIterator;
+
+ double maxNorm(double& res) const {
+ typename QMatrix::ConstIterator i;
+ res = 0.0;
+ double tmp;
+
+ for( i = _matA->Begin(); i != _matA->End(); ++i ) {
+ Integer d,n;
+ _ratField.get_den(d,*i);
+ _ratField.get_num(n,*i);
+ tmp = abs( (double)(n)/(double)(d) );
+ if( res < tmp ) res = tmp;
+ }
+ return res;
}
- }
- return di=denAi[i];
- }
-
-//returns max of abs(numerators) and denominators of _A
- Integer& rationalNorm(Integer& res) const {
- ConstRawIterator i;
- res = 0L;
- Integer tmp;
- for (i = _A->rawBegin (); i != _A->rawEnd (); ++i) {
- Integer n ;Q.get_num(n,*i);
- Integer d ;Q.get_den(d,*i);
- tmp = abs (n);
- if (tmp < d) tmp = d;
- if (res < tmp) res = tmp;
+
+ double hadamardBound(double& res) const {
+ typename QMatrix::ConstRowIterator r;
+ typename QMatrix::ConstRow::const_iterator c;
+
+ res = 1.0;
+ double temp;
+
+ for( r = _matA->rowBegin(); r != _matA->rowEnd(); ++r ) {
+ temp = 0.0;
+ for( c = r->begin(); c != r->end(); ++c ) {
+ Integer d,n;
+ _ratField.get_den(d,*c);
+ _ratField.get_num(n,*c);
+ double a = (double) n / (double) d;
+ temp = temp + (a* a);
+ }
+ res *= temp;
+ }
+ res = sqrt(res);
+ return res;
}
- return res;
- }
-
-//returns norm of A'= denA * _A
- Integer& normAprim(Integer& res) const {
-
- Integer DA;
- denominator(DA);
-
- double norm; maxNorm(norm);
- res = (Integer) ( (double) DA * norm ) ;
-
- return res;
- }
-
-//returns norm of tilde{A} = diag(denAi[i])_A
- Integer& normAtilde(Integer& res) const {
- //typedef typename DenseMatrixBase<Quotient>::ConstRow::const_iterator EltIterator;
- res = 0L;
- double dres = 0;
- //int i=0;
- Integer tmp;
- double dtmp;
- for (int i=0; i < _A->rowdim(); ++i) {
- Integer di; denominator(di,i);
- for (int j=0; j < _A->coldim(); ++j ) {
- Integer n ; Q.get_num(n,_A->getEntry(i,j));
- Integer d ; Q.get_den(d,_A->getEntry(i,j));
- dtmp = (double)di/double(d)*double(n);
- //tmp = di/d;
- //tmp*=abs(n);
- if (dtmp > dres) dres = dtmp;
- }
- }
- res = (Integer)dres;
-
- return res;
- }
-
-/*
- * optimization: computes normAprim, normAprim, rationalNormat the same time
- */
- Integer getNorms(Integer& ratnorm, Integer& normaprim, Integer& normatilde) const {
- typedef typename QMatrix::ConstRow::const_iterator EltIterator;
- ratnorm = 0L; normaprim=0L; normatilde= 0L;
- Integer da=1L;
- std::vector<integer> di(_A->rowdim(),1L);
-
- for (size_t i=0; i < _A->rowdim(); ++i) {
- if (denAi[i]==1) {
- for (size_t j=0; j < _A->coldim(); ++j ) {
- Integer d ; Q.get_den(d,_A->getEntry(i,j));
- lcm(denAi[i],denAi[i],d);
+
+ //rational specialization
+
+ /*
+ * Returns the common denominator _denA of _matA
+ */
+ Integer& denominator(Integer& da) const {
+ if (_denA ==1 ) {
+ ConstIterator i;
+ //_denA = 1L;
+ for (i = _matA->Begin (); i != _matA->End (); ++i) {
+ Integer d;
+ _ratField.get_den(d,*i);
+ lcm(_denA,_denA,d);
+ }
+ }
+ return da=_denA;;
+ }
+
+ /*
+ * returns common denominator _denAi[i] of i-th row
+ */
+ Integer& denominator(Integer& di, const int i) const {
+ if (_denAi[i]==1) {
+ typedef typename QMatrix::ConstRow::const_iterator EltIterator;
+ for (size_t j=0; j < _matA->coldim(); ++j) {
+ Integer d;
+ _ratField.get_den(d,_matA->getEntry(i,j));
+ lcm(_denAi[i],_denAi[i],d);
+ }
}
- }
- di[i] = denAi[i];
- lcm(denA,denA,di[i]);
+ return di=_denAi[i];
}
- da = denA;
- for (size_t i=0; i < _A->rowdim(); ++i ) {
- for (size_t j=0; j < _A->coldim(); ++j ) {
- Integer n ; Q.get_num(n,_A->getEntry(i,j));
- Integer d ; Q.get_den(d,_A->getEntry(i,j));
+ //returns max of abs(numerators) and denominators of _matA
+ Integer& rationalNorm(Integer& res) const {
+ ConstIterator i;
+ res = 0L;
+ Integer tmp;
+ for (i = _matA->Begin (); i != _matA->End (); ++i) {
+ Integer n ;
+ _ratField.get_num(n,*i);
+ Integer d ;
+ _ratField.get_den(d,*i);
+ tmp = abs (n);
+ if (tmp < d) tmp = d;
+ if (res < tmp) res = tmp;
+ }
+ return res;
+ }
- Integer tmp = abs(n);
- if (tmp > ratnorm) ratnorm = tmp;
- if (d > ratnorm) ratnorm = d;
+ //returns norm of A'= _denA * _matA
+ Integer& normAprim(Integer& res) const {
- Integer tmp2 = (di[i]) / d;
- tmp2 *=tmp;
- if (tmp2 > normatilde) normatilde = tmp2;
+ Integer DA;
+ denominator(DA);
- tmp2 = da/d;
- tmp2 *= tmp;
- if (tmp2 > normaprim) normaprim = tmp2;
+ double norm; maxNorm(norm);
+ res = (Integer) ( (double) DA * norm ) ;
+
+ return res;
+ }
+ //returns norm of tilde{A} = diag(_denAi[i])_matA
+ Integer& normAtilde(Integer& res) const {
+ res = 0L;
+ double dres = 0;
+ //int i=0;
+ Integer tmp;
+ double dtmp;
+ for (int i=0; i < _matA->rowdim(); ++i) {
+ Integer di; denominator(di,i);
+ for (int j=0; j < _matA->coldim(); ++j ) {
+ Integer n ;
+ _ratField.get_num(n,_matA->getEntry(i,j));
+ Integer d ;
+ _ratField.get_den(d,_matA->getEntry(i,j));
+ dtmp = (double)di/double(d)*double(n);
+ //tmp = di/d;
+ //tmp*=abs(n);
+ if (dtmp > dres) dres = dtmp;
+ }
}
+ res = (Integer)dres;
+
+ return res;
}
- integer minnorm = (ratnorm > normatilde) ? normatilde : ratnorm;
- return minnorm;
- }
-/*
- DenseMatrix< Rationals >& makeA(DenseMatrix<Rationals >& A) {
- //DenseMatrix<Rationals > local(Q,_A);
- //return A = local;
-
- for( int i=0; i < _A->rowdim(); ++i) {
- for (int j=0; j < _A->coldim(); ++j) {
- A.setEntry(i,j, _A->getEntry(i,j));
+
+ /*
+ * optimization: computes normAprim, normAprim, rationalNormat the same time
+ */
+ Integer getNorms(Integer& ratnorm, Integer& normaprim, Integer& normatilde) const {
+ typedef typename QMatrix::ConstRow::const_iterator EltIterator;
+ ratnorm = 0L; normaprim=0L; normatilde= 0L;
+ Integer da=1L;
+ std::vector<integer> di(_matA->rowdim(),1L);
+
+ for (size_t i=0; i < _matA->rowdim(); ++i) {
+ if (_denAi[i]==1) {
+ for (size_t j=0; j < _matA->coldim(); ++j ) {
+ Integer d ;
+ _ratField.get_den(d,_matA->getEntry(i,j));
+ lcm(_denAi[i],_denAi[i],d);
+ }
+ }
+ di[i] = _denAi[i];
+ lcm(_denA,_denA,di[i]);
}
+ da = _denA;
+
+ for (size_t i=0; i < _matA->rowdim(); ++i ) {
+ for (size_t j=0; j < _matA->coldim(); ++j ) {
+ Integer n ;
+ _ratField.get_num(n,_matA->getEntry(i,j));
+ Integer d ;
+ _ratField.get_den(d,_matA->getEntry(i,j));
+
+ Integer tmp = abs(n);
+ if (tmp > ratnorm) ratnorm = tmp;
+ if (d > ratnorm) ratnorm = d;
+
+ Integer tmp2 = (di[i]) / d;
+ tmp2 *=tmp;
+ if (tmp2 > normatilde) normatilde = tmp2;
+
+ tmp2 = da/d;
+ tmp2 *= tmp;
+ if (tmp2 > normaprim) normaprim = tmp2;
+
+ }
+ }
+ integer minnorm = (ratnorm > normatilde) ? normatilde : ratnorm;
+ return minnorm;
}
- }
-*/
- /*
- * Creates Aprim = denA * _A
- */
- template <class Matrix>
- Matrix& makeAprim(Matrix& Aprim) const {
- Integer da; denominator(da);
- Aprim.resize(_A->rowdim(),_A->coldim());
-
- for( size_t i=0; i < _A->rowdim(); ++i) {
- for (size_t j=0; j < _A->coldim(); ++j) {
- Quotient q = _A->getEntry(i,j);
- Integer n ; Q.get_num(n,q);
- Integer d ; Q.get_den(d,q);
- Integer tmp = da/d;
- tmp *=n;
- typename Matrix::Field F=Aprim.field();
- typename Matrix::Field::Element ftmp; F.init(ftmp,tmp);
- Aprim.setEntry(i,j, ftmp);
+
+ /*
+ * Creates Aprim = _denA * _matA
+ */
+ template <class Matrix>
+ Matrix& makeAprim(Matrix& Aprim) const {
+ Integer da; denominator(da);
+ Aprim.resize(_matA->rowdim(),_matA->coldim());
+
+ for( size_t i=0; i < _matA->rowdim(); ++i) {
+ for (size_t j=0; j < _matA->coldim(); ++j) {
+ Quotient Aij = _matA->getEntry(i,j);
+ Integer n ;
+ _ratField.get_num(n,Aij);
+ Integer d ;
+ _ratField.get_den(d,Aij);
+ Integer tmp = da/d;
+ tmp *=n;
+ typename Matrix::Field F=Aprim.field();
+ typename Matrix::Field::Element ftmp; F.init(ftmp,tmp);
+ Aprim.setEntry(i,j, ftmp);
+ }
}
+ return Aprim;
}
- return Aprim;
- }
- /*
- * Creates Atilde = diag(denAi[i]) * _A
- */
- template <class Matrix>
- Matrix& makeAtilde(Matrix& Atilde) const {
-
- Atilde.resize(_A->rowdim(),_A->coldim());
- std::vector<integer> di(_A->rowdim());
- for (size_t i=0; i < _A->rowdim(); ++i) denominator(di[i],i);
-
- for( size_t i=0; i < _A->rowdim(); ++i) {
- for (size_t j=0; j < _A->coldim(); ++j) {
- Quotient q = _A->getEntry(i,j);
- Integer n ; Q.get_num(n,q);
- Integer d ; Q.get_den(d,q);
- Integer tmp = di[i]/d;
- tmp *=n;
- typename Matrix::Field F=Atilde.field();
- typename Matrix::Field::Element ftmp; F.init(ftmp,tmp);
- Atilde.setEntry(i,j, ftmp);
+ /*
+ * Creates Atilde = diag(_denAi[i]) * _matA
+ */
+ template <class Matrix>
+ Matrix& makeAtilde(Matrix& Atilde) const {
+
+ Atilde.resize(_matA->rowdim(),_matA->coldim());
+ std::vector<integer> di(_matA->rowdim());
+ for (size_t i=0; i < (size_t)_matA->rowdim(); ++i)
+ denominator(di[(int)i],(int)i);
+
+ for( size_t i=0; i < _matA->rowdim(); ++i) {
+ for (size_t j=0; j < _matA->coldim(); ++j) {
+ Quotient Aij = _matA->getEntry(i,j);
+ Integer n ;
+ _ratField.get_num(n,Aij);
+ Integer d ;
+ _ratField.get_den(d,Aij);
+ Integer tmp = di[i]/d;
+ tmp *=n;
+ typename Matrix::Field F=Atilde.field();
+ typename Matrix::Field::Element ftmp; F.init(ftmp,tmp);
+ Atilde.setEntry(i,j, ftmp);
+ }
}
- }
- return Atilde;
- }
+ return Atilde;
+ }
- /*
- * Counts the number of non-zero and non-integer elements
- */
- size_t getOmega(size_t& o, size_t& ro) const {
- if (omega ==0 ) {
- for( size_t i=0; i < _A->rowdim(); ++i) {
- for (size_t j=0; j < _A->coldim(); ++j) {
- Quotient q = _A->getEntry(i,j);
- Integer n ; Q.get_num(n,q);
- Integer d ; Q.get_den(d,q);
- if (n!=0) {
- ++omega;
- if (d!=1) ++rat_omega;
+ /*
+ * Counts the number of non-zero and non-integer elements
+ */
+ size_t getOmega(size_t& o, size_t& ro) const {
+ if (_omega ==0 ) {
+ for( size_t i=0; i < _matA->rowdim(); ++i) {
+ for (size_t j=0; j < _matA->coldim(); ++j) {
+ Quotient Aij = _matA->getEntry(i,j);
+ Integer n ;
+ _ratField.get_num(n,Aij);
+ Integer d ;
+ _ratField.get_den(d,Aij);
+ if (n!=0) {
+ ++_omega;
+ if (d!=1) ++_ratOmega;
+ }
+ }
}
}
- }
+ ro = _ratOmega;
+ return o=_omega;
}
- ro = rat_omega;
- return o=omega;
- }
-};
+ };
} // namespace LinBox
-#include "dense.inl"
#endif //__LINBOX_rational_dense_factory_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/scalar-matrix.h b/linbox/blackbox/scalar-matrix.h
index 64acf20..0590449 100644
--- a/linbox/blackbox/scalar-matrix.h
+++ b/linbox/blackbox/scalar-matrix.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/scalar.h
* Copyright (C) 2002 by -bds
* evolved from diagonal.h written by William J Turner and Bradford Hovinen
@@ -10,8 +8,24 @@
* Added parametrization of VectorCategory tags by VectorTraits. See
* vector-traits.h for more details.
*
- * see COPYING for licence details
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
* -------------------------------
*/
@@ -19,12 +33,12 @@
#define __LINBOX_scalar_H
#include <algorithm>
-#include <linbox/field/hom.h>
+#include "linbox/field/hom.h"
#include "linbox/vector/vector-traits.h"
#include "linbox/util/debug.h"
#include "linbox/linbox-config.h"
#include "linbox/field/hom.h"
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
namespace LinBox
{
@@ -45,14 +59,14 @@ namespace LinBox
typedef ScalarMatrix<_Field> Self_t;
/* In each specialization, I must define suitable constructor(s) and
- BlackboxArchetype<Vector> * clone() const;
- Vector& apply(Vector& y, Vector& x) const;
- Vector& applyTranspose(Vector& y, Vector& x) const;
- size_t rowdim(void) const;
- size_t coldim(void) const;
- Field& field() const;
- ...rebind...
- */
+ * BlackboxArchetype<Vector> * clone() const;
+ * Vector& apply(Vector& y, Vector& x) const;
+ * Vector& applyTranspose(Vector& y, Vector& x) const;
+ * size_t rowdim(void) const;
+ * size_t coldim(void) const;
+ * Field& field() const;
+ * ...rebind...
+ */
/// Constructs an initially 0 by 0 matrix.
ScalarMatrix () :
@@ -65,7 +79,7 @@ namespace LinBox
* @param s scalar, a field element, to be used as the diagonal of the matrix.
*/
ScalarMatrix (const Field &F, const size_t n, const Element &s) :
- _F(F), _n(n), _v(s)
+ _field(F), _n(n), _v(s)
{}
/** Constructor from a random element.
@@ -74,14 +88,14 @@ namespace LinBox
* @param iter Random iterator from which to get the diagonal scalar element.
*/
ScalarMatrix (const Field &F, const size_t n, const typename Field::RandIter& iter) :
- _F(F), _n(n)
+ _field(F), _n(n)
{ iter.random(_v); }
- ScalarMatrix(const ScalarMatrix<Field> &M) :
- _F(M._F)
+ ScalarMatrix(const ScalarMatrix<Field> &Mat) :
+ _field(Mat._field)
{
- _n = M._n;
- _v = M._v;
+ _n = Mat._n;
+ _v = Mat._v;
}
@@ -110,10 +124,11 @@ namespace LinBox
struct rebind {
typedef ScalarMatrix<_Tp1> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F)
+ void operator() (other & Ap, const Self_t& A)
{
- Hom<typename Self_t::Field, _Tp1> hom(A.field(), F);
- typename _Tp1::Element e; F.init(e);
+ Hom<typename Self_t::Field, _Tp1> hom(A.field(), Ap.field());
+ typename _Tp1::Element e;
+ Ap.field().init(e,0UL);
hom.image (e, A._v);
Ap.setScalar(e);
}
@@ -121,9 +136,9 @@ namespace LinBox
template<typename _Tp1>
ScalarMatrix (const ScalarMatrix<_Tp1>& S, const Field &F) :
- _F(F), _n(S.rowdim())
+ _field(F), _n(S.rowdim())
{
- typename ScalarMatrix<_Tp1>::template rebind<Field>() (*this, S, F);
+ typename ScalarMatrix<_Tp1>::template rebind<Field>() (*this, S);
}
@@ -131,26 +146,26 @@ namespace LinBox
size_t coldim(void) const { return _n; }
- const Field& field() const {return _F;}
+ const Field& field() const {return _field;}
// for a specialization in solutions
Element& trace(Element& t) const
- { Element n; _F.init(n, _n);
- return _F.mul(t, _v, n);
+ { Element n; _field.init(n, _n);
+ return _field.mul(t, _v, n);
}
Element& getEntry(Element& x, const size_t i, const size_t j) const
{
- return (i==j?_F.assign(x,_v):_F.init(x,0));
+ return (i==j?_field.assign(x,_v):_field.init(x,0));
}
- Element& getScalar(Element& x) const { return this->_F.assign(x,this->_v); }
- Element& setScalar(const Element& x) { return this->_F.assign(this->_v,x); }
+ Element& getScalar(Element& x) const { return this->_field.assign(x,this->_v); }
+ Element& setScalar(const Element& x) { return this->_field.assign(this->_v,x); }
protected:
- Field _F; // Field for arithmetic
+ Field _field; // Field for arithmetic
size_t _n; // Number of rows and columns of square matrix.
@@ -183,14 +198,14 @@ namespace LinBox
linbox_check (y.size() >= _n);
typename OutVector::iterator y_iter = y.begin ();
- if (_F.isZero(_v)) // just write zeroes
+ if (_field.isZero(_v)) // just write zeroes
for ( ; y_iter != y.end (); ++y_iter) *y_iter = _v;
- else if (_F.isOne(_v) ) // just copy
+ else if (_field.isOne(_v) ) // just copy
copy(x.begin(), x.end(), y.begin());
else // use actual muls
{ typename InVector::const_iterator x_iter = x.begin ();
for ( ; y_iter != y.end () ; ++y_iter, ++x_iter )
- _F.mul (*y_iter, _v, *x_iter);
+ _field.mul (*y_iter, _v, *x_iter);
}
return y;
@@ -210,13 +225,13 @@ namespace LinBox
// field element to be used in calculations
Element entry;
- _F.init (entry, 0); // needed?
+ _field.init (entry, 0); // needed?
// For each element, multiply input element with corresponding element
// of stored scalar and insert non-zero elements into output vector
for ( typename InVector::const_iterator x_iter = x.begin (); x_iter != x.end (); ++x_iter)
- { _F.mul (entry, _v, x_iter->second);
- if (!_F.isZero (entry)) y.push_back (make_pair (x_iter->first, entry));
+ { _field.mul (entry, _v, x_iter->second);
+ if (!_field.isZero (entry)) y.push_back (make_pair (x_iter->first, entry));
}
return y;
@@ -232,14 +247,14 @@ namespace LinBox
// create field elements and size_t to be used in calculations
Element entry;
- _F.init (entry, 0);
+ _field.init (entry, 0);
// Iterator over indices of input vector.
// For each element, multiply input element with
// stored scalar and insert non-zero elements into output vector
for ( typename InVector::const_iterator x_iter = x.begin (); x_iter != x.end (); ++x_iter)
- { _F.mul (entry, _v, x_iter->second);
- if (!_F.isZero (entry)) y.insert (y.end (), make_pair (x_iter->first, entry));
+ { _field.mul (entry, _v, x_iter->second);
+ if (!_field.isZero (entry)) y.insert (y.end (), make_pair (x_iter->first, entry));
}
return y;
@@ -249,3 +264,12 @@ namespace LinBox
#endif // __LINBOX_scalar_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/scompose.h b/linbox/blackbox/scompose.h
index 0f393f0..606faf9 100644
--- a/linbox/blackbox/scompose.h
+++ b/linbox/blackbox/scompose.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by Zhendong Wan
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_scompose_H
@@ -29,10 +30,9 @@
* Compute the perturbation A+UV and LAR
*/
-#include <linbox/util/debug.h>
-#include <linbox/blackbox/blackbox-interface.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/blackbox/compose.h>
+#include "linbox/util/debug.h"
+#include "linbox/blackbox/blackbox-interface.h"
+#include "linbox/blackbox/compose.h"
namespace LinBox
{
@@ -48,7 +48,8 @@ namespace LinBox
static Compose<Blackbox, Blackbox>*& compose (Compose<Blackbox, Blackbox>*& LAR,
const Blackbox& L,
const Blackbox& A,
- const Blackbox& R) {
+ const Blackbox& R)
+ {
linbox_check (L.coldim() == A.rowdim());
@@ -67,23 +68,23 @@ namespace LinBox
return LAR;
}
- // specialization for dense matrix case, explicitly compute the LAR by matrix multiplication
+
template <class Field>
- static DenseMatrix<Field>*& compose (DenseMatrix<Field>*& LAR,
- const DenseMatrix<Field>& L,
- const DenseMatrix<Field>& A,
- const DenseMatrix<Field>& R)
+ static BlasMatrix<Field>*& compose (BlasMatrix<Field>*& LAR,
+ const BlasMatrix<Field>& L,
+ const BlasMatrix<Field>& A,
+ const BlasMatrix<Field>& R)
{
linbox_check (L.coldim() == A.rowdim());
linbox_check (A.coldim() == R.rowdim());
- LAR = new DenseMatrix<Field>(L.field(), L.rowdim(), R.coldim());
+ LAR = new BlasMatrix<Field>(L.field(), L.rowdim(), R.coldim());
- typename DenseMatrix<Field>::ConstRowIterator crow_p;
+ typename BlasMatrix<Field>::ConstRowIterator crow_p;
- typename DenseMatrix<Field>::RowIterator row_p;
+ typename BlasMatrix<Field>::RowIterator row_p;
std::vector<typename Field::Element> tmp(R.rowdim());
@@ -98,53 +99,6 @@ namespace LinBox
return LAR;
}
-#if 0
- //- Compute A + UV, for EGV algorithm, not be used any more.
- template <class Blackbox>
- static Blackbox*& composeBig (Blackbox*& AUV,
- const Blackbox& A,
- const Blackbox& U,
- const Blackbox& V);
-
-
-
- // @brief This composeBig creates A + UV for EGV algorithm for the DenseMatrix case.
- template <class Field>
- static DenseMatrix<Field>*& composeBig (DenseMatrix<Field>*& AUV,
- const DenseMatrix<Field>& A,
- const DenseMatrix<Field>& U,
- const DenseMatrix<Field>& V) {
-
- linbox_check (U.rowdim() == A.rowdim());
-
- linbox_check (A.coldim() == V.coldim());
-
- AUV = new DenseMatrix<Field>(A.field(), A.rowdim(), A.coldim());
-
- typename DenseMatrix<Field>::ConstRowIterator crow_p;
-
- typename DenseMatrix<Field>::RowIterator row_p;
-
- for (row_p = AUV -> rowBegin(), crow_p = U.rowBegin();
- row_p != AUV -> rowEnd(); ++ row_p, ++ crow_p) {
-
- V.applyTranspose(*row_p, *crow_p);
-
- }
-
- typename DenseMatrix<Field>::ConstRawIterator celt_p;
- typename DenseMatrix<Field>::RawIterator elt_p;
-
- for( elt_p = AUV -> rawBegin(), celt_p = A.rawBegin(); celt_p != A.rawEnd(); ++ elt_p, ++ celt_p)
- A.field().addin(*elt_p,*celt_p);
-
- return AUV;
-
- }
-#endif
-
-
-
};
}
@@ -152,3 +106,12 @@ namespace LinBox
#endif //__LINBOX_scompose_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/sparse.h b/linbox/blackbox/sparse.h
index 7ec081d..5b89ecf 100644
--- a/linbox/blackbox/sparse.h
+++ b/linbox/blackbox/sparse.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/sparse.h
* Copyright (C) 1999-2005 William J Turner,
* 2001-2002 Bradford Hovinen
@@ -22,15 +20,33 @@
* - New read/write implementations for SparseMatrixBase, supporting multiple
* formats
* - Eliminated Gaussian elimination code
- * - Added iterators, including ColOfRowsIterator, RawIterator, and
- * RawIndexIterator
+ * - Added iterators, including ColOfRowsIterator, Iterator, and
+ * IndexIterator
* - Eliminated operator []; added getEntry; changed put_value to setEntry
* ------------------------------------
* Modified by W. J. Turner <wjturner at acm.org>
* 24.06.2005 : Removed using declarations
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_blackbox_sparse_H
@@ -43,8 +59,8 @@
#include "linbox/vector/vector-traits.h"
#include "linbox/vector/stream.h"
#include "linbox/util/field-axpy.h"
-#include <linbox/field/hom.h>
-#include <linbox/field/rebind.h>
+#include "linbox/field/hom.h"
+#include "linbox/field/rebind.h"
namespace LinBox
{
@@ -74,10 +90,10 @@ namespace LinBox
FileFormatTag Format;
- typedef typename SparseMatrixBase<typename Field::Element, _Row>::RawIterator RawIterator;
- typedef typename SparseMatrixBase<typename Field::Element, _Row>::RawIndexedIterator RawIndexedIterator;
- typedef typename SparseMatrixBase<typename Field::Element, _Row>::ConstRawIterator ConstRawIterator;
- typedef typename SparseMatrixBase<typename Field::Element, _Row>::ConstRawIndexedIterator ConstRawIndexedIterator;
+ typedef typename SparseMatrixBase<typename Field::Element, _Row>::Iterator Iterator;
+ typedef typename SparseMatrixBase<typename Field::Element, _Row>::IndexedIterator IndexedIterator;
+ typedef typename SparseMatrixBase<typename Field::Element, _Row>::ConstIterator ConstIterator;
+ typedef typename SparseMatrixBase<typename Field::Element, _Row>::ConstIndexedIterator ConstIndexedIterator;
/** Constructor.
* Builds a zero m x n matrix
@@ -89,19 +105,19 @@ namespace LinBox
*/
#if 0
SparseMatrix (const Field &F) :
- SparseMatrixBase<Element, _Row> (0,0), _F (F), _VD (F), _MD (F), _AT (*this)
+ SparseMatrixBase<Element, _Row> (0,0), _field (F), _VD (F), _MD (F), _AT (*this)
{
std::cerr << "default cstor" << std::endl;
}
SparseMatrix (const Field &F, size_t m, size_t n) :
- SparseMatrixBase<Element, _Row> (m, n), _F (F), _VD (F), _MD (F), _AT (*this)
+ SparseMatrixBase<Element, _Row> (m, n), _field (F), _VD (F), _MD (F), _AT (*this)
{
std::cerr << "default cstor : " << m << "x" << n << std::endl;
}
#endif
SparseMatrix (const Field &F, size_t m=0, size_t n=0) :
- SparseMatrixBase<Element, _Row> (m, n), _F (F), _VD (F), _MD (F), _AT (*this)
+ SparseMatrixBase<Element, _Row> (m, n), _field (F), _VD (F), _MD (F), _AT (*this)
{ }
/** Constructor from a vector stream
@@ -111,7 +127,7 @@ namespace LinBox
template<class VectStream>
SparseMatrix (const Field &F, VectStream &stream) :
SparseMatrixBase<Element, _Row> (stream.size (), stream.dim ()),
- _F (F), _VD (F), _MD (F), _AT (*this)
+ _field (F), _VD (F), _MD (F), _AT (*this)
{
typename SparseMatrixBase<Element, _Row>::RowIterator i;
@@ -124,20 +140,20 @@ namespace LinBox
* @param ms A matrix stream properly initialized
*/
SparseMatrix( MatrixStream<Field>& ms ) :
- SparseMatrixBase<Element,_Row>(ms), _F(ms.getField()), _VD(ms.getField()), _MD(ms.getField()), _AT(*this)
+ SparseMatrixBase<Element,_Row>(ms), _field(ms.getField()), _VD(ms.getField()), _MD(ms.getField()), _AT(*this)
{ }
/** Copy constructor
*/
SparseMatrix (const SparseMatrix<Field, Row> &B) :
- SparseMatrixBase<Element, _Row> (B), _F (B._F), _VD (B._F), _MD (B._F), _AT (*this)
+ SparseMatrixBase<Element, _Row> (B), _field (B._field), _VD (B._field), _MD (B._field), _AT (*this)
{ }
/** Row type Converter constructor
*/
template<class VectorType>
SparseMatrix (const SparseMatrix<Field, VectorType> &B) :
- SparseMatrixBase<Element, _Row> (B), _F (B._F), _VD (B._F), _MD (B._F), _AT (*this)
+ SparseMatrixBase<Element, _Row> (B), _field (B._field), _VD (B._field), _MD (B._field), _AT (*this)
{ }
/** Destructor. */
@@ -196,18 +212,19 @@ namespace LinBox
struct rebind {
typedef SparseMatrix<_Tp1, _Rw1> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F) {
- // Ap = new other(F, A.rowdim(), A.coldim());
+ void operator() (other & Ap, const Self_t& A) {
+ // Ap = new other(F, A.rowdim(), A.coldim());
typename _Tp1::Element e;
- Hom<typename Self_t::Field, _Tp1> hom(A.field(), F);
- for( typename Self_t::ConstRawIndexedIterator
- indices = A.rawIndexedBegin();
- (indices != A.rawIndexedEnd()) ;
+
+ Hom<typename Self_t::Field, _Tp1> hom(A.field(), Ap.field());
+ for( typename Self_t::ConstIndexedIterator
+ indices = A.IndexedBegin();
+ (indices != A.IndexedEnd()) ;
++indices ) {
- // hom. image (e, A.getEntry(indices.rowIndex(),indices.colIndex()) );
+ // hom. image (e, A.getEntry(indices.rowIndex(),indices.colIndex()) );
hom. image (e, indices.value() );
- if (!F.isZero(e))
+ if (!Ap.field().isZero(e))
Ap.setEntry (indices.rowIndex(),
indices.colIndex(), e);
}
@@ -215,9 +232,10 @@ namespace LinBox
};
template<typename _Tp1, typename _Rw1>
- SparseMatrix (const SparseMatrix<_Tp1, _Rw1> &M, const Field& F) :
- SparseMatrixBase<Element, _Row> (M.rowdim(),M.coldim()), _F (F), _VD (F), _MD (F), _AT (*this) {
- typename SparseMatrix<_Tp1,_Rw1>::template rebind<Field,_Row>()(*this, M, F);
+ SparseMatrix (const SparseMatrix<_Tp1, _Rw1> &Mat, const Field& F) :
+ SparseMatrixBase<Element, _Row> (Mat.rowdim(),Mat.coldim()),
+ _field (F), _VD (F), _MD (F), _AT (*this) {
+ typename SparseMatrix<_Tp1,_Rw1>::template rebind<Field,_Row>()(*this, Mat);
}
@@ -241,7 +259,7 @@ namespace LinBox
* @return Reference to input stream
*/
std::istream &read (std::istream &is, FileFormatTag format = FORMAT_DETECT)
- { return SparseMatrixBase<Element, _Row>::read (is, _F, format); }
+ { return SparseMatrixBase<Element, _Row>::read (is, _field, format); }
/** Write the matrix to a stream in the given format
* @param os Output stream to which to write the matrix
@@ -249,17 +267,17 @@ namespace LinBox
* @return Reference to output stream
*/
std::ostream &write (std::ostream &os, FileFormatTag format = FORMAT_PRETTY) const
- { return SparseMatrixBase<Element, _Row>::write (os, _F, format); }
+ { return SparseMatrixBase<Element, _Row>::write (os, _field, format); }
// JGD 28.08.2002
/** Access to the base field
*/
const Field& field () const
- { return _F;}
+ { return _field;}
protected:
- const Field _F; // Field used for all arithmetic
+ const Field _field; // Field used for all arithmetic
VectorDomain<Field> _VD; // Vector domain for matrix operations
MatrixDomain<Field> _MD; // Matrix domain for matrix operations
@@ -279,12 +297,12 @@ namespace LinBox
class Row = typename LinBox::Vector<Field>::Sparse,
class BRow = typename LinBox::RawVector<BElement>::Sparse>
class SparseMatrixFactory : public BlackboxFactory<Field,SparseMatrix<Field,Row> > {//otot
- const SparseMatrixBase<BElement, BRow> &_A;
+ const SparseMatrixBase<BElement, BRow> &_matA;
public:
SparseMatrixFactory (const SparseMatrixBase<BElement, BRow> &A) :
- _A (A)
+ _matA (A)
{}
// FIXME: This function assumes basically that the matrix is over the integers
@@ -293,13 +311,13 @@ namespace LinBox
integer &maxNorm (integer &res)
{
- typename SparseMatrixBase<BElement, BRow>::ConstRawIterator i;
+ typename SparseMatrixBase<BElement, BRow>::ConstIterator i;
res = 0L;
integer tmp;
- for (i = _A.rawBegin (); i != _A.rawEnd (); ++i) {
+ for (i = _matA.Begin (); i != _matA.End (); ++i) {
tmp = abs (*i);
if (res < tmp)
@@ -310,9 +328,9 @@ namespace LinBox
}
size_t rowdim ()
- { return _A.rowdim (); }
+ { return _matA.rowdim (); }
size_t coldim ()
- { return _A.coldim (); }
+ { return _matA.coldim (); }
// A better bound for determinant of an integer sparse matrix, ZW
integer &hadamardBound (integer& res) const
@@ -331,7 +349,7 @@ namespace LinBox
RowIterator row_p;
EltIterator elt_p;
- for (row_p = _A. rowBegin(); row_p != _A. rowEnd(); ++ row_p) {
+ for (row_p = _matA. rowBegin(); row_p != _matA. rowEnd(); ++ row_p) {
tmp = 0;
for (elt_p = row_p -> second. begin(); elt_p != row_p -> second. end(); ++ elt_p)
@@ -352,9 +370,8 @@ namespace LinBox
integer tmp;
RowIterator row_p;
- EltIterator elt_p;
- for ( row_p = _A. rowBegin(); row_p != _A. rowEnd(); ++ row_p) {
+ for ( row_p = _matA. rowBegin(); row_p != _matA. rowEnd(); ++ row_p) {
tmp = 0;
for (EltIterator elt_p = row_p -> begin(); elt_p != row_p -> end(); ++ elt_p)
@@ -378,7 +395,7 @@ namespace LinBox
RowIterator row_p;
EltIterator elt_p;
- for ( row_p = _A. rowBegin(); row_p != _A. rowEnd(); ++ row_p) {
+ for ( row_p = _matA. rowBegin(); row_p != _matA. rowEnd(); ++ row_p) {
tmp = 0;
for (elt_p = row_p -> begin(); elt_p != row_p -> end(); ++ elt_p)
@@ -392,9 +409,9 @@ namespace LinBox
}
};
-#if !defined(__INTEL_COMPILER) && !defined(__CUDACC__)
- template <>
- #endif
+// #if !defined(__INTEL_COMPILER) && !defined(__CUDACC__) && !defined(__clang__)
+ // template <>
+// #endif
template <class Field, class _Row>
struct MatrixTraits< SparseMatrix<Field, _Row> >
{
@@ -415,3 +432,12 @@ namespace LinBox
#endif // __LINBOX_blackbox_sparse_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/sparse.inl b/linbox/blackbox/sparse.inl
index e108ed7..57f9380 100644
--- a/linbox/blackbox/sparse.inl
+++ b/linbox/blackbox/sparse.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/sparse.inl
* Copyright (C) 1999-2001 William J Turner,
* 2001-2002 Bradford Hovinen
@@ -16,12 +14,30 @@
* - New read/write implementations for SparseMatrixBase, supporting multiple
* formats
* - Eliminated Gaussian elimination code
- * - Added iterators, including ColOfRowsIterator, RawIterator, and
- * RawIndexIterator
+ * - Added iterators, including ColOfRowsIterator, Iterator, and
+ * IndexIterator
* - Eliminated operator []; added getEntry; changed put_value to setEntry
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_blackbox_sparse_INL
@@ -37,10 +53,10 @@ namespace LinBox
{
SparseMatrix<Field, _Row> *A = new SparseMatrix<Field, _Row> (F, rowdim (), coldim ());
- typename SparseMatrixBase<BElement, BRow>::ConstRawIterator i;
- typename SparseMatrixBase<BElement, BRow>::ConstRawIndexedIterator j;
+ typename SparseMatrixBase<BElement, BRow>::ConstIterator i;
+ typename SparseMatrixBase<BElement, BRow>::ConstIndexedIterator j;
- for (i = _A.rawBegin (), j = _A.rawIndexedBegin (); i != _A.rawEnd (); ++i, ++j)
+ for (i = _matA.Begin (), j = _matA.IndexedBegin (); i != _matA.End (); ++i, ++j)
F.init (A->refEntry (j.rowIndex (), j.colIndex ()), *i);
return A;
@@ -50,3 +66,12 @@ namespace LinBox
#endif // __LINBOX_blackbox_sparse_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/sparse1.h b/linbox/blackbox/sparse1.h
index 7de571d..4a3e7da 100644
--- a/linbox/blackbox/sparse1.h
+++ b/linbox/blackbox/sparse1.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 1999,2005 LinBox
* Written by JG Dumas
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_sparse_bb_domain_H
@@ -451,3 +452,12 @@ public:
#endif // __LINBOX_sparse_bb_domain_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/squarize.h b/linbox/blackbox/squarize.h
index bf6bb0c..4ce6f96 100644
--- a/linbox/blackbox/squarize.h
+++ b/linbox/blackbox/squarize.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/transpose.h
* Copyright (C) 2001 Bradford Hovinen
*
* Written by Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,15 +17,15 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_squarize_H
#define __LINBOX_squarize_H
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
#ifndef GIVMAX
#define GIVMAX(a,b) ((b)>(a)?(b):(a))
@@ -180,3 +181,12 @@ namespace LinBox
#endif // __LINBOX_squarize_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/submatrix-traits.h b/linbox/blackbox/submatrix-traits.h
index c244c48..8c5f548 100644
--- a/linbox/blackbox/submatrix-traits.h
+++ b/linbox/blackbox/submatrix-traits.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by Zhendong Wan
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,15 +17,15 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_submatrix_traits_H
#define __LINBOX_submatrix_traits_H
-#include <linbox/blackbox/dense.h>
-#include <linbox/blackbox/submatrix.h>
+#include "linbox/blackbox/submatrix.h"
+
namespace LinBox
{
@@ -33,23 +34,32 @@ namespace LinBox
class SubMatrixTraits;
template<class Field>
- class SubMatrixTraits<DenseMatrix<Field> > {
+ class SubMatrixTraits<BlasMatrix<Field> > {
public:
- typedef Submatrix<DenseMatrix<Field> > value_type;
+ typedef Submatrix<BlasMatrix<Field> > value_type;
};
-
template<class Field>
- class SubMatrixTraits<Submatrix<DenseMatrix<Field> > > {
+ class SubMatrixTraits<Submatrix<BlasMatrix<Field> > > {
public:
- typedef Submatrix<DenseMatrix<Field> > value_type;
+ typedef Submatrix<BlasMatrix<Field> > value_type;
};
+
}
#endif //__LINBOX_submatrix_traits_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/submatrix.h b/linbox/blackbox/submatrix.h
index 600f554..da3eece 100644
--- a/linbox/blackbox/submatrix.h
+++ b/linbox/blackbox/submatrix.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/submatrix.h
* Copyright (C) 2001 Bradford Hovinen
*
@@ -14,27 +12,46 @@
* ------------------------------------
* Modified by Zhendong Wan
*
- * Added specialization for DenseMatrix.
+ * Added specialization for BlasMatrix.
*
* -------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
-#ifndef __LINBOX_bb_submatrix_H
-#define __LINBOX_bb_submatrix_H
+#ifndef __LINBOX_blackbox_submatrix_H
+#define __LINBOX_blackbox_submatrix_H
#include "linbox/vector/vector-traits.h"
#include "linbox/util/debug.h"
#include "linbox/util/error.h"
-#include <linbox/matrix/dense-submatrix.h>
-#include <linbox/vector/vector-domain.h>
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/vector/vector-domain.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/blackbox/blackbox-interface.h"
+
// Namespace in which all LinBox library code resides
namespace LinBox
-{
+{ /* Submatrix */
/** \brief leading principal minor of existing matrix without copying.
* \ingroup blackbox
@@ -57,7 +74,6 @@ namespace LinBox
* implementation. This is chosen by a default parameter
* and partial template specialization.
*/
- //@{
// Basic declaration.
template <class Blackbox, class Trait = typename VectorTraits<typename LinBox::Vector<typename Blackbox::Field>::Dense >::VectorCategory>
class Submatrix : public BlackboxInterface {
@@ -76,7 +92,7 @@ namespace LinBox
// Namespace in which all LinBox library code resides
namespace LinBox
-{
+{ /* Submatrix */
/** Specialization for dense vectors */
template <class Blackbox>
@@ -91,20 +107,20 @@ namespace LinBox
* @param BB Black box from which to extract the submatrix
* @param row First row of the submatrix to extract (1.._BB->rowdim ())
* @param col First column of the submatrix to extract (1.._BB->coldim ())
- * @param rowdim Row dimension
- * @param coldim Column dimension
+ * @param Rowdim Row dimension
+ * @param Coldim Column dimension
*/
Submatrix (const Blackbox *BB,
size_t row,
size_t col,
- size_t rowdim,
- size_t coldim) :
+ size_t Rowdim,
+ size_t Coldim) :
_BB (BB),
- _row (row), _col (col), _rowdim (rowdim), _coldim (coldim),
+ _row (row), _col (col), _rowdim (Rowdim), _coldim (Coldim),
_z (_BB->coldim ()), _y (_BB->rowdim ())
{
- linbox_check (row + rowdim <= _BB->rowdim ());
- linbox_check (col + coldim <= _BB->coldim ());
+ linbox_check (row + Rowdim <= _BB->rowdim ());
+ linbox_check (col + Coldim <= _BB->coldim ());
}
@@ -156,12 +172,12 @@ namespace LinBox
template<typename _Tp1>
- struct rebind
- {
- typedef SubmatrixOwner<typename Blackbox_t::template rebind<_Tp1>::other, VectorCategories::DenseVectorTag> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F) {
- typename Blackbox_t::template rebind<_Tp1> Rebinder;
- Rebinder( Ap.getData(), *(A.getPtr()), F);
+ struct rebind {
+ typedef typename Blackbox_t::template rebind<_Tp1> Rebinder;
+ typedef SubmatrixOwner<typename Rebinder::other, VectorCategories::DenseVectorTag> other;
+ void operator() (other & Ap, const Self_t& A)
+ {
+ Rebinder () ( Ap.getData(), *(A.getPtr()));
}
};
@@ -172,23 +188,38 @@ namespace LinBox
* @return integer number of _rows of black box matrix.
*/
size_t rowdim (void) const
- { return _rowdim; }
+ {
+ return _rowdim;
+ }
/** Retreive _column dimensions of BlackBox matrix.
* Required by abstract base class.
* @return integer number of _columns of black box matrix.
*/
size_t coldim (void) const
- { return _coldim; }
-
- size_t rowfirst() const { return _row; }
- size_t colfirst() const { return _col; }
+ {
+ return _coldim;
+ }
+ size_t rowfirst() const
+ {
+ return _row;
+ }
+ size_t colfirst() const
+ {
+ return _col;
+ }
- const Field& field() const {return _BB->field();}
+ const Field& field() const
+ {
+ return _BB->field();
+ }
- const Blackbox * getPtr() const { return _BB; }
+ const Blackbox * getPtr() const
+ {
+ return _BB;
+ }
private:
@@ -219,30 +250,27 @@ namespace LinBox
* @param BB Black box from which to extract the submatrix
* @param row First row of the submatrix to extract (1.._BB->rowdim ())
* @param col First column of the submatrix to extract (1.._BB->coldim ())
- * @param rowdim Row dimension
- * @param coldim Column dimension
+ * @param Rowdim Row dimension
+ * @param Coldim Column dimension
*/
Submatrix (const Blackbox *BB,
size_t row,
size_t col,
- size_t rowdim,
- size_t coldim) :
- Father_t(BB,row,col,rowdim,coldim)
+ size_t Rowdim,
+ size_t Coldim) :
+ Father_t(BB,row,col,Rowdim,Coldim)
{}
};
- template <class Field>
- class DenseMatrix;
- /** special case for the submatrix of a dense matrix
- */
+ /** Specialization for BlasMatrix */
template<class _Field>
- class Submatrix<DenseMatrix<_Field>, VectorCategories::DenseVectorTag> : public DenseSubmatrix<typename _Field::Element> {
+ class Submatrix<BlasMatrix<_Field>, VectorCategories::DenseVectorTag> : public BlasSubmatrix<_Field> {
public:
typedef _Field Field;
- typedef Submatrix<DenseMatrix<_Field>, VectorCategories::DenseVectorTag> Self_t;
- typedef DenseSubmatrix<typename _Field::Element> Father_t;
+ typedef Submatrix<BlasMatrix<_Field>, VectorCategories::DenseVectorTag> Self_t;
+ typedef BlasSubmatrix<_Field> Father_t;
private:
@@ -254,89 +282,94 @@ namespace LinBox
typedef typename Field::Element Element;
- /** Constructor from an existing \ref DenseMatrix and dimensions
- * @param M Pointer to \ref DenseMatrix of which to construct submatrix
+ /** Constructor from an existing \ref BlasMatrix and dimensions
+ * @param Mat Pointer to \ref BlasMatrix of which to construct submatrix
* @param row Starting row
* @param col Starting column
- * @param rowdim Row dimension
- * @param coldim Column dimension
+ * @param Rowdim Row dimension
+ * @param Coldim Column dimension
*/
-
- Submatrix (const DenseMatrix<Field> *M,
+ Submatrix (const BlasMatrix<Field> *Mat,
size_t row,
size_t col,
- size_t rowdim,
- size_t coldim) :
- DenseSubmatrix<Element>(const_cast<DenseMatrix<Field>& >(*M), row, col, rowdim, coldim),
- f(M -> field()), vd(M -> field())
- {
- }
-
- /** Constructor from an existing \ref DenseMatrix and dimensions
- * @param M reference to \ref DenseMatrix of which to construct submatrix
+ size_t Rowdim,
+ size_t Coldim) :
+ BlasSubmatrix<Field>(const_cast<BlasMatrix<Field>& >(*Mat), row, col, Rowdim, Coldim),
+ f(Mat -> field()), vd(Mat -> field())
+ { }
+
+ /** Constructor from an existing \ref BlasMatrix and dimensions
+ * @param Mat reference to \ref BlasMatrix of which to construct submatrix
* @param row Starting row
* @param col Starting column
- * @param rowdim Row dimension
- * @param coldim Column dimension
+ * @param Rowdim Row dimension
+ * @param Coldim Column dimension
*/
- Submatrix (const DenseMatrix<Field> &M,
+ Submatrix (const BlasMatrix<Field> &Mat,
size_t row,
size_t col,
- size_t rowdim,
- size_t coldim) :
- DenseSubmatrix<Element>(const_cast<DenseMatrix<Field>& >(M), row, col, rowdim, coldim),
- f(M.field()), vd(M.field()) {
- }
+ size_t Rowdim,
+ size_t Coldim) :
+ BlasSubmatrix<Field>(const_cast<BlasMatrix<Field>& >(Mat), row, col, Rowdim, Coldim),
+ f(Mat.field()), vd(Mat.field())
+ { }
/** Constructor from an existing submatrix and dimensions
* @param SM pointer to Submatrix from which to
* construct submatrix
* @param row Starting row
* @param col Starting column
- * @param rowdim Row dimension
- * @param coldim Column dimension
+ * @param Rowdim Row dimension
+ * @param Coldim Column dimension
*/
- Submatrix (const Submatrix<DenseMatrix<Field> > *SM,
+ Submatrix (const Submatrix<BlasMatrix<Field> > *SM,
size_t row,
size_t col,
- size_t rowdim,
- size_t coldim ) :
- DenseSubmatrix<Element> (const_cast<Submatrix<DenseMatrix<Field> >&>(*SM), row, col, rowdim, coldim),
- f (SM -> field()), vd(SM -> field()){
- }
+ size_t Rowdim,
+ size_t Coldim ) :
+ BlasSubmatrix<Field> (const_cast<Submatrix<BlasMatrix<Field> >&>(*SM), row, col, Rowdim, Coldim),
+ f (SM -> field()), vd(SM -> field())
+ {
+ }
/** Constructor from an existing submatrix and dimensions
* @param SM reference to Submatrix from which to
* construct submatrix
* @param row Starting row
* @param col Starting column
- * @param rowdim Row dimension
- * @param coldim Column dimension
+ * @param Rowdim Row dimension
+ * @param Coldim Column dimension
*/
- Submatrix (const Submatrix<DenseMatrix<Field> >& SM,
+ Submatrix (const Submatrix<BlasMatrix<Field> >& SM,
size_t row,
size_t col,
- size_t rowdim,
- size_t coldim ) :
- DenseSubmatrix<Element> (const_cast<Submatrix<DenseMatrix<Field> >&>(SM), row, col, rowdim, coldim),
- f (SM. field()), vd(SM. field()){
- }
-
- const Field& field() const {
+ size_t Rowdim,
+ size_t Coldim ) :
+ BlasSubmatrix<Field> (const_cast<Submatrix<BlasMatrix<Field> >&>(SM), row, col, Rowdim, Coldim),
+ f (SM. field()), vd(SM. field())
+ { }
+
+ //! get the field
+ const Field& field() const
+ {
return f;
}
- std::istream& read (std::istream& is) {
+ //! read
+ std::istream& read (std::istream& is)
+ {
- DenseSubmatrix<Element>::read (is, f);
+ BlasSubmatrix<Field>::read (is, f);
return is;
}
- std::ostream& write (std::ostream& os) const {
+ //! write
+ std::ostream& write (std::ostream& os) const
+ {
- DenseSubmatrix<Element>::write (os, f);
+ BlasSubmatrix<Field>::write (os, f);
return os;
}
@@ -349,9 +382,10 @@ namespace LinBox
* @return Reference to output vector
*/
template<class Vect1, class Vect2>
- Vect1 &apply (Vect1 &y, const Vect2 &x) const {
+ Vect1 &apply (Vect1 &y, const Vect2 &x) const
+ {
- typename DenseSubmatrix<Element>::ConstRowIterator p;
+ typename BlasSubmatrix<Field>::ConstRowIterator p;
typename Vect1::iterator p_y = y.begin ();
@@ -370,9 +404,10 @@ namespace LinBox
* @return Reference to output vector
*/
template<class Vect1, class Vect2>
- Vect1 &applyTranspose (Vect1 &y, const Vect2 &x) const {
+ Vect1 &applyTranspose (Vect1 &y, const Vect2 &x) const
+ {
- typename DenseSubmatrix<Element>::ConstColIterator colp;
+ typename BlasSubmatrix<Field>::ConstColIterator colp;
typename Vect1::iterator p_y = y.begin ();
@@ -383,29 +418,26 @@ namespace LinBox
}
template<typename _Tp1>
- struct rebind
- {
- typedef SubmatrixOwner<DenseMatrix<_Tp1>, VectorCategories::DenseVectorTag> other;
+ struct rebind {
+ typedef SubmatrixOwner<BlasMatrix<_Tp1>, VectorCategories::DenseVectorTag> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F) {
+ void operator() (other & Ap, const Self_t& A) {
typename other::Father_t A1;
- typename Father_t::template rebind<_Tp1> () ( A1, static_cast<Father_t>(A), F);
- Ap = other(A1, A._row, A._col, A._rowdim, A._coldim);
+ typename Father_t::template rebind<_Tp1> () ( A1, static_cast<Father_t>(A) );
+ Ap = other(A1, A.rowfirst(), A.colfirst(), A.rowdim(), A.coldim());
}
};
};
- //@}
-} // namespace LinBox
-
+} // namespace LinBox
// Namespace in which all LinBox library code resides
namespace LinBox
-{
+{ /* SubmatrixOwner dense vector specialisation */
/** Specialization for dense vectors */
template <class Blackbox>
@@ -415,25 +447,26 @@ namespace LinBox
typedef typename Field::Element Element;
typedef Blackbox Blackbox_t;
typedef SubmatrixOwner<Blackbox_t, VectorCategories::DenseVectorTag > Self_t;
+ typedef Self_t Father_t ; // XXX ???
/** Constructor from field and dense vector of field elements.
* @param BB Black box from which to extract the submatrix
* @param row First row of the submatrix to extract (1.._BB_data.rowdim ())
* @param col First column of the submatrix to extract (1.._BB_data.coldim ())
- * @param rowdim Row dimension
- * @param coldim Column dimension
+ * @param Rowdim Row dimension
+ * @param Coldim Column dimension
*/
SubmatrixOwner (const Blackbox *BB,
size_t row,
size_t col,
- size_t rowdim,
- size_t coldim) :
+ size_t Rowdim,
+ size_t Coldim) :
_BB_data (*BB),
- _row (row), _col (col), _rowdim (rowdim), _coldim (coldim),
+ _row (row), _col (col), _rowdim (Rowdim), _coldim (Coldim),
_z (_BB_data.coldim ()), _y (_BB_data.rowdim ())
{
- linbox_check (row + rowdim <= _BB_data.rowdim ());
- linbox_check (col + coldim <= _BB_data.coldim ());
+ linbox_check (row + Rowdim <= _BB_data.rowdim ());
+ linbox_check (col + Coldim <= _BB_data.coldim ());
}
@@ -486,11 +519,12 @@ namespace LinBox
template<typename _Tp1>
struct rebind {
- typedef SubmatrixOwner< typename Blackbox::template rebind<_Tp1>::other, VectorCategories::DenseVectorTag> other;
-
- void operator() (other & Ap, const Self_t& A, const _Tp1& F) {
- typename Blackbox_t::template rebind<_Tp1> () ( Ap.getData(), A.getData(), F);
+ typedef typename Blackbox_t::template rebind<_Tp1> Rebinder ;
+ typedef SubmatrixOwner<typename Rebinder::other, VectorCategories::DenseVectorTag> other;
+ void operator() (other & Ap, const Self_t& A)
+ {
+ Rebinder () ( Ap.getData(), A.getData());
}
};
@@ -502,7 +536,7 @@ namespace LinBox
_rowdim(T.rowdim()), _coldim(T.coldim()),
_z (_BB_data.coldim ()), _y (_BB_data.rowdim ())
{
- typename Submatrix<_BB,_Vc>::template rebind<Field>()(*this,T, F);
+ typename Submatrix<_BB,_Vc>::template rebind<Field>()(*this,T );
}
template<typename _BB, typename _Vc, class Field>
SubmatrixOwner (const SubmatrixOwner<_BB,_Vc>& T, const Field& F) :
@@ -511,7 +545,7 @@ namespace LinBox
_rowdim(T.rowdim()), _coldim(T.coldim()),
_z (_BB_data.coldim ()), _y (_BB_data.rowdim ())
{
- typename SubmatrixOwner<_BB,_Vc>::template rebind<Field>()(*this,T, F);
+ typename SubmatrixOwner<_BB,_Vc>::template rebind<Field>()(*this,T);
}
/** Retreive _row dimensions of BlackBox matrix.
@@ -520,22 +554,42 @@ namespace LinBox
* @return integer number of _rows of black box matrix.
*/
size_t rowdim (void) const
- { return _rowdim; }
+ {
+ return _rowdim;
+ }
/** Retreive _column dimensions of BlackBox matrix.
* Required by abstract base class.
* @return integer number of _columns of black box matrix.
*/
size_t coldim (void) const
- { return _coldim; }
+ {
+ return _coldim;
+ }
- size_t rowfirst() const { return _row; }
- size_t colfirst() const { return _col; }
+ size_t rowfirst() const
+ {
+ return _row;
+ }
+ size_t colfirst() const
+ {
+ return _col;
+ }
- const Field& field() const {return _BB_data.field();}
+ const Field& field() const
+ {
+ return _BB_data.field();
+ }
- const Blackbox& getData() const {return _BB_data;}
- Blackbox& getData() {return _BB_data;}
+ const Blackbox& getData() const
+ {
+ return _BB_data;
+ }
+
+ Blackbox& getData()
+ {
+ return _BB_data;
+ }
private:
@@ -552,10 +606,17 @@ namespace LinBox
}; // template <Vector> class SubmatrixOwner
- //@}
} // namespace LinBox
-
#endif // __LINBOX_bb_submatrix_H
+
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+
diff --git a/linbox/blackbox/sum.h b/linbox/blackbox/sum.h
index 01c5652..8782d67 100644
--- a/linbox/blackbox/sum.h
+++ b/linbox/blackbox/sum.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/sum.h
* Copyright (C) 2002 The LinBox group
*
@@ -7,7 +5,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_sum_H
@@ -15,7 +31,7 @@
#include "linbox/vector/vector-domain.h"
#include "linbox/util/debug.h"
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
namespace LinBox
{
@@ -138,15 +154,15 @@ namespace LinBox
}
template<typename _Tp1, typename _Tp2 = _Tp1>
- struct rebind
- { typedef SumOwner<
+ struct rebind {
+ typedef SumOwner<
typename Blackbox1::template rebind<_Tp1>::other,
typename Blackbox2::template rebind<_Tp2>::other
> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F) {
- typename Blackbox1::template rebind<_Tp1> () ( Ap.getLeftData(), *(A.getLeftPtr()), F);
- typename Blackbox2::template rebind<_Tp2> () ( Ap.getRightData(), *(A.getRightPtr()), F);
+ void operator() (other & Ap, const Self_t& A) {
+ typename Blackbox1::template rebind<_Tp1> () ( Ap.getLeftData(), *(A.getLeftPtr()));
+ typename Blackbox2::template rebind<_Tp2> () ( Ap.getRightData(), *(A.getRightPtr()));
}
@@ -198,7 +214,6 @@ namespace LinBox
* Adds only at apply time.
* Given two black boxes A and B of the same dimensions, form a black
* box representing A+B, i.e., SumOwner(A,B)x=(A+B)x=Ax+Bx
- * @param Vector \ref LinBox dense or sparse vector of field elements
*/
template <class _Blackbox1, class _Blackbox2>
class SumOwner : public BlackboxInterface {
@@ -237,11 +252,11 @@ namespace LinBox
// create new copies of matrices in dynamic memory
linbox_check (A_data != 0);
linbox_check (B_data != 0);
- linbox_check (A_data.coldim () == B_data.coldim ());
- linbox_check (A_data.rowdim () == B_data.rowdim ());
+ linbox_check (A_data->coldim () == B_data->coldim ());
+ linbox_check (A_data->rowdim () == B_data->rowdim ());
- VectorWrapper::ensureDim (_z1, A_data.rowdim ());
- VectorWrapper::ensureDim (_z2, A_data.coldim ());
+ VectorWrapper::ensureDim (_z1, A_data->rowdim ());
+ VectorWrapper::ensureDim (_z2, A_data->coldim ());
}
/** Copy constructor.
@@ -298,16 +313,17 @@ namespace LinBox
}
template<typename _Tp1, typename _Tp2 = _Tp1>
- struct rebind
- { typedef SumOwner<typename Blackbox1::template rebind<_Tp1>::other, typename Blackbox2::template rebind<_Tp2>::other> other;
+ struct rebind {
+ typedef SumOwner<typename Blackbox1::template rebind<_Tp1>::other, typename Blackbox2::template rebind<_Tp2>::other> other;
void operator() (other & Ap, const Self_t& A, const _Tp1& F) {
- typename Blackbox1::template rebind<_Tp1> () ( Ap.getLeftData(), A.getLeftData(), F);
- typename Blackbox2::template rebind<_Tp1> () ( Ap.getRightData(), A.getRightData(), F);
+ typename Blackbox1::template rebind<_Tp1> () ( Ap.getLeftData(), A.getLeftData());
+ typename Blackbox2::template rebind<_Tp1> () ( Ap.getRightData(), A.getRightData());
}
};
+
template<typename _BBt1, typename _BBt2, typename Field>
SumOwner (const Sum<_BBt1, _BBt2> &M, const Field& F) :
_A_data(*(M.getLeftPtr()), F),
@@ -316,7 +332,7 @@ namespace LinBox
_z2(_A_data.coldim()),
VD(F)
{
- typename Sum<_BBt1, _BBt2>::template rebind<Field>()(*this,M,F);
+ typename Sum<_BBt1, _BBt2>::template rebind<Field>()(*this,M);
}
template<typename _BBt1, typename _BBt2, typename Field>
@@ -327,36 +343,54 @@ namespace LinBox
_z2(_A_data.coldim()) ,
VD(F)
{
- typename SumOwner<_BBt1, _BBt2>::template rebind<Field>()(*this,M,F);
+ typename SumOwner<_BBt1, _BBt2>::template rebind<Field>()(*this,M);
}
-
-
/** Retreive row dimensions of BlackBox matrix.
* This may be needed for applying preconditioners.
* Required by abstract base class.
* @return integer number of rows of black box matrix.
*/
size_t rowdim (void) const
- { return _A_data.rowdim (); }
+ {
+ return _A_data.rowdim ();
+ }
/** Retreive column dimensions of BlackBox matrix.
* Required by abstract base class.
* @return integer number of columns of black box matrix.
*/
size_t coldim (void) const
- { return _A_data.coldim (); }
+ {
+ return _A_data.coldim ();
+ }
- const Field& field() const { return _A_data . field(); }
+ const Field& field() const
+ {
+ return _A_data . field();
+ }
// accessors to the blackboxes without ownership
- const Blackbox1& getLeftData() const {return _A_data;}
- Blackbox1& getLeftData() {return _A_data;}
+ const Blackbox1& getLeftData() const
+ {
+ return _A_data;
+ }
+ Blackbox1& getLeftData()
+ {
+ return _A_data;
+ }
- const Blackbox2& getRightData() const {return _B_data;}
- Blackbox2& getRightData() {return _B_data;}
+ const Blackbox2& getRightData() const
+ {
+ return _B_data;
+ }
+
+ Blackbox2& getRightData()
+ {
+ return _B_data;
+ }
protected:
@@ -375,3 +409,12 @@ namespace LinBox
#endif // __LINBOX_sum_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/toeplitz.h b/linbox/blackbox/toeplitz.h
index ab8164f..dbab05c 100644
--- a/linbox/blackbox/toeplitz.h
+++ b/linbox/blackbox/toeplitz.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* *******************************************************************
* ntl-toeplitz.h
* Copyright (C) 2002 Austin Lobo, B. David Saunders
@@ -7,7 +5,23 @@
* Template for Toeplitz specification for ntl Arithmetic
* Linbox version 2001 and 2002 from a version
* Designed by A.Lobo and B.D. Saunders in 4/98
- * see COPYING for licence information
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+*/
#ifndef __LINBOX_toeplitz_H
@@ -18,10 +32,10 @@
#include "linbox/vector/vector-traits.h"
#include "linbox/solutions/methods.h" // for shape
#include "linbox/linbox-config.h"
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
#ifdef __LINBOX_HAVE_NTL
-#include <linbox/field/ntl-ZZ_pX.h>
+#include "linbox/field/ntl.h"
#endif
//#define DBGMSGS 1
@@ -219,9 +233,18 @@ namespace LinBox
} // namespace LinBox
-#include <linbox/blackbox/toeplitz.inl>
+#include "linbox/blackbox/toeplitz.inl"
// Hide the implementation; include it here because
// older compilers want everything in one template file
#endif //__LINBOX_toeplitz_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/toeplitz.inl b/linbox/blackbox/toeplitz.inl
index 07c4970..1978f0f 100644
--- a/linbox/blackbox/toeplitz.inl
+++ b/linbox/blackbox/toeplitz.inl
@@ -1,13 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* toeplitz.inl NTL_Toeplitz.cpp file
*
* Copyright (C) 2002 Austin Lobo, B. David Saunders
* Author: Austin Lobo
* LinBox version 2001 and 2002
- * see COPYING for license information
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
* This file is included in the template description of ntl-Toeplitz.h
* it contains the implementations of templatized member functions in the
* partial template specialization for toeplitz matrices that
@@ -24,7 +38,7 @@
#include <iostream>
#include <fstream>
#include <cassert> // JGD 26.09.2003
-#include <linbox/algorithms/toeplitz-det.h>
+#include "linbox/algorithms/toeplitz-det.h"
namespace LinBox
{
@@ -172,11 +186,11 @@ namespace LinBox
Element temp;
os<< this->rowDim << " " << this->colDim << " " << this->shape.shape() << std::endl;
- N = this->rowDim + this->colDim -1;
+ N = (int) (this->rowDim + this->colDim) -1;
if ( N < 20 ) // Print small matrices in dense format
{
- for (i = this->colDim-1; i < N; i++)
+ for (i = (int)this->colDim-1; i < N; i++)
{
for ( j = 0; j < this->colDim ; j++)
os << " " ;
@@ -187,8 +201,8 @@ namespace LinBox
else
{ // Print large matrices' first row and col
os << "[";
- for (size_t i = this->rowDim + this->colDim - 2; i> 0;i--)
- this->K.write(os, this->P.getCoeff(temp,this->pdata,i) ) << " ";
+ for (size_t ii = this->rowDim + this->colDim - 2; ii> 0;ii--)
+ this->K.write(os, this->P.getCoeff(temp,this->pdata,ii) ) << " ";
this->K.write(os,this->P.getCoeff(temp,this->pdata,0)) << "]\n";
this->P.write(os, this->pdata) << std::endl;
} //[v(2n-2),....,v(0)]; where v(0) is the top right entry of the matrix
@@ -225,7 +239,7 @@ namespace LinBox
std::ofstream o_fp(outFileName, std::ios::out);
o_fp << this->rowDim << " " << this->colDim << " " << this->shape.shape() << std::endl ;
o_fp << "[";
- for (size_t i = this->rowDim + this->colDim - 2; i>= 0;i--)
+ for (size_t i = this->rowDim + this->colDim - 1 ; i-- ; )
this->K.write(o_fp,this->P.getCoeff(temp,this->pdata,i))
<< " ";
o_fp << "]\n";
@@ -386,3 +400,12 @@ namespace LinBox
} // namespace LinBox
#endif //__LINBOX_bb_toeplitz_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/transpose.h b/linbox/blackbox/transpose.h
index bb9d61c..4c4fb8c 100644
--- a/linbox/blackbox/transpose.h
+++ b/linbox/blackbox/transpose.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/transpose.h
* Copyright (C) 2001 Bradford Hovinen
*
* Written by Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,15 +18,15 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_transpose_H
#define __LINBOX_transpose_H
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
namespace LinBox
{
@@ -75,10 +76,10 @@ namespace LinBox
}
/** Copy constructor.
- * @param M constant reference to compose black box matrix
+ * @param Mat constant reference to compose black box matrix
*/
- Transpose (const Transpose<Blackbox> &M) :
- _A_ptr(M._A_ptr)
+ Transpose (const Transpose<Blackbox> &Mat) :
+ _A_ptr(Mat._A_ptr)
{
// create new copies of matrices in dynamic memory
//linbox_check (M._A_ptr != NULL);
@@ -93,9 +94,9 @@ namespace LinBox
template<typename _Tp1>
struct rebind {
typedef TransposeOwner<typename Blackbox_t::template rebind<_Tp1>::other> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F)
+ void operator() (other & Ap, const Self_t& A)
{
- typename Blackbox_t::template rebind<_Tp1> () ( Ap.getData(), *(A.getPtr()), F);
+ typename Blackbox_t::template rebind<_Tp1> () ( Ap.getData(), *(A.getPtr()));
}
};
@@ -205,10 +206,10 @@ namespace LinBox
{ }
/** Copy constructor.
- * @param M constant reference to compose black box matrix
+ * @param Mat constant reference to compose black box matrix
*/
- TransposeOwner (const TransposeOwner<Blackbox> &M) :
- _A_data(M.getData())
+ TransposeOwner (const TransposeOwner<Blackbox> &Mat) :
+ _A_data(Mat.getData())
{
#if 0
create new copies of matrices in dynamic memory
@@ -225,9 +226,9 @@ namespace LinBox
template<typename _Tp1>
struct rebind {
typedef TransposeOwner<typename Blackbox::template rebind<_Tp1>::other> other;
- void operator() (other & Ap, const Self_t& A, const _Tp1& F)
+ void operator() (other & Ap, const Self_t& A)
{
- typename Blackbox_t::template rebind<_Tp1> () ( Ap.getData(), A.getData(), F);
+ typename Blackbox_t::template rebind<_Tp1> () ( Ap.getData(), A.getData());
}
};
@@ -235,13 +236,13 @@ namespace LinBox
TransposeOwner (const Transpose<_BB>& T, const Field& F) :
_A_data(*(T.getPtr()), F)
{
- typename Transpose<_BB>::template rebind<Field>()(*this,T, F);
+ typename Transpose<_BB>::template rebind<Field>()(*this,T);
}
template<typename _BB, class Field>
TransposeOwner (const TransposeOwner<_BB>& T, const Field& F) :
_A_data(T.getData(), F)
{
- typename TransposeOwner<_BB>::template rebind<Field>()(*this,T, F);
+ typename TransposeOwner<_BB>::template rebind<Field>()(*this,T);
}
@@ -313,3 +314,12 @@ namespace LinBox
#endif // __LINBOX_transpose_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/triplesbb.h b/linbox/blackbox/triplesbb.h
index f0dc568..973b4f5 100644
--- a/linbox/blackbox/triplesbb.h
+++ b/linbox/blackbox/triplesbb.h
@@ -1,8 +1,23 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/triplesbb.h
- * Copyright (C) 2002 Rich Seagraves, see COPYING for details.
+ * Copyright (c) Linbox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
* Written by Rich Seagraves <seagrave at cis.udel.edu>
* with mods by bds
*/
@@ -20,8 +35,8 @@ using std::max;
#include "linbox/linbox-config.h"
#include "linbox/util/debug.h"
#include "linbox/util/field-axpy.h"
-#include <linbox/blackbox/blackbox-interface.h>
-#include <linbox/field/hom.h>
+#include "linbox/blackbox/blackbox-interface.h"
+#include "linbox/field/hom.h"
#include <vector>
@@ -100,7 +115,7 @@ namespace LinBox
template<typename _Tp1>
TriplesBB(const TriplesBB<_Tp1>& T, const Field& F) :
- _F(F), _values(T.size()), _RowV(T.getRows()), _ColV(T.getCols()), _rows(T.rowdim()), _cols(T.coldim()), _faxpy(max(T.getRows(),T.getCols()), FieldAXPY<Field>(F)), _RowSortFlag(T.isRowSorted()), _ColSortFlag(T.isColSorted())
+ _field(F), _values(T.size()), _RowV(T.getRows()), _ColV(T.getCols()), _rows(T.rowdim()), _cols(T.coldim()), _faxpy(max(T.getRows(),T.getCols()), FieldAXPY<Field>(F)), _RowSortFlag(T.isRowSorted()), _ColSortFlag(T.isColSorted())
{}
@@ -111,7 +126,7 @@ namespace LinBox
// Add entry function, element e is added in the i,j position. Zero based?
void addEntry(const Element & e, const size_t i, const size_t j);
- const Field & field() const { return _F; }
+ const Field & field() const { return _field; }
/* Data accessors. Used to access the 3 vectors containing Matrix data
*/
@@ -123,7 +138,7 @@ namespace LinBox
protected:
- Field _F; // The field used by this class
+ Field _field; // The field used by this class
/// _values contains the nonzero elements of the BlackBox
std::vector<Element> _values;
@@ -174,7 +189,7 @@ namespace LinBox
size_t cols,
bool RowSortFlag,
bool ColSortFlag) :
- _F(F), _values(values), _RowV(RowV), _ColV(ColV), _rows(rows), _cols(cols), _faxpy(max(rows,cols), FieldAXPY<Field>(F)), _RowSortFlag(RowSortFlag), _ColSortFlag(ColSortFlag)
+ _field(F), _values(values), _RowV(RowV), _ColV(ColV), _rows(rows), _cols(cols), _faxpy(max(rows,cols), FieldAXPY<Field>(F)), _RowSortFlag(RowSortFlag), _ColSortFlag(ColSortFlag)
{}
/* Better constructor that only takes the field, m, n and recommended
@@ -184,7 +199,7 @@ namespace LinBox
*/
template<class Field>
TriplesBB<Field>::TriplesBB( Field F, size_t rows, size_t cols, size_t res):
- _F(F), _rows(rows), _cols(cols), _faxpy( max(rows, cols), FieldAXPY<Field>(F)), _RowSortFlag(false), _ColSortFlag(false)
+ _field(F), _rows(rows), _cols(cols), _faxpy( max(rows, cols), FieldAXPY<Field>(F)), _RowSortFlag(false), _ColSortFlag(false)
{
if(res != 0) {
_values.reserve(res);
@@ -197,8 +212,8 @@ namespace LinBox
template<class Field>
TriplesBB<Field>::TriplesBB(const TriplesBB<Field> &In) :
- _faxpy( max(In._rows, In._cols), FieldAXPY<Field>(In._F)),
- _F ( In._F ),
+ _faxpy( max(In._rows, In._cols), FieldAXPY<Field>(In._field)),
+ _field ( In._field ),
_values ( In._values ),
_RowV ( In._RowV ),
_ColV ( In._ColV ),
@@ -212,7 +227,7 @@ namespace LinBox
template<class Field>
const TriplesBB<Field> & TriplesBB<Field>::operator=(const TriplesBB<Field> & rhs)
{
- _F = rhs._F;
+ _field = rhs._field;
_values = rhs._values;
_RowV = rhs._RowV;
_ColV = rhs._ColV;
@@ -220,7 +235,7 @@ namespace LinBox
_RowSortFlag = rhs._RowSortFlag;
_ColSortFlag = rhs._ColSortFlag;
- _faxpy.resize(rhs._faxpy.size(), FieldAXPY<Field>(_F));
+ _faxpy.resize(rhs._faxpy.size(), FieldAXPY<Field>(_field));
return *this;
}
@@ -261,7 +276,7 @@ namespace LinBox
typename std::vector<Element>::const_iterator v;
typename std::vector<FieldAXPY<Field> >::iterator fa_i;
- _F.init(zero,0);
+ _field.init(zero,0);
for(fa_i = _faxpy.begin(); fa_i != _faxpy.end(); ++fa_i)
fa_i->assign(zero);
@@ -299,7 +314,7 @@ namespace LinBox
RowWiseLessThan<Field,Vector> rwlt;
if(_RowSortFlag) return; // If already sorted, bail
- std::sort( rawIndexedBegin(), rawIndexedEnd(), rwlt );
+ std::sort( IndexedBegin(), IndexedEnd(), rwlt );
_RowSortFlag = true; // Sets the row sort flag
_ColSortFlag = false; // Unset the col sort flag
@@ -312,7 +327,7 @@ namespace LinBox
ColWiseLessThan<Field,Vector> cwlt;
if(_ColSortFlag) return; // If already sorted, bail
- std::sort( rawIndexedBegin(), rawIndexedEnd(), cwlt );
+ std::sort( IndexedBegin(), IndexedEnd(), cwlt );
_ColSortFlag = true; // Sets the Col sort flag
_RowSortFlag = false; // Unset the Row sort flag
}
@@ -322,3 +337,12 @@ namespace LinBox
#endif // __LINBOX_triplesbb_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/zero-one.h b/linbox/blackbox/zero-one.h
index 6e73cda..a1734a3 100644
--- a/linbox/blackbox/zero-one.h
+++ b/linbox/blackbox/zero-one.h
@@ -1,6 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* -*- mode: C++; style: linux -*- */
/* linbox/blackbox/zero-one.h
* Copyright (C) 2002 Rich Seagraves
@@ -11,7 +8,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_zero_one_H
@@ -21,9 +36,9 @@
#include "linbox/vector/vector-traits.h"
#include "linbox/util/debug.h"
#include "linbox/field/modular.h"
-#include <linbox/blackbox/blackbox-interface.h>
+#include "linbox/blackbox/blackbox-interface.h"
-// For STL pair in RawIndexIterator
+// For STL pair in IndexIterator
#include <utility>
#include <vector> // For vectors in _col2row and _row2col
#include <cstdlib> // For randomness in randomized quicksort
@@ -71,7 +86,7 @@ namespace LinBox
template<class OutVector, class InVector>
OutVector& apply(OutVector& y, const InVector& x) const // y = Ax;
{
- return applySpecialization(y,x,getType(_F));
+ return applySpecialization(y,x,getType(_field));
}
/** applyTranspose.
@@ -85,7 +100,7 @@ namespace LinBox
template<class OutVector, class InVector>
OutVector& applyTranspose(OutVector& y, const InVector& x) const // y = ATx
{
- return applyTransposeSpecialization(y,x,getType(_F));
+ return applyTransposeSpecialization(y,x,getType(_field));
}
size_t rowdim() const
@@ -102,8 +117,7 @@ namespace LinBox
struct rebind {
typedef ZeroOne<_Tp1> other;
void operator() (other & Ap,
- const Self_t& A,
- const _Tp1& F)
+ const Self_t& A)
{
// ZeroOne does not store any field element
}
@@ -111,7 +125,7 @@ namespace LinBox
template<typename _Tp1>
ZeroOne(const ZeroOne<_Tp1>& Z, const Field& F) :
- _F(F),
+ _field(F),
_rows(Z.rowdim()), _cols(Z.coldim()), _nnz(Z.nnz()),
_rowP(new Index[Z.nnz()]), _colP(new Index[Z.nnz()]),
_rowSort(Z.isRowSorted()), _colSort(Z.isColSorted()),
@@ -121,32 +135,32 @@ namespace LinBox
Index * rowit = _rowP;
Index * colit = _colP;
- for(typename ZeroOne<_Tp1>::RawIndexIterator it = Z.indexBegin();
+ for(typename ZeroOne<_Tp1>::IndexIterator it = Z.indexBegin();
it != Z.indexEnd(); ++it,++rowit,++colit) {
*rowit = (*it).first;
*colit = (*it).second;
}
}
- /** RawIterator class.
+ /** Iterator class.
* Iterates straight through the values of the matrix
*/
- class RawIterator;
+ class Iterator;
- RawIterator rawBegin();
- RawIterator rawEnd();
- const RawIterator rawBegin() const;
- const RawIterator rawEnd() const;
+ Iterator Begin();
+ Iterator End();
+ const Iterator Begin() const;
+ const Iterator End() const;
- /** RawIndexIterator.
+ /** IndexIterator.
* Iterates through the i and j of the current element
* and when accessed returns an STL pair containing the coordinates
*/
- class RawIndexIterator;
- RawIndexIterator indexBegin();
- const RawIndexIterator indexBegin() const;
- RawIndexIterator indexEnd();
- const RawIndexIterator indexEnd() const;
+ class IndexIterator;
+ IndexIterator indexBegin();
+ const IndexIterator indexBegin() const;
+ IndexIterator indexEnd();
+ const IndexIterator indexEnd() const;
/** Read the matrix from a stream in the JGD's SMS format.
* @param is Input stream from which to read the matrix
@@ -194,7 +208,7 @@ namespace LinBox
const Field& field() const
{
- return _F;
+ return _field;
}
bool isRowSorted() const
@@ -215,11 +229,11 @@ namespace LinBox
protected:
- Field _F; //!< @internal The field used by this class
+ Field _field; //!< @internal The field used by this class
- /*! @internal A temporary element used for initalization for the rawBegin() and
- * rawEnd() methods of the ZeroOne class. Is used to initalize a 1
- * so that the RawIterator returned stores a 1
+ /*! @internal A temporary element used for initalization for the Begin() and
+ * End() methods of the ZeroOne class. Is used to initalize a 1
+ * so that the Iterator returned stores a 1
*/
Element _tmp;
@@ -275,3 +289,12 @@ namespace LinBox
#endif // __LINBOX_zero_one_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/zero-one.inl b/linbox/blackbox/zero-one.inl
index ed51ea3..5252d5e 100644
--- a/linbox/blackbox/zero-one.inl
+++ b/linbox/blackbox/zero-one.inl
@@ -1,6 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* -*- mode: C++; style: linux -*- */
/* linbox/blackbox/nag-sparse.h
* Copyright (C) 2002 Rich Seagraves
@@ -9,7 +6,25 @@
* Modified by Zhendong Wan, -bds
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file blackbox/zero-one.inl
@@ -26,17 +41,17 @@ namespace LinBox
* @ingroup iterators
*/
template<class Field>
- class ZeroOne<Field>::RawIterator {
+ class ZeroOne<Field>::Iterator {
public:
typedef Element value_type;
- RawIterator(size_t pos, Element elem) :
+ Iterator(size_t pos, Element elem) :
_pos(pos), _elem(elem) {}
- RawIterator(const RawIterator &In) :
+ Iterator(const Iterator &In) :
_pos(In._pos), _elem(In._elem) {}
- const RawIterator& operator=(const RawIterator& rhs)
+ const Iterator& operator=(const Iterator& rhs)
{
_pos = rhs._pos;
_elem = rhs._elem;
@@ -44,25 +59,25 @@ namespace LinBox
}
- bool operator==(const RawIterator &rhs)
+ bool operator==(const Iterator &rhs)
{
return ( _pos == rhs._pos && _elem == rhs._elem);
}
- bool operator!=(const RawIterator &rhs)
+ bool operator!=(const Iterator &rhs)
{
return ( _pos != rhs._pos || _elem != rhs._elem );
}
- RawIterator & operator++()
+ Iterator & operator++()
{
++_pos;
return *this;
}
- RawIterator operator++(int)
+ Iterator operator++(int)
{
- RawIterator tmp = *this;
+ Iterator tmp = *this;
_pos++;
return tmp;
}
@@ -77,78 +92,78 @@ namespace LinBox
};
/* STL standard Begin and End functions. Used to get
- * the beginning and end of the data. So that RawIterator
+ * the beginning and end of the data. So that Iterator
* can be used in algorithms like a normal STL iterator.
*/
template<class Field> typename
- ZeroOne<Field>::RawIterator ZeroOne<Field>::rawBegin()
+ ZeroOne<Field>::Iterator ZeroOne<Field>::Begin()
{
- return RawIterator( 0, _F.init(_tmp, 1) );
+ return Iterator( 0, _field.init(_tmp, 1) );
}
template<class Field> typename
- ZeroOne<Field>::RawIterator ZeroOne<Field>::rawEnd()
+ ZeroOne<Field>::Iterator ZeroOne<Field>::End()
{
- return RawIterator( _nnz, _F.init(_tmp, 1) );
+ return Iterator( _nnz, _field.init(_tmp, 1) );
}
template<class Field>
- const typename ZeroOne<Field>::RawIterator ZeroOne<Field>::rawBegin() const
+ const typename ZeroOne<Field>::Iterator ZeroOne<Field>::Begin() const
{
- return RawIterator(0, _F.init(_tmp, 1) );
+ return Iterator(0, _field.init(_tmp, 1) );
}
template<class Field>
- const typename ZeroOne<Field>::RawIterator ZeroOne<Field>::rawEnd() const
+ const typename ZeroOne<Field>::Iterator ZeroOne<Field>::End() const
{
- return RawIterator(_nnz, _F.init(_tmp, 1) );
+ return Iterator(_nnz, _field.init(_tmp, 1) );
}
- /*! RawIndexIterator.
+ /*! IndexIterator.
* @ingroup iterators
* Iterates through the i and j of the current element
* and when accessed returns an STL pair containing the coordinates
*/
template<class Field>
- class ZeroOne<Field>::RawIndexIterator {
+ class ZeroOne<Field>::IndexIterator {
public:
typedef std::pair<size_t, size_t> value_type;
- RawIndexIterator() {}
+ IndexIterator() {}
- RawIndexIterator(size_t* row, size_t* col):
+ IndexIterator(size_t* row, size_t* col):
_row(row), _col(col) {}
- RawIndexIterator(const RawIndexIterator &In):
+ IndexIterator(const IndexIterator &In):
_row(In._row), _col(In._col)
{}
- const RawIndexIterator &operator=(const RawIndexIterator &rhs)
+ const IndexIterator &operator=(const IndexIterator &rhs)
{
_row = rhs._row;
_col = rhs._col;
return *this;
}
- bool operator==(const RawIndexIterator &rhs)
+ bool operator==(const IndexIterator &rhs)
{
return _row == rhs._row && _col == rhs._col;
}
- bool operator!=(const RawIndexIterator &rhs)
+ bool operator!=(const IndexIterator &rhs)
{
return _row != rhs._row || _col != rhs._col;
}
- const RawIndexIterator& operator++()
+ const IndexIterator& operator++()
{
++_row; ++_col;
return *this;
}
- const RawIndexIterator operator++(int)
+ const IndexIterator operator++(int)
{
- RawIndexIterator tmp = *this;
+ IndexIterator tmp = *this;
++_row; ++_col;
return tmp;
}
@@ -167,42 +182,43 @@ namespace LinBox
};
template<class Field> typename
- ZeroOne<Field>::RawIndexIterator ZeroOne<Field>::indexBegin()
+ ZeroOne<Field>::IndexIterator ZeroOne<Field>::indexBegin()
{
- return RawIndexIterator(_rowP, _colP);
+ return IndexIterator(_rowP, _colP);
}
template<class Field>
- const typename ZeroOne<Field>::RawIndexIterator ZeroOne<Field>::indexBegin() const
+ const typename ZeroOne<Field>::IndexIterator ZeroOne<Field>::indexBegin() const
{
- return RawIndexIterator(_rowP, _colP);
+ return IndexIterator(_rowP, _colP);
}
template<class Field> typename
- ZeroOne<Field>::RawIndexIterator ZeroOne<Field>::indexEnd()
+ ZeroOne<Field>::IndexIterator ZeroOne<Field>::indexEnd()
{
- return RawIndexIterator(_rowP + _nnz, _colP + _nnz);
+ return IndexIterator(_rowP + _nnz, _colP + _nnz);
}
template<class Field>
- const typename ZeroOne<Field>::RawIndexIterator ZeroOne<Field>::indexEnd() const
+ const typename ZeroOne<Field>::IndexIterator ZeroOne<Field>::indexEnd() const
{
- return RawIndexIterator(_rowP + _nnz, _colP + _nnz);
+ return IndexIterator(_rowP + _nnz, _colP + _nnz);
}
template<class Field>
ZeroOne<Field>::ZeroOne(const Field& F) :
- _F(F)
+ _field(F)
{
- srand( time(NULL) );
+ srand((unsigned int) time(NULL) );
dynamic = false;
}
template<class Field>
- ZeroOne<Field>::ZeroOne(Field F, Index* rowP, Index* colP, Index rows, Index cols, Index NNz, bool rowSort, bool colSort):
- _F(F), _rows(rows), _cols(cols), _nnz(NNz), _rowP(rowP), _colP(colP), _rowSort(rowSort), _colSort(colSort) , dynamic(false)
+ ZeroOne<Field>::ZeroOne(Field F, Index* rowP, Index* colP,
+ Index rows, Index cols, Index NNz, bool RowSort, bool ColSort):
+ _field(F), _rows(rows), _cols(cols), _nnz(NNz), _rowP(rowP), _colP(colP), _rowSort(RowSort), _colSort(ColSort) , dynamic(false)
{
- srand(time(NULL));
+ srand((unsigned)time(NULL));
}
template<class Field>
@@ -241,7 +257,7 @@ namespace LinBox
if( (e - p) <= 1) ;
else
{
- i = 1 + _part(p, e, mode);
+ i = 1 + (int)_part(p, e, mode);
_qsort(p, i, mode);
_qsort(i, e, mode);
}
@@ -251,7 +267,7 @@ namespace LinBox
size_t ZeroOne<Field>::_part(size_t p, size_t e, int &mode) const
{
size_t rtemp, ctemp, rowval, colval;
- int i = p + rand() % (e - p), j = e;
+ int i = int(p +(int) rand() % (e - p)), j =(int) e;
rtemp = _rowP[p];
ctemp = _colP[p];
_rowP[p] = _rowP[i];
@@ -260,7 +276,7 @@ namespace LinBox
_colP[i] = ctemp;
rowval = _rowP[p];
colval = _colP[p];
- i = p - 1;
+ i = (int)p - 1;
if(mode == 0)
{ // Row mode, go by row order, then column
@@ -311,7 +327,7 @@ namespace LinBox
// 0 out y. Note, this implementation assumes a dense vector.
for(yp = y.begin(); yp != y.end(); ++yp)
- _F.init(*yp , 0);
+ _field.init(*yp , 0);
rowSort();
@@ -324,7 +340,7 @@ namespace LinBox
for(; ip <_rowP+nnz(); ++ip,++jp)
{
if( *ip == rowI)
- _F.addin(*yp,*(xp + *jp));
+ _field.addin(*yp,*(xp + *jp));
else
{
if((*ip-rowI)==1)
@@ -333,7 +349,7 @@ namespace LinBox
yp=y.begin()+*ip;
rowI=*ip;
- _F.addin(*yp,*(xp + *jp));
+ _field.addin(*yp,*(xp + *jp));
}
}
return y;
@@ -349,10 +365,11 @@ namespace LinBox
typename OutVector::iterator yp;
typename InVector::const_iterator xp;
+ typedef typename OutVector::value_type val_t ;
Index* ip, *jp;
for(yp = y.begin(); yp != y.end(); ++yp)
- _F.init(*yp , 0);
+ _field.init(*yp , 0);
rowSort();
@@ -363,7 +380,7 @@ namespace LinBox
size_t rowI =0;
integer _prime;
- _F.characteristic(_prime);
+ _field.characteristic(_prime);
uint32_t prime = static_cast<uint32_t>(_prime);
@@ -375,7 +392,7 @@ namespace LinBox
accum=accum+*(xp + *jp);
else
{
- *yp= accum % prime;
+ *yp= (val_t)(accum % prime);
if((*ip-rowI)==1)
++yp;
else
@@ -386,7 +403,7 @@ namespace LinBox
}
}
if(rowI)
- *yp=accum % prime;
+ *yp= val_t(accum % prime);
return y;
}
@@ -404,7 +421,7 @@ namespace LinBox
// 0 out y. Note, this implementation assumes a dense vector.
for(yp = y.begin(); yp != y.end(); ++yp)
- _F.init(*yp , 0);
+ _field.init(*yp , 0);
rowSort();
@@ -417,7 +434,7 @@ namespace LinBox
for(; ip <_rowP+nnz(); ++ip,++jp)
{
if( *ip == rowI)
- _F.addin(*(yp+*jp),*xp);
+ _field.addin(*(yp+*jp),*xp);
else
{
if((*ip-rowI)==1)
@@ -426,7 +443,7 @@ namespace LinBox
xp=x.begin()+*ip;
rowI=*ip;
- _F.addin(*(yp+*jp),*xp);
+ _field.addin(*(yp+*jp),*xp);
}
}
@@ -443,8 +460,9 @@ namespace LinBox
std::vector<uint64_t> y_c (y.size(),0);
- typename OutVector::iterator yp;
- typename InVector::const_iterator xp;
+ typename OutVector::iterator yp;
+ typename InVector::const_iterator xp;
+ typedef typename OutVector::value_type val_t ;
Index* ip, *jp;
rowSort();
@@ -458,10 +476,10 @@ namespace LinBox
for(; ip <_rowP+nnz(); ++ip,++jp)
{
- if( *ip == rowI)
+ if( *ip == rowI) {
*(y_cp+*jp) += *xp;
- else
- {
+ }
+ else {
if((*ip-rowI)==1)
++xp;
else
@@ -473,13 +491,13 @@ namespace LinBox
}
integer _prime;
- _F.characteristic(_prime);
+ _field.characteristic(_prime);
uint32_t prime = static_cast<uint32_t>(_prime);
yp=y.begin();
y_cp=y_c.begin();
for(;yp!=y.end();++yp,++y_cp)
- *yp = (*y_cp) % prime;
+ *yp =(val_t)( (*y_cp) % prime );
return y;
}
@@ -487,3 +505,12 @@ namespace LinBox
}//End of LinBox
#endif // __LINBOX_bb_zero_one_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/zo-gf2.h b/linbox/blackbox/zo-gf2.h
index 98b3fb9..84d8443 100644
--- a/linbox/blackbox/zo-gf2.h
+++ b/linbox/blackbox/zo-gf2.h
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/zo-gf2.h
* Copyright (C) 2009,2010 The LinBox group
*
* Time-stamp: <23 Jun 10 16:02:02 Jean-Guillaume.Dumas at imag.fr>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*
*/
#ifndef __LINBOX_zo_gf2_H
@@ -29,8 +45,8 @@ namespace LinBox
\ingroup blackbox
*/
template<>
- struct ZeroOne<GF2> : public LightContainer< LightContainer< size_t > >
- {
+ class ZeroOne<GF2> : public LightContainer< LightContainer< size_t > > {
+ public:
typedef LightContainer< LightContainer< size_t > > Father_t;
typedef LightContainer< size_t > Row_t;
typedef GF2::Element Element;
@@ -38,7 +54,7 @@ namespace LinBox
typedef ZeroOne<GF2> Self_t;
typedef GF2 Field;
- const GF2 _F;
+ const GF2 _field;
ZeroOne(const GF2& ) :
_nnz(0)
@@ -73,10 +89,11 @@ namespace LinBox
Father_t(static_cast<const Father_t&>(A)), _rowdim(A._rowdim), _coldim(A._coldim), _nnz(A._nnz)
{ }
- ZeroOne(const GF2& , size_t* rowP, size_t* colP, const size_t m, const size_t n, const size_t nnz, const bool ,const bool) :
- Father_t(m), _rowdim(m), _coldim(n), _nnz(nnz)
+ ZeroOne(const GF2& , size_t* rowP, size_t* colP,
+ const size_t m, const size_t n, const size_t Nnz, const bool ,const bool) :
+ Father_t(m), _rowdim(m), _coldim(n), _nnz(Nnz)
{
- for(size_t k=0; k<nnz; ++k)
+ for(size_t k=0; k<Nnz; ++k)
this->operator[](rowP[k]).push_back(colP[k]);
}
@@ -104,7 +121,7 @@ namespace LinBox
std::istream &read (std::istream &is) ;
std::ostream& write (std::ostream& out, FileFormatTag format=FORMAT_GUILLAUME) const ;
- const Field& field() const { return _F; }
+ const Field& field() const { return _field; }
template<typename _Tp1>
struct rebind {
@@ -122,7 +139,7 @@ namespace LinBox
ZeroOne(ZeroOne<_Tp1>& A, const GF2 F2) :
Father_t(A.rowdim()), _rowdim(A.rowdim()), _coldim(A.coldim()), _nnz(0)
{
- for(typename ZeroOne<_Tp1>::RawIndexIterator it = A.indexBegin();
+ for(typename ZeroOne<_Tp1>::IndexIterator it = A.indexBegin();
it != A.indexEnd(); ++it,++_nnz) {
this->operator[]( it->first ).push_back( it->second );
}
@@ -132,23 +149,23 @@ namespace LinBox
bool isRowSorted() const { return true; }
bool isColSorted() const { return true; }
- /** RawIterator class. Iterates straight through the values of the matrix
+ /** Iterator class. Iterates straight through the values of the matrix
*/
- class RawIterator;
+ class Iterator;
- RawIterator rawBegin();
- RawIterator rawEnd();
- const RawIterator rawBegin() const;
- const RawIterator rawEnd() const;
+ Iterator Begin();
+ Iterator End();
+ const Iterator Begin() const;
+ const Iterator End() const;
- /** RawIndexIterator - Iterates through the i and j of the current element
+ /** IndexIterator - Iterates through the i and j of the current element
* and when accessed returns an STL pair containing the coordinates
*/
- class RawIndexIterator;
- RawIndexIterator indexBegin();
- const RawIndexIterator indexBegin() const;
- RawIndexIterator indexEnd();
- const RawIndexIterator indexEnd() const;
+ class IndexIterator;
+ IndexIterator indexBegin();
+ const IndexIterator indexBegin() const;
+ IndexIterator indexEnd();
+ const IndexIterator indexEnd() const;
private:
@@ -161,3 +178,12 @@ namespace LinBox
#endif //__LINBOX_zo_gf2_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/zo-gf2.inl b/linbox/blackbox/zo-gf2.inl
index 18289e7..fa18cfd 100644
--- a/linbox/blackbox/zo-gf2.inl
+++ b/linbox/blackbox/zo-gf2.inl
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file blackbox/zo-gf2.inl
@@ -35,17 +36,17 @@ namespace LinBox
// Dot product structure enabling std::transform call
template<class Blackbox, class InVector>
struct dotp {
- const typename Blackbox::Field& _F;
+ const typename Blackbox::Field& _field;
const InVector& _x;
dotp(const typename Blackbox::Field& F, const InVector& x) :
- _F(F), _x(x)
+ _field(F), _x(x)
{}
bool operator()(const typename Blackbox::Row_t& row) const
{
bool tmp(false);
for(typename Blackbox::Row_t::const_iterator loc = row.begin(); loc != row.end(); ++loc) {
- _F.addin(tmp,_x[*loc]);
+ _field.addin(tmp,_x[*loc]);
}
return tmp;
}
@@ -55,7 +56,7 @@ namespace LinBox
template<class OutVector, class InVector>
inline OutVector & ZeroOne<GF2>::apply(OutVector & y, const InVector & x) const
{
- dotp<Self_t,InVector> mydp(this->_F, x);
+ dotp<Self_t,InVector> mydp(this->_field, x);
std::transform(this->begin(), this->end(), y.begin(), mydp );
return y;
}
@@ -69,7 +70,7 @@ namespace LinBox
for( ; row != this->end(); ++yit, ++row) {
bool tmp(false);
for(Row_t::const_iterator loc = row->begin();loc != row->end(); ++loc)
- _F.addin(tmp,x[*loc]);
+ _field.addin(tmp,x[*loc]);
*yit = tmp;
}
return y;
@@ -84,7 +85,7 @@ namespace LinBox
Self_t::const_iterator row = this->begin();
for( ; row != this->end(); ++row, ++xit) {
for(typename Self_t::Row_t::const_iterator loc = row->begin(); loc != row->end(); ++loc) {
- _F.addin(y[*loc],*xit);
+ _field.addin(y[*loc],*xit);
}
}
return y;
@@ -94,7 +95,7 @@ namespace LinBox
inline void ZeroOne<GF2>::setEntry(size_t i, size_t j, const Element& v) {
Row_t& rowi = this->operator[](i);
Row_t::iterator there = std::lower_bound(rowi.begin(), rowi.end(), j);
- if (! _F.isZero(v) ) {
+ if (! _field.isZero(v) ) {
if ( (there == rowi.end() ) || (*there != j) ) {
rowi.insert(there, j);
++_nnz;
@@ -115,7 +116,7 @@ namespace LinBox
if (there != rowi.end() )
return r=*there;
else
- return r=_F.zero;
+ return r=_field.zero;
}
inline const ZeroOne<GF2>::Element& ZeroOne<GF2>::getEntry(size_t i, size_t j) const
@@ -125,7 +126,7 @@ namespace LinBox
if (there != rowi.end() )
return reinterpret_cast<const ZeroOne<GF2>::Element&>(*there);
else
- return _F.zero;
+ return _field.zero;
}
inline std::istream &ZeroOne<GF2>::read (std::istream &is) {
@@ -193,19 +194,19 @@ namespace LinBox
/*! Raw iterator.
* @ingroup iterators
*/
- class ZeroOne<GF2>::RawIterator {
+ class ZeroOne<GF2>::Iterator {
public:
typedef Element value_type;
- RawIterator(size_t pos, Element elem) :
+ Iterator(size_t pos, Element elem) :
_elem(elem),_pos(pos)
{}
- RawIterator(const RawIterator &In) :
+ Iterator(const Iterator &In) :
_elem(In._elem),_pos(In._pos)
{}
- const RawIterator& operator=(const RawIterator& rhs)
+ const Iterator& operator=(const Iterator& rhs)
{
_pos = rhs._pos;
_elem = rhs._elem;
@@ -213,25 +214,25 @@ namespace LinBox
}
- bool operator==(const RawIterator &rhs)
+ bool operator==(const Iterator &rhs)
{
return ( _pos == rhs._pos && _elem == rhs._elem);
}
- bool operator!=(const RawIterator &rhs)
+ bool operator!=(const Iterator &rhs)
{
return ( _pos != rhs._pos || _elem != rhs._elem );
}
- RawIterator & operator++()
+ Iterator & operator++()
{
++_pos;
return *this;
}
- RawIterator operator++(int)
+ Iterator operator++(int)
{
- RawIterator tmp = *this;
+ Iterator tmp = *this;
_pos++;
return tmp;
}
@@ -249,48 +250,48 @@ namespace LinBox
};
/* STL standard Begin and End functions. Used to get
- * the beginning and end of the data. So that RawIterator
+ * the beginning and end of the data. So that Iterator
* can be used in algorithms like a normal STL iterator.
*/
- inline ZeroOne<GF2>::RawIterator ZeroOne<GF2>::rawBegin()
+ inline ZeroOne<GF2>::Iterator ZeroOne<GF2>::Begin()
{
- return RawIterator( 0, _F.one );
+ return Iterator( 0, _field.one );
}
- inline ZeroOne<GF2>::RawIterator ZeroOne<GF2>::rawEnd()
+ inline ZeroOne<GF2>::Iterator ZeroOne<GF2>::End()
{
- return RawIterator( _nnz, _F.one );
+ return Iterator( _nnz, _field.one );
}
- inline const ZeroOne<GF2>::RawIterator ZeroOne<GF2>::rawBegin() const
+ inline const ZeroOne<GF2>::Iterator ZeroOne<GF2>::Begin() const
{
- return RawIterator(0, _F.one );
+ return Iterator(0, _field.one );
}
- inline const ZeroOne<GF2>::RawIterator ZeroOne<GF2>::rawEnd() const
+ inline const ZeroOne<GF2>::Iterator ZeroOne<GF2>::End() const
{
- return RawIterator(_nnz, _F.one );
+ return Iterator(_nnz, _field.one );
}
- /*! RawIndexIterator.
+ /*! IndexIterator.
* @ingroup iterators
* Iterates through the i and j of the current element
* and when accessed returns an STL pair containing the coordinates
*/
- class ZeroOne<GF2>::RawIndexIterator {
+ class ZeroOne<GF2>::IndexIterator {
public:
typedef std::pair<size_t, size_t> value_type;
- RawIndexIterator() {}
+ IndexIterator() {}
- RawIndexIterator(size_t rowidx,
+ IndexIterator(size_t rowidx,
LightContainer<LightContainer<size_t> >::const_iterator rowbeg,
LightContainer<LightContainer<size_t> >::const_iterator rowend,
size_t colidx,
LightContainer<size_t>::const_iterator colbeg) :
- _rowbeg( LightContainer<LightContainer<size_t> >::iterator(rowbeg) ),
- _rowend( LightContainer<LightContainer<size_t> >::iterator(rowend) ),
- _colbeg( LightContainer<size_t>::iterator(colbeg) ),
+ _rowbeg( LightContainer<LightContainer<size_t> >::const_iterator(rowbeg) ),
+ _rowend( LightContainer<LightContainer<size_t> >::const_iterator(rowend) ),
+ _colbeg( LightContainer<size_t>::const_iterator(colbeg) ),
_row(rowidx),
_col(colidx)
{
@@ -307,11 +308,11 @@ namespace LinBox
}
- RawIndexIterator(const RawIndexIterator &In) :
+ IndexIterator(const IndexIterator &In) :
_rowbeg(In._rowbeg), _rowend(In._rowend), _colbeg(In._colbeg), _row(In._row), _col(In._col)
{}
- const RawIndexIterator &operator=(const RawIndexIterator &rhs)
+ const IndexIterator &operator=(const IndexIterator &rhs)
{
_rowbeg = rhs._rowbeg;
_rowend = rhs._rowend;
@@ -321,17 +322,17 @@ namespace LinBox
return *this;
}
- bool operator==(const RawIndexIterator &rhs)
+ bool operator==(const IndexIterator &rhs)
{
return _rowbeg == rhs._rowbeg && _colbeg == rhs._colbeg;
}
- bool operator!=(const RawIndexIterator &rhs)
+ bool operator!=(const IndexIterator &rhs)
{
return _rowbeg != rhs._rowbeg || _colbeg != rhs._colbeg;
}
- const RawIndexIterator& operator++() {
+ const IndexIterator& operator++() {
@@ -347,9 +348,9 @@ namespace LinBox
return *this;
}
- const RawIndexIterator operator++(int)
+ const IndexIterator operator++(int)
{
- RawIndexIterator tmp = *this;
+ IndexIterator tmp = *this;
this->operator++();
return tmp;
}
@@ -364,36 +365,36 @@ namespace LinBox
return std::pair<size_t,size_t>(_row, _col);
}
private:
- LightContainer<LightContainer<size_t> >::iterator _rowbeg, _rowend;
- LightContainer<size_t>::iterator _colbeg;
+ LightContainer<LightContainer<size_t> >::const_iterator _rowbeg, _rowend;
+ LightContainer<size_t>::const_iterator _colbeg;
size_t _row, _col;
};
- inline ZeroOne<GF2>::RawIndexIterator ZeroOne<GF2>::indexBegin()
+ inline ZeroOne<GF2>::IndexIterator ZeroOne<GF2>::indexBegin()
{
- return RawIndexIterator(0, this->begin(), this->end(), 0, this->front().begin() );
+ return IndexIterator(0, this->begin(), this->end(), 0, this->front().begin() );
}
- inline const ZeroOne<GF2>::RawIndexIterator ZeroOne<GF2>::indexBegin() const
+ inline const ZeroOne<GF2>::IndexIterator ZeroOne<GF2>::indexBegin() const
{
- return RawIndexIterator(0, this->begin(), this->end(), 0, this->front().begin() );
+ return IndexIterator(0, this->begin(), this->end(), 0, this->front().begin() );
}
- inline ZeroOne<GF2>::RawIndexIterator ZeroOne<GF2>::indexEnd()
+ inline ZeroOne<GF2>::IndexIterator ZeroOne<GF2>::indexEnd()
{
- return RawIndexIterator(_rowdim, this->end(), this->end(), this->back().size(),this->back().end() );
+ return IndexIterator(_rowdim, this->end(), this->end(), this->back().size(),this->back().end() );
}
- inline const ZeroOne<GF2>::RawIndexIterator ZeroOne<GF2>::indexEnd() const
+ inline const ZeroOne<GF2>::IndexIterator ZeroOne<GF2>::indexEnd() const
{
- return RawIndexIterator(_rowdim, this->end(), this->end(), this->back().size(),this->back().end() );
+ return IndexIterator(_rowdim, this->end(), this->end(), this->back().size(),this->back().end() );
}
-}; // end of namespace LinBox
+} // end of namespace LinBox
// Specialization of getentry
@@ -404,3 +405,12 @@ namespace LinBox
} // end of namespace LinBox
#endif //__LINBOX_zo_gf2_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/zo.h b/linbox/blackbox/zo.h
index e1cfef1..8f3300a 100644
--- a/linbox/blackbox/zo.h
+++ b/linbox/blackbox/zo.h
@@ -1,10 +1,26 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/blackbox/zo.h
* Copyright (c) LinBox
* by Hui Wang, assisted by bds
* ------------------------------------
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_zero_one_H
@@ -22,10 +38,10 @@
#include "linbox/util/debug.h"
#include "linbox/util/matrix-stream.h"
#include "linbox/field/modular.h"
-#include <linbox/blackbox/blackbox-interface.h>
-#include <linbox/blackbox/quad-matrix.h>
+#include "linbox/blackbox/blackbox-interface.h"
+#include "linbox/blackbox/quad-matrix.h"
-// For STL pair in RawIndexIterator
+// For STL pair in IndexIterator
#include <utility>
#include <iterator>
#include <vector> // For vectors in _col2row and _row2col
@@ -70,28 +86,28 @@ namespace LinBox
// basic constructor, can be used with subsequent read.
ZeroOne(const Field& F) :
- _F(F), sorted(true)
+ _field(F), sorted(true)
{}
// constructor for use by ZOQuad. Needs work.
- ZeroOne
- (const Field& F, IndexVector& index, PointerVector& indexP, Index rowdim, Index coldim, bool sortedBy) :
- _F(F), _index(index), _indexP(indexP), _rowdim(rowdim), _coldim(coldim), sorted(sortedBy)
+ ZeroOne (const Field& F, IndexVector& index, PointerVector& indexP,
+ Index Rowdim, Index Coldim, bool sortedBy) :
+ _field(F), _index(index), _indexP(indexP),
+ _rowdim(Rowdim), _coldim(Coldim), sorted(sortedBy)
{
- ptrdiff_t diff = _index.begin() - index.begin();
+ std::ptrdiff_t diff = _index.begin() - index.begin();
for (size_t i = 0; i < _indexP.size(); ++i)
_indexP[i] += diff;
- /*
- _indexP.push_back( _index.begin() );
- IndexVector::iterator i = _index.begin();
- PointerVector::iterator j = indexP.begin();
- for( ++j; j < indexP.end(); ++j )
- {
- _indexP.push_back( i + ( *j - *(j-1) ) );
- i = _indexP.back();
- }
- */
+#if 0
+ _indexP.push_back( _index.begin() );
+ IndexVector::iterator i = _index.begin();
+ PointerVector::iterator j = indexP.begin();
+ for( ++j; j < indexP.end(); ++j ) {
+ _indexP.push_back( i + ( *j - *(j-1) ) );
+ i = _indexP.back();
+ }
+#endif
}
/** The real constructor /todo give docs here
@@ -99,7 +115,7 @@ namespace LinBox
*/
ZeroOne
(Field& F, Index* rowP, Index* colP, Index rows, Index cols, Index NNz) :
- _F(F), _rowdim(rows), _coldim(cols), sorted(true)
+ _field(F), _rowdim(rows), _coldim(cols), sorted(true)
{
std::vector<std::pair<Index, Index> > indexPairs;
for (Index i = 0; i < NNz; ++i, ++rowP, ++colP)
@@ -107,12 +123,12 @@ namespace LinBox
init(indexPairs);
}
ZeroOne(const ZeroOne<Field>& A) :
- // better keep the commented out statements below for later debugging
- _F(A._F), _index(A._index), _rowdim(A._rowdim), _coldim(A._coldim), sorted(A.sorted)
+ // better keep the commented out statements below for later debugging
+ _field(A._field), _index(A._index), _rowdim(A._rowdim), _coldim(A._coldim), sorted(A.sorted)
{
#if 0
std::cout << " copy constructor of zero-one matrix: A.rowdim = " << A._rowdim << " A.coldim = " << A._coldim << std::endl;
- ZeroOne(A._F, A._index, A._indexP, A._rowdim, A._coldim, A.sorted);
+ ZeroOne(A._field, A._index, A._indexP, A._rowdim, A._coldim, A.sorted);
std::cout << " copy constructor of zero-one matrix: rowdim = " << _rowdim << " coldim = " << _coldim << std::endl;
#endif
_indexP.push_back( _index.begin() );
@@ -285,7 +301,7 @@ namespace LinBox
std::vector<std::pair<Index, Index> > indexPairs;
Index r, c;
Element v;
- MatrixStream<Field> S(_F, is);
+ MatrixStream<Field> S(_field, is);
long count = 0;
// /*
@@ -323,7 +339,7 @@ namespace LinBox
}
const Field& field() const
- { return _F; }
+ { return _field; }
/* Non blackbox function. Tells the number of nonzero entries
*/
@@ -335,7 +351,7 @@ namespace LinBox
protected:
- Field _F; // The field used by this class
+ Field _field; // The field used by this class
/* _indexP is a pointer to an array of row indexes. _colP is a pointer
* to an array of column indexes. These two are the other arrays of a
@@ -382,3 +398,12 @@ namespace LinBox
#endif // __LINBOX_zero_one_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/blackbox/zo.inl b/linbox/blackbox/zo.inl
index 690d61f..0cf73a4 100644
--- a/linbox/blackbox/zo.inl
+++ b/linbox/blackbox/zo.inl
@@ -1,6 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* -*- mode: C++; style: linux -*- */
/* linbox/blackbox/nag-sparse.h
* Copyright (C) 2002 Rich Seagraves
@@ -9,7 +6,25 @@
* Modified by Zhendong Wan, -bds
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
namespace LinBox
@@ -52,7 +67,7 @@ namespace LinBox
linbox_check((y.size()==rowdim())&&(x.size()==coldim()));
- FieldAXPY<Field> accum (_F);
+ FieldAXPY<Field> accum (_field);
typename OutVector::iterator yp;
typename InVector::const_iterator xp;
@@ -124,7 +139,7 @@ namespace LinBox
{
linbox_check((y.size()==coldim())&&(x.size()==rowdim()));
- FieldAXPY<Field> accum (_F);
+ FieldAXPY<Field> accum (_field);
typename OutVector::iterator yp;
typename InVector::const_iterator xp;
@@ -154,7 +169,7 @@ namespace LinBox
{
linbox_check((y.size()==coldim())&&(x.size()==rowdim()));
- FieldAXPY<Field> accum (_F);
+ FieldAXPY<Field> accum (_field);
typename OutVector::iterator yp;
typename InVector::const_iterator xp;
@@ -183,3 +198,12 @@ namespace LinBox
}
}//End of LinBox
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/config-blas.h b/linbox/config-blas.h
index 7210005..90a7135 100644
--- a/linbox/config-blas.h
+++ b/linbox/config-blas.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* config-blas.h
* Copyright (C) 2005 Pascal Giorgi
* 2007 Clement Pernet
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -26,5 +27,31 @@
#define __LINBOX_config_blas_H
#include <fflas-ffpack/config-blas.h>
+#include <fflas-ffpack/fflas-ffpack-config.h>
+
+#ifdef __FFLASFFPACK_HAVE_BLAS
+#define __LINBOX_HAVE_BLAS 1
+#endif
+
+#ifdef __FFLASFFPACK_HAVE_CBLAS
+#define __LINBOX_HAVE_CBLAS 1
+#endif
+
+#ifdef __FFLASFFPACK_HAVE_LAPACK
+#define __LINBOX_HAVE_LAPACK 1
+#endif
+
+#ifdef __FFLASFFPACK_HAVE_CLAPACK
+#define __LINBOX_HAVE_CLAPACK 1
+#endif
#endif //__LINBOX_config_blas_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/dummy.C b/linbox/dummy.C
index 562ea08..8c7f9d8 100644
--- a/linbox/dummy.C
+++ b/linbox/dummy.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/dummy.C
* Copyright (C) 1994-1997 Givaro Team
@@ -8,7 +6,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#include "linbox/linbox-config.h"
@@ -19,3 +35,12 @@
static int dummy;
void foobar(){}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/element/Makefile.am b/linbox/element/Makefile.am
index 28cf39c..aabf88b 100644
--- a/linbox/element/Makefile.am
+++ b/linbox/element/Makefile.am
@@ -1,6 +1,24 @@
# Copyright (c) 2010 the LinBox group
# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+ LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
+
pkgincludesubdir=$(pkgincludedir)/element
EXTRA_DIST= \
diff --git a/linbox/element/Makefile.in b/linbox/element/Makefile.in
index 51a90ea..c926d64 100644
--- a/linbox/element/Makefile.in
+++ b/linbox/element/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,9 +16,27 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -41,12 +59,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -54,7 +75,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -63,18 +87,44 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
-pkgincludesubHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkgincludesub_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -86,6 +136,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -109,10 +160,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -133,10 +186,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -145,6 +203,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -161,6 +221,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -223,10 +284,20 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
pkgincludesubdir = $(pkgincludedir)/element
EXTRA_DIST = \
element.doxy
@@ -249,9 +320,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/element/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps linbox/element/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/element/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/element/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -269,6 +340,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -277,21 +349,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludesubdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)"
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludesubHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- $(pkgincludesubHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
done
uninstall-pkgincludesubHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
- done
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -305,7 +381,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -313,29 +389,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -356,13 +437,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -383,16 +468,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -478,6 +569,14 @@ uninstall-am: uninstall-pkgincludesubHEADERS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
+# Copyright (c) 2010 the LinBox group
+# This file is part of LinBox
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+ LinBox is free software: you can redistribute it and/or modify
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/linbox/element/abstract.h b/linbox/element/abstract.h
index 6d17089..b1aa86f 100644
--- a/linbox/element/abstract.h
+++ b/linbox/element/abstract.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/element/abstract.h
* Copyright (C) 1999-2001 William J Turner,
* 2001 Bradford Hovinen
@@ -7,10 +5,13 @@
* Written by William J Turner <wjturner at math.ncsu.edu>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_element_abstract_H
@@ -75,3 +76,12 @@ namespace LinBox
#endif // __LINBOX_element_abstract_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/element/archetype.h b/linbox/element/archetype.h
index 51a1427..76deff1 100644
--- a/linbox/element/archetype.h
+++ b/linbox/element/archetype.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/element/archetype.h
* Copyright (C) 1999-2001 William J Turner,
* 2001 Bradford Hovinen
@@ -7,10 +5,13 @@
* Written by William J Turner <wjturner at math.ncsu.edu>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*!@file element/archetype.h
@@ -161,3 +162,12 @@ namespace LinBox
#endif // __LINBOX_element_archetype_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/element/element.doxy b/linbox/element/element.doxy
index 85238cb..246c7c6 100644
--- a/linbox/element/element.doxy
+++ b/linbox/element/element.doxy
@@ -1,3 +1,25 @@
+/* Copyright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+
/** \ingroup linbox
\defgroup element element
diff --git a/linbox/element/envelope.h b/linbox/element/envelope.h
index 5338f63..e8838ff 100644
--- a/linbox/element/envelope.h
+++ b/linbox/element/envelope.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/element/envelope.h
* Copyright (C) 1999-2001 William J Turner,
* 2001 Bradford Hovinen
@@ -7,10 +5,13 @@
* Written by William J Turner <wjturner at math.ncsu.edu>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_element_envelope_H
@@ -112,3 +113,12 @@ namespace LinBox
#endif // __LINBOX_element_envelope_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/element/gmp-rational.h b/linbox/element/gmp-rational.h
index 2fc8048..b8ac1d7 100644
--- a/linbox/element/gmp-rational.h
+++ b/linbox/element/gmp-rational.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/element/gmp-rational.h
* Copyright (C) 2001-2002 Bradford Hovinen
*
* Written by Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_element_gmp_rational_H
@@ -169,3 +170,12 @@ namespace LinBox
#endif // __LINBOX_element_gmp_rational_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Givaro/Makefile.am b/linbox/field/Givaro/Makefile.am
new file mode 100644
index 0000000..9065a7b
--- /dev/null
+++ b/linbox/field/Givaro/Makefile.am
@@ -0,0 +1,42 @@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
+pkgincludesubdir=$(pkgincludedir)/field/Givaro
+
+GIVARO_HDRS = \
+ givaro-zpz.h \
+ givaro-montg.h \
+ givaro-zpz.inl \
+ givaro-gfq.h \
+ givaro-extension.h \
+ givaro-field.h \
+ givaro-field-gf2.h \
+ givaro-rational.h
+
+if LINBOX_HAVE_GIVARO
+USE_GIVARO_HDRS = $(GIVARO_HDRS)
+endif
+
+pkgincludesub_HEADERS = \
+ $(USE_GIVARO_HDRS)
+
+# EXTRA_DIST = \
+ # givaro.doxy
diff --git a/linbox/field/Givaro/Makefile.in b/linbox/field/Givaro/Makefile.in
new file mode 100644
index 0000000..e270249
--- /dev/null
+++ b/linbox/field/Givaro/Makefile.in
@@ -0,0 +1,591 @@
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = linbox/field/Givaro
+DIST_COMMON = $(am__pkgincludesub_HEADERS_DIST) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
+ $(top_srcdir)/macros/config-header.m4 \
+ $(top_srcdir)/macros/debug.m4 \
+ $(top_srcdir)/macros/expat-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
+ $(top_srcdir)/macros/givaro-check.m4 \
+ $(top_srcdir)/macros/gmp-check.m4 \
+ $(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
+ $(top_srcdir)/macros/libtool.m4 \
+ $(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
+ $(top_srcdir)/macros/linbox-doc.m4 \
+ $(top_srcdir)/macros/linbox-misc.m4 \
+ $(top_srcdir)/macros/linbox-opt.m4 \
+ $(top_srcdir)/macros/ltoptions.m4 \
+ $(top_srcdir)/macros/ltsugar.m4 \
+ $(top_srcdir)/macros/ltversion.m4 \
+ $(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
+ $(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
+ $(top_srcdir)/macros/ntl-check.m4 \
+ $(top_srcdir)/macros/saclib-check.m4 \
+ $(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__pkgincludesub_HEADERS_DIST = givaro-zpz.h givaro-montg.h \
+ givaro-zpz.inl givaro-gfq.h givaro-extension.h givaro-field.h \
+ givaro-field-gf2.h givaro-rational.h
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
+HEADERS = $(pkgincludesub_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
+BLAS_LIBS = @BLAS_LIBS@
+CC = @CC@
+CCNAM = @CCNAM@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DBG = @DBG@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
+DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
+DEFS = @DEFS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXPAT_CFLAGS = @EXPAT_CFLAGS@
+EXPAT_LIBS = @EXPAT_LIBS@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
+FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
+GIVARO_CFLAGS = @GIVARO_CFLAGS@
+GIVARO_LIBS = @GIVARO_LIBS@
+GMP_CFLAGS = @GMP_CFLAGS@
+GMP_LIBS = @GMP_LIBS@
+GMP_VERSION = @GMP_VERSION@
+GREP = @GREP@
+IML_CFLAGS = @IML_CFLAGS@
+IML_LIBS = @IML_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIDIA_CFLAGS = @LIDIA_CFLAGS@
+LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
+LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MAPLE_CFLAGS = @MAPLE_CFLAGS@
+MAPLE_HOME = @MAPLE_HOME@
+MAPLE_LIBS = @MAPLE_LIBS@
+MAPLE_VERSION = @MAPLE_VERSION@
+MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NTL_CFLAGS = @NTL_CFLAGS@
+NTL_LIBS = @NTL_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
+RANLIB = @RANLIB@
+RM = @RM@
+SACLIB_CFLAGS = @SACLIB_CFLAGS@
+SACLIB_LIBS = @SACLIB_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TESTS_CFLAGS = @TESTS_CFLAGS@
+VERSION = @VERSION@
+WARN = @WARN@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+pkgincludesubdir = $(pkgincludedir)/field/Givaro
+GIVARO_HDRS = \
+ givaro-zpz.h \
+ givaro-montg.h \
+ givaro-zpz.inl \
+ givaro-gfq.h \
+ givaro-extension.h \
+ givaro-field.h \
+ givaro-field-gf2.h \
+ givaro-rational.h
+
+ at LINBOX_HAVE_GIVARO_TRUE@USE_GIVARO_HDRS = $(GIVARO_HDRS)
+pkgincludesub_HEADERS = \
+ $(USE_GIVARO_HDRS)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/field/Givaro/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/field/Givaro/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
+ @$(NORMAL_INSTALL)
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
+ done
+
+uninstall-pkgincludesubHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+ for dir in "$(DESTDIR)$(pkgincludesubdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgincludesubHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgincludesubHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool ctags distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkgincludesubHEADERS install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
+
+# EXTRA_DIST = \
+# # givaro.doxy
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/linbox/field/Givaro/givaro-extension.h b/linbox/field/Givaro/givaro-extension.h
new file mode 100644
index 0000000..2031d19
--- /dev/null
+++ b/linbox/field/Givaro/givaro-extension.h
@@ -0,0 +1,321 @@
+/* linbox/field/givaro-gfq.h
+ * Copyright (C) 2005 JGD
+ *
+ * Time-stamp: <22 Jun 10 10:02:34 Jean-Guillaume.Dumas at imag.fr>
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/*! @file field/Givaro/givaro-extension.h
+ * @ingroup field
+ * @brief NO DOC
+ */
+
+#ifndef __LINBOX_field_givaro_extension_H
+#define __LINBOX_field_givaro_extension_H
+
+
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/util/debug.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/field/Givaro/givaro-gfq.h"
+
+#ifdef __LINBOX_XMLENABLED
+
+#include "linbox/util/xml/linbox-reader.h"
+#include "linbox/util/xml/linbox-writer.h"
+
+#include <iostream>
+#include <string>
+#include <vector>
+
+#endif //__LINBOX_XMLENABLED
+
+//---------------------------------------------
+// Files of Givaro library
+#include <givaro/givextension.h>
+#include <givaro/giv_randiter.h>
+//---------------------------------------------
+// To convert linbox fields to Givaro interface
+#include "linbox/field/Givaro/givaro-field.h"
+
+//---------------------------------------------
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template< class BaseField>
+ class GivaroExtension;
+
+// #if !defined(__INTEL_COMPILER) && !defined(__CUDACC__) && !defined(__clang__)
+ // template<>
+// #endif
+ template< class BaseField>
+ struct ClassifyRing<GivaroExtension<BaseField> > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+// #if !defined(__INTEL_COMPILER) && !defined(__CUDACC__) && !defined(__clang__)
+ // template<>
+// #endif
+ template< class BaseField>
+ struct FieldTraits< GivaroExtension<BaseField> > {
+ typedef RingCategories::ModularTag categoryTag;
+
+ static integer& maxModulus( integer& i )
+ {
+ return FieldTraits<BaseField>::maxModulus(i);
+ }
+
+ static bool goodModulus( const integer& i )
+ {
+ return FieldTraits<BaseField>::goodModulus(i);
+ }
+
+ // After that degree might not be correct ...
+ static integer& maxExponent( integer& i )
+ {
+ return i = 2147483648UL;
+ }
+ static bool goodExponent( const integer& i )
+ {
+ integer max;
+ return ( i >= 1 && i <= maxExponent( max ) );
+ }
+ };
+
+
+ /** This template class is defined to be in phase with the LinBox
+ * archetype.
+ * Most of all methods are inherited from Extension class
+ * of Givaro.
+ * These class allow to construct only extension field with a prime characteristic.
+ */
+ template< class BaseField = LinBox::GivaroGfq>
+ class GivaroExtension : public Givaro::Extension<GivaroField<BaseField> >, public FieldInterface {
+
+ typedef GivaroExtension<GivaroField<BaseField> > Self_t;
+ typedef Givaro::Extension<GivaroField<BaseField> > Extension_t;
+ public:
+ /** Element type.
+ * This type is inherited from the Givaro class Extension
+ */
+ typedef typename Givaro::Extension<GivaroField<BaseField> >::Element Element;
+
+ typedef Givaro:: Extension<GivaroField<BaseField> > Father_t;
+
+ using Extension_t::zero;
+ using Extension_t::one;
+ using Extension_t::mOne;
+
+ /** RandIter type.
+ * This type is inherited from the Givaro class GFqDom<TAG>
+ */
+ typedef Givaro::GIV_ExtensionrandIter< Givaro::Extension<GivaroField<BaseField> >, LinBox::integer > RandIter;
+
+
+ GivaroExtension()
+ {}
+
+
+ /** Constructor from an integer.
+ */
+ GivaroExtension(const integer& p, const integer& k=1) :
+ Givaro::Extension<GivaroField<BaseField> >(static_cast<typename Givaro::Extension< GivaroField< BaseField > >::Residu_t >(int32_t(p)), static_cast<typename Givaro::Extension< GivaroField< BaseField > >::Residu_t>(int32_t(k)))
+ {
+ }
+
+ /** Constructor extension of a base field.
+ */
+ GivaroExtension(const BaseField& bF, const integer& ext=1) :
+ Givaro::Extension<GivaroField<BaseField> >( GivaroField<BaseField>(bF),
+ static_cast<typename Givaro::Extension< GivaroField< BaseField > >::Residu_t>(int32_t(ext)))
+ {
+ }
+
+
+ /** Copy Constructor
+ */
+ GivaroExtension(const Self_t& F) :
+ Givaro::Extension<GivaroField<BaseField> >(F) {
+ }
+
+
+ using Givaro::Extension<GivaroField<BaseField> >:: characteristic ;
+#if (GIVARO_VERSION<30403)
+ long unsigned int & characteristic(long unsigned int & c) const
+ {
+ return c = (long unsigned)Givaro::Extension<GivaroField<BaseField> >::characteristic() ;
+ }
+#else
+ long unsigned int & characteristic(long unsigned int & c) const
+ {
+ return Givaro::Extension<GivaroField<BaseField> >::characteristic(c) ;
+ }
+#endif
+
+ }; // class GivaroExtension
+
+
+
+ /** This template class is define just to be in phase with the LinBox
+ * archetype.
+ * Most of all methods are inherited from Extension class
+ * of Givaro.
+ * these class allow to construct only extension field with a prime characteristic.
+ */
+// #ifndef __INTEL_COMPILER
+ template<>
+// #endif
+ class GivaroExtension<LinBox::GivaroGfq> : public Givaro::Extension< Givaro::GFqDom<int32_t> >, public FieldInterface {
+
+ typedef GivaroExtension<GivaroGfq> Self_t;
+ typedef Givaro::Extension< Givaro::GFqDom<int32_t> > Extension_t;
+ public:
+
+ /** Element type.
+ * This type is inherited from the Givaro class Extension
+ */
+ typedef Givaro::Extension< Givaro::GFqDom<int32_t> >::Element Element;
+ typedef Givaro::Extension< Givaro::GFqDom<int32_t> > Father_t;
+
+ using Extension_t::zero;
+ using Extension_t::one;
+ using Extension_t::mOne;
+
+
+ /** RandIter type.
+ * This type is inherited from the Givaro class GFqDom<TAG>
+ */
+ typedef Givaro::GIV_ExtensionrandIter< Givaro::Extension< Givaro::GFqDom<int32_t> >, LinBox::integer > RandIter;
+
+ /** Constructor from an integer.
+ */
+ GivaroExtension(const integer& p, const integer& k=1) :
+ Givaro::Extension< Givaro::GFqDom<int32_t> >(static_cast< Givaro::Extension< Givaro::GFqDom<int32_t> >::Residu_t>(int32_t(p)),
+ static_cast< Givaro::Extension< Givaro::GFqDom<int32_t> >::Residu_t>(int32_t(k)))
+ {
+ }
+
+ /** Constructor extension of a base field.
+ */
+ GivaroExtension(const GivaroGfq& bF, const integer& ext=1) :
+ Givaro::Extension< Givaro::GFqDom<int32_t> >( static_cast< const Givaro::Extension< Givaro::GFqDom< int32_t > >::BaseField_t &>(bF),
+ static_cast< Givaro::Extension< Givaro::GFqDom<int32_t> >::Residu_t >(int32_t(ext)))
+ {
+ }
+
+
+ /** Copy Constructor.
+ */
+ GivaroExtension(const Self_t& F) :
+ Givaro::Extension< Givaro::GFqDom<int32_t> >(F)
+ { }
+
+
+ }; // class GivaroExtension
+
+
+
+} // namespace LinBox
+
+
+
+// Specialization of homomorphism for basefield
+#include "linbox/field/hom.h"
+namespace LinBox
+{
+ /// NO DOC
+ template< class BaseField>
+ class Hom < BaseField, GivaroExtension<BaseField> > {
+ typedef BaseField Source;
+ typedef GivaroExtension<BaseField> Target;
+ public:
+ typedef typename Source::Element SrcElt;
+ typedef typename Target::Element Elt;
+
+ //Hom(){}
+ /** Constructor.
+ * Construct a homomorphism from a specific source ring S and target
+ * field T with Hom(S, T). The default behaviour is error.
+ * Specializations define all actual homomorphisms.
+ */
+ Hom(const Source& S, const Target& T) :
+ _source(S), _target(T)
+ {}
+
+ /** Image.
+ * image(t, s) implements the homomorphism, assigning the
+ * t the value of the image of s under the mapping.
+ *
+ * The default behaviour is a no-op.
+ */
+ Elt& image(Elt& t, const SrcElt& s) const
+ {
+ return _target.assign(t, s);
+ }
+
+ /** Preimage.
+ * If possible, preimage(s,t) assigns a value to s such that
+ * the image of s is t. Otherwise behaviour is unspecified.
+ * An error may be thrown, a conventional value may be set, or
+ * an arb value set.
+ *
+ * The default behaviour is a no-op.
+ */
+ SrcElt& preimage(SrcElt& s, const Elt& t) const
+ {
+ // return _target.getEntry(s, Degree(0), t);
+ return _target.convert(s, t);
+ }
+
+ const Source& source() const
+ {
+ return _source;
+ }
+ const Target& target() const
+ {
+ return _target;
+ }
+
+ private:
+ Source _source;
+ Target _target;
+ }; // end Hom
+}
+#endif // __LINBOX_field_givaro_extension_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Givaro/givaro-field-gf2.h b/linbox/field/Givaro/givaro-field-gf2.h
new file mode 100644
index 0000000..750f808
--- /dev/null
+++ b/linbox/field/Givaro/givaro-field-gf2.h
@@ -0,0 +1,218 @@
+/* linbox/field/givaro-field.h
+ * Copyright (C) 2009 JGD
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+#ifndef __LINBOX_givaro_field_gf2_H
+#define __LINBOX_givaro_field_gf2_H
+
+#include "linbox/field/gf2.h"
+#include "linbox/field/Givaro/givaro-field.h"
+
+// Specialization of GivaroField for GF2
+namespace LinBox
+{
+
+ /**
+ \brief give LinBox fields an allure of Givaro Fields
+ \ingroup field
+
+ * This class adds the necessary requirements allowing
+ * the construction of an extension of a LinBox field.
+ */
+ template<>
+ struct GivaroField<LinBox::GF2> : public LinBox::GF2 {
+ typedef LinBox::GF2 BaseField;
+ typedef BaseField::Element TT;
+ typedef Signed_Trait<TT>::unsigned_type UTT;
+ typedef TT Rep;
+ typedef GivaroField<BaseField> Self_t;
+ typedef Rep Element;
+ typedef UTT Residu_t;
+
+ Element zero, one;
+ GivaroField(const BaseField& bf) :
+ BaseField(bf)
+ {
+ this->init(zero,0UL);
+ this->init(one, 1UL);
+ }
+
+
+ // -- amxy: r <- c - a * b mod p
+ Rep& amxy (Rep& r, const Rep a, const Rep b, const Rep c) const
+ {
+ Rep tmp;
+ this->mul(tmp, a, b);
+ this->assign(r,c);
+ return this->subin(r,tmp);
+ }
+ stdBitReference amxy (stdBitReference r, const Rep a, const Rep b, const Rep c) const
+ {
+ Rep tmp;
+ this->mul(tmp, a, b);
+ this->assign(r,c);
+ return this->subin(r,tmp);
+ }
+
+
+ // -- maxpy: r <- y - a * x
+ Rep& maxpy (Rep& r, const Rep a, const Rep x, const Rep y) const
+ {
+ Rep tmp; this->mul(tmp, a, x);
+ return this->sub(r,y,tmp);
+ }
+ stdBitReference maxpy (stdBitReference r, const Rep a, const Rep x, const Rep y) const
+ {
+ Rep tmp; this->mul(tmp, a, x);
+ return this->sub(r,y,tmp);
+ }
+ // -- axmyin: r <- a * x - r
+ Rep& axmyin (Rep& r, const Rep a, const Rep x) const
+ {
+ maxpyin(r,a,x);
+ return negin(r);
+ }
+ stdBitReference axmyin (stdBitReference r, const Rep a, const Rep x) const
+ {
+ maxpyin(r,a,x);
+ return negin(r);
+ }
+ // -- maxpyin: r <- r - a * x
+ Rep& maxpyin (Rep& r, const Rep a, const Rep x) const
+ {
+ Rep tmp; this->mul(tmp, a, x);
+ return this->subin(r,tmp);
+ }
+ stdBitReference maxpyin (stdBitReference r, const Rep a, const Rep x) const
+ {
+ Rep tmp; this->mul(tmp, a, x);
+ return this->subin(r,tmp);
+ }
+
+
+
+ bool areNEqual ( const Rep a, const Rep b) const
+ {
+ return ! this->areEqual(a,b);
+ }
+
+ // Access to the modulus, characteristic, size, exponent
+ UTT residu() const
+ {
+ integer c;
+ BaseField::characteristic(c);
+ return UTT(c);
+ }
+
+ UTT characteristic() const
+ {
+ integer c; BaseField::characteristic(c); return UTT(c);
+ }
+ UTT cardinality() const
+ {
+ integer c; BaseField::cardinality(c); return UTT(c);
+ }
+ UTT exponent() const
+ {
+ return 1;
+ }
+ UTT size() const
+ {
+ integer c;
+ BaseField::cardinality(c);
+ return UTT(c);
+ }
+
+
+ // ----- random generators
+ template<class RandIter> Rep& random(RandIter& g, Rep& r) const
+ {
+ return r = g() ;
+ }
+ template<class RandIter> Rep& random(RandIter& g, Rep& r, long s) const
+ {
+ return r = g() ;
+ }
+ template<class RandIter> Rep& random(RandIter& g, Rep& r, const Rep& b) const
+ {
+ return r = g() ;
+ }
+ template<class RandIter> Rep& nonzerorandom(RandIter& g, Rep& r) const
+ {
+ return r = g() ;
+ }
+ template<class RandIter> Rep& nonzerorandom(RandIter& g, Rep& r, long s) const
+ {
+ return r = g() ;
+ }
+ template<class RandIter> Rep& nonzerorandom(RandIter& g, Rep& r, const Rep& b) const
+ {
+ return r = g() ;
+ }
+
+ template<class RandIter> stdBitReference random(RandIter& g, stdBitReference r) const
+ {
+ return r = g() ;
+ }
+ template<class RandIter> stdBitReference random(RandIter& g, stdBitReference r, long s) const
+ {
+ return r = g() ;
+ }
+ template<class RandIter> stdBitReference random(RandIter& g, stdBitReference r, const stdBitReference b) const
+ {
+ return r = g() ;
+ }
+ template<class RandIter> stdBitReference nonzerorandom(RandIter& g, stdBitReference r) const
+ {
+ return r = g() ;
+ }
+ template<class RandIter> stdBitReference nonzerorandom(RandIter& g, stdBitReference r, long s) const
+ {
+ return r = g() ;
+ }
+ template<class RandIter> stdBitReference nonzerorandom(RandIter& g, stdBitReference r, const Rep& b) const
+ {
+ return r = g() ;
+ }
+ template<class RandIter> stdBitReference nonzerorandom(RandIter& g, stdBitReference r, const stdBitReference b) const
+ {
+ return r = g() ;
+ }
+
+ };
+
+}
+
+#endif // __LINBOX_givaro_field_gf2_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Givaro/givaro-field.h b/linbox/field/Givaro/givaro-field.h
new file mode 100644
index 0000000..e911211
--- /dev/null
+++ b/linbox/field/Givaro/givaro-field.h
@@ -0,0 +1,200 @@
+/* linbox/field/givaro-field.h
+ * Copyright (C) 2009 JGD
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+#ifndef __LINBOX_givaro_field_H
+#define __LINBOX_givaro_field_H
+
+#include <givaro/givconfig.h>
+#include "linbox/integer.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/field/field-interface.h"
+
+namespace LinBox
+{
+
+ /**
+ \brief give LinBox fields an allure of Givaro Fields
+ \ingroup field
+
+ * This class adds the necessary requirements allowing
+ * the construction of an extension of a LinBox field
+ * or a givaro polynomial of a LinBox field ...
+ */
+ template< class BaseField >
+ struct GivaroField : public BaseField {
+ typedef typename BaseField::Element TT;
+ typedef typename Signed_Trait<TT>::unsigned_type UTT;
+ typedef TT Rep;
+ typedef GivaroField<BaseField> Self_t;
+ typedef Rep Element;
+ typedef UTT Residu_t;
+
+ Element zero, one, mOne;
+ GivaroField() :
+ BaseField()
+ {
+ this->init(zero,0UL);
+ this->init(one, 1UL);
+ this->init(mOne);
+ this->neg(mOne,one);
+ }
+
+ GivaroField(const BaseField& bf) :
+ BaseField(bf)
+ {
+ this->init(zero,0UL);
+ this->init(one, 1UL);
+ this->init(mOne);
+ this->neg(mOne,one);
+ // neg(init(mOne),one);
+ }
+
+
+ // -- axmy: r <- a * x - y
+ Rep& axmy (Rep& r, const Rep a, const Rep x, const Rep y) const
+ {
+ Rep tmp; this->mul(tmp, a, x);
+ return this->sub(r,tmp,y);
+ }
+
+ // -- maxpy: r <- y - a * x
+ Rep& maxpy (Rep& r, const Rep a, const Rep x, const Rep y) const
+ {
+ Rep tmp; this->mul(tmp, a, x);
+ return this->sub(r,y,tmp);
+ }
+
+ // -- axmyin: r <- a * x - r
+ Rep& axmyin (Rep& r, const Rep a, const Rep x) const
+ {
+ maxpyin(r,a,x);
+ return negin(r);
+ }
+
+ // -- maxpyin: r <- r - a * x
+ Rep& maxpyin (Rep& r, const Rep a, const Rep x) const
+ {
+ Rep tmp; this->mul(tmp, a, x);
+ return this->subin(r,tmp);
+ }
+
+ bool areNEqual ( const Rep a, const Rep b) const
+ {
+ return ! this->areEqual(a,b);
+ }
+
+ // Access to the modulus, characteristic, size, exponent
+ UTT residu() const
+ {
+ integer c;
+ BaseField::characteristic(c);
+ return UTT(c);
+ }
+
+ UTT characteristic() const
+ {
+ integer c;
+ BaseField::characteristic(c);
+ return UTT(c);
+ }
+
+ integer& characteristic(integer& i) const
+ {
+ return BaseField::characteristic(i);
+ }
+
+ UTT cardinality() const
+ {
+ integer c;
+ BaseField::cardinality(c);
+ return UTT(c);
+ }
+
+ UTT exponent() const
+ {
+ return 1;
+ }
+
+ UTT size() const
+ {
+ integer c;
+ BaseField::cardinality(c);
+ return UTT(c);
+ }
+
+
+ // ----- random generators
+ template<class RandIter> Rep& random(RandIter& g, Rep& r) const
+ {
+ return this->init(r,g()) ;
+ }
+
+ template<class RandIter> Rep& random(RandIter& g, Rep& r, long s) const
+ {
+ return this->init(r,g()) ;
+ }
+
+ template<class RandIter> Rep& random(RandIter& g, Rep& r, const Rep& b) const
+ {
+ return this->init(r,g()) ;
+ }
+
+ template<class RandIter> Rep& nonzerorandom(RandIter& g, Rep& r) const
+ {
+ do { this->init(r,g()); } while( this->isZero(r) );
+ return r;
+ }
+
+ template<class RandIter> Rep& nonzerorandom(RandIter& g, Rep& r, long s) const
+ {
+ do { this->init(r,g()); } while( this->isZero(r) );
+ return r;
+ }
+
+ template<class RandIter> Rep& nonzerorandom(RandIter& g, Rep& r, const Rep& b) const
+ {
+ do { this->init(r,g()); } while( this->isZero(r) ); return r;
+ }
+
+ };
+
+
+
+} // end namespace LinBox
+//! @bug the following line is a bug.
+#include "linbox/field/Givaro/givaro-field-gf2.h"
+
+#endif // __LINBOX_givaro_field_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Givaro/givaro-gfq.h b/linbox/field/Givaro/givaro-gfq.h
new file mode 100644
index 0000000..7361dff
--- /dev/null
+++ b/linbox/field/Givaro/givaro-gfq.h
@@ -0,0 +1,283 @@
+/* linbox/field/givaro-gfq.h
+ * Copyright (C) 2002 Pascal Giorgi
+ *
+ * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
+ * JGD 12.06.2002 : -- I don't see the need of *(new in convert
+ * JGD 19.09.2003 : added isZero
+ * WJT 24.06.2005 : Removed using declarations
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/*! @file field/Givaro/givaro-gfq.h
+ *
+ * @warning This wrapper works only with an improved version of Givaro ;
+ * This version of givaro won't be available for public yet ;
+ * But it is available on my web page ;
+ * You can send me a mail to get it or for others details.
+ */
+
+#ifndef __LINBOX_field_givaro_gfq_H
+#define __LINBOX_field_givaro_gfq_H
+
+
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+#include "linbox/integer.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/field/field-interface.h"
+
+
+//------------------------------------
+// Files of Givaro library
+
+
+#include <givaro/givtablelimits.h>
+#include <givaro/givgfq.h>
+#include <givaro/giv_randiter.h>
+#include <givaro/givpoly1factor.h>
+//------------------------------------
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ class GivaroGfq;
+
+ template<>
+ struct ClassifyRing<GivaroGfq> {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+
+ template<>
+ inline integer& FieldTraits<GivaroGfq>::maxModulus( integer& i )
+ {
+ return i = integer( 32749 ); // prevprime( 2^15 )
+ }
+
+ template<>
+ inline bool FieldTraits<GivaroGfq>::goodModulus( const integer& i )
+ {
+ integer max;
+ if( i < 2 || i > FieldTraits<GivaroGfq>::maxModulus(max) )
+ return false;
+ return probab_prime( i, 10 );
+ }
+
+ template<>
+ inline integer& FieldTraits<GivaroGfq>::maxExponent( integer& i )
+ {
+ return i = _GIVARO_FF_MAXEXPONENT_; // Cardinality must be <= 2^21
+ }
+
+
+ /** Wrapper of Givaro's GFqDom<int32_t> class.
+ \ingroup field
+
+ * This class allows to construct only extension fields with a prime characteristic.
+ */
+ class GivaroGfq : public Givaro::GFqDom<int32_t>, public FieldInterface {
+
+ public:
+
+ typedef Givaro::GFqDom<int32_t> Father_t ;
+
+ using Father_t::one ;
+ using Father_t::zero;
+ using Father_t::mOne;
+ /** Element type.
+ * This type is inherited from the Givaro class GFqDom<int32_t>
+ */
+ typedef Givaro::GFqDom<int32_t>::Rep Element;
+
+ /** RandIter type
+ * This type is inherited from the Givaro class GFqDom<TAG>
+ */
+ typedef Givaro::GIV_randIter< Givaro::GFqDom<int32_t>, LinBox::integer > RandIter;
+
+ /** Empty Constructor
+ */
+ GivaroGfq() :
+ Givaro::GFqDom<int32_t>()
+ {
+ // Givaro::GFqDom<int32_t>::init(one,1);
+ // Givaro::GFqDom<int32_t>::init(mOne,-1);
+ // Givaro::GFqDom<int32_t>::init(zero,0);
+ }
+
+ /** Constructor from an integer
+ * this constructor use the ZpzDom<TAG> constructor
+ */
+ GivaroGfq(const integer& p, const integer& k=1) :
+ Givaro::GFqDom<int32_t>(static_cast<UTT>(int32_t(p)), static_cast<UTT>(int32_t(k)))
+ {
+ //enforce that the cardinality must be <2^16, for givaro-gfq
+ int32_t pl=p;
+ for(int32_t i=1;i<k;++i) pl*=(int32_t)p;
+ if(!FieldTraits<GivaroGfq>::goodModulus(p)) {
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus be between 2 and 2^15 and prime");
+ }
+ else if(pl>(1<<_GIVARO_FF_MAXEXPONENT_)) {
+ std::stringstream MSGFFMAXE;
+ MSGFFMAXE << "cardinality must be < 2^" << _GIVARO_FF_MAXEXPONENT_;
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,MSGFFMAXE.str().c_str());
+ }
+ // Givaro::GFqDom<int32_t>::init(one,1);
+ // Givaro::GFqDom<int32_t>::init(mOne,-1);
+ // Givaro::GFqDom<int32_t>::init(zero,0);
+
+ }
+
+ // This constructor takes a vector of ints that represent the polynomial
+ // to use (for modular arithmetic on the extension field).
+ GivaroGfq(const integer& p, const integer& k, const std::vector<integer>& modPoly) :
+ Givaro::GFqDom<int32_t>(static_cast<UTT>(int32_t(p)), static_cast<UTT>(int32_t(k)), modPoly)
+ {
+ }
+
+ /** Characteristic.
+ * Return integer representing characteristic of the domain.
+ * Returns a positive integer to all domains with finite characteristic,
+ * and returns 0 to signify a domain of infinite characteristic.
+ * @return integer representing characteristic of the domain.
+ */
+ integer& characteristic(integer& c) const
+ {
+ return c=integer(static_cast<int32_t>( Givaro::GFqDom<int32_t>::characteristic()));
+ }
+
+ int32_t characteristic() const
+ {
+ return static_cast<int32_t>( Givaro::GFqDom<int32_t>::characteristic());
+ }
+
+#if (GIVARO_VERSION<30403)
+ unsigned long characteristic(unsigned long & c) const
+ {
+ return c = static_cast<int32_t>( Givaro::GFqDom<int32_t>::characteristic());
+ }
+#else
+ unsigned long characteristic(unsigned long & c) const
+ {
+ return Givaro::GFqDom<int32_t>::characteristic(c);
+ }
+#endif
+
+ /** Cardinality.
+ * Return integer representing cardinality of the domain.
+ * Returns a non-negative integer for all domains with finite
+ * cardinality, and returns -1 to signify a domain of infinite
+ * cardinality.
+ * @return integer representing cardinality of the domain
+ */
+ integer& cardinality(integer& c) const
+ {
+ return c=integer(static_cast<int32_t>( Givaro::GFqDom<int32_t>::size()));
+ }
+
+
+ integer cardinality() const
+ {
+ return integer(static_cast<int32_t>( Givaro::GFqDom<int32_t>::cardinality()));
+ }
+
+
+ /** Initialization of field base Element from an integer.
+ * Behaves like C++ allocator construct.
+ * This function assumes the output field base Element x has already been
+ * constructed, but that it is not already initialized.
+ * We assume that the type of Element is short int.
+ * this methos is just a simple cast.
+ * @return reference to field base Element.
+ * @param x field base Element to contain output (reference returned).
+ * @param y integer.
+ */
+ Element& init(Element& x , const integer& y = 0) const
+ {
+ return Givaro::GFqDom<int32_t>::init( x, int32_t(y % (integer) _q));
+ }
+
+ // TO BE OPTIMIZED
+ Element& init(Element& x , const float y) const
+ {
+ return Givaro::GFqDom<int32_t>::init( x, (double)y);
+ }
+
+ template<class YYY>
+ Element& init(Element& x , const YYY& y) const
+ {
+ return Givaro::GFqDom<int32_t>::init( x, y);
+ }
+
+ /** Conversion of field base Element to an integer.
+ * This function assumes the output field base Element x has already been
+ * constructed, but that it is not already initialized.
+ * @return reference to an integer.
+ * @param x integer to contain output (reference returned).
+ * @param y constant field base Element.
+ */
+ integer& convert(integer& x, const Element& y) const
+ {
+ int32_t tmp;
+ return x = integer( Givaro::GFqDom<int32_t>::convert(tmp,y));
+ }
+ // TO BE OPTIMIZED
+ float& convert(float& x, const Element& y) const
+ {
+ double tmp;
+ Givaro::GFqDom<int32_t>::convert( tmp, y);
+ return x = (float)tmp;
+ }
+
+ template<class XXX>
+ XXX& convert(XXX& x, const Element& y) const
+ {
+ return Givaro::GFqDom<int32_t>::convert( x, y);
+ }
+
+ //bool isZero(const Element& x) const { return Givaro::GFqDom<int32_t>::isZero(x); }
+
+
+ }; // class GivaroGfq
+
+
+
+
+
+} // namespace LinBox
+
+#endif // __LINBOX_field_givaro_gfq_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Givaro/givaro-montg.h b/linbox/field/Givaro/givaro-montg.h
new file mode 100644
index 0000000..51d82ca
--- /dev/null
+++ b/linbox/field/Givaro/givaro-montg.h
@@ -0,0 +1,207 @@
+/* linbox/field/givaro-gfq.h
+ * Copyright (C) 2004 Jean-Guillaume Dumas
+ *
+ * Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/* WARNING this wrapper works only with an improved version of Givaro.
+ * This version of givaro won't be available for public yet.
+ * But it is available on my web page.
+ * You can send me a mail to get it or for others details.
+ */
+
+#ifndef __LINBOX_field_givaro_montgomery_H
+#define __LINBOX_field_givaro_montgomery_H
+
+
+#include "linbox/integer.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/util/debug.h"
+#include "linbox/linbox-config.h"
+#include "linbox/field/field-traits.h"
+
+//------------------------------------
+// Files of Givaro library
+
+
+#include <givaro/givmontg32.h>
+#include <givaro/giv_randiter.h>
+//------------------------------------
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ class GivaroMontg;
+
+ template<>
+ struct ClassifyRing<GivaroMontg> {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+ /**
+ \brief wrapper of Givaro's Givaro::Montgomery< Givaro::Std32>.
+ \ingroup field
+
+ * This class is a modular representation with a Givaro::Montgomery reduction
+ */
+ class GivaroMontg : public Givaro::Montgomery< Givaro::Std32>, public FieldInterface {
+
+ public:
+
+ /** Element type.
+ * This type is inherited from the Givaro class Givaro::Montgomery< Givaro::Std32>
+ */
+ typedef Givaro::Montgomery< Givaro::Std32> Father_t ;
+ typedef Father_t::Rep Element;
+ using Father_t::one;
+ using Father_t::mOne;
+ using Father_t::zero;
+
+ /** RandIter type
+ * This type is inherited from the Givaro class Givaro::Montgomery< Givaro::Std32>
+ */
+ typedef Givaro::GIV_randIter< Givaro::Montgomery< Givaro::Std32>, LinBox::integer > RandIter;
+
+ /** Constructor from an integer
+ * this constructor use the ZpzDom<TAG> constructor
+ */
+ GivaroMontg(const integer& p) :
+ Givaro::Montgomery< Givaro::Std32>(static_cast<uint32_t>(long(p)))
+ { }
+
+ /** Constructor from an integer (takes degree of extension as 2nd parameter, must be 1)
+ * this constructor use the ZpzDom<TAG> constructor
+ */
+ GivaroMontg(const integer& p, const integer& k) :
+ Givaro::Montgomery< Givaro::Std32>(static_cast<uint32_t>(long(p)))
+ {
+
+ if (k!=1)
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
+ }
+
+ /** Characteristic.
+ * Return integer representing characteristic of the domain.
+ * Returns a positive integer to all domains with finite characteristic,
+ * and returns 0 to signify a domain of infinite characteristic.
+ * @return integer representing characteristic of the domain.
+ */
+ integer& characteristic(integer& c) const
+ {
+ return c=integer(static_cast<long>( Givaro::Montgomery< Givaro::Std32>::characteristic()));
+ }
+
+ long characteristic() const
+ {
+ return static_cast<long>( Givaro::Montgomery< Givaro::Std32>::characteristic());
+ }
+
+
+ /** Cardinality.
+ * Return integer representing cardinality of the domain.
+ * Returns a non-negative integer for all domains with finite
+ * cardinality, and returns -1 to signify a domain of infinite
+ * cardinality.
+ * @return integer representing cardinality of the domain
+ */
+ integer& cardinality(integer& c) const
+ {
+ return c=integer(static_cast<long>( Givaro::Montgomery< Givaro::Std32>::size()));
+ }
+
+ long cardinality() const
+ {
+ return static_cast<long>( Givaro::Montgomery< Givaro::Std32>::size());
+ }
+
+ /** Initialization of field base Element from an integer.
+ * Behaves like C++ allocator construct.
+ * This function assumes the output field base Element x has already been
+ * constructed, but that it is not already initialized.
+ * We assume that the type of Element is short int.
+ * this methos is just a simple cast.
+ * @return reference to field base Element.
+ * @param x field base Element to contain output (reference returned).
+ * @param y integer.
+ */
+ Element& init(Element& x , const integer& y=0) const
+ {
+ return Givaro::Montgomery< Givaro::Std32>::init( x,long(y % (integer)_p));
+ }
+
+ Element& init(Element& x , const double y) const
+ {
+ return Givaro::Montgomery< Givaro::Std32>::init( x, y);
+ }
+
+ /** Conversion of field base element to an integer.
+ * This function assumes the output field base element x has already been
+ * constructed, but that it is not already initialized.
+ * @return reference to an integer.
+ * @param x integer to contain output (reference returned).
+ * @param y constant field base element.
+ */
+ integer& convert(integer& x, const Element& y) const
+ {
+ long tmp;
+ // return x = *(new integer(Montgomery< Givaro::Std32>::convert(tmp,y)));
+ return x = integer( Givaro::Montgomery< Givaro::Std32>::convert(tmp,y));
+ }
+
+ double& convert(double& x, const Element& y) const
+ {
+ return Givaro::Montgomery< Givaro::Std32>::convert( x, y);
+ }
+
+#if 0 /* isZero */
+ bool isZero(const Element& x) const
+ {
+ return Givaro::Montgomery< Givaro::Std32>::isZero(x);
+ }
+#endif
+
+ static inline int getMaxModulus() { return 40504; }
+
+ }; // class GivaroMontg
+
+
+
+} // namespace LinBox
+
+#endif // __LINBOX_field_givaro_montgomery_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Givaro/givaro-rational.h b/linbox/field/Givaro/givaro-rational.h
new file mode 100644
index 0000000..9b4178b
--- /dev/null
+++ b/linbox/field/Givaro/givaro-rational.h
@@ -0,0 +1,229 @@
+/* linbox/field/givaro-rational.h
+ * Copyright (C) 2004 Gilles Villard
+ *
+ * Created Gilles Villard < Gilles.Villard at ens-lyon.fr>
+ * ven oct 8 13:30:05 CEST 2004
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+
+#ifndef __LINBOX_givaro_rational_H
+#define __LINBOX_givaro_rational_H
+
+
+#include "linbox/integer.h"
+#include "linbox/field/unparametric.h"
+#include "linbox/field/field-traits.h"
+
+
+//------------------------------------
+// Files of Givaro library
+
+#include "givaro/givrational.h"
+//------------------------------------
+
+
+namespace LinBox
+{
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ class GivaroRational;
+
+ template<>
+ struct ClassifyRing<GivaroRational> {
+ typedef RingCategories::RationalTag categoryTag;
+ };
+
+ class GivaroRational : public UnparametricField< Givaro::Rational> {
+
+ public:
+
+ /** Element type.
+ *
+ */
+ typedef Givaro::Rational Element;
+ Element zero,one,mOne;
+
+
+ Element& init(Element& x , const integer& y) const
+ {
+ return x=Element(y);
+ }
+
+ Element& init(Element& x , const integer& n,const integer& d) const
+ {
+ return x=Element(n,d);
+ }
+
+ template<class XX>
+ Element& init(Element& x , const XX& y) const
+ {
+ return x=Element(y);
+ }
+
+ std::istream &read(std::istream & s, Element &a) const
+ {
+ s >> a;
+ return s;
+ }
+
+ integer& convert(integer& i, const Element& r) const
+ {
+ return i=r.nume();
+ }
+
+
+ Element& assign(Element& x , const Element& y) const
+ {
+ return x=y;
+ }
+
+ // x = numerator of y
+ integer& get_num (integer& x, const Element& y) const
+ {
+ return x = y.nume();
+ }
+
+ // x = denominator of y
+ integer& get_den (integer& x, const Element& y) const
+ {
+ return x = y.deno();
+ }
+
+
+ }; // class
+
+
+
+} // namespace LinBox
+
+
+// Specialization of homomorphism for basefield
+#include "linbox/field/hom.h"
+namespace LinBox
+{
+ template <class _Target>
+ class Hom<GivaroRational, _Target> {
+
+ public:
+ typedef GivaroRational Source;
+ typedef _Target Target;
+ typedef typename Source::Element SrcElt;
+ typedef typename Target::Element Elt;
+
+ Hom(const Source& S, const Target& T) :
+ _source (S), _target(T)
+ {
+ }
+ Elt& image(Elt& t, const SrcElt& s)
+ {
+ _source. get_num (num, s);
+ _source. get_den (den, s);
+ if (den == 1) {
+ return _target.init(t,num);
+ }
+ else if (num == 1) {
+ _target.init(t,den);
+ return _target.invin(t);
+ }
+ else {
+ _target. init (tmp, den);
+ _target. init (t, num);
+ return _target. divin (t, tmp);
+
+ }
+ // _target. init (t, den);
+ // return _target. invin (t);
+
+ }
+ SrcElt& preimage(SrcElt& s, const Elt& t)
+ {
+ _target. convert (num, t);
+ _source. init (s, num);
+ return s;
+
+ }
+ const Source& source()
+ {
+ return _source;
+ }
+ const Target& target()
+ {
+ return _target;
+ }
+
+ protected:
+ integer num, den;
+ Elt tmp;
+ Source _source;
+ Target _target;
+ }; // end Hom
+
+ template <>
+ class Hom<GivaroRational,GivaroRational> {
+
+ public:
+ typedef GivaroRational Source;
+ typedef Source Target;
+ typedef Source::Element SrcElt;
+ typedef Target::Element Elt;
+
+ Hom(const Source& S, const Target& T) :
+ _source (S), _target(T)
+ {
+}
+ Elt& image(Elt& t, const SrcElt& s) {
+ _target.assign(t, s);
+ return t;
+
+
+}
+ SrcElt& preimage(SrcElt& s, const Elt& t)
+ {
+ _source.assign(s, t);
+ return s;
+
+}
+ const Source& source() {
+return _source;
+}
+ const Target& target() {
+return _target;
+}
+
+ protected:
+ Source _source;
+ Target _target;
+ }; // end Hom
+
+}
+
+#endif // __LINBOX_givaro_rational_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Givaro/givaro-zpz.h b/linbox/field/Givaro/givaro-zpz.h
new file mode 100644
index 0000000..6fa4230
--- /dev/null
+++ b/linbox/field/Givaro/givaro-zpz.h
@@ -0,0 +1,518 @@
+/* linbox/field/givaro-zpz.h
+ * Copyright (C) 2002 Pascal Giorgi
+ *
+ * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/* WARNING this wrapper works only with an improved version of Givaro.
+ * This version of givaro won't be available for public yet.
+ * But it is available on my web page.
+ * You can send me a mail to get it or for others details.
+ */
+
+#ifndef __LINBOX_field_givaro_zpz_H
+#define __LINBOX_field_givaro_zpz_H
+
+
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/util/debug.h"
+#include "linbox/vector/vector-domain.h"
+//-------------------------------------
+// Files of Givaro library
+#include <givaro/givzpz.h>
+#include <givaro/giv_randiter.h>
+#include "linbox/field/field-traits.h"
+
+//--------------------------------------
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+ /* This wrappers allows to use three sorts of givaro fields :
+ * Elements represent by a 32 bits integer
+ * Elements represent by a 16 bits integer
+ * Elements represent in Zech log representation by a 16 bits integer
+ *
+ * To use this fields with the wrapper below just replace the template
+ * parameter by the Tag appropriated.
+ * "Givaro::Std16" for 16 bits integer
+ * "Givaro::Std32" for 32 bits integer
+ * "Givaro::Log16" for Zech log representation in 16 bits
+ */
+ template<class Field>
+ class DotProductDomain;
+ template<class Field>
+ class FieldAXPY;
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template <class TAG>
+ class GivaroZpz;
+
+ template<class Tag>
+ struct ClassifyRing<GivaroZpz<Tag> > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ /** \brief wrapper of Givaro's ZpzDom.
+ \ingroup field
+
+ * Most methods are inherited from Givaro::ZpzDom< Givaro::Std16>, Givaro::ZpzDom< Givaro::Std32>
+ * and Givaro::ZpzDom<log16> classes of Givaro.
+ * These classes allow to construct only finite field with a prime modulus.
+ */
+ template <class TAG>
+ class GivaroZpz : public Givaro::ZpzDom<TAG>, public FieldInterface {
+
+ private:
+
+ /* friend class DotProductDomain<GivaroZpz<TAG> > ;
+ friend class FieldAXPY<GivaroZpz<TAG> >; */
+
+ public:
+
+ //typedef integer Integer;
+
+ /** Element type.
+ * This type is inherited from the Givaro class Givaro::ZpzDom<TAG>
+ */
+ typedef typename Givaro::ZpzDom<TAG>::Rep Element;
+ // Element zero,one,mOne;
+ typedef Givaro::ZpzDom<TAG> Father_t ;
+ typedef GivaroZpz<TAG> Self_t ;
+ using Father_t::one ;
+ using Father_t::zero ;
+ using Father_t::mOne ;
+
+ /** RandIter type
+ * This type is inherited from the Givaro class Givaro::ZpzDom<TAG>
+ */
+ typedef Givaro::GIV_randIter< Givaro::ZpzDom<TAG>, integer > RandIter;
+
+ /** Constructor from an integer
+ * this constructor use the Givaro::ZpzDom<TAG> constructor
+ */
+ GivaroZpz (const integer &p) :
+ Givaro::ZpzDom<TAG> (static_cast<typename Givaro::ZpzDom<TAG>::Residu_t> (p))
+ {}
+
+
+ /** Constructor from an integer (takes degree of extension as 2nd parameter, must be 1)
+ * this constructor use the Givaro::ZpzDom<TAG> constructor
+ */
+ GivaroZpz (const integer &p, const integer& k) :
+ Givaro::ZpzDom<TAG> (static_cast<typename Givaro::ZpzDom<TAG>::Residu_t> (p))
+ {
+
+ if (k!=1)
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
+ }
+
+ /** Copy constructor.
+ * This copy constructor use the Givaro::ZpzDom<TAG> copy constructor
+ */
+ GivaroZpz (const GivaroZpz<TAG>& F) :
+ Givaro::ZpzDom<TAG> (F)
+ {}
+
+
+#if 0
+ // Rich Seagraves 7-16-2003
+ // As is, this operator is an infinite loop
+ // By not providing an operator= in GivaroZpz,
+ // the operator= in the base class ( Givaro::ZpzDom<TAG>) is called
+ // automatically by the rules of C++, which I'm guessing is
+ // the "Right Thing" for this operator
+ //
+ /** Operator =
+ */
+ /*
+ GivaroZpz<TAG>& operator= (const GivaroZpz<TAG>& F)
+ {
+ return (*this)=F;
+ }
+ */
+#endif
+
+ /** Characteristic.
+ * Return integer representing characteristic of the domain.
+ * @return integer representing characteristic of the domain.
+ */
+ integer &characteristic (integer &c) const
+ {
+ return c = integer ( Givaro::ZpzDom<TAG>::size ());
+ }
+ unsigned long &characteristic (unsigned long &c) const
+ {
+ return c = (unsigned long) ( Givaro::ZpzDom<TAG>::size ());
+ }
+
+ long characteristic() const
+ {
+ return static_cast<int>( Givaro::ZpzDom<TAG>::size());
+ }
+
+ /** Cardinality.
+ * Return integer representing cardinality of the domain.
+ * @return integer representing cardinality of the domain
+ */
+ integer &cardinality (integer &c) const
+ {
+ return c = integer ( Givaro::ZpzDom<TAG>::size ());
+ }
+
+ integer cardinality () const
+ {
+ return integer ( Givaro::ZpzDom<TAG>::size ());
+ }
+
+ /** Conversion of field base element to an integer.
+ * This function assumes the output field base element x has already been
+ * constructed, but that it is not already initialized.
+ * @return reference to an integer.
+ * @param x integer to contain output (reference returned).
+ * @param y constant field base element.
+ */
+ integer &convert (integer &x, const Element &y) const
+ {
+ return x = integer (y);
+ }
+
+ double &convert (double& x, const Element& y) const
+ {
+ return x = static_cast<double>(y);
+ }
+
+ template<class Type>
+ Type &convert (Type& x, const Element& y) const
+ {
+ return x = static_cast<Type>(y);
+ }
+
+
+ /** Initialization of field base element from an integer.
+ * Behaves like C++ allocator construct.
+ * This function assumes the output field base element x has already been
+ * constructed, but that it is not already initialized.
+ * @return reference to field base element.
+ * @param x field base element to contain output (reference returned).
+ * @param y integer.
+ */
+ Element &init (Element &x , const integer &y = 0) const
+ {
+ //
+ // AU 28/03/07 no cast to long allows to use Givaro::ZpzDom<integer>
+ //
+ //Givaro::ZpzDom<TAG>::init (x, (long) (y% integer(this->_p)));
+ Givaro::ZpzDom<TAG>::init (x, (y% integer(this->_p)));
+ return x;
+ }
+
+ Element &init (Element &x , const long &y ) const
+ {
+ return Givaro::ZpzDom<TAG>::init (x, y ) ;
+
+ }
+ Element &init (Element &x , const int &y ) const
+ {
+ return Givaro::ZpzDom<TAG>::init (x, y ) ;
+
+ }
+
+ Element &init (Element &x , const unsigned&y ) const
+ {
+ return Givaro::ZpzDom<TAG>::init (x, y ) ;
+
+ }
+
+ Element &init (Element &x , const unsigned long &y ) const
+ {
+ return Givaro::ZpzDom<TAG>::init (x, y ) ;
+
+ }
+
+ Element &init (Element &x , const double &y ) const
+ {
+ double z = fmod(y, (double) this->_p);
+ if (z < 0) z += (double) this->_p;
+ z += 0.5;
+ return x = static_cast<Element>(z); //rounds towards 0
+ }
+
+ static uint64_t getMaxModulus();
+
+ }; // class GivaroZpz<TAG>
+
+
+ template <> uint64_t GivaroZpz< Givaro::Std32>::getMaxModulus() { return 46339; } // 2^15.5-1
+ template <> uint64_t GivaroZpz< Givaro::Std64>::getMaxModulus() { return 3037000499ULL; } // 2^15.5-1
+ template <> uint64_t GivaroZpz< Givaro::Unsigned32>::getMaxModulus() { return 65535; } // 2^16-1
+ template <> uint64_t GivaroZpz< Givaro::Std16>::getMaxModulus() { return 255; } // 2^8-1
+ template <> uint64_t GivaroZpz< Givaro::Log16>::getMaxModulus() { return 32767; } // 2^15 - 1
+
+ /** Specialisation of the convert function for the zech log representation
+ * of givaro-zpz (GivaroZpz< Givaro::Log16>.
+ * this function translates the internal representation to the real
+ * value of the element.
+ * This can have no sense but can be usefull
+ * NB : the init function for this specialisation does the same thing.
+ * the function transaltes the values to her internal representation.
+ */
+ template <> integer& GivaroZpz< Givaro::Log16>::convert(integer& x, const Element& y) const
+ {
+ if (y>=this->_p) return x = 0;
+ int tmp = _tab_rep2value[y];
+ return x = integer (tmp);
+ }
+
+ template <> double& GivaroZpz< Givaro::Log16>::convert(double& x, const Element& y) const
+ {
+ if (y>=this->_p) return x = 0.0;
+ int tmp = _tab_rep2value[y];
+ return x = (double) tmp;
+ }
+
+ template <> GivaroZpz< Givaro::Log16>::Element& GivaroZpz< Givaro::Log16>::init(GivaroZpz< Givaro::Log16>::Element& x, const double& y) const
+ {
+ double z = fmod(y, (double) this->_p);
+ if (z < 0) z += this->_p;
+ z += 0.5;
+ return x = _tab_value2rep[static_cast<long>(z)]; //rounds towards 0
+ }
+
+ template <> GivaroZpz< Givaro::Log16>::Element& GivaroZpz< Givaro::Log16>::init(GivaroZpz< Givaro::Log16>::Element& x, const integer& y) const
+ {
+ int tmp =(int) (y % (integer)this->_p);
+ if (tmp < 0 ) tmp += this->_p;
+ return x = _tab_value2rep[tmp];
+ }
+
+ /* Specialization of FieldAXPY for GivaroZpz< Givaro::Std32> Field */
+
+ template <>
+ class FieldAXPY<GivaroZpz< Givaro::Std32> > {
+ public:
+
+ typedef GivaroZpz< Givaro::Std32>::Element Element;
+ typedef GivaroZpz< Givaro::Std32> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F) , Corr(uint64_t(-1) % (uint64_t)F.characteristic() +1)
+ { _y = 0; }
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field), _y (0) , Corr(faxpy.Corr)
+ {}
+
+ FieldAXPY<GivaroZpz< Givaro::Std32> > &operator = (const FieldAXPY &faxpy)
+ { _field = faxpy._field; _y = faxpy._y; Corr = faxpy.Corr; return *this; }
+
+ inline uint64_t& mulacc (const Element &a, const Element &x)
+ {
+ uint64_t t = (uint64_t) a * (uint64_t) x;
+ _y += t;
+ if (_y < t)
+ return _y += Corr;
+ else
+ return _y;
+ }
+
+ inline uint64_t& accumulate (const Element &t)
+ {
+ _y += t;
+ if (_y < (uint64_t)t)
+ return _y += Corr;
+ else
+ return _y;
+ }
+
+ inline Element &get (Element &y) {
+ _y %= (uint64_t) _field.characteristic();
+ if ((int64_t) _y < 0) _y += _field.characteristic();
+ y = (uint32_t) _y;
+ return y;
+ }
+
+ inline FieldAXPY &assign (const Element y)
+ { _y = y; return *this; }
+
+ inline void reset() {
+ _y = 0;
+ }
+
+ private:
+
+ Field _field;
+ uint64_t _y;
+ uint64_t Corr;
+ };
+
+
+ /* Specialization of FieldAXPY for GivaroZpz< Givaro::Std32> Field */
+
+ template <>
+ class FieldAXPY<GivaroZpz< Givaro::Std16> > {
+ public:
+
+ typedef GivaroZpz< Givaro::Std16>::Element Element;
+ typedef GivaroZpz< Givaro::Std16> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F) , Corr(uint32_t(-1) % (uint32_t)F.characteristic() +1)
+ {
+ _y = 0;
+ }
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field), _y (0) , Corr(faxpy.Corr)
+ {}
+
+ FieldAXPY<GivaroZpz< Givaro::Std16> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field;
+ _y = faxpy._y;
+ Corr = faxpy.Corr;
+ return *this;
+ }
+
+ inline uint32_t& mulacc (const Element &a, const Element &x)
+ {
+ uint32_t t = (uint32_t) a * (uint32_t) x;
+ _y += t;
+
+ if (_y < t)
+ return _y += Corr;
+ else
+ return _y;
+ }
+
+ inline uint32_t& accumulate (const Element &t)
+ {
+ _y += t;
+
+ if (_y < (uint32_t)t)
+ return _y += Corr;
+ else
+ return _y;
+ }
+
+ inline Element &get (Element &y)
+ {
+ _y %= (uint32_t) _field.characteristic();
+ if ((int32_t) _y < 0)
+ _y += (Element) _field.characteristic();
+ y = (uint16_t) _y;
+ return y;
+ }
+
+ inline FieldAXPY &assign (const Element y)
+ {
+ _y = y;
+ return *this;
+ }
+
+ inline void reset()
+ {
+ _y = 0;
+ }
+
+ private:
+
+ Field _field;
+ uint32_t _y;
+ uint32_t Corr;
+ };
+
+ // Specialization of DotProductDomain for GivaroZpz< Givaro::Std32> field
+
+ template <>
+ class DotProductDomain<GivaroZpz< Givaro::Std32> > : private virtual VectorDomainBase<GivaroZpz< Givaro::Std32> > {
+
+ public:
+
+ typedef GivaroZpz< Givaro::Std32>::Element Element;
+
+ DotProductDomain (const GivaroZpz< Givaro::Std32> &F) :
+ VectorDomainBase<GivaroZpz< Givaro::Std32> > (F) ,
+ Corr(uint64_t(-1) % (uint64_t)F.characteristic() +1),
+ Max(uint64_t(-1))
+ {}
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const;
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const;
+
+ private:
+ uint64_t Corr;
+ uint64_t Max;
+ };
+
+ // Specialization of DotProductDomain for GivaroZpz< Givaro::Std16> field
+
+ template <>
+ class DotProductDomain<GivaroZpz< Givaro::Std16> > : private virtual VectorDomainBase<GivaroZpz< Givaro::Std16> > {
+
+ public:
+
+ typedef GivaroZpz< Givaro::Std16>::Element Element;
+
+ DotProductDomain (const GivaroZpz< Givaro::Std16> &F) :
+ VectorDomainBase<GivaroZpz< Givaro::Std16> > (F) ,
+ Corr(uint32_t(-1) % (uint32_t)F.characteristic() +1),
+ Max(uint32_t(-1))
+ {}
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const;
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const;
+
+ private:
+ uint32_t Corr;
+ uint32_t Max;
+ };
+
+} // namespace LinBox
+
+#include "linbox/field/Givaro/givaro-zpz.inl"
+
+#endif // __LINBOX_field_givaro_zpz_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Givaro/givaro-zpz.inl b/linbox/field/Givaro/givaro-zpz.inl
new file mode 100644
index 0000000..f247992
--- /dev/null
+++ b/linbox/field/Givaro/givaro-zpz.inl
@@ -0,0 +1,288 @@
+/* linbox/field/givaro-zpz.inl
+ * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
+ *
+ * ------------------------------------
+ *
+ * Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/*!@internal
+ * @file linbox/field/Givaro/givaro-zpz.inl
+ * @brief implementation of givaro-zpz.h.
+ */
+
+
+#ifndef __LINBOX_givaro_zpz_INL
+#define __LINBOX_givaro_zpz_INL
+
+
+#include <iostream>
+#include "linbox/integer.h"
+
+namespace LinBox
+{
+
+
+
+ template <class Vector1, class Vector2>
+ inline GivaroZpz< Givaro::Std32>::Element &DotProductDomain<GivaroZpz< Givaro::Std32> >::dotSpecializedDD
+ (GivaroZpz< Givaro::Std32>::Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ typedef typename GivaroZpz<Givaro::Std32>::Element Elem;
+ uint64_t inter,best ;
+ inter=best=0;
+ if (v1.size()==0)
+ return res=Elem(0);
+ else {
+
+ uint64_t size = v1.size();
+ uint64_t min = Max / (Corr+ (uint64_t)(_field.characteristic()-1)*(uint64_t)(_field.characteristic()-1));
+ uint64_t min_size = (size < min ? size : min);
+ uint64_t good1 = (size > min_size ? size - min_size: 0);
+ uint64_t good2 = (long)(size / min_size)* min_size ;
+ uint64_t good_size = (good1 > good2 ? good1 : good2 );
+
+ typename Vector1::const_iterator i=v1.begin();
+ typename Vector2::const_iterator j=v2.begin();
+
+ unsigned long k=0;
+
+ for (;k<min_size;i++,j++,k++)
+ best+=(uint64_t)*i * (uint64_t)*j;
+
+ for (inter=best;k<good_size;inter=best) {
+ for (unsigned long l=0;l<min_size;i++,j++,k++,l++)
+ best+= (uint64_t)*i * (uint64_t)*j;
+ if (inter > best) best+=Corr;
+ }
+
+ for (;k<size;i++,j++,k++)
+ best+= (uint64_t)*i * (uint64_t)*j;
+ if (inter > best) best+=Corr;
+
+
+ return res = Elem(best % (uint64_t)_field.characteristic());
+ }
+ }
+
+ template <class Vector1, class Vector2>
+ inline GivaroZpz< Givaro::Std32>::Element &DotProductDomain<GivaroZpz< Givaro::Std32> >::dotSpecializedDSP
+ (GivaroZpz< Givaro::Std32>::Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ uint64_t inter,best ;
+ inter=best=0;
+ if ((v1.first).size()== 0)
+ return res=GivaroZpz< Givaro::Std32>::Element(0);
+ else {
+ uint64_t size = (v1.first).size();
+ uint64_t min = Max / (Corr+ (uint64_t)(_field.characteristic()-1)*(uint64_t)(_field.characteristic()-1));
+ uint64_t min_size = (size < min ? size : min);
+ uint64_t good1 = (size > min_size ? size - min_size: 0);
+ uint64_t good2 = (long)(size / min_size)* min_size ;
+ uint64_t good_size = (good1 > good2 ? good1 : good2 );
+
+ typename Vector1::first_type::const_iterator i_idx = v1.first.begin ();
+ typename Vector1::second_type::const_iterator i_elt = v1.second.begin ();
+
+ unsigned long k=0;
+
+ for (;k<min_size;i_idx++,i_elt++,k++)
+ best+=(uint64_t)*i_elt * (uint64_t)v2[*i_idx];
+
+ for (inter=best;k<good_size;inter=best) {
+ for (unsigned long l=0;l<min_size;i_idx++,i_elt++,k++,l++)
+ best+= (uint64_t)*i_elt * (uint64_t)v2[*i_idx];
+ if (inter > best) best+=Corr;
+ }
+
+ for (;k<size;i_idx++,i_elt++,k++)
+ best+= (uint64_t)*i_elt * (uint64_t)v2[*i_idx];
+ if (inter > best) best+=Corr;
+
+ return res = best % _field.characteristic();
+ }
+ }
+
+
+
+ template <class Vector1, class Vector2>
+ inline GivaroZpz< Givaro::Std16>::Element &DotProductDomain<GivaroZpz< Givaro::Std16> >::dotSpecializedDD
+ (GivaroZpz< Givaro::Std16>::Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ uint32_t inter,best ;
+ inter=best=0;
+ if (v1.size() == 0)
+ return res=GivaroZpz< Givaro::Std16>::Element(0);
+ else {
+ uint32_t size = v1.size();
+ uint32_t min = Max / (Corr+ ((uint32_t)_field.characteristic()-1)*(uint32_t)(_field.characteristic()-1));
+ uint32_t min_size = (size < min ? size : min);
+ uint32_t good1 = (size > min_size ? size - min_size: 0);
+ uint32_t good2 = (long)(size / min_size)* min_size ;
+ uint32_t good_size = (good1 > good2 ? good1 : good2 );
+
+
+ typename Vector1::const_iterator i=v1.begin();
+ typename Vector2::const_iterator j=v2.begin();
+
+ uint32_t k=0;
+
+ for (;k<min_size;i++,j++,k++)
+ best+=(uint32_t)*i * (uint32_t)*j;
+
+ for (inter=best;k<good_size;inter=best) {
+ for (unsigned long l=0;l<min_size;i++,j++,k++,l++)
+ best+= (uint32_t)*i * (uint32_t)*j;
+ if (inter > best) best+=Corr;
+ }
+
+ for (;k<size;i++,j++,k++)
+ best+= (uint32_t)*i * (uint32_t)*j;
+ if (inter > best) best+=Corr;
+
+ return res = best % (uint32_t)_field.characteristic();
+ }
+ }
+
+ template <class Vector1, class Vector2>
+ inline GivaroZpz< Givaro::Std16>::Element &DotProductDomain<GivaroZpz< Givaro::Std16> >::dotSpecializedDSP
+ (GivaroZpz< Givaro::Std16>::Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ uint32_t inter,best ;
+ inter=best=0;
+ if ((v1.first).size()==0)
+ return res=GivaroZpz< Givaro::Std16>::Element(0);
+ else {
+ uint32_t size = (v1.first).size();
+ uint32_t min = Max / (Corr+ (uint32_t)(_field.characteristic()-1)*(uint32_t)(_field.characteristic()-1));
+ uint32_t min_size = (size < min ? size : min);
+ uint32_t good1 = (size > min_size ? size - min_size: 0);
+ uint32_t good2 = (long)(size / min_size)* min_size ;
+ uint32_t good_size = (good1 > good2 ? good1 : good2 );
+
+ typename Vector1::first_type::const_iterator i_idx = v1.first.begin ();
+ typename Vector1::second_type::const_iterator i_elt = v1.second.begin ();
+ uint32_t k=0;
+
+ for (;k<min_size;i_idx++,i_elt++,k++)
+ best+=(uint32_t)*i_elt * (uint32_t)v2[*i_idx];
+
+ for (inter=best;k<good_size;inter=best) {
+ for (unsigned long l=0;l<min_size;i_idx++,i_elt++,k++,l++)
+ best+= (uint32_t)*i_elt * (uint32_t)v2[*i_idx];
+ if (inter > best) best+=Corr;
+ }
+
+ for (;k<size;i_idx++,i_elt++,k++)
+ best+= (uint32_t)*i_elt * (uint32_t)v2[*i_idx];
+ if (inter > best) best+=Corr;
+
+ return res = best % (uint32_t)_field.characteristic();
+ }
+ }
+
+
+#ifdef XMLENABLED
+
+ template<>
+ bool GivaroZpz< Givaro::Std16>::toTag(Writer &W) const
+ {
+ string s;
+ int16_t m = ZpzDom< Givaro::Std16>::residu();
+
+ W.setTagName("field");
+ W.setAttribute("implDetail", "givaro-zpz-std16");
+ W.setAttribute("cardinality", Writer::numToString(s, m));
+
+ W.addTagChild();
+ W.setTagName("finite");
+
+ W.addTagChild();
+ W.setTagName("characteristic");
+ W.addNum(m);
+ W.upToParent();
+ W.upToParent();
+
+ return true;
+ }
+
+ template <>
+ bool GivaroZpz< Givaro::Std32>::toTag(Writer &W) const
+ {
+ string s;
+ int32_t m = ZpzDom< Givaro::Std32>::residu();
+
+ W.setTagName("field");
+ W.setAttribute("implDetail", "givaro-zpz-std32");
+ W.setAttribute("cardinality", Writer::numToString(s, m));
+
+ W.addTagChild();
+ W.setTagName("finite");
+
+ W.addTagChild();
+ W.setTagName("characteristic");
+ W.addNum(m);
+ W.upToParent();
+
+ W.upToParent();
+
+ return true;
+ }
+
+ template <>
+ bool GivaroZpz<Log16>::toTag(Writer &W) const
+ {
+ string s;
+ int16_t m = ZpzDom<Log16>::residu();
+
+ W.setTagName("field");
+ W.setAttribute("implDetail", "givaro-zpz-log16");
+ W.setAttribute("cardinality", Writer::numToString(s, m));
+
+ W.addTagChild();
+ W.setTagName("finite");
+
+ W.addTagChild();
+ W.setTagName("characteristic");
+ W.addNum(m);
+ W.upToParent();
+
+ W.upToParent();
+
+ return true;
+ }
+#endif
+
+
+}
+
+#endif //__LINBOX_givaro_zpz_INL
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Makefile.am b/linbox/field/Makefile.am
index cb0c3dc..08fae88 100644
--- a/linbox/field/Makefile.am
+++ b/linbox/field/Makefile.am
@@ -1,8 +1,28 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
pkgincludesubdir=$(pkgincludedir)/field
+SUBDIRS=NTL Givaro Modular
+
BASIC_HDRS = \
field-interface.h \
field-traits.h \
@@ -14,19 +34,7 @@ BASIC_HDRS = \
param-fuzzy.h \
gmp-rational.h \
modular.h \
- modular.inl \
- modular-int32.h \
- modular-int64.h \
- modular-short.h \
- modular-byte.h \
modular-balanced.h \
- modular-balanced-double.h \
- modular-balanced-float.h \
- modular-balanced-int32.h \
- modular-balanced-int64.h \
- modular-crooked-double.h \
- modular-double.h \
- modular-float.h \
gf2.h \
gf2.inl \
hom.h \
@@ -40,27 +48,11 @@ BASIC_HDRS = \
NTL_HDRS = \
ntl.h \
- ntl-RR.h \
- ntl-ZZ_p.h \
- ntl-ZZ_pE.h \
- ntl-ZZ_pX.h \
- ntl-lzz_p.h \
- ntl-ZZ.h \
- ntl-lzz_pE.h \
- ntl-lzz_pX.h \
- ntl-GF2E.h \
- ntl-pid-lzz_p.h \
+ PID-ntl-zz_p.h \
PIR-ntl-ZZ_p.h
GIVARO_HDRS = \
- givaro.h \
- givaro-zpz.h \
- givaro-montg.h \
- givaro-zpz.inl \
- givaro-gfq.h \
- givaro-extension.h \
- givaro-field.h \
- givaro-rational.h
+ givaro.h
LIDIA_HDRS = \
lidia.h \
diff --git a/linbox/field/Makefile.in b/linbox/field/Makefile.in
index c7c68c8..9c752bd 100644
--- a/linbox/field/Makefile.in
+++ b/linbox/field/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,10 +15,47 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -41,12 +78,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -54,7 +94,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -63,37 +106,92 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__pkgincludesub_HEADERS_DIST = field-interface.h field-traits.h \
rebind.h abstract.h archetype.h envelope.h unparametric.h \
- param-fuzzy.h gmp-rational.h modular.h modular.inl \
- modular-int32.h modular-int64.h modular-short.h modular-byte.h \
- modular-balanced.h modular-balanced-double.h \
- modular-balanced-float.h modular-balanced-int32.h \
- modular-balanced-int64.h modular-crooked-double.h \
- modular-double.h modular-float.h gf2.h gf2.inl hom.h map.h \
- PIR-modular-int32.h local2_32.h PID-integer.h PID-double.h \
- block-ring.h multimod-field.h ntl.h ntl-RR.h ntl-ZZ_p.h \
- ntl-ZZ_pE.h ntl-ZZ_pX.h ntl-lzz_p.h ntl-ZZ.h ntl-lzz_pE.h \
- ntl-lzz_pX.h ntl-GF2E.h ntl-pid-lzz_p.h PIR-ntl-ZZ_p.h \
- givaro.h givaro-zpz.h givaro-montg.h givaro-zpz.inl \
- givaro-gfq.h givaro-extension.h givaro-field.h \
- givaro-rational.h lidia.h lidia-gfq.h
+ param-fuzzy.h gmp-rational.h modular.h modular-balanced.h \
+ gf2.h gf2.inl hom.h map.h PIR-modular-int32.h local2_32.h \
+ PID-integer.h PID-double.h block-ring.h multimod-field.h ntl.h \
+ PID-ntl-zz_p.h PIR-ntl-ZZ_p.h givaro.h lidia.h lidia-gfq.h
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
-pkgincludesubHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkgincludesub_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
ETAGS = etags
CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -101,6 +199,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -124,10 +223,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -148,10 +249,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -160,6 +266,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -176,6 +284,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -238,11 +347,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
pkgincludesubdir = $(pkgincludedir)/field
+SUBDIRS = NTL Givaro Modular
BASIC_HDRS = \
field-interface.h \
field-traits.h \
@@ -254,19 +360,7 @@ BASIC_HDRS = \
param-fuzzy.h \
gmp-rational.h \
modular.h \
- modular.inl \
- modular-int32.h \
- modular-int64.h \
- modular-short.h \
- modular-byte.h \
modular-balanced.h \
- modular-balanced-double.h \
- modular-balanced-float.h \
- modular-balanced-int32.h \
- modular-balanced-int64.h \
- modular-crooked-double.h \
- modular-double.h \
- modular-float.h \
gf2.h \
gf2.inl \
hom.h \
@@ -280,27 +374,11 @@ BASIC_HDRS = \
NTL_HDRS = \
ntl.h \
- ntl-RR.h \
- ntl-ZZ_p.h \
- ntl-ZZ_pE.h \
- ntl-ZZ_pX.h \
- ntl-lzz_p.h \
- ntl-ZZ.h \
- ntl-lzz_pE.h \
- ntl-lzz_pX.h \
- ntl-GF2E.h \
- ntl-pid-lzz_p.h \
+ PID-ntl-zz_p.h \
PIR-ntl-ZZ_p.h
GIVARO_HDRS = \
- givaro.h \
- givaro-zpz.h \
- givaro-montg.h \
- givaro-zpz.inl \
- givaro-gfq.h \
- givaro-extension.h \
- givaro-field.h \
- givaro-rational.h
+ givaro.h
LIDIA_HDRS = \
lidia.h \
@@ -325,7 +403,7 @@ EXTRA_DIST = \
lidia.doxy \
ntl.doxy
-all: all-am
+all: all-recursive
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@@ -337,9 +415,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/field/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps linbox/field/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/field/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/field/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -357,6 +435,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -365,20 +444,94 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludesubdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)"
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludesubHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- $(pkgincludesubHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
done
uninstall-pkgincludesubHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -391,39 +544,57 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -444,117 +615,155 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
check-am: all-am
-check: check-am
+check: check-recursive
all-am: Makefile $(HEADERS)
-installdirs:
+installdirs: installdirs-recursive
+installdirs-am:
for dir in "$(DESTDIR)$(pkgincludesubdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
html-am:
-info: info-am
+info: info-recursive
info-am:
install-data-am: install-pkgincludesubHEADERS
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
install-dvi-am:
install-exec-am:
-install-html: install-html-am
+install-html: install-html-recursive
install-html-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-info-am:
install-man:
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
install-pdf-am:
-install-ps: install-ps-am
+install-ps: install-ps-recursive
install-ps-am:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
uninstall-am: uninstall-pkgincludesubHEADERS
-.MAKE: install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool ctags distclean distclean-generic \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ ctags ctags-recursive distclean distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
@@ -562,9 +771,11 @@ uninstall-am: uninstall-pkgincludesubHEADERS
install-info-am install-man install-pdf install-pdf-am \
install-pkgincludesubHEADERS install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-pkgincludesubHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/linbox/field/Modular/Makefile.am b/linbox/field/Modular/Makefile.am
new file mode 100644
index 0000000..9c9b370
--- /dev/null
+++ b/linbox/field/Modular/Makefile.am
@@ -0,0 +1,44 @@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
+pkgincludesubdir=$(pkgincludedir)/field/Modular
+
+BASIC_HDRS = \
+ modular-unsigned.h \
+ modular.inl \
+ modular-int32.h \
+ modular-int64.h \
+ modular-short.h \
+ modular-byte.h \
+ modular-balanced-double.h \
+ modular-balanced-float.h \
+ modular-balanced-int32.h \
+ modular-balanced-int64.h \
+ modular-crooked-double.h \
+ modular-double.h \
+ modular-float.h
+
+
+pkgincludesub_HEADERS = \
+ $(BASIC_HDRS)
+
+# EXTRA_DIST = \
+ # modular.doxy
diff --git a/linbox/field/Modular/Makefile.in b/linbox/field/Modular/Makefile.in
new file mode 100644
index 0000000..41645ae
--- /dev/null
+++ b/linbox/field/Modular/Makefile.in
@@ -0,0 +1,592 @@
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = linbox/field/Modular
+DIST_COMMON = $(pkgincludesub_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
+ $(top_srcdir)/macros/config-header.m4 \
+ $(top_srcdir)/macros/debug.m4 \
+ $(top_srcdir)/macros/expat-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
+ $(top_srcdir)/macros/givaro-check.m4 \
+ $(top_srcdir)/macros/gmp-check.m4 \
+ $(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
+ $(top_srcdir)/macros/libtool.m4 \
+ $(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
+ $(top_srcdir)/macros/linbox-doc.m4 \
+ $(top_srcdir)/macros/linbox-misc.m4 \
+ $(top_srcdir)/macros/linbox-opt.m4 \
+ $(top_srcdir)/macros/ltoptions.m4 \
+ $(top_srcdir)/macros/ltsugar.m4 \
+ $(top_srcdir)/macros/ltversion.m4 \
+ $(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
+ $(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
+ $(top_srcdir)/macros/ntl-check.m4 \
+ $(top_srcdir)/macros/saclib-check.m4 \
+ $(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
+HEADERS = $(pkgincludesub_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
+BLAS_LIBS = @BLAS_LIBS@
+CC = @CC@
+CCNAM = @CCNAM@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DBG = @DBG@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
+DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
+DEFS = @DEFS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXPAT_CFLAGS = @EXPAT_CFLAGS@
+EXPAT_LIBS = @EXPAT_LIBS@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
+FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
+GIVARO_CFLAGS = @GIVARO_CFLAGS@
+GIVARO_LIBS = @GIVARO_LIBS@
+GMP_CFLAGS = @GMP_CFLAGS@
+GMP_LIBS = @GMP_LIBS@
+GMP_VERSION = @GMP_VERSION@
+GREP = @GREP@
+IML_CFLAGS = @IML_CFLAGS@
+IML_LIBS = @IML_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIDIA_CFLAGS = @LIDIA_CFLAGS@
+LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
+LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MAPLE_CFLAGS = @MAPLE_CFLAGS@
+MAPLE_HOME = @MAPLE_HOME@
+MAPLE_LIBS = @MAPLE_LIBS@
+MAPLE_VERSION = @MAPLE_VERSION@
+MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NTL_CFLAGS = @NTL_CFLAGS@
+NTL_LIBS = @NTL_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
+RANLIB = @RANLIB@
+RM = @RM@
+SACLIB_CFLAGS = @SACLIB_CFLAGS@
+SACLIB_LIBS = @SACLIB_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TESTS_CFLAGS = @TESTS_CFLAGS@
+VERSION = @VERSION@
+WARN = @WARN@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+pkgincludesubdir = $(pkgincludedir)/field/Modular
+BASIC_HDRS = \
+ modular-unsigned.h \
+ modular.inl \
+ modular-int32.h \
+ modular-int64.h \
+ modular-short.h \
+ modular-byte.h \
+ modular-balanced-double.h \
+ modular-balanced-float.h \
+ modular-balanced-int32.h \
+ modular-balanced-int64.h \
+ modular-crooked-double.h \
+ modular-double.h \
+ modular-float.h
+
+pkgincludesub_HEADERS = \
+ $(BASIC_HDRS)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/field/Modular/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/field/Modular/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
+ @$(NORMAL_INSTALL)
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
+ done
+
+uninstall-pkgincludesubHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+ for dir in "$(DESTDIR)$(pkgincludesubdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgincludesubHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgincludesubHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool ctags distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkgincludesubHEADERS install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
+
+# EXTRA_DIST = \
+# # modular.doxy
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/linbox/field/Modular/modular-balanced-double.h b/linbox/field/Modular/modular-balanced-double.h
new file mode 100644
index 0000000..839f65d
--- /dev/null
+++ b/linbox/field/Modular/modular-balanced-double.h
@@ -0,0 +1,342 @@
+/* linbox/field/modular-balanced-double.h
+ * Copyright (C) 2003 Pascal Giorgi
+ * 2005,2008 Clement Pernet
+ * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
+ * and Clement Pernet <Clement.Pernet at imag.fr>
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/*! @file field/Modular/modular-balanced-double.h
+ * @ingroup field
+ * @brief Balanced representation of <code>Z/mZ</code> over \c double .
+ */
+
+#ifndef __LINBOX_modular_balanced_double_H
+#define __LINBOX_modular_balanced_double_H
+
+#ifdef __INTEL_COMPILER
+#define FmodF fmodf
+#else
+#define FmodF fmod
+#endif
+
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/util/field-axpy.h"
+#include "linbox/util/debug.h"
+#include <math.h>
+#include "linbox/field/field-traits.h"
+#include "linbox/randiter/modular-balanced.h"
+#include "linbox/randiter/nonzero.h"
+
+#include <fflas-ffpack/field/modular-balanced-double.h>
+
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+ template< class Element >
+ class ModularBalanced;
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template <class Element>
+ struct ClassifyRing<ModularBalanced<Element> >;
+
+ template <>
+ struct ClassifyRing<ModularBalanced<double> > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ class MultiModDouble;
+
+ /*! \ingroup modular
+ * Centered representation of \f$\mathbf{Z}/m\mathbf{Z}\f$.
+ * If \c m is the modulus, then elements are represented in \f[ \left
+ * \llbracket \left \lceil -\frac{m-1}{2} \right \rceil, \left \lceil
+ * \frac{m-1}{2} \right \rceil \right \rrbracket.\f] This
+ * representation allows more accumulations before a reduction is
+ * necessary, at the cost of a more expensive reduction.
+ */
+ template<>
+ class ModularBalanced<double> : public FieldInterface,
+ public FFPACK::ModularBalanced<double> {
+
+ public:
+ typedef FFPACK::ModularBalanced<double> Father_t ;
+ friend class FieldAXPY<ModularBalanced<double> >;
+ friend class DotProductDomain<ModularBalanced<double> >;
+ friend class MultiModDouble;
+
+ typedef double Element;
+ typedef ModularBalancedRandIter<double> RandIter;
+
+ static ClassifyRing <ModularBalanced<double> >::categoryTag getCategory()
+ {
+ return ClassifyRing<ModularBalanced<double> >::categoryTag();
+ }
+
+ ModularBalanced (const integer& p, int e = 1) :
+ Father_t((unsigned long)p)
+ {
+#ifdef DEBUG
+ if (p > (integer) ULONG_MAX)
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"prime too big");
+ if(modulus <= 1)
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
+ if(modulus > getMaxModulus())
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
+#endif
+
+ }
+
+ using Father_t::cardinality ;
+ integer &cardinality (integer &c) const
+ {
+ return c = integer(modulus);
+ }
+
+ using Father_t::characteristic ;
+ integer &characteristic (integer &c) const
+ {
+ return c = integer(modulus);
+ }
+
+ using Father_t::convert ;
+ integer &convert (integer &x, const Element &y) const
+ {
+ return x = integer (y);
+ }
+
+ using Father_t::init ;
+ Element &init (Element &x, const integer &y) const
+ {
+ x = (Element)(y%lmodulus);
+ if (x<mhalf_mod) return x += modulus ;
+ else if (x>half_mod) return x -= modulus ;
+ return x ;
+ }
+
+ Element &init(Element &x) const
+ {
+ return x = 0 ;
+ }
+
+ //! @bug faux si modulus==2
+ inline bool isMinusOne (const Element &x) const
+ {
+ return (x == -1.);
+ }
+
+ unsigned long AccBound(const Element&r) const
+ {
+ // Element one, zero ; init(one,1UL) ; init(zero,0UL);
+ double max_double = (double) (1ULL<<DBL_MANT_DIG) - modulus ;
+ double p = std::max(half_mod,-mhalf_mod) ;
+ if (areEqual(zero,r))
+ return (unsigned long) (double(max_double)/p) ;
+ else if (areEqual(one,r))
+ {
+ if (modulus>= getMaxModulus())
+ return 0 ;
+ else
+ return (unsigned long) (double(max_double)/(p*p)) ;
+ }
+ else
+ throw LinboxError("Bad input, expecting 0 or 1");
+ return 0;
+ }
+
+ };
+
+ //! Specialization of FieldAXPY.
+ template <>
+ class FieldAXPY<ModularBalanced<double> > {
+ public:
+
+ typedef double Element;
+ typedef ModularBalanced<double> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F),
+ _y(0.) , _bound( (double) ((1ULL << 53) - (int) (_field.modulus*_field.modulus)))
+ {}
+
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field),
+ _y(faxpy._y), _bound(faxpy._bound)
+ {}
+
+ FieldAXPY<ModularBalanced<double> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field;
+ _y= faxpy._y;
+ _bound= faxpy._bound;
+ return *this;
+ }
+
+ inline Element& mulacc (const Element &a, const Element &x)
+ {
+ // Element tmp= a*x;
+ // return accumulate(tmp);
+ return accumulate(a*x);
+ }
+
+ inline Element& accumulate (const Element &tmp)
+ {
+ _y += tmp;
+ if (_y > _bound)
+ return _y = fmod (_y, _field.modulus);
+ else
+ return _y;
+ }
+ inline Element& subumulate (const Element &tmp)
+ {
+ _y -= tmp;
+ if (_y < 0)
+ return _y += _field.modulus;
+ else
+ return _y;
+ }
+
+ inline Element& get (Element &y) {
+ _y = fmod (_y, _field.modulus);
+ return y=_y ;
+ }
+
+ inline FieldAXPY &assign (const Element y) {
+ _y = y;
+ return *this;
+ }
+
+ inline void reset() {
+ _y = 0.;
+ }
+
+ inline Element& set (const Element &tmp) {
+ _y = tmp;
+ if (_y > _bound)
+ return _y = fmod (_y, _field.modulus);
+ else
+ return _y;
+ }
+
+ private:
+
+ Field _field;
+ double _y;
+ double _bound;
+ };
+
+
+ //! Specialization of DotProductDomain.
+ template <>
+ class DotProductDomain<ModularBalanced<double> > : private virtual VectorDomainBase<ModularBalanced<double> > {
+ private:
+ double _bound;
+ size_t _nmax;
+
+ public:
+ typedef double Element;
+ DotProductDomain (const ModularBalanced<double> &F) :
+ VectorDomainBase<ModularBalanced<double> > (F), _bound( (double) ( (1ULL<<53) - (int) (_field.modulus*_field.modulus)))
+ {
+ _nmax= (size_t)floor((double(1<<26)* double(1<<26)*2.)/ (_field.modulus * _field.modulus));
+ }
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ double y = 0.;
+ double t = 0.;
+ if (v1.size() < _nmax) {
+ for (size_t i = 0; i< v1.size();++i)
+ y += v1[i] * v2[i] ;
+ y = fmod(y, _field.modulus);
+ }
+ else{
+ size_t i=0;
+ for (;i< v1.size()- _nmax ;i=i+_nmax){
+ for (size_t j=i;j<i+_nmax;++j)
+ y += v1[j] * v2[j];
+ t+=fmod(y, _field.modulus);
+ y=0.;
+ }
+ for (;i < v1.size();++i)
+ y += v1[i] * v2[i];
+ t+=fmod(y, _field.modulus);
+ y = fmod(t, _field.modulus);
+ }
+ return res = y;
+ }
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ double y = 0.;
+ double t =0.;
+
+
+ if (v1.first.size() < _nmax) {
+ for (size_t i=0;i<v1.first.size();++i)
+ y+= v1.second[i] * v2[v1.first[i]];
+ y = fmod(y, _field.modulus);
+ }
+ else {
+ size_t i=0;
+ for (;i< v1.first.size()- _nmax ;i=i+_nmax){
+ for (size_t j=i;j<i+_nmax;++j)
+ y += v1.second[j] * v2[v1.first[j]];
+ t+=fmod(y, _field.modulus);
+ y=0.;
+ }
+ for (;i < v1.first.size();++i)
+ y += v1.second[i] * v2[v1.first[i]];
+ t+= fmod(y, _field.modulus);
+ y = fmod(t, _field.modulus);
+ }
+ return res = y;
+ }
+ };
+}
+
+#endif //__LINBOX_modular_balanced_double_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Modular/modular-balanced-float.h b/linbox/field/Modular/modular-balanced-float.h
new file mode 100644
index 0000000..0d8f4f4
--- /dev/null
+++ b/linbox/field/Modular/modular-balanced-float.h
@@ -0,0 +1,336 @@
+/* field/modular-balanced-float.h
+ * Copyright (C) 2003 Pascal Giorgi
+ * 2005,2008 Clement Pernet
+ * Written by Clement Pernet <clement.pernet at gmail.com>
+ * Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
+ * Modified Brice Boyer <bboyer at imag.fr>
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/*! @file field/Modular/modular-balanced-float.h
+ * @ingroup field
+ * @brief Balanced representation of <code>Z/mZ</code> over \c float .
+ */
+
+#ifndef __LINBOX_modular_balanced_float_H
+#define __LINBOX_modular_balanced_float_H
+
+#ifdef __INTEL_COMPILER
+#define FmodF fmodf
+#else
+#define FmodF fmod
+#endif
+
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/util/field-axpy.h"
+#include "linbox/util/debug.h"
+#include <math.h>
+#include "linbox/field/field-traits.h"
+#include "linbox/randiter/modular-balanced.h"
+#include "linbox/randiter/nonzero.h"
+
+#include <fflas-ffpack/field/modular-balanced-float.h>
+
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+ template< class Element >
+ class ModularBalanced;
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template <class Element>
+ struct ClassifyRing<ModularBalanced<Element> >;
+
+ template <>
+ struct ClassifyRing<ModularBalanced<float> > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ class MultiModFloat;
+
+ /// \ingroup field
+ template <>
+ class ModularBalanced<float> : public FieldInterface,
+ public FFPACK::ModularBalanced<float> {
+ public :
+ typedef float Element;
+ typedef FFPACK::ModularBalanced<float> Father_t ;
+
+ friend class FieldAXPY<ModularBalanced<Element> >;
+ friend class DotProductDomain<ModularBalanced<Element> >;
+ friend class MultiModFloat;
+
+ typedef ModularBalancedRandIter<Element> RandIter;
+
+ static ClassifyRing <ModularBalanced<Element> >::categoryTag
+ getCategory()
+ {
+ return ClassifyRing<ModularBalanced<Element> >::categoryTag();
+ }
+
+ ModularBalanced (const integer& p, int e = 1) :
+ Father_t((unsigned long)p)
+ {
+#ifdef DEBUG
+ if(modulus <= 1)
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
+ if(modulus > getMaxModulus())
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
+ // check integer not too big.
+#endif
+
+ }
+
+
+ using Father_t::cardinality ;
+ inline integer &cardinality (integer &c) const
+ {
+ return c = integer(modulus);
+ }
+
+ using Father_t::characteristic ;
+ inline integer &characteristic (integer &c) const
+ {
+ return c = integer(modulus);
+ }
+
+ using Father_t::convert ;
+ inline integer &convert (integer &x, const Element &y) const
+ {
+ // if ( y < 0. )
+ // return x = integer (y + modulus) ;
+ // else
+ return x = integer (y);
+ }
+
+ using Father_t::init ;
+ inline Element &init (Element &x, const integer &y) const
+ {
+ x = (Element)(y%lmodulus);
+ if (x > half_mod) return x -= modulus;
+ else if (x < mhalf_mod) return x += modulus;
+
+ return x;
+ }
+
+ Element &init(Element &x) const
+ {
+ return x = 0 ;
+ }
+
+ inline bool isMinusOne (const Element &x) const
+ {
+ return (x == -1.);
+ }
+
+ unsigned long AccBound(const Element&r) const
+ {
+ // Element one, zero ; init(one,1UL) ; init(zero,0UL);
+ double max_double = (double) (1ULL<<FLT_MANT_DIG) - modulus ;
+ double p = std::max(half_mod,-mhalf_mod) ;
+ if (areEqual(zero,r))
+ return (unsigned long) (double(max_double)/p) ;
+ else if (areEqual(one,r))
+ {
+ if (modulus>= getMaxModulus())
+ return 0 ;
+ else
+ return (unsigned long) (double(max_double)/(p*p)) ;
+ }
+ else
+ throw LinboxError("Bad input, expecting 0 or 1");
+ return 0;
+ }
+
+ };
+
+ template <>
+ class FieldAXPY<ModularBalanced<float> > {
+ public:
+ typedef float Element;
+ typedef ModularBalanced<Element> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F),
+ _y(0.) , _bound( (Element) (((1ULL << 24) - (int) (_field.modulus*_field.modulus))))
+ {}
+
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field),
+ _y(faxpy._y), _bound(faxpy._bound)
+ {}
+
+ FieldAXPY<ModularBalanced<Element> > &operator = (const FieldAXPY &faxpy) {
+ _field = faxpy._field;
+ _y= faxpy._y;
+ _bound= faxpy._bound;
+ return *this;
+ }
+
+ inline Element& mulacc (const Element &a, const Element &x) {
+ // Element tmp= a*x;
+ // return accumulate(tmp);
+ return accumulate(a*x);
+ }
+
+ inline Element& accumulate (const Element &tmp) {
+ _y += tmp;
+ if (_y > _bound)
+ return _y = fmodf (_y, _field.modulus);
+ else
+ return _y;
+ }
+ inline Element& subumulate (const Element &tmp) {
+ _y -= tmp;
+ if (_y < 0)
+ return _y += _field.modulus;
+ else
+ return _y;
+ }
+
+ inline Element& get (Element &y) {
+ _y = fmodf (_y, _field.modulus);
+ return y=_y ;
+ }
+
+ inline FieldAXPY &assign (const Element y) {
+ _y = y;
+ return *this;
+ }
+
+ inline void reset() {
+ _y = 0.;
+ }
+
+ inline Element& set (const Element &tmp) {
+ _y = tmp;
+ if (_y > _bound)
+ return _y = fmodf (_y, _field.modulus);
+ else
+ return _y;
+ }
+
+ private:
+ Field _field;
+ Element _y;
+ Element _bound;
+ };
+
+
+ template <>
+ class DotProductDomain<ModularBalanced<float> > : private virtual VectorDomainBase<ModularBalanced<float> > {
+ public:
+ typedef float Element;
+ DotProductDomain (const ModularBalanced<Element> &F) :
+ VectorDomainBase<ModularBalanced<Element> > (F), _bound( (Element) ( (1ULL<<24) - (int) (_field.modulus*_field.modulus)))
+ {
+ _nmax= (size_t)floor((Element(1<<11)* Element(1<<11)*2.)/ (_field.modulus * _field.modulus));
+ }
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ Element y = 0.;
+ Element t = 0.;
+ if (v1.size() < _nmax) {
+ for (size_t i = 0; i< v1.size();++i)
+ y += v1[i] * v2[i] ;
+ y = fmodf(y, _field.modulus);
+ }
+ else{
+ size_t i=0;
+ for (;i< v1.size()- _nmax ;i=i+_nmax){
+ for (size_t j=i;j<i+_nmax;++j)
+ y += v1[j] * v2[j];
+ t+= fmodf(y, _field.modulus);
+ y=0.;
+ }
+ for (;i < v1.size();++i)
+ y += v1[i] * v2[i];
+ t+= fmodf(y, _field.modulus);
+ y = fmodf(t, _field.modulus);
+ }
+ return res = y;
+ }
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ Element y = 0.;
+ Element t =0.;
+
+
+ if (v1.first.size() < _nmax) {
+ for (size_t i=0;i<v1.first.size();++i)
+ y+= v1.second[i] * v2[v1.first[i]];
+ y = fmodf(y, _field.modulus);
+ }
+ else {
+ size_t i=0;
+ for (;i< v1.first.size()- _nmax ;i=i+_nmax){
+ for (size_t j=i;j<i+_nmax;++j)
+ y += v1.second[j] * v2[v1.first[j]];
+ t+=fmodf(y, _field.modulus);
+ y=0.;
+ }
+ for (;i < v1.first.size();++i)
+ y += v1.second[i] * v2[v1.first[i]];
+ t+= fmodf(y, _field.modulus);
+ y = fmodf(t, _field.modulus);
+ }
+ return res = y;
+ }
+ private:
+ Element _bound;
+ size_t _nmax;
+
+ };
+} // Namespace LinBox
+
+#include "linbox/randiter/modular-balanced.h"
+#include "linbox/randiter/nonzero.h"
+
+#undef FmodF
+
+#endif //__LINBOX_modular_balanced_float_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Modular/modular-balanced-int32.h b/linbox/field/Modular/modular-balanced-int32.h
new file mode 100644
index 0000000..82282a3
--- /dev/null
+++ b/linbox/field/Modular/modular-balanced-int32.h
@@ -0,0 +1,336 @@
+/* Copyright (C) 2009 LinBox
+ * Written by C Pernet
+ * updated to compilable condition by <brice.boyer at imag.fr>
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+
+/*! @file field/Modular/modular-balanced-int32.h
+ * @ingroup field
+ * @brief Balanced representation of <code>Z/mZ</code> over \c int32_t .
+ */
+
+#ifndef __LINBOX_modular_balanced_int32_H
+#define __LINBOX_modular_balanced_int32_H
+
+
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/util/field-axpy.h"
+#include "linbox/util/debug.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/field/Modular/modular-int32.h"
+
+#include <fflas-ffpack/field/modular-balanced-int32.h>
+
+#ifndef LINBOX_MAX_INT /* 2147483647 */
+#define LINBOX_MAX_INT INT32_MAX
+#endif
+
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+ template< class Element >
+ class ModularBalanced;
+ template< class Element >
+ class ModularBalancedRandIter;
+ template< class Field, class RandIter >
+ class NonzeroRandIter;
+
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template<class Element>
+ struct ClassifyRing<ModularBalanced<Element> >;
+
+ template<>
+ struct ClassifyRing<ModularBalanced<int32_t> > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ /// \ingroup field
+ template <>
+ class ModularBalanced<int32_t> : public FieldInterface,
+ public FFPACK::ModularBalanced<int32_t> {
+
+ public:
+ typedef FFPACK::ModularBalanced<int32_t> Father_t ;
+
+ friend class FieldAXPY<ModularBalanced<int32_t> >;
+ friend class DotProductDomain<ModularBalanced<int32_t> >;
+
+ typedef int32_t Element;
+ typedef ModularBalancedRandIter<int32_t> RandIter;
+
+ ModularBalanced(int32_t p, int32_t e=1) :
+ Father_t(p,e)
+ {}
+
+ using Father_t::cardinality ;
+ integer &cardinality (integer &c) const
+ {
+ return c = modulus;
+ }
+
+ using Father_t::characteristic ;
+ integer &characteristic (integer &c) const
+ {
+ return c = modulus;
+ }
+
+ using Father_t::convert;
+ // this function converts an int to a natural number ?
+ integer &convert (integer &x, const Element &y) const
+ {
+ if(y >= 0)
+ return x = y;
+ else
+ return x = y + modulus;
+ }
+
+ using Father_t::init ;
+ Element &init (Element &x, const integer &y) const
+ {
+ x = Element(y % (long)modulus);
+
+ if (x < mhalf_mod)
+ x += modulus;
+ else if (x > half_mod)
+ x -= modulus;
+
+ return x;
+ }
+
+ Element &init(Element &x) const
+ {
+ return x = 0 ;
+ }
+
+ };
+
+ template <>
+ class FieldAXPY<ModularBalanced<int32_t> > {
+ public:
+
+ typedef int32_t Element;
+ typedef ModularBalanced<int32_t> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F),_y(0),_times(0)
+ { }
+
+
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field), _y (0),_times(0)
+ {}
+
+ FieldAXPY<ModularBalanced<int32_t> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field;
+ _y = faxpy._y;
+ _times = faxpy._times;
+ return *this;
+ }
+
+ inline int64_t& mulacc (const Element &a, const Element &x)
+ {
+ int64_t t = (int64_t) a * (int64_t) x;
+ if (_times < blocksize) {
+ ++_times;
+ return _y += t;
+ }
+
+ else {
+ _times = 1;
+ normalize();
+ return _y += t;
+ }
+ }
+
+ inline int64_t& accumulate (const Element &t)
+ {
+ if (_times < blocksize) {
+ ++_times;
+ return _y += t;
+ }
+
+ else {
+ _times = 1;
+ normalize();
+ return _y += t;
+ }
+ }
+
+ inline Element& get (Element &y)
+ {
+
+ normalize();
+
+ y = Element(_y);
+
+ if (y > _field.half_mod)
+ y -= _field.modulus;
+ else if (y < _field.mhalf_mod)
+ y += _field.modulus;
+
+ return y;
+ }
+
+ inline FieldAXPY &assign (const Element y)
+ {
+ _y = y;
+ return *this;
+ }
+
+ inline void reset()
+ {
+ _y = 0;
+ }
+
+ private:
+
+ Field _field;
+ int64_t _y;
+ int32_t _times;
+ static const int32_t blocksize = 32;
+
+ inline void normalize() {
+ _y = (int32_t)_y -(int32_t)(int64_t)((double) _y * _field.modulusinv) * (int32_t)_field.modulus;
+ }
+
+ };
+
+
+ template <>
+ class DotProductDomain<ModularBalanced<int32_t> > : private virtual VectorDomainBase<ModularBalanced<int32_t> > {
+
+ private:
+ const int32_t blocksize;
+
+ public:
+ typedef int32_t Element;
+ DotProductDomain (const ModularBalanced<int32_t> &F) :
+ VectorDomainBase<ModularBalanced<int32_t> > (F) ,blocksize(32)
+ { }
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ typename Vector1::const_iterator pv1,pv1e;
+ typename Vector2::const_iterator pv2;
+
+ int64_t y = 0;
+ int64_t t;
+ // int32_t times = 0;
+
+ pv1 = pv1e = v1.begin();
+ pv2 = v2.begin();
+
+ for(size_t i = 0; i < v1.size() / blocksize ;++i) {
+ pv1e = pv1e + blocksize;
+ for(;pv1 != pv1e;++pv1,++pv2) {
+ t = (((int64_t) *pv1 ) * ((int64_t) *pv2 ));
+ y += t;
+ }
+ normalize(y);
+ }
+
+ for(;pv1 != v1.end(); ++pv1, ++pv2) {
+ t = (((int64_t) *pv1 ) * ((int64_t) *pv2 ));
+ y += t;
+ }
+
+ normalize(y);
+ res = (Element) y;
+
+ if (res > _field.half_mod) res -= _field.modulus;
+ else if(res < _field.mhalf_mod) res += _field.modulus;
+
+ return res;
+
+ }
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ typename Vector1::first_type::const_iterator i_idx, i_idxe;
+ typename Vector1::second_type::const_iterator i_elt;
+
+ int64_t y = 0;
+ int64_t t;
+
+ i_idx = i_idxe = v1.first.begin();
+ i_elt = v1.second.begin();
+
+ for(size_t i = 0; i < v1.first.size() / blocksize ; ++i) {
+ i_idxe = i_idxe + blocksize;
+ for(;i_idx!= i_idxe;++i_idx, ++i_elt) {
+ t = ( (int64_t) *i_elt ) * ( (int64_t) v2[*i_idx] );
+ y += t;
+ }
+ normalize(y);
+ }
+
+
+ for(;i_idx!= v1.first.end();++i_idx, ++i_elt) {
+ t = ( (int64_t) *i_elt ) * ( (int64_t) v2[*i_idx] );
+ y += t;
+ }
+
+ normalize(y);
+
+ res = (Element) y;
+ if (res > _field.half_mod) res -= _field.modulus;
+ else if(res < _field.mhalf_mod) res += _field.modulus;
+
+ return res;
+ }
+
+ inline void normalize(int64_t& _y) const
+ {
+ _y = (int32_t)_y -(int32_t)(int64_t)((double) _y * _field.modulusinv) * (int32_t)_field.modulus;
+ }
+
+ };
+}
+
+#include "linbox/randiter/modular-balanced.h"
+#endif //__LINBOX_modular_balanced_int32_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Modular/modular-balanced-int64.h b/linbox/field/Modular/modular-balanced-int64.h
new file mode 100644
index 0000000..4a25eb3
--- /dev/null
+++ b/linbox/field/Modular/modular-balanced-int64.h
@@ -0,0 +1,345 @@
+/* Copyright (C) 2010 LinBox
+ * Adapted by B Boyer <brice.boyer at imag.fr>
+ * (from other modular-balanced* files)
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+
+/*! @file field/Modular/modular-balanced-int64.h
+ * @ingroup field
+ * @brief Balanced representation of <code>Z/mZ</code> over \c int64_t .
+ */
+
+#ifndef __LINBOX_modular_balanced_int64_H
+#define __LINBOX_modular_balanced_int64_H
+
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/util/field-axpy.h"
+#include "linbox/util/debug.h"
+#include "linbox/field/field-traits.h"
+
+#include <fflas-ffpack/field/modular-balanced-int64.h>
+
+#ifndef LINBOX_MAX_INT64
+#ifdef __x86_64__
+#define LINBOX_MAX_INT64 INT64_MAX
+#else
+#define LINBOX_MAX_INT64 INT64_MAX
+#endif
+#endif
+
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+ template< class Element >
+ class ModularBalanced;
+ template< class Element >
+ class ModularBalancedRandIter;
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template<class Element>
+ struct ClassifyRing<ModularBalanced<Element> >;
+
+ template<>
+ struct ClassifyRing<ModularBalanced<int64_t> > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ /// \ingroup field
+ template <>
+ class ModularBalanced<int64_t> : public FieldInterface
+ public FFPACK::ModularBalanced<int64_t> {
+
+ public:
+
+ friend class FieldAXPY<ModularBalanced<int64_t> >;
+ friend class DotProductDomain<ModularBalanced<int64_t> >;
+
+ typedef FFPACK::ModularBalanced<int64_t> Father_t ;
+
+ typedef int64_t Element;
+ typedef ModularBalancedRandIter<int64_t> RandIter;
+
+ using Father_t:: cardinality;
+ integer &cardinality (integer &c) const
+ {
+ return c = modulus;
+ }
+
+ using Father_t:: characteristic;
+ integer &characteristic (integer &c) const
+ {
+ return c = modulus;
+ }
+
+ using Father_t:: convert;
+ // this function converts an int to a natural number ?
+ integer &convert (integer &x, const Element &y) const
+ {
+ if(y >= 0)
+ return x = y;
+ else
+ return x = y + modulus;
+ }
+
+ using Father_t:: init;
+ Element &init (Element &x, const integer &y) const
+ {
+ x = y % (long) (modulus);
+ if (x < mhalf_mod) x += modulus;
+ else if (x > half_mod) x -= modulus;
+ return x;
+ }
+
+ Element &init(Element &x) const
+ {
+ return x = 0 ;
+ }
+
+ private:
+
+ };
+
+ template <>
+ class FieldAXPY<ModularBalanced<int64_t> > {
+ public:
+
+ typedef int64_t Element;
+ typedef ModularBalanced<int64_t> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F),_y(0),_times(0)
+ {
+ }
+
+
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field), _y (0),_times(0)
+ {}
+
+ FieldAXPY<ModularBalanced<int64_t> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field;
+ _y = faxpy._y;
+ _times = faxpy._times;
+ return *this;
+ }
+
+ inline int64_t& mulacc (const Element &a, const Element &x)
+ {
+ int64_t t = (int64_t) a * (int64_t) x;
+ if (_times < blocksize)
+ {
+ ++_times;
+ return _y += t;
+ }
+
+ else {
+ _times = 1;
+ normalize();
+ return _y += t;
+ }
+ }
+
+ inline int64_t& accumulate (const Element &t)
+ {
+ if (_times < blocksize)
+ {
+ ++_times;
+ return _y += t;
+ }
+
+ else {
+ _times = 1;
+ normalize();
+ return _y += t;
+ }
+ }
+
+ inline Element& get (Element &y)
+ {
+
+ normalize();
+
+ y = _y;
+
+ if (y > _field.half_mod)
+ y -= _field.modulus;
+ else if (y < _field.mhalf_mod)
+ y += _field.modulus;
+
+ return y;
+ }
+
+ inline FieldAXPY &assign (const Element y)
+ {
+ _y = y;
+ return *this;
+ }
+
+ inline void reset()
+ {
+ _y = 0;
+ }
+
+ private:
+
+ Field _field;
+ int64_t _y;
+ int64_t _times;
+ //!@todo tune me ?
+ static const int64_t blocksize = 32;
+
+ inline void normalize()
+ {
+ _y = (int64_t)_y -(int64_t)(int64_t)((double) _y * _field.modulusinv) * (int64_t)_field.modulus;
+ }
+
+ };
+
+
+ template <>
+ class DotProductDomain<ModularBalanced<int64_t> > : private virtual VectorDomainBase<ModularBalanced<int64_t> > {
+
+ private:
+ const int64_t blocksize;
+
+ public:
+ typedef int64_t Element;
+ DotProductDomain (const ModularBalanced<int64_t> &F) :
+ VectorDomainBase<ModularBalanced<int64_t> > (F) ,blocksize(32)
+ { }
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ typename Vector1::const_iterator pv1,pv1e;
+ typename Vector2::const_iterator pv2;
+
+ int64_t y = 0;
+ int64_t t;
+ int64_t times = 0;
+
+ pv1 = pv1e = v1.begin();
+ pv2 = v2.begin();
+
+ for(int i = 0; i < v1.size() / blocksize ;++i)
+ {
+ pv1e = pv1e + blocksize;
+ for(;pv1 != pv1e;++pv1,++pv2)
+ {
+ t = (((int64_t) *pv1 ) * ((int64_t) *pv2 ));
+ y += t;
+ }
+ normalize(y);
+ }
+
+ for(;pv1 != v1.end(); ++pv1, ++pv2)
+ {
+ t = (((int64_t) *pv1 ) * ((int64_t) *pv2 ));
+ y += t;
+ }
+
+ normalize(y);
+ res = y;
+
+ if (res > _field.half_mod) res -= _field.modulus;
+ else if(res < _field.mhalf_mod) res += _field.modulus;
+
+ return res;
+
+ }
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ typename Vector1::first_type::const_iterator i_idx, i_idxe;
+ typename Vector1::second_type::const_iterator i_elt;
+
+ int64_t y = 0;
+ int64_t t;
+
+ i_idx = i_idxe = v1.first.begin();
+ i_elt = v1.second.begin();
+
+ for(int i = 0; i < v1.first.size() / blocksize ; ++i)
+ {
+ i_idxe = i_idxe + blocksize;
+ for(;i_idx!= i_idxe;++i_idx, ++i_elt)
+ {
+ t = ( (int64_t) *i_elt ) * ( (int64_t) v2[*i_idx] );
+ y += t;
+ }
+ normalize(y);
+ }
+
+
+ for(;i_idx!= v1.first.end();++i_idx, ++i_elt)
+ {
+ t = ( (int64_t) *i_elt ) * ( (int64_t) v2[*i_idx] );
+ y += t;
+ }
+
+ normalize(y);
+
+ res = y;
+ if (res > _field.half_mod) res -= _field.modulus;
+ else if(res < _field.mhalf_mod) res += _field.modulus;
+
+ return res;
+ }
+
+ inline void normalize(int64_t& _y) const
+ {
+ _y = (int64_t)_y -(int64_t)(int64_t)((double) _y * _field.modulusinv) * (int64_t)_field.modulus;
+ }
+
+ };
+}
+
+#undef LINBOX_MAX_INT64
+
+#include "linbox/randiter/modular.h" // do not unse _LB_MAX inside this one !
+
+
+#endif //__LINBOX_modular_balanced_int64_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Modular/modular-byte.h b/linbox/field/Modular/modular-byte.h
new file mode 100644
index 0000000..b49f9f4
--- /dev/null
+++ b/linbox/field/Modular/modular-byte.h
@@ -0,0 +1,773 @@
+/* Copyright (C) 2010 LinBox
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file field/Modular/modular-byte.h
+ * @ingroup field
+ * @brief representation of <code>Z/mZ</code> over \c byte .
+ */
+#ifndef __LINBOX_modular_bit_H
+#define __LINBOX_modular_bit_H
+
+
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/util/debug.h"
+#include "linbox/field/field-traits.h"
+
+#ifndef LINBOX_MAX_INT8 /* 127 */
+#define LINBOX_MAX_INT8 INT8_MAX
+#endif
+
+#ifdef __ICC
+#pragma warning(disable:2259)
+#endif
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+ template<class Element>
+ class Modular;
+
+ template<class Element>
+ class ModularRandIter;
+
+ template<class Field>
+ class FieldAXPY;
+
+ template<class Field>
+ class DotProductDomain;
+
+ template<class Field>
+ class MVProductDomain;
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template <class Element>
+ struct ClassifyRing<Modular<Element> >;
+
+ template <>
+ struct ClassifyRing<Modular<int8_t> >{
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ /** \brief Specialization of Modular to signed 8 bit element type with efficient dot product.
+ *
+ * Efficient element operations for dot product, mul, axpy, by using floating point
+ * inverse of modulus (borrowed from NTL) and some use of non-normalized intermediate values.
+ *
+ * Requires: modulus < 2^7.
+ * Intended use: prime modulus < 2^7.
+ \ingroup field
+ */
+ template <>
+ class Modular<int8_t> : public FieldInterface {
+ public:
+ typedef int8_t Element;
+ protected:
+ Element modulus;
+ unsigned long lmodulus ;
+ double modulusinv;
+ public:
+ const Element one,zero,mOne;
+ friend class FieldAXPY<Modular<Element> >;
+ friend class DotProductDomain<Modular<Element> >;
+ friend class MVProductDomain<Modular<Element> >;
+
+ typedef ModularRandIter<Element> RandIter;
+
+ //default modular field,taking 65521 as default modulus
+ Modular () :
+ modulus(13),lmodulus(13)
+ ,one((Element)1),zero((Element)0),mOne(Element(modulus-(Element)1))
+ {
+ modulusinv=1/(double)13;
+ }
+
+ Modular (int value, int exp = 1) :
+ modulus(Element(value)),lmodulus((unsigned int)value)
+ ,one((Element)1),zero((Element)0),mOne(Element(modulus-(Element)1))
+ {
+ modulusinv = 1 / ((double) value);
+#ifdef DEBUG
+ if(exp != 1) throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
+ if(value <= 1) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
+ integer max;
+ if(value > FieldTraits< Modular<Element> >::maxModulus(max)) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
+#endif
+ }
+
+ Modular(const Modular<Element>& mf) :
+ modulus(mf.modulus),lmodulus(mf.lmodulus),modulusinv(mf.modulusinv)
+ ,one(mf.one),zero(mf.zero),mOne(mf.mOne)
+ {}
+
+ Modular &operator=(const Modular<Element> &F)
+ {
+ modulus = F.modulus;
+ lmodulus = F.lmodulus;
+ modulusinv = F.modulusinv;
+ F.assign(const_cast<Element&>(one),F.one);
+ F.assign(const_cast<Element&>(zero),F.zero);
+ F.assign(const_cast<Element&>(mOne),F.mOne);
+
+ return *this;
+ }
+
+
+ inline integer &cardinality (integer &c) const
+ {
+ return c = modulus;
+ }
+
+ inline integer &characteristic (integer &c) const
+ {
+ return c = modulus;
+ }
+
+ inline unsigned long cardinality () const
+ {
+ return lmodulus;
+ }
+
+ inline unsigned long characteristic () const
+ {
+ return lmodulus;
+ }
+
+
+ inline integer &convert (integer &x, const Element &y) const
+ {
+ return x = y;
+ }
+
+ inline std::ostream &write (std::ostream &os) const
+ {
+ return os << "Element mod " << (int)modulus;
+ }
+
+ inline std::istream &read (std::istream &is)
+ {
+ int prime;
+ is >> prime;
+ modulus = (Element) prime;
+ modulusinv = 1 /((double) modulus );
+#ifdef DEBUG
+ if(prime <= 1) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
+ integer max;
+ if(prime > FieldTraits< Modular<Element> >::maxModulus(max)) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
+#endif
+
+ return is;
+ }
+
+ inline std::ostream &write (std::ostream &os, const Element &x) const
+ {
+ return os << x;
+ }
+
+ inline std::istream &read (std::istream &is, Element &x) const
+ {
+ integer tmp;
+ is >> tmp;
+ init(x,tmp);
+ return is;
+ }
+
+
+ inline Element &init (Element &x, const integer &y) const
+ {
+ x =(Element)((int16_t) (y % (long) (modulus)));
+ if (x < 0) x=Element(x+modulus);
+ return x;
+ }
+
+ inline Element& init(Element& x, int y ) const
+ {
+ x = Element(y % int(modulus));
+ if ( x < 0 ) x=Element(x+modulus);
+ return x;
+ }
+
+ inline Element& init(Element& x, long y) const
+ {
+ x = Element(y % long(modulus));
+ if ( x < 0 ) x=Element(x+modulus);
+ return x;
+ }
+
+ inline Element& init(Element& x, long unsigned y) const
+ {
+ x = Element (y % lmodulus);
+ if ( x < 0 ) x=Element(x+modulus);
+ return x;
+ }
+
+
+ Element& init(Element&x) const
+ {
+ return x = 0 ;
+ }
+
+ inline Element& assign(Element& x, const Element& y) const
+ {
+ return x=y;
+ }
+
+
+ inline bool areEqual (const Element &x, const Element &y) const
+ {
+ return x == y;
+ }
+
+ inline bool isZero (const Element &x) const
+ {
+ return x == 0;
+ }
+
+ inline bool isOne (const Element &x) const
+ {
+ return x == 1;
+ }
+
+ inline Element &add (Element &x, const Element &y, const Element &z) const
+ {
+ x = Element(y + z);
+ if ( (uint8_t)x >= modulus )
+ x =Element(( (uint8_t)x )- modulus);
+ return x;
+ }
+
+ inline Element &sub (Element &x, const Element &y, const Element &z) const
+ {
+ x = Element(y - z);
+ if (x < 0) x=Element(x+modulus);
+ return x;
+ }
+
+ inline Element &mul (Element &x, const Element &y, const Element &z) const
+ {
+ Element q;
+
+ double ab=((double) y)* ((double) z);
+ q = (Element)(ab*modulusinv); // q could be off by (+/-) 1
+ x = (Element) (ab - ((double) q )* ((double) modulus));
+
+
+ if (x >= modulus)
+ x=Element(x-modulus);
+ else if (x < 0)
+ x=Element(x+modulus);
+
+ return x;
+ }
+
+ inline Element &div (Element &x, const Element &y, const Element &z) const
+ {
+ Element temp;
+ inv (temp, z);
+ return mul (x, y, temp);
+ }
+
+ inline Element &neg (Element &x, const Element &y) const
+ {
+ if(y==0) return x=0;
+ else return x=Element(modulus-y);
+ }
+
+ inline Element &inv (Element &x, const Element &y) const
+ {
+ Element d, t;
+ XGCD(d, x, t, y, modulus);
+#ifdef DEBUG
+ if (d != 1)
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"InvMod: inverse undefined");
+#endif
+ if (x < 0)
+ return x=Element(x+modulus);
+ else
+ return x;
+ }
+
+ inline Element &axpy (Element &r,
+ const Element &a,
+ const Element &x,
+ const Element &y) const
+ {
+ Element q;
+
+ double ab = ((double) a)* ((double) x) + y;
+ q = (Element)(ab*modulusinv); // q could be off by (+/-) 1
+ r = (Element) (ab - ((double) q )* ((double) modulus));
+
+
+ if (r >= modulus)
+ r=Element(r-modulus);
+ else if (x < 0)
+ r=Element(r+modulus);
+
+ return r;
+
+ }
+
+ inline Element &addin (Element &x, const Element &y) const
+ {
+ x = Element(x+y);
+ if ( ((uint8_t) x) >= modulus )
+ x = Element( ((uint8_t) x)-modulus );
+ return x;
+ }
+
+ inline Element &subin (Element &x, const Element &y) const
+ {
+ x = Element(x-y);
+ if (x < 0) x=Element(x+modulus);
+ return x;
+ }
+
+ inline Element &mulin (Element &x, const Element &y) const
+ {
+ return mul(x,x,y);
+ }
+
+ inline Element &divin (Element &x, const Element &y) const
+ {
+ return div(x,x,y);
+ }
+
+ inline Element &negin (Element &x) const
+ {
+ if (x == 0) return x;
+ else return x = Element(modulus - x);
+ }
+
+ inline Element &invin (Element &x) const
+ {
+ return inv (x, x);
+ }
+
+ inline Element &axpyin (Element &r, const Element &a, const Element &x) const
+ {
+
+
+ Element q;
+
+ double ab = ((double) a)* ((double) x) + r;
+ q = (Element)(ab*modulusinv); // q could be off by (+/-) 1
+ r = (Element) (ab - ((double) q )* ((double) modulus));
+
+
+ if (r >= modulus)
+ r=Element(r-modulus);
+ else if (x < 0)
+ r=Element(r+modulus);
+
+ return r;
+ }
+
+ static inline Element getMaxModulus()
+ {
+ return INT8_MAX;
+ } // 2^7-1
+
+
+ private:
+
+ static void XGCD(Element& d, Element& s, Element& t, Element a, Element b)
+ {
+ int32_t u, v, u0, v0, u1, v1, u2, v2, q, r;
+
+ Element aneg = 0, bneg = 0;
+
+ if (a < 0) {
+#ifdef DEBUG
+ if (a < -LINBOX_MAX_INT8) throw PreconditionFailed(__func__,__FILE__,__LINE__,"XGCD: integer overflow");
+#endif
+ a = Element(-a);
+ aneg = 1;
+ }
+
+ if (b < 0) {
+#ifdef DEBUG
+ if (b < -LINBOX_MAX_INT8) throw PreconditionFailed(__func__,__FILE__,__LINE__,"XGCD: integer overflow");
+#endif
+ b = (Element)-b;
+ bneg = 1;
+ }
+
+ u1 = 1; v1 = 0;
+ u2 = 0; v2 = 1;
+ u = a; v = b;
+
+ while (v != 0) {
+ q = u / v;
+ r = u % v;
+ u = v;
+ v = r;
+ u0 = u2;
+ v0 = v2;
+ u2 = u1 - q*u2;
+ v2 = v1- q*v2;
+ u1 = u0;
+ v1 = v0;
+ }
+
+ if (aneg)
+ u1 = -u1;
+
+ if (bneg)
+ v1 = -v1;
+
+ d = Element(u);
+ s = Element(u1);
+ t = Element(v1);
+ }
+
+ };
+
+ template <>
+ class FieldAXPY<Modular<int8_t> > {
+ public:
+
+ typedef int8_t Element;
+ typedef Modular<int8_t> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F),_y(0)
+ {
+ }
+
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field), _y (0)
+ {}
+
+ FieldAXPY<Modular<int8_t> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field;
+ _y = faxpy._y;
+
+ return *this;
+ }
+
+ inline uint64_t& mulacc (const Element &a, const Element &x)
+ {
+ uint64_t t = ( (uint16_t) a ) * ( (uint16_t) x );
+ return _y +=t;
+ }
+
+ inline uint64_t& accumulate (const Element &t)
+ {
+ return _y += (uint64_t)t;
+ }
+
+ inline Element& get (Element &y)
+ {
+ y = Element(_y % (uint64_t) _field.modulus);
+ return y;
+ }
+
+ inline FieldAXPY &assign (const Element y)
+ {
+ _y = (uint64_t) y;
+ return *this;
+ }
+
+ inline void reset()
+ {
+ _y = 0;
+ }
+
+ private:
+
+ Field _field;
+ uint64_t _y;
+ uint8_t _two_64;
+ };
+
+
+ template <>
+ class DotProductDomain<Modular<int8_t> > : private virtual VectorDomainBase<Modular<int8_t> > {
+
+ public:
+ typedef int8_t Element;
+ DotProductDomain (const Modular<int8_t> &F) :
+ VectorDomainBase<Modular<int8_t> > (F)
+ { }
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ typename Vector1::const_iterator i;
+ typename Vector2::const_iterator j;
+
+ uint64_t y = 0;
+ // uint64_t t;
+
+ for (i = v1.begin (), j = v2.begin (); i < v1.end (); ++i, ++j) {
+ y += ( (uint16_t) *i ) * ( (uint16_t) *j );
+ }
+
+
+ y %= (uint64_t) _field.modulus;
+
+ return res = (Element) y;
+
+ }
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ typename Vector1::first_type::const_iterator i_idx;
+ typename Vector1::second_type::const_iterator i_elt;
+
+ uint64_t y = 0;
+
+ for (i_idx = v1.first.begin (), i_elt = v1.second.begin (); i_idx != v1.first.end (); ++i_idx, ++i_elt) {
+ y += ( (uint16_t) *i_elt ) * ( (uint16_t) v2[*i_idx] );
+ }
+
+ y %= (uint64_t) _field.modulus;
+
+ return res = (Element)y;
+
+ }
+
+ };
+
+
+ template <>
+ class MVProductDomain<Modular<int8_t> >
+ {
+ public:
+
+ typedef int8_t Element;
+
+ protected:
+ template <class Vector1, class Matrix, class Vector2>
+ inline Vector1 &mulColDense
+ (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
+ {
+ return mulColDenseSpecialized
+ (VD, w, A, v, VectorTraits<typename Matrix::Column>::VectorCategory ());
+ }
+
+ private:
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const;
+
+ mutable std::vector<uint64_t> _tmp;
+ };
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int8_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseVectorTag) const
+ {
+
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i) {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
+ t = ((uint16_t) *k) * ((uint16_t) *j);
+
+ *l += t;
+
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int8_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i) {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
+ t = ((uint16_t) k->second) * ((uint16_t) *j);
+
+ _tmp[k->first] += t;
+
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int8_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const
+ {
+
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i) {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
+ t = ((uint16_t) k->second) * ((uint16_t) *j);
+
+ _tmp[k->first] += t;
+
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int8_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const
+ {
+
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::first_type::const_iterator k_idx;
+ typename Matrix::Column::second_type::const_iterator k_elt;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i) {
+ for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
+ k_idx != i->first.end ();
+ ++k_idx, ++k_elt, ++l)
+ {
+ t = ((uint16_t) *k_elt) * ((uint16_t) *j);
+
+ _tmp[*k_idx] += t;
+
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+}
+
+#ifdef __ICC
+#pragma warning(enable:2259)
+#endif
+
+#include "linbox/randiter/modular.h"
+#endif //__LINBOX_modular_bit_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Modular/modular-crooked-double.h b/linbox/field/Modular/modular-crooked-double.h
new file mode 100644
index 0000000..2ce863d
--- /dev/null
+++ b/linbox/field/Modular/modular-crooked-double.h
@@ -0,0 +1,616 @@
+
+/* linbox/field/modular-crooked-double.h
+ * Copyright (C) 2010 LinBox
+ *
+ * adapted from field/modular-balanced-double.h
+ * by Brice Boyer <brice.boyer at imag.fr>
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/*! @file field/Modular/modular-crooked-double.h
+ * @ingroup field
+ * @brief Crooked representation of <code>Z/mZ</code> over \c double .
+ * This is a balanced representation with more positive (or negative) representants.
+ * Being tested.
+ */
+#ifndef __LINBOX_modular_crooked_double_H
+#define __LINBOX_modular_crooked_double_H
+
+
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/util/field-axpy.h"
+#include "linbox/util/debug.h"
+#include <cmath>
+#include "linbox/field/field-traits.h"
+#include "linbox/randiter/modular-crooked.h"
+#include "linbox/randiter/nonzero.h"
+#include <iostream>
+
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+ template< class Element >
+ class ModularCrooked;
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template <class Element>
+ struct ClassifyRing<ModularCrooked<Element> >;
+
+ template <>
+ struct ClassifyRing<ModularCrooked<double> >
+ {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ class MultiModDouble;
+
+ /// \ingroup field
+ template <>
+ class ModularCrooked<double> : public FieldInterface {
+
+ protected:
+
+ double modulus;
+ double up_mod;
+ double lo_mod;
+ unsigned long lmodulus;
+
+ public:
+
+ friend class FieldAXPY<ModularCrooked<double> >;
+ friend class DotProductDomain<ModularCrooked<double> >;
+ friend class MultiModDouble;
+
+ typedef double Element;
+ const Element zero,one,mOne;
+ typedef ModularCrookedRandIter<double> RandIter;
+
+ static ClassifyRing <ModularCrooked<double> >::categoryTag
+ getCategory()
+ {
+ return ClassifyRing<ModularCrooked<double> >::categoryTag();
+ }
+
+ ModularCrooked ()
+ : zero(0),one(1),mOne(-1)
+ {}
+
+ ModularCrooked (int32_t p, float f = 0.5, int exp = 1) :
+ modulus((Element)p), up_mod( std::ceil((p-1.)*f) ), lo_mod( up_mod-modulus+1 ),lmodulus (p)
+ ,zero(0),one(1),mOne(-1)
+ {
+#ifdef DEBUG
+ if(modulus <= 1)
+ throw PreconditionFailed(__func__,
+ __LINE__,
+ "modulus must be > 1");
+ if( exp != 1 ) throw PreconditionFailed(__func__,
+ __LINE__,
+ "exponent must be 1");
+ integer max;
+ if (modulus > (double) FieldTraits<ModularCrooked<double> >::maxModulus(max))
+ throw PreconditionFailed (__func__,
+ __LINE__,
+ "modulus is too big");
+#endif
+ }
+
+ ModularCrooked (double p, float f = 0.5) :
+ modulus((Element)p), up_mod( std::ceil((p-1.)*f) ), lo_mod( up_mod-modulus+1 ),lmodulus ((unsigned long)p)
+ ,zero(0),one(1),mOne(-1)
+ {
+#ifdef DEBUG
+ if (modulus <= 1)
+ throw PreconditionFailed(__func__,
+ __LINE__,
+ "modulus must be > 1");
+ integer max;
+ if (modulus > (double) FieldTraits<ModularCrooked<double> >::maxModulus(max))
+ throw PreconditionFailed (__func__,
+ __LINE__,
+ "modulus is too big");
+#endif
+ }
+
+ ModularCrooked (long int p, float f = 0.5) :
+ modulus((double)p), up_mod( std::ceil((double)(p-1)*f) ), lo_mod( up_mod-modulus+1 ),lmodulus ((unsigned long)p)
+ ,zero(0),one(1),mOne(-1)
+ {
+#ifdef DEBUG
+ if ((double) modulus <= 1)
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
+ integer max;
+ if ((double) modulus > (double) FieldTraits<ModularCrooked<double> >::maxModulus(max))
+ throw PreconditionFailed (__func__,
+ __LINE__,
+ "modulus is too big");
+#endif
+ }
+
+ ModularCrooked (const integer& p, float f = 0.5) :
+ modulus((double)p), up_mod( std::ceil((double)(p-1)*f) ), lo_mod( up_mod-modulus+1 ),lmodulus (p)
+ ,zero(0),one(1),mOne(-1)
+ {
+#ifdef DEBUG
+ if(modulus <= 1)
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
+ if(modulus > getMaxModulus())
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
+#endif
+
+ }
+
+ ModularCrooked (const ModularCrooked<double>& mf) :
+ modulus (mf.modulus)
+ ,up_mod (mf.up_mod)
+ ,lo_mod (mf.lo_mod)
+ ,lmodulus (mf.lmodulus)
+ ,zero(mf.zero),one(mf.one),mOne(mf.mOne)
+ {}
+
+#if 1
+ const ModularCrooked &operator= (const ModularCrooked<double> &F)
+ {
+ modulus = F.modulus;
+ up_mod = F.up_mod;
+ lo_mod = F.lo_mod;
+ lmodulus= F.lmodulus;
+ return *this;
+ }
+#endif
+
+
+ inline integer &cardinality (integer &c) const
+ {
+ return c = integer(modulus);
+ }
+
+ inline integer &characteristic (integer &c) const
+ {
+ return c = integer(modulus);
+ }
+
+ inline unsigned long &characteristic (unsigned long &c) const
+ {
+ return c = (unsigned long)lmodulus;
+ }
+
+ inline size_t characteristic () const
+ {
+ return (size_t)modulus;
+ }
+
+
+ inline integer &convert (integer &x, const Element &y) const
+ {
+ if ( y < 0. ) return x = integer (y + modulus) ;
+ else return x = integer (y);
+ }
+
+ inline double &convert (double &x, const Element& y) const
+ {
+ return x=y;
+ }
+
+ inline float &convert (float &x, const Element& y) const
+ {
+ return x=(float)y;
+ }
+
+ std::ostream &write (std::ostream &os) const
+ {
+ // os << modulus << '(' << lo_mod << ',' << up_mod << ')' << std::endl;
+ os << "crooked double mod " << int(modulus) << " @ " ;
+ os.precision(2) ;
+ os << (double)up_mod/(modulus-1);
+ os.precision();
+ return os ;
+ }
+
+ std::istream &read (std::istream &is)
+ {
+ is >> modulus;
+#ifdef DEBUG
+ if(modulus <= 1)
+ throw PreconditionFailed (__func__,
+ __LINE__,
+ "modulus must be > 1");
+ if(modulus > getMaxModulus())
+ throw PreconditionFailed (__func__,
+ __LINE__,
+ "modulus is too big");
+#endif
+ return is;
+ }
+
+ std::ostream &write (std::ostream &os, const Element &x) const
+ {
+ return os << int(x);
+ }
+
+ std::istream &read (std::istream &is, Element &x) const
+ {
+ integer tmp;
+ // JGD : should'nt it be double tmp ???
+ is >> tmp;
+ init(x,tmp);
+ return is;
+ }
+
+
+ inline Element &init (Element &x, const integer &y) const {
+ x = (Element)(y%lmodulus);
+ if (x < lo_mod) return x += modulus;
+ if (x > up_mod) x -= modulus;
+
+ return x;
+ }
+
+ inline Element& init(Element& x, const double y=0) const
+ {
+
+ // x = (Element)((long unsigned)y)%(lmodulus);
+ // x = ((long int)y) % (lmodulus);
+ x = fmod(y,modulus);
+ if (x < lo_mod) return x += modulus;
+ if (x > up_mod) x -= modulus;
+ return x;
+ }
+
+ inline Element& assign(Element& x, const Element& y) const
+ {
+ return x = y;
+ }
+
+ inline bool areEqual (const Element &x, const Element &y) const
+ {
+ return x == y;
+ }
+
+ inline bool isZero (const Element &x) const
+ {
+ return x == 0.;
+ }
+
+ inline bool isOne (const Element &x) const
+ {
+ return x == 1.;
+ }
+
+ inline bool isMinusOne (const Element &x) const
+ {
+ return (x == -1.);
+ }
+
+ inline Element &add (Element &x,
+ const Element &y,
+ const Element &z) const
+ {
+ x = y + z;
+ if ( x < lo_mod ) return x += modulus;
+ if ( x > up_mod ) x -= modulus;
+ return x;
+ }
+
+ inline Element &sub (Element &x,
+ const Element &y,
+ const Element &z) const
+ {
+ x = y - z;
+ if (x < lo_mod ) return x += modulus;
+ if (x > up_mod ) x -= modulus;
+ return x;
+ }
+
+ inline Element &mul (Element &x, const Element &y, const Element &z) const
+ {
+ x = y * z;
+ return init (x,x);
+ }
+
+ inline Element &div (Element &x, const Element &y, const Element &z) const
+ {
+ Element temp;
+ inv (temp, z);
+ return mul (x, y, temp);
+ }
+
+ inline Element &neg (Element &x, const Element &y) const
+ {
+ return x = -y;
+ }
+
+ inline Element &inv (Element &x, const Element &y) const
+ {
+ // The extended Euclidean algoritm
+ int x_int, y_int, q, tx, ty, temp;
+ x_int = int (modulus);
+ y_int = (y < 0.) ? int(y + modulus) : int(y);
+ tx = 0;
+ ty = 1;
+
+ while (y_int != 0) {
+ // always: gcd (modulus,residue) = gcd (x_int,y_int)
+ // sx*modulus + tx*residue = x_int
+ // sy*modulus + ty*residue = y_int
+ q = x_int / y_int; // integer quotient
+ temp = y_int; y_int = x_int - q * y_int;
+ x_int = temp;
+ temp = ty; ty = tx - q * ty;
+ tx = temp;
+ }
+ if ( tx < lo_mod ) return x = tx + modulus;
+ if ( tx > up_mod ) return x = tx - modulus;
+ return x = (double) tx;
+ }
+
+ inline Element &axpy (Element &r,
+ const Element &a,
+ const Element &x,
+ const Element &y) const
+ {
+ r = a * x + y;
+ return init (r, r);
+ }
+
+ inline Element &addin (Element &x, const Element &y) const
+ {
+ x += y;
+ if ( x < lo_mod ) return x += modulus;
+ if ( x > up_mod ) x -= modulus;
+ return x;
+ }
+
+ inline Element &subin (Element &x, const Element &y) const
+ {
+ x -= y;
+ if ( x < lo_mod ) return x += modulus;
+ if ( x > up_mod ) x -= modulus;
+ return x;
+ }
+
+ inline Element &mulin (Element &x, const Element &y) const
+ {
+ return mul(x,x,y);
+ }
+
+ inline Element &divin (Element &x, const Element &y) const
+ {
+ return div(x,x,y);
+ }
+
+ inline Element &negin (Element &x) const
+ {
+ return x = -x;
+ }
+
+ inline Element &invin (Element &x) const
+ {
+ return inv (x, x);
+ }
+
+ inline Element &axpyin (Element &r, const Element &a, const Element &x) const
+ {
+ r += a * x;
+ return init (r, r);
+ }
+
+ unsigned long AccBound(const Element&r) const
+ {
+ double max_double = (double) (1ULL<<DBL_MANT_DIG) - modulus ;
+ double p = std::max(up_mod,-lo_mod) ;
+ if (areEqual(zero,r))
+ return (unsigned long) (double(max_double)/p) ;
+ else if (areEqual(one,r))
+ {
+ if (modulus>= getMaxModulus())
+ return 0 ;
+ else
+ return (unsigned long) (double(max_double)/(p*p)) ;
+ }
+ else
+ throw LinboxError("Bad input, expecting 0 or 1");
+ return 0;
+ }
+
+
+ static inline double getMaxModulus()
+ { return 67108864.0; } // 2^26
+
+ };
+
+#define SQR(A) \
+ ((A)*(A))
+
+ template <>
+ class FieldAXPY<ModularCrooked<double> > {
+ public:
+
+ typedef double Element;
+ typedef ModularCrooked<double> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F), _y(0.) , _bound( (double) ((1ULL << 53) - (int) (SQR(std::max(_field.up_mod,-_field.lo_mod)))))
+ {}
+
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field),
+ _y(faxpy._y), _bound(faxpy._bound)
+ {}
+
+ FieldAXPY<ModularCrooked<double> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field;
+ _y= faxpy._y;
+ _bound= faxpy._bound;
+ return *this;
+ }
+
+ inline Element& mulacc (const Element &a, const Element &x) {
+ // Element tmp= a*x;
+ // return accumulate(tmp);
+ return accumulate(a*x);
+ }
+
+ inline Element& accumulate (const Element &tmp) {
+ _y += tmp;
+ if (_y > _bound)
+ return _y = drem (_y, _field.modulus);
+ else
+ return _y;
+ }
+ inline Element& subumulate (const Element &tmp) {
+ _y -= tmp;
+ if (_y < 0)
+ return _y += _field.modulus;
+ else
+ return _y;
+ }
+
+ inline Element& get (Element &y) {
+ _y = drem (_y, _field.modulus);
+ return y=_y ;
+ }
+
+ inline FieldAXPY &assign (const Element y) {
+ _y = y;
+ return *this;
+ }
+
+ inline void reset() {
+ _y = 0.;
+ }
+
+ inline Element& set (const Element &tmp) {
+ _y = tmp;
+ if (_y > _bound)
+ return _y = drem (_y, _field.modulus);
+ else
+ return _y;
+ }
+
+ private:
+
+ Field _field;
+ double _y;
+ double _bound;
+ };
+
+ template <>
+ class DotProductDomain<ModularCrooked<double> > : private virtual VectorDomainBase<ModularCrooked<double> > {
+ private:
+ double _bound;
+ size_t _nmax;
+
+ public:
+ typedef double Element;
+ DotProductDomain (const ModularCrooked<double> &F) :
+ VectorDomainBase<ModularCrooked<double> > (F), _bound( (double) ( (1ULL<<53) - (int) (SQR(std::max(_field.up_mod,-_field.lo_mod)))))
+ {
+ _nmax= (size_t)floor((double(1<<26)* double(1<<26)*2.)/ (SQR(std::max(_field.up_mod,-_field.lo_mod))));
+ }
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ double y = 0.;
+ double t = 0.;
+ if (v1.size() < _nmax) {
+ for (size_t i = 0; i< v1.size();++i)
+ y += v1[i] * v2[i] ;
+ y = drem(y, _field.modulus);
+ }
+ else{
+ size_t i=0;
+ for (;i< v1.size()- _nmax ;i=i+_nmax){
+ for (size_t j=i;j<i+_nmax;++j)
+ y += v1[j] * v2[j];
+ t+=drem(y, _field.modulus);
+ y=0.;
+ }
+ for (;i < v1.size();++i)
+ y += v1[i] * v2[i];
+ t+=drem(y, _field.modulus);
+ y = drem(t, _field.modulus);
+ }
+ return res = y;
+ }
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ double y = 0.;
+ double t =0.;
+
+
+ if (v1.first.size() < _nmax) {
+ for (size_t i=0;i<v1.first.size();++i)
+ y+= v1.second[i] * v2[v1.first[i]];
+ y = drem(y, _field.modulus);
+ }
+ else {
+ size_t i=0;
+ for (;i< v1.first.size()- _nmax ;i=i+_nmax){
+ for (size_t j=i;j<i+_nmax;++j)
+ y += v1.second[j] * v2[v1.first[j]];
+ t+=drem(y, _field.modulus);
+ y=0.;
+ }
+ for (;i < v1.first.size();++i)
+ y += v1.second[i] * v2[v1.first[i]];
+ t+= drem(y, _field.modulus);
+ y = drem(t, _field.modulus);
+ }
+ return res = y;
+ }
+ };
+
+ template<class T>
+ std::ostream& operator<< (std::ostream & o, const ModularCrooked<T> & F)
+ {
+ return F.write(o);
+ }
+
+}
+#endif //__LINBOX_modular_crooked_double_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Modular/modular-double.h b/linbox/field/Modular/modular-double.h
new file mode 100644
index 0000000..d630b37
--- /dev/null
+++ b/linbox/field/Modular/modular-double.h
@@ -0,0 +1,381 @@
+/* linbox/field/modular-double.h
+ * Copyright (C) 2003 Pascal Giorgi
+ *
+ * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/*! @file field/Modular/modular-double.h
+ * @ingroup field
+ * @brief Standard representation of <code>Z/mZ</code> over \c double .
+ */
+
+#ifndef __LINBOX_modular_double_H
+#define __LINBOX_modular_double_H
+
+
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/util/field-axpy.h"
+#include "linbox/util/debug.h"
+#include <math.h>
+#include "linbox/randiter/nonzero.h"
+#include "linbox/randiter/modular.h"
+
+#include <fflas-ffpack/field/modular-double.h>
+
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+ template< class Element >
+ class Modular;
+
+ template< class Element >
+ class ModularRandIter;
+
+ template< class Field, class RandIter >
+ class NonzeroRandIter;
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template <class Element>
+ struct ClassifyRing<Modular<Element> >;
+
+ template <>
+ struct ClassifyRing<Modular<double> > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ class MultiModDouble;
+
+ /*! \ingroup modular
+ * Standard representation of \f$\mathbf{Z}/m\mathbf{Z}\f$.
+ * If \c m is the modulus, then elements are represented in \f[ \left
+ * \llbracket 0, m-1 \right \rrbracket.\f]
+ */
+ template <>
+ class Modular<double> :
+ public FFPACK::Modular<double>,public FieldInterface {
+ public:
+ typedef double Element;
+
+ protected:
+
+ public:
+ typedef FFPACK::Modular<double> Father_t;
+ friend class FieldAXPY<Modular<Element> >;
+ friend class DotProductDomain<Modular<Element> >;
+ friend class MultiModDouble;
+
+ public:
+
+ typedef ModularRandIter<Element> RandIter;
+
+ static ClassifyRing<Modular<Element> >::categoryTag getCategory()
+ {
+ return ClassifyRing<Modular<Element> >::categoryTag();
+ }
+
+ Modular (const integer& p, int e=1) :
+ Father_t((unsigned long) p)
+ {
+ linbox_check(e==1);
+#ifdef DEBUG
+ if(modulus <= 1)
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
+ if(modulus > getMaxModulus())
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
+#endif
+ }
+
+ Modular () : Father_t() {};
+
+ using Father_t ::cardinality ;
+ integer &cardinality (integer &c) const
+ {
+ return c = integer(modulus);
+ }
+
+ using Father_t ::characteristic;
+ integer &characteristic (integer &c) const
+ {
+ return c = integer(modulus);
+ }
+
+ using Father_t ::convert;
+ integer &convert (integer &x, const Element &y) const
+ {
+ return x = integer(y);
+ }
+
+
+
+ //!@bug use FFPACK operator
+ const Modular<double> &operator=(const Modular<double> &F)
+ {
+ if ( this == &F)
+ return *this;
+ modulus = F.modulus;
+ lmodulus = F.lmodulus;
+
+ F.assign(const_cast<Element&>(one),F.one);
+ F.assign(const_cast<Element&>(zero),F.zero);
+ F.assign(const_cast<Element&>(mOne),F.mOne);
+ return *this;
+ }
+
+
+ using Father_t ::init;
+ Element &init (Element &x, const integer &y) const
+ {
+ x = (Element)(y%lmodulus);
+ if (x<0) x+= modulus ;
+ linbox_check(x < lmodulus);
+ linbox_check(!(x < 0));
+ return x ;
+ }
+
+ Element &init (Element &x) const
+ {
+ return x = 0 ;
+ }
+
+ bool isMinusOne (const Element &x) const
+ {
+ return (x == mOne);
+ }
+
+ /** Max number of operations before reducing
+ * @param r if \c r=0, we consider how many \c += are performable.
+ * if \c r=1, then we look for the maximum \c axpy operations doable.
+ * @return \p 0 if the field is too big, a positive number otherwise, \p -1 if infinity
+ * on general fields, it is \p 1.
+ */
+ unsigned long AccBound(const Element r) const
+ {
+ // Element One, Zero ; init(One,1UL) ; init(Zero,0UL);
+ Element max_Element = (Element) (1ULL<<DBL_MANT_DIG) - modulus ; /* other wise 2^52+(2^52-1) */
+ Element p = modulus-1 ;
+ if (areEqual(zero,r))
+ return (unsigned long) (Element(max_Element)/p) ;
+ else if (areEqual(one,r))
+ {
+ if (modulus>= getMaxModulus())
+ return 0 ;
+ else
+ return (unsigned long) (Element(max_Element)/(modulus*modulus)) ;
+ }
+ else
+ throw LinboxError("Bad input, expecting 0 or 1");
+ return 0;
+ }
+
+ };
+
+} // LinBox
+
+// FieldAXPY/DotProductDomain
+namespace LinBox
+{
+
+ template <>
+ class FieldAXPY<Modular<double> > {
+ public:
+
+ typedef double Element;
+ typedef Modular<double> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F) , //_invmod(1./_field.modulus),
+ _y(0.) , _bound( (double) ((1ULL << 53) - (unsigned long int) (_field.modulus*_field.modulus)))
+ {}
+
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field),// _invmod(faxpy._invmod) ,
+ _y(faxpy._y), _bound(faxpy._bound)
+ {}
+
+#if 0
+ FieldAXPY<Modular<double> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field;
+ //_invmod= faxpy._invmod;
+ _y= faxpy._y;
+ _bound= faxpy._bound;
+ return *this;
+ }
+#endif
+
+ Element& mulacc (const Element &a, const Element &x)
+ {
+ // Element tmp= a*x;
+ // return accumulate(tmp);
+ return accumulate(a*x);
+ }
+
+ Element& accumulate (const Element &tmp)
+ {
+ _y += tmp;
+ if (_y > _bound)
+ return _y = fmod (_y, _field.modulus);
+ else
+ return _y;
+ }
+
+ Element& subumulate (const Element &tmp)
+ {
+ _y -= tmp;
+ if (_y < 0)
+ return _y += _field.modulus;
+ else
+ return _y;
+ }
+
+ Element& get (Element &y)
+ {
+ _y = fmod (_y, _field.modulus);
+ return y=_y ;
+ }
+
+ FieldAXPY &assign (const Element y)
+ {
+ _y = y;
+ return *this;
+ }
+
+ void reset()
+ {
+ _y = 0.;
+ }
+
+ Element& set (const Element &tmp)
+ {
+ _y = tmp;
+ if (_y > _bound)
+ return _y = fmod (_y, _field.modulus);
+ else
+ return _y;
+ }
+
+ private:
+
+ Field _field;
+ //double _invmod;
+ double _y;
+ double _bound;
+ };
+
+ template <>
+ class DotProductDomain<Modular<double> > : private virtual VectorDomainBase<Modular<double> > {
+ private:
+ double _bound;
+ size_t _nmax;
+ //double _invmod;
+
+ public:
+ typedef double Element;
+ DotProductDomain (const Modular<double> &F) :
+ VectorDomainBase<Modular<double> > (F), _bound( (double) ( (1ULL<<53) - (unsigned long int) (F.modulus*F.modulus)))//, _invmod(1./_field.modulus)
+ {
+ _nmax= (size_t)floor((double(1<<26)* double(1<<26)*2.)/ (F.modulus * F.modulus));
+ _nmax = (_nmax>0?_nmax:1);
+ }
+
+ protected:
+ template <class Vector1, class Vector2>
+ Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ double y = 0.;
+ double t = 0.;
+ if (v1.size() < _nmax) {
+ for (size_t i = 0; i< v1.size();++i)
+ y += v1[i] * v2[i] ;
+ y = fmod(y, _field.modulus);
+ }
+ else{
+ size_t i=0;
+ for (;i< v1.size()- _nmax ;i=i+_nmax){
+ for (size_t j=i;j<i+_nmax;++j)
+ y += v1[j] * v2[j];
+ t+=fmod(y, _field.modulus);
+ y=0.;
+ }
+ for (;i < v1.size();++i)
+ y += v1[i] * v2[i];
+ t+=fmod(y, _field.modulus);
+ y = fmod(t, _field.modulus);
+ }
+ return res = y;
+ }
+
+ template <class Vector1, class Vector2>
+ Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ double y = 0.;
+ double t =0.;
+
+
+ if (v1.first.size() < _nmax) {
+ for (size_t i=0;i<v1.first.size();++i)
+ y+= v1.second[i] * v2[v1.first[i]];
+ y = fmod(y, _field.modulus);
+ }
+ else {
+ size_t i=0;
+ for (;i< v1.first.size()- _nmax ;i=i+_nmax){
+ for (size_t j=i;j<i+_nmax;++j)
+ y += v1.second[j] * v2[v1.first[j]];
+ t+=fmod(y, this->_field.modulus);
+ y=0.;
+ }
+ for (;i < v1.first.size();++i)
+ y += v1.second[i] * v2[v1.first[i]];
+ t+= fmod(y, _field.modulus);
+ y = fmod(t, _field.modulus);
+ }
+ return res = y;
+ }
+ };
+}
+
+
+#endif //__LINBOX_modular_double_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Modular/modular-float.h b/linbox/field/Modular/modular-float.h
new file mode 100644
index 0000000..8c4c5db
--- /dev/null
+++ b/linbox/field/Modular/modular-float.h
@@ -0,0 +1,335 @@
+/* linbox/field/modular-float.h
+ * Copyright (C) 2003 Pascal Giorgi
+ * 2007 Clement Pernet
+ * Written by Clement Pernet <cpernet at uwaterloo.ca>
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/*! @file field/Modular/modular-float.h
+ * @ingroup field
+ * @brief representation of <code>Z/mZ</code> over \c float .
+ */
+
+#ifndef __LINBOX_modular_float_H
+#define __LINBOX_modular_float_H
+
+#ifdef __INTEL_COMPILER
+#define FmodF fmodf
+#else
+#define FmodF fmod
+#endif
+
+
+
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/util/field-axpy.h"
+#include "linbox/util/debug.h"
+#include <math.h>
+#include "linbox/field/field-traits.h"
+#include "linbox/randiter/nonzero.h"
+
+#include <fflas-ffpack/field/modular-float.h>
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+ template< class Element >
+ class Modular;
+ template< class Element >
+ class ModularRandIter;
+
+ template< class Field, class RandIter >
+ class NonzeroRandIter;
+
+ template <class Ring>
+ struct ClassifyRing;
+ template <class Element>
+ struct ClassifyRing<Modular<Element> >;
+ template <>
+ struct ClassifyRing<Modular<float> > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ class MultiModFloat;
+
+ /// \ingroup field
+ template <>
+ class Modular<float> : public FieldInterface,
+ public FFPACK::Modular<float> {
+
+ public :
+ typedef float Element;
+ typedef FFPACK::Modular<float> Father_t ;
+ using Father_t::one ;
+ using Father_t::zero ;
+ using Father_t::mOne ;
+
+ public:
+ friend class FieldAXPY<Modular<Element> >;
+ friend class DotProductDomain<Modular<Element> >;
+ friend class MultiModFloat;
+
+ typedef ModularRandIter<Element> RandIter;
+
+ static ClassifyRing<Modular<Element> >::categoryTag getCategory()
+ {
+ return ClassifyRing<Modular<Element> >::categoryTag();
+ }
+
+ Modular (const integer& p, int e = 1) :
+ Father_t((unsigned long)p)
+ {
+#ifdef DEBUG
+ if(modulus <= 1)
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
+ integer max;
+ if(modulus > (Element) FieldTraits<Modular<Element> >::maxModulus(max))
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
+#endif
+
+ }
+
+ using Father_t ::cardinality ;
+ integer &cardinality (integer &c) const
+ {
+ return c = integer(modulus);
+ }
+
+ using Father_t ::characteristic;
+ integer &characteristic (integer &c) const
+ {
+ return c = integer(modulus);
+ }
+
+ using Father_t ::convert;
+ integer &convert (integer &x, const Element &y) const
+ {
+ return x = integer(y);
+ }
+
+ using Father_t ::init;
+ Element &init (Element &x, const integer &y) const
+ {
+ x = (Element)(y%lmodulus);
+
+ if (x<0) return x+=modulus ;
+ return x;
+ }
+
+ Element &init(Element &x) const
+ {
+ return x = 0 ;
+ }
+
+ unsigned long AccBound(const Element&r) const
+ {
+ double max_double = (double) (1ULL<<FLT_MANT_DIG) - modulus ;
+ double p = modulus-1 ;
+ if (areEqual(zero,r))
+ return (unsigned long) (double(max_double)/p) ;
+ else if (areEqual(one,r))
+ {
+ if (modulus>= getMaxModulus())
+ return 0 ;
+ else
+ return (unsigned long) (double(max_double)/(modulus*modulus)) ;
+ }
+ else
+ throw LinboxError("Bad input, expecting 0 or 1");
+ return 0;
+ }
+
+ };
+
+ template <>
+ class FieldAXPY<Modular<float> > {
+ public:
+
+ typedef float Element;
+ typedef Modular<float> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F) , //_invmod(1./_field.modulus),
+ _y(0.) , _bound( (float) ( (1UL << 23) - (unsigned long int) (_field.modulus*_field.modulus)))
+ {}
+
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field),// _invmod(faxpy._invmod) ,
+ _y(faxpy._y), _bound(faxpy._bound)
+ {}
+
+#if 0
+ FieldAXPY<Modular<float> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field ;
+ //_invmod= faxpy._invmod;
+ _y = faxpy._y;
+ _bound= faxpy._bound;
+ return *this;
+ }
+#endif
+
+ inline Element& mulacc (const Element &a, const Element &x)
+ {
+ Element tmp= a*x;
+ return accumulate(tmp);
+ }
+
+ inline Element& accumulate (const Element &tmp)
+ {
+ _y += tmp;
+ if (_y > _bound)
+ return _y = fmodf (_y, _field.modulus);
+ else
+ return _y;
+ }
+
+ inline Element& get (Element &y)
+ {
+ _y = fmodf (_y, _field.modulus);
+ return y=_y ;
+ }
+
+ inline FieldAXPY &assign (const Element y)
+ {
+ _y = y;
+ return *this;
+ }
+
+ inline void reset()
+ {
+ _y = 0.;
+ }
+
+ private:
+
+ Field _field;
+ //float _invmod;
+ float _y;
+ float _bound;
+ };
+
+
+ template <>
+ class DotProductDomain<Modular<float> > : private virtual VectorDomainBase<Modular<float> > {
+ private:
+ float _bound;
+ size_t _nmax;
+ //float _invmod;
+
+ public:
+ typedef float Element;
+ DotProductDomain (const Modular<float> &F) :
+ VectorDomainBase<Modular<float> > (F)
+ , _bound( (float) ( (1<<23) - (int) (_field.modulus*_field.modulus)))
+ //, _invmod(1./_field.modulus)
+ {
+ _nmax= (size_t)floor((float(1<<11)* float(1<<12))/ (_field.modulus * _field.modulus));
+ }
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ float y = 0.;
+ float t = 0.;
+ if (v1.size() < _nmax)
+ {
+ for (size_t i = 0; i< v1.size();++i)
+ y += v1[i] * v2[i] ;
+ y = fmodf(y, _field.modulus);
+ }
+ else
+ {
+ size_t i=0;
+ for (;i< v1.size()- _nmax ;i=i+_nmax)
+ {
+ for (size_t j=i;j<i+_nmax;++j)
+ y += v1[j] * v2[j];
+ t+=fmodf(y, _field.modulus);
+ y=0.;
+ }
+ for (;i < v1.size();++i)
+ y += v1[i] * v2[i];
+ t+=fmodf(y, _field.modulus);
+ y = fmodf(t, _field.modulus);
+ }
+ return res = y;
+ }
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ float y = 0.;
+ float t =0.;
+
+
+ if (v1.first.size() < _nmax)
+ {
+ for (size_t i=0;i<v1.first.size();++i)
+ y+= v1.second[i] * v2[v1.first[i]];
+ y = fmodf(y, _field.modulus);
+ }
+ else
+ {
+ size_t i=0;
+ for (;i< v1.first.size()- _nmax ;i=i+_nmax)
+ {
+ for (size_t j=i;j<i+_nmax;++j)
+ y += v1.second[j] * v2[v1.first[j]];
+ t+=fmodf(y, _field.modulus);
+ y=0.;
+ }
+ for (;i < v1.first.size();++i)
+ y += v1.second[i] * v2[v1.first[i]];
+ t+= fmodf(y, _field.modulus);
+ y = fmodf(t, _field.modulus);
+ }
+ return res = y;
+ }
+ };
+}
+
+#include "linbox/randiter/modular.h"
+
+#undef FmodF
+
+#endif //__LINBOX_modular_float_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Modular/modular-int32.h b/linbox/field/Modular/modular-int32.h
new file mode 100644
index 0000000..dbb69ba
--- /dev/null
+++ b/linbox/field/Modular/modular-int32.h
@@ -0,0 +1,526 @@
+/* Copyright (C) 2010 LinBox
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file field/Modular/modular-int32.h
+ * @ingroup field
+ * @brief representation of <code>Z/mZ</code> over \c int32_t .
+ */
+#ifndef __LINBOX_modular_int32_H
+#define __LINBOX_modular_int32_H
+
+
+#include <math.h>
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/util/debug.h"
+#include "linbox/field/field-traits.h"
+
+#include <fflas-ffpack/field/modular-int32.h>
+
+#ifndef LINBOX_MAX_INT /* 2147483647 */
+#define LINBOX_MAX_INT INT32_MAX
+#endif
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+ template< class Element >
+ class Modular;
+ template< class Element >
+ class ModularRandIter;
+ template< class Field, class RandIter >
+ class NonzeroRandIter;
+
+ template<class Field>
+ class DotProductDomain;
+ template<class Field>
+ class FieldAXPY;
+ template<class Field>
+ class MVProductDomain;
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template <class Element>
+ struct ClassifyRing<Modular<Element> >;
+
+ template <>
+ struct ClassifyRing<Modular<int32_t> > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+
+
+ /** \brief Specialization of Modular to int32_t element type with efficient dot product.
+ *
+ * Efficient element operations for dot product, mul, axpy, by using floating point
+ * inverse of modulus (borrowed from NTL) and some use of non-normalized intermediate values.
+ *
+ * For some uses this is the most efficient field for primes in the range from half word
+ * to 2^30.
+ *
+ * Requires: Modulus < 2^30.
+ * Intended use: 2^15 < prime modulus < 2^30.
+ \ingroup field
+ */
+ template <>
+ class Modular<int32_t> : public FieldInterface ,
+ public ::FFPACK::Modular<int32_t> {
+
+ protected:
+
+ public:
+
+ friend class FieldAXPY<Modular<int32_t> >;
+ friend class DotProductDomain<Modular<int32_t> >;
+ friend class MVProductDomain<Modular<int32_t> >;
+
+ typedef FFPACK::Modular<int32_t> Father_t;
+
+ typedef int32_t Element;
+ typedef ModularRandIter<int32_t> RandIter;
+
+ Modular (integer &p) :
+ Father_t((unsigned long)p)
+ {}
+
+ Modular (int32_t value, int32_t exp=1) :
+ Father_t(value,exp)
+ {}
+#if (FFLAFLAS_VERSIONW>10400)
+ Modular (long value) :
+ Father_t(value)
+ {}
+#endif
+
+ Modular (unsigned long value) :
+ Father_t(value)
+ {}
+
+ using Father_t ::cardinality;
+ integer &cardinality (integer &c) const
+ {
+ return c = modulus;
+ }
+
+ using Father_t ::characteristic;
+ integer &characteristic (integer &c) const
+ {
+ return c = modulus;
+ }
+
+
+
+ using Father_t ::convert;
+ integer &convert (integer &x, const Element &y) const
+ {
+ return x = y;
+ }
+
+
+ using Father_t ::init;
+ Element &init (Element &x, const integer &y) const
+ {
+ x = Element (y % lmodulus);
+ if (x < 0) x += modulus;
+ return x;
+ }
+
+ unsigned long AccBound(const Element&r) const
+ {
+ // Element one, zero ; init(one,1UL) ; init(zero,0UL);
+ double max_double = (double) (INT_MAX) - modulus ;
+ double p = modulus-1 ;
+ if (areEqual(zero,r))
+ return (unsigned long) (max_double/p) ;
+ else if (areEqual(one,r))
+ {
+ if (modulus>= getMaxModulus())
+ return 0 ;
+ else
+ return (unsigned long) max_double/(unsigned long)(modulus*modulus) ;
+ }
+ else
+ throw LinboxError("Bad input, expecting 0 or 1");
+ return 0;
+ }
+
+ private:
+
+ };
+
+ template <>
+ class FieldAXPY<Modular<int32_t> > {
+ public:
+
+ typedef int32_t Element;
+ typedef Modular<int32_t> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F),_y(0)
+ { }
+
+
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field), _y (0)
+ {}
+
+ FieldAXPY<Modular<int32_t> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field;
+ _y = faxpy._y;
+ return *this;
+ }
+
+ uint64_t& mulacc (const Element &a, const Element &x)
+ {
+ uint64_t t = (uint64_t) a * (uint64_t) x;
+ _y += t;
+ if (_y < t) {
+ _y += (uint64_t)_field._two64;
+ return _y ;
+ }
+ else
+ return _y;
+ }
+
+ uint64_t& accumulate (const Element &t)
+ {
+ _y += (uint64_t) t;
+ if (_y < (uint64_t)t)
+ return _y += (uint64_t) _field._two64;
+ else
+ return _y;
+ }
+
+ Element& get (Element &y)
+ {
+ y = Element (_y % (uint64_t) _field.modulus);
+ return y;
+ }
+
+ FieldAXPY &assign (const Element y)
+ {
+ _y = (uint64_t) y;
+ return *this;
+ }
+
+ void reset()
+ {
+ _y = 0;
+ }
+
+ protected:
+ Field _field;
+ uint64_t _y;
+ };
+
+
+ template <>
+ class DotProductDomain<Modular<int32_t> > : private virtual VectorDomainBase<Modular<int32_t> > {
+
+ public:
+ typedef int32_t Element;
+ DotProductDomain (const Modular<int32_t> &F) :
+ VectorDomainBase<Modular<int32_t> > (F)
+ {}
+
+
+ protected:
+ template <class Vector1, class Vector2>
+ Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ typename Vector1::const_iterator i;
+ typename Vector2::const_iterator j;
+
+ uint64_t y = 0;
+ uint64_t t;
+
+ for (i = v1.begin (), j = v2.begin (); i < v1.end (); ++i, ++j)
+ {
+ t = ( (uint64_t) *i ) * ( (uint64_t) *j );
+ y += t;
+
+ if (y < t)
+ y += (uint64_t) _field._two64;
+ }
+
+ y %= (uint64_t) _field.modulus;
+ return res = Element(y);
+
+ }
+
+ template <class Vector1, class Vector2>
+ Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ typename Vector1::first_type::const_iterator i_idx;
+ typename Vector1::second_type::const_iterator i_elt;
+
+ uint64_t y = 0;
+ uint64_t t;
+
+ for (i_idx = v1.first.begin (), i_elt = v1.second.begin (); i_idx != v1.first.end (); ++i_idx, ++i_elt)
+ {
+ t = ( (uint64_t) *i_elt ) * ( (uint64_t) v2[*i_idx] );
+ y += t;
+
+ if (y < t)
+ y += (uint64_t) _field._two64;
+ }
+
+
+ y %= (uint64_t) _field.modulus;
+
+ return res = (Element) y;
+ }
+ };
+
+ // Specialization of MVProductDomain for int32_t modular field
+
+ template <>
+ class MVProductDomain<Modular<int32_t> > {
+ public:
+
+ typedef int32_t Element;
+
+ protected:
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDense
+ (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
+ {
+ return mulColDenseSpecialized
+ (VD, w, A, v, typename VectorTraits<typename Matrix::Column>::VectorCategory ());
+ }
+
+ private:
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const;
+
+ mutable std::vector<uint64_t> _tmp;
+ };
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int32_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseVectorTag) const
+ {
+
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i)
+ {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
+ {
+ t = ((uint64_t) *k) * ((uint64_t) *j);
+
+ *l += t;
+
+ if (*l < t)
+ *l += (uint64_t) VD.field ()._two64;
+ }
+ }
+
+ typename Vector1::iterator w_j;
+ typedef typename Vector1::value_type elements ;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = elements(*l % VD.field ().modulus);
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int32_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i) {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
+ t = ((uint64_t) k->second) * ((uint64_t) *j);
+
+ _tmp[k->first] += t;
+
+ if (_tmp[k->first] < t)
+ _tmp[k->first] += VD.field ()._two64;
+ }
+ }
+
+ typename Vector1::iterator w_j;
+ typedef typename Vector1::value_type val_t;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = (val_t)( *l % VD.field ().modulus );
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int32_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const
+ {
+
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i)
+ {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
+ {
+ t = ((uint64_t) k->second) * ((uint64_t) *j);
+
+ _tmp[k->first] += t;
+
+ if (_tmp[k->first] < t)
+ _tmp[k->first] += VD.field ()._two64;
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int32_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const
+ {
+
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::first_type::const_iterator k_idx;
+ typename Matrix::Column::second_type::const_iterator k_elt;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i)
+ {
+ for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
+ k_idx != i->first.end ();
+ ++k_idx, ++k_elt, ++l)
+ {
+ t = ((uint64_t) *k_elt) * ((uint64_t) *j);
+
+ _tmp[*k_idx] += t;
+
+ if (_tmp[*k_idx] < t)
+ _tmp[*k_idx] += VD.field ()._two64;
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+
+}
+
+#include "linbox/randiter/modular.h"
+
+#endif //__LINBOX_modular_int32_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Modular/modular-int64.h b/linbox/field/Modular/modular-int64.h
new file mode 100644
index 0000000..8a0e35d
--- /dev/null
+++ b/linbox/field/Modular/modular-int64.h
@@ -0,0 +1,505 @@
+/* Copyright (C) 2010 LinBox
+ * Adapted by B Boyer <brice.boyer at imag.fr>
+ * (from other modular-balanced* files)
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file field/Modular/modular-int64.h
+ * @ingroup field
+ * @brief representation of <code>Z/mZ</code> over \c int64_t .
+ */
+#ifndef __LINBOX_modular_int64_H
+#define __LINBOX_modular_int64_H
+
+
+#include <math.h>
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/util/debug.h"
+#include "linbox/field/field-traits.h"
+
+#include <fflas-ffpack/field/modular-int64.h>
+
+#ifndef LINBOX_MAX_INT64 /* 18446744073709551615L(L) is UINT64_MAX*/
+#ifdef __x86_64__
+#define LINBOX_MAX_INT64 INT64_MAX
+#else
+#define LINBOX_MAX_INT64 INT64_MAX
+#endif
+#endif
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+ template< class Element >
+ class Modular;
+ template< class Element >
+ class ModularRandIter;
+ template<class Field>
+ class DotProductDomain;
+ template<class Field>
+ class FieldAXPY;
+ template<class Field>
+ class MVProductDomain;
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template <class Element>
+ struct ClassifyRing<Modular<Element> >;
+
+ template <>
+ struct ClassifyRing<Modular<int64_t> > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+
+
+ /** \brief Specialization of Modular to int64_t element type with efficient dot product.
+ *
+ * Efficient element operations for dot product, mul, axpy, by using floating point
+ * inverse of modulus (borrowed from NTL) and some use of non-normalized intermediate values.
+ *
+ * For some uses this is the most efficient field for primes in the range from half word
+ * to 2^62.
+ *
+ * Requires: Modulus < 2^62.
+ * Intended use: 2^30 < prime modulus < 2^62.
+ \ingroup field
+ */
+ template <>
+ class Modular<int64_t> : public FieldInterface,
+ public FFPACK::Modular<int64_t> {
+
+ public:
+ typedef int64_t Element;
+
+ typedef FFPACK::Modular<int64_t> Father_t
+ friend class FieldAXPY<Modular<int64_t> >;
+ friend class DotProductDomain<Modular<int64_t> >;
+ friend class MVProductDomain<Modular<int64_t> >;
+
+ typedef ModularRandIter<int64_t> RandIter;
+
+ using Father_t ::cardinality;
+ inline integer &cardinality (integer &c) const
+ {
+ return c = modulus;
+ }
+
+ using Father_t ::characteristic;
+ inline integer &characteristic (integer &c) const
+ {
+ return c = modulus;
+ }
+
+ inline integer characteristic () const
+ {
+ return modulus;
+ }
+
+ using Father_t ::convert;
+ inline integer &convert (integer &x, const Element &y) const
+ {
+ return x = y;
+ }
+
+ using Father_t ::init;
+ inline Element &init (Element &x, const integer &y) const
+ {
+ x = Element (y % lmodulus);
+ if (x < 0) x += modulus;
+ return x;
+ }
+
+
+ private:
+
+
+ };
+
+ template <>
+ class FieldAXPY<Modular<int64_t> > {
+ public:
+
+ typedef int64_t Element;
+ typedef Modular<int64_t> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F),_y(0)
+ {}
+
+
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field), _y (0)
+ {}
+
+ FieldAXPY<Modular<int64_t> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field;
+ _y = faxpy._y;
+ return *this;
+ }
+
+ inline uint64_t& mulacc (const Element &a, const Element &x)
+ {
+ uint64_t t = (uint64_t) a * (uint64_t) x;
+ _y += t;
+ if (_y < t)
+ return _y += _field._two64;
+ else
+ return _y;
+ }
+
+ inline uint64_t& accumulate (const Element &t)
+ {
+ _y += t;
+ if (_y < (uint64_t)t)
+ return _y += _field._two64;
+ else
+ return _y;
+ }
+
+ inline Element& get (Element &y)
+ {
+ y =_y % (uint64_t) _field.modulus;
+ return y;
+ }
+
+ inline FieldAXPY &assign (const Element y)
+ {
+ _y = y;
+ return *this;
+ }
+
+ inline void reset()
+ {
+ _y = 0;
+ }
+
+ protected:
+ Field _field;
+ uint64_t _y;
+ };
+
+
+ template <>
+ class DotProductDomain<Modular<int64_t> > : private virtual VectorDomainBase<Modular<int64_t> > {
+
+ public:
+ typedef int64_t Element;
+ DotProductDomain (const Modular<int64_t> &F) :
+ VectorDomainBase<Modular<int64_t> > (F)
+ {}
+
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ typename Vector1::const_iterator i;
+ typename Vector2::const_iterator j;
+
+ uint64_t y = 0;
+ uint64_t t;
+
+ for (i = v1.begin (), j = v2.begin (); i < v1.end (); ++i, ++j)
+ {
+ t = ( (uint64_t) *i ) * ( (uint64_t) *j );
+ y += t;
+
+ if (y < t)
+ y += _field._two64;
+ }
+
+ y %= (uint64_t) _field.modulus;
+ return res = y;
+
+ }
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ typename Vector1::first_type::const_iterator i_idx;
+ typename Vector1::second_type::const_iterator i_elt;
+
+ uint64_t y = 0;
+ uint64_t t;
+
+ for (i_idx = v1.first.begin (), i_elt = v1.second.begin (); i_idx != v1.first.end (); ++i_idx, ++i_elt)
+ {
+ t = ( (uint64_t) *i_elt ) * ( (uint64_t) v2[*i_idx] );
+ y += t;
+
+ if (y < t)
+ y += _field._two64;
+ }
+
+
+ y %= (uint64_t) _field.modulus;
+
+ return res = y;
+ }
+ };
+
+ // Specialization of MVProductDomain for int64_t modular field
+
+ template <>
+ class MVProductDomain<Modular<int64_t> > {
+ public:
+
+ typedef int64_t Element;
+
+ protected:
+ template <class Vector1, class Matrix, class Vector2>
+ inline Vector1 &mulColDense
+ (const VectorDomain<Modular<int64_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
+ {
+ return mulColDenseSpecialized
+ (VD, w, A, v, typename VectorTraits<typename Matrix::Column>::VectorCategory ());
+ }
+
+ private:
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int64_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int64_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int64_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int64_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const;
+
+ mutable std::vector<uint64_t> _tmp;
+ };
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 & MVProductDomain<Modular<int64_t> >::
+ mulColDenseSpecialized (const VectorDomain<Modular<int64_t> > &VD,
+ Vector1 &w,
+ const Matrix &A,
+ const Vector2 &v,
+ VectorCategories::DenseVectorTag) const
+ {
+
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i)
+ {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
+ {
+ t = ((uint64_t) *k) * ((uint64_t) *j);
+
+ *l += t;
+
+ if (*l < t)
+ *l += VD.field ()._two64;
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int64_t> >::
+ mulColDenseSpecialized (const VectorDomain<Modular<int64_t> > &VD,
+ Vector1 &w,
+ const Matrix &A,
+ const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i)
+ {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
+ {
+ t = ((uint64_t) k->second) * ((uint64_t) *j);
+
+ _tmp[k->first] += t;
+
+ if (_tmp[k->first] < t)
+ _tmp[k->first] += VD.field ()._two64;
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int64_t> > ::
+ mulColDenseSpecialized(const VectorDomain<Modular<int64_t> > &VD,
+ Vector1 &w,
+ const Matrix &A,
+ const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const
+ {
+
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i)
+ {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
+ {
+ t = ((uint64_t) k->second) * ((uint64_t) *j);
+
+ _tmp[k->first] += t;
+
+ if (_tmp[k->first] < t)
+ _tmp[k->first] += VD.field ()._two64;
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int64_t> > ::
+ mulColDenseSpecialized (const VectorDomain<Modular<int64_t> > &VD,
+ Vector1 &w,
+ const Matrix &A,
+ const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const
+ {
+
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::first_type::const_iterator k_idx;
+ typename Matrix::Column::second_type::const_iterator k_elt;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i)
+ {
+ for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
+ k_idx != i->first.end ();
+ ++k_idx, ++k_elt, ++l)
+ {
+ t = ((uint64_t) *k_elt) * ((uint64_t) *j);
+
+ _tmp[*k_idx] += t;
+
+ if (_tmp[*k_idx] < t)
+ _tmp[*k_idx] += VD.field ()._two64;
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+
+}
+
+#undef LINBOX_MAX_INT64
+
+#include "linbox/randiter/modular.h"
+
+#endif //__LINBOX_modular_int64_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Modular/modular-short.h b/linbox/field/Modular/modular-short.h
new file mode 100644
index 0000000..e3236e2
--- /dev/null
+++ b/linbox/field/Modular/modular-short.h
@@ -0,0 +1,794 @@
+/* Copyright (C) 2010 LinBox
+ * Written by <?>
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file field/Modular/modular-short.h
+ * @ingroup field
+ * @brief representation of <code>Z/mZ</code> over \c short .
+ */
+#ifndef __LINBOX_modular_short_H
+#define __LINBOX_modular_short_H
+
+
+#include "math.h"
+#include "linbox/linbox-config.h"
+#include "linbox/integer.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/field/field-interface.h"
+#include "linbox/util/debug.h"
+#include "linbox/field/field-traits.h"
+
+#ifndef LINBOX_MAX_INT16 /* 32767 */
+#define LINBOX_MAX_INT16 INT16_MAX
+#endif
+
+#ifdef __ICC /* pas content avec x = -x par exemple */
+#pragma warning(disable:2259)
+#endif
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+
+ template<class Element>
+ class Modular;
+
+ template<class Element>
+ class ModularRandIter;
+
+ template<class Field>
+ class FieldAXPY;
+
+ template<class Field>
+ class DotProductDomain;
+
+ template<class Field>
+ class MVProductDomain;
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template <class Element>
+ struct ClassifyRing<Modular<Element> >;
+
+ template <>
+ struct ClassifyRing<Modular<short> >{
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ /** \brief Specialization of Modular to short element type with efficient dot product.
+ *
+ * Efficient element operations for dot product, mul, axpy, by using floating point
+ * inverse of modulus (borrowed from NTL) and some use of non-normalized intermediate values.
+ *
+ * Requires: modulus < 2^15.
+ * Intended use: 2^7 < prime modulus < 2^15.
+ \ingroup field
+ */
+ template <>
+ class Modular<int16_t> : public FieldInterface {
+ public:
+ typedef int16_t Element;
+ protected:
+ Element modulus;
+ unsigned long lmodulus;
+ double modulusinv;
+
+ public:
+ const Element one,zero,mOne;
+ friend class FieldAXPY<Modular<Element> >;
+ friend class DotProductDomain<Modular<Element> >;
+ friend class MVProductDomain<Modular<Element> >;
+
+ typedef ModularRandIter<Element> RandIter;
+
+ //default modular field,taking 251 as default modulus
+ Modular () :
+ modulus(251),lmodulus((unsigned long)modulus)
+ ,one((Element)1),zero((Element)0),mOne(Element(modulus-(Element)1))
+ {
+ modulusinv=1/(double)modulus;
+ }
+
+ Modular (int value, int exp = 1) :
+ modulus((Element)value),lmodulus((unsigned long) value)
+ ,one((Element)1),zero((Element)0),mOne(Element(modulus-(Element)1))
+ {
+ modulusinv = 1 / ((double) value);
+#ifdef DEBUG
+ if(value<=1)
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
+ integer max;
+ if(value>FieldTraits< Modular<Element> >::maxModulus(max))
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
+ if(exp != 1)
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
+#endif
+ }
+
+ Modular(const Modular<Element>& mf) :
+ modulus(mf.modulus),lmodulus(mf. lmodulus),modulusinv(mf.modulusinv)
+ ,one(mf.one),zero(mf.zero),mOne(mf.mOne)
+ {}
+
+ const Modular &operator=(const Modular<Element> &F)
+ {
+ modulus = F. modulus;
+ lmodulus = F. lmodulus ;
+ modulusinv = F. modulusinv;
+ F.assign(const_cast<Element&>(one),F.one);
+ F.assign(const_cast<Element&>(zero),F.zero);
+ F.assign(const_cast<Element&>(mOne),F.mOne);
+
+
+ return *this;
+ }
+
+ inline integer &cardinality (integer &c) const
+ {
+ return c = modulus;
+ }
+
+ inline integer &characteristic (integer &c) const
+ {
+ return c = modulus;
+ }
+
+ inline unsigned long cardinality () const
+ {
+ return lmodulus;
+ }
+
+ inline unsigned long characteristic () const
+ {
+ return lmodulus;
+ }
+
+
+ inline integer &convert (integer &x, const Element &y) const
+ {
+ return x = y;
+ }
+
+ inline std::ostream &write (std::ostream &os) const
+ {
+ return os << "Element mod " << modulus;
+ }
+
+ inline std::istream &read (std::istream &is)
+ {
+ int prime;
+ is >> prime;
+#ifdef DEBUG
+ if(prime <= 1) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
+ integer max;
+ if(prime > FieldTraits< Modular<Element> >::maxModulus(max)) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
+#endif
+ modulus = (Element) prime;
+ modulusinv = 1 /((double) modulus );
+
+ return is;
+ }
+
+ inline std::ostream &write (std::ostream &os, const Element &x) const
+ {
+ return os << x;
+ }
+
+ inline std::istream &read (std::istream &is, Element &x) const
+ {
+ integer tmp;
+ is >> tmp;
+ init(x,tmp);
+ return is;
+ }
+
+ template<class T>
+ inline Element &init (Element &x, const T& y) const
+ {
+ return init( x, static_cast<integer>(y) );
+ }
+
+ inline Element &init (Element &x, const integer &y) const
+ {
+ x = Element(y % lmodulus);
+ if (x < 0)
+ x = Element((int) x + (int)modulus);
+ return x;
+ }
+
+ inline Element& init(Element& x, int y) const
+ {
+ x = (Element)(y % int(modulus));
+ if ( x < 0 )
+ x = Element((int) x + (int)modulus);
+ return x;
+ }
+
+ inline Element& init(Element& x, long y) const
+ {
+ x = Element(y % (long)modulus);
+ if ( x < 0 )
+ x = Element((int) x + (int)modulus);
+ return x;
+ }
+
+ inline Element &init (Element & x, const double &y) const
+ {
+ double z = fmod(y, (double)modulus);
+ if (z < 0) z += (double)modulus;
+ //z += 0.5; // C Pernet Sounds nasty and not necessary
+ return x = static_cast<Element>(z); //rounds towards 0
+ }
+
+ inline Element &init (Element &x, const float &y) const
+ {
+ return init (x, (double) y);
+ }
+
+ Element &init(Element &x) const
+ {
+ return x = 0 ;
+ }
+ inline Element& assign(Element& x, const Element& y) const
+ {
+ return x = y;
+ }
+
+
+ inline bool areEqual (const Element &x, const Element &y) const
+ {
+ return x == y;
+ }
+
+ inline bool isZero (const Element &x) const
+ {
+ return x == 0;
+ }
+
+ inline bool isOne (const Element &x) const
+ {
+ return x == 1;
+ }
+
+ inline Element &add (Element &x, const Element &y, const Element &z) const
+ {
+ x = Element((int)y + (int)z);
+ if ( (uint16_t)x >= (uint16_t)modulus )
+ x = (Element) (( (uint16_t)x )- modulus);
+ return x;
+ }
+
+ inline Element &sub (Element &x, const Element &y, const Element &z) const
+ {
+ x = Element(y - z);
+ if (x < 0)
+ x = Element((int) x + (int)modulus);
+ return x;
+ }
+
+ inline Element &mul (Element &x, const Element &y, const Element &z) const
+ {
+ Element q;
+
+ double ab=((double) y)* ((double) z);
+ q = (Element)(ab*modulusinv); // q could be off by (+/-) 1
+ x = (Element) (ab - ((double) q )* ((double) modulus));
+
+
+ if (x >= modulus)
+ x = Element((int) x - (int)modulus);
+ else if (x < 0)
+ x = Element((int) x + (int)modulus);
+
+ return x;
+ }
+
+ inline Element &div (Element &x, const Element &y, const Element &z) const
+ {
+ Element temp;
+ inv (temp, z);
+ return mul (x, y, temp);
+ }
+
+ inline Element &neg (Element &x, const Element &y) const
+ {
+ if(y==0)
+ return x=0;
+ else
+ return x= Element(modulus-y);
+ }
+
+ inline Element &inv (Element &x, const Element &y) const
+ {
+ Element d, t;
+ XGCD(d, x, t, y, modulus);
+#ifdef DEBUG
+ if (d != 1)
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"InvMod: inverse undefined");
+#endif
+ if (x < 0)
+ return x = Element((int) x + (int)modulus);
+ else
+ return x;
+
+ }
+
+ inline Element &axpy (Element &r,
+ const Element &a,
+ const Element &x,
+ const Element &y) const
+ {
+ Element q;
+
+ double ab=((double) a)* ((double) x) + ( double ) y;
+ q = (Element)(ab*modulusinv); // q could be off by (+/-) 1
+ r = (Element) (ab - ((double) q )* ((double) modulus));
+
+
+ if (r >= modulus)
+ r = Element((int) r - (int)modulus);
+ else if (r < 0)
+ r = Element((int) r + (int)modulus);
+
+ return r;
+
+ }
+
+ inline Element &addin (Element &x, const Element &y) const
+ {
+ x = Element(x+y);
+ if ( ((uint16_t) x) >= (uint16_t)modulus )
+ x = Element( ((uint16_t) x)-modulus );
+ return x;
+ }
+
+ inline Element &subin (Element &x, const Element &y) const
+ {
+ x = Element(x - y);
+ if (x < 0) x = Element(x+modulus);
+ return x;
+ }
+
+ inline Element &mulin (Element &x, const Element &y) const
+ {
+ return mul(x,x,y);
+ }
+
+ inline Element &divin (Element &x, const Element &y) const
+ {
+ return div(x,x,y);
+ }
+
+ inline Element &negin (Element &x) const
+ {
+ if (x == 0) return x;
+ else return x = Element(modulus - x);
+ }
+
+ inline Element &invin (Element &x) const
+ {
+ return inv (x, x);
+ }
+
+ inline Element &axpyin (Element &r, const Element &a, const Element &x) const
+ {
+
+ Element q;
+
+ double ab = ((double) a)* ((double) x) + ( double ) r;
+ q = (Element)(ab*modulusinv); // q could be off by (+/-) 1
+ r = (Element) (ab - ((double) q )* ((double) modulus));
+
+
+ if (r >= modulus)
+ r = Element(r - modulus);
+ else if (r < 0)
+ r = Element( r + modulus );
+
+ return r;
+ }
+
+ static inline Element getMaxModulus()
+ {
+ return 32767; // 2^15 - 1
+ // linbox_check(180*181 < INT16_MAX);
+ // return 181 ;
+ }
+
+ private:
+
+ static void XGCD(int16_t& d, int16_t& s, int16_t& t, int16_t a, int16_t b)
+ {
+ int32_t u, v, u0, v0, u1, v1, u2, v2, q, r;
+
+ Element aneg = 0, bneg = 0;
+
+ if (a < 0) {
+#ifdef DEBUG
+ if (a < -LINBOX_MAX_INT16) throw PreconditionFailed(__func__,__FILE__,__LINE__,"XGCD: integer overflow");
+#endif
+ a = Element(-a);
+ aneg = 1;
+ }
+
+ if (b < 0) {
+#ifdef DEBUG
+ if (b < -LINBOX_MAX_INT16) throw PreconditionFailed(__func__,__FILE__,__LINE__,"XGCD: integer overflow");
+#endif
+ b = Element(-b);
+ bneg = 1;
+ }
+
+ u1 = 1; v1 = 0;
+ u2 = 0; v2 = 1;
+ u = a; v = b;
+
+
+ while (v != 0) {
+ q = u / v;
+ r = Element(u % v);
+ u = v;
+ v = r;
+ u0 = u2;
+ v0 = v2;
+ u2 = u1 - q*u2;
+ v2 = v1- q*v2;
+ u1 = u0;
+ v1 = v0;
+ }
+
+ if (aneg)
+ u1 = -u1;
+
+ if (bneg)
+ v1 = -v1;
+
+ d = Element(u);
+ s = Element(u1);
+ t = Element(v1);
+ }
+
+ };
+
+ template <>
+ class FieldAXPY<Modular<int16_t> > {
+ public:
+
+ typedef int16_t Element;
+ typedef Modular<int16_t> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F),_y(0)
+ {
+ }
+
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field), _y (0)
+ {}
+
+ FieldAXPY<Modular<int16_t> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field;
+ _y = faxpy._y;
+ return *this;
+ }
+
+ inline uint64_t& mulacc (const Element &a, const Element &x)
+ {
+ uint64_t t = ( (uint32_t) a ) * ( (uint32_t) x );
+ return _y+=t;
+ }
+
+ inline uint64_t& accumulate (const Element &t)
+ {
+ return _y += (uint64_t) t;
+ }
+
+ inline Element& get (Element &y)
+ {
+ y = Element(_y % (uint64_t) _field.modulus);
+ return y;
+ }
+
+ inline FieldAXPY &assign (const Element y)
+ {
+ _y = (uint64_t) y;
+ return *this;
+ }
+
+ inline void reset()
+ {
+ _y = 0;
+ }
+
+ private:
+
+ Field _field;
+ uint64_t _y;
+ uint16_t _two_64;
+ };
+
+
+ template <>
+ class DotProductDomain<Modular<int16_t> > : private virtual VectorDomainBase<Modular<int16_t> > {
+
+ public:
+ typedef int16_t Element;
+ DotProductDomain (const Modular<int16_t> &F) :
+ VectorDomainBase<Modular<int16_t> > (F)
+ { }
+
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+
+ typename Vector1::const_iterator i;
+ typename Vector2::const_iterator j;
+
+ uint64_t y = 0;
+ // uint64_t t;
+
+ for (i = v1.begin (), j = v2.begin (); i < v1.end (); ++i, ++j) {
+ y += ( (uint32_t) *i ) * ( (uint32_t) *j );
+ }
+
+ y %= (uint64_t) _field.modulus;
+
+ return res = (Element) y;
+
+ }
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ typename Vector1::first_type::const_iterator i_idx;
+ typename Vector1::second_type::const_iterator i_elt;
+
+ uint64_t y = 0;
+
+ for (i_idx = v1.first.begin (), i_elt = v1.second.begin (); i_idx != v1.first.end (); ++i_idx, ++i_elt) {
+ y += ( (uint32_t) *i_elt ) * ( (uint32_t) v2[*i_idx] );
+ }
+
+ y %= (uint64_t) _field.modulus;
+
+ return res = (Element) y;
+ }
+
+ };
+ // Specialization of MVProductDomain for int16_t modular field
+
+ template <>
+ class MVProductDomain<Modular<int16_t> >
+ {
+ public:
+
+ typedef int16_t Element;
+
+ protected:
+ template <class Vector1, class Matrix, class Vector2>
+ inline Vector1 &mulColDense
+ (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
+ {
+ return mulColDenseSpecialized
+ (VD, w, A, v, typename VectorTraits<typename Matrix::Column>::VectorCategory ());
+ }
+
+ private:
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const;
+
+ mutable std::vector<uint64_t> _tmp;
+ };
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int16_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseVectorTag) const
+ {
+
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i) {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
+ t = ((uint32_t) *k) * ((uint32_t) *j);
+
+ *l += t;
+
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int16_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i) {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
+ t = ((uint32_t) k->second) * ((uint32_t) *j);
+
+ _tmp[k->first] += t;
+
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int16_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const
+ {
+
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i) {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
+ t = ((uint32_t) k->second) * ((uint32_t) *j);
+
+ _tmp[k->first] += t;
+
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<int16_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const
+ {
+
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::first_type::const_iterator k_idx;
+ typename Matrix::Column::second_type::const_iterator k_elt;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i) {
+ for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
+ k_idx != i->first.end ();
+ ++k_idx, ++k_elt, ++l)
+ {
+ t = ((uint32_t) *k_elt) * ((uint32_t) *j);
+
+ _tmp[*k_idx] += t;
+
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ().modulus;
+
+ return w;
+ }
+
+
+}
+
+#ifdef __ICC
+#pragma warning(enable:2259)
+#endif
+
+#include "linbox/randiter/modular.h"
+#endif //__LINBOX_modular_short_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Modular/modular-unsigned.h b/linbox/field/Modular/modular-unsigned.h
new file mode 100644
index 0000000..f407611
--- /dev/null
+++ b/linbox/field/Modular/modular-unsigned.h
@@ -0,0 +1,1102 @@
+/* linbox/field/modular.h
+ * Copyright (C) 1999-2001 William J Turner,
+ * 2001 Bradford Hovinen
+ * Copyright (C) 2011 LinBox
+ *
+ * Written by William J Turner <wjturner at math.ncsu.edu>,
+ * Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * ------------------------------------
+ * 2002-04-10 Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * LargeModular is now replace by a class Modular parameterized on the element
+ * type. So, the old LargeModular is equivalent to Modular<integer>. All other
+ * interface details are exactly the same.
+ *
+ * Renamed from large-modular.h to modular.h
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+#ifndef __LINBOX_field_modular_unsigned_H
+#define __LINBOX_field_modular_unsigned_H
+namespace LinBox
+{
+ /** @brief Allows compact storage when the modulus is less than 2^8.
+ *
+ * Requires <code>1 < modulus < 2^8</code>, normally prime. See \ref
+ * FieldArchetype for member specifications.
+ */
+ template <>
+ class Modular<uint8_t> : public FieldInterface, public ModularBase<uint8_t> {
+ public:
+ typedef uint8_t Element;
+ const Element zero,one, mOne;
+
+ Modular () :
+ zero(0),one(1),mOne(0),_k (0)
+ {}
+ Modular (uint32_t modulus) :
+ ModularBase<Element> (modulus),
+ zero(0),one(1),mOne((Element)(modulus-1)),
+ _k (((uint64_t) -1LL) / ((modulus - 1) * (modulus - 1))),
+ _pinv (1.0 / (double) ((Element) modulus))
+ {
+ linbox_check(modulus < UINT8_MAX);
+ }
+ Modular (const integer &modulus) :
+ ModularBase<Element> ((unsigned long) modulus),
+ zero(0),one(1),mOne(modulus-1),
+ _k (((uint64_t) -1LL) / (((Element)modulus - 1) * ((Element)modulus - 1))),
+ _pinv (1.0 / (double) ((Element) modulus))
+ {
+ linbox_check(modulus < UINT8_MAX);
+ }
+
+ const Modular &operator=(const Modular &F)
+ {
+ ModularBase<Element>::_modulus = F._modulus;
+ _k = F._k;
+ _pinv = F._pinv;
+ F.assign(const_cast<Element&>(one),F.one);
+ F.assign(const_cast<Element&>(zero),F.zero);
+ F.assign(const_cast<Element&>(mOne),F.mOne);
+
+
+ return *this;
+ }
+
+ Element &init (Element &x, const integer &y = 0) const
+ {
+ x = (Element) (abs (y) % integer (ModularBase<Element>::_modulus));
+ if (y < 0)
+ x = Element(ModularBase<Element>::_modulus - x);
+ return x;
+ }
+
+ Element &init (Element &x, const double &y) const
+ {
+ double z = fmod(y, (double)_modulus);
+ if (z < 0) z += (double) _modulus;
+ return x = (Element) (z);
+ }
+
+ Element &init (Element &x, const long int &y ) const
+ {
+ x = (Element)(abs (y) % (long int) (ModularBase<Element>::_modulus));
+ if (y < 0L)
+ x = Element(ModularBase<Element>::_modulus - x);
+ return x;
+ }
+
+ Element &init (Element &x, const int &y ) const
+ {
+ x = (Element)(abs (y) % (int) (ModularBase<Element>::_modulus));
+ if (y < 0)
+ x = Element(ModularBase<Element>::_modulus - x);
+ return x;
+ }
+
+ /*! add elements
+ * @todo is it faster to use uint32 and multiple casts ?
+ */
+ Element &add (Element &x, const Element &y, const Element &z) const
+ {
+ uint32_t t = (uint32_t) y + (uint32_t) z;
+ if (t >= (uint32_t) ModularBase<Element>::_modulus)
+ t -= ModularBase<Element>::_modulus;
+ return x = (Element)t;
+ }
+
+ Element &sub (Element &x, const Element &y, const Element &z) const
+ {
+ int32_t t = (int32_t) y - (int32_t) z;
+ if (t < 0)
+ t += ModularBase<Element>::_modulus;
+ return x = (Element)t;
+ }
+
+ Element &mul (Element &x, const Element &y, const Element &z) const
+ {
+ return x = Element( ((uint32_t) y * (uint32_t) z) % (uint32_t) ModularBase<Element>::_modulus );
+ }
+
+ Element &div (Element &x, const Element &y, const Element &z) const
+ {
+ Element temp;
+ inv (temp, z);
+ return mul (x, y, temp);
+ }
+
+ Element &neg (Element &x, const Element &y) const
+ {
+ if (y == 0)
+ return x = y;
+ else
+ return x = (Element) (ModularBase<Element>::_modulus - y);
+ }
+
+ Element &inv (Element &x, const Element &y) const
+ {
+ // The extended Euclidean algoritm
+ int32_t x_int, y_int, q, tx, ty, temp;
+ x_int = ModularBase<Element>::_modulus;
+ y_int = y;
+ tx = 0;
+ ty = 1;
+
+ while (y_int != 0) {
+ // always: gcd (modulus,residue) = gcd (x_int,y_int)
+ // sx*modulus + tx*residue = x_int
+ // sy*modulus + ty*residue = y_int
+ q = x_int / y_int; // integer quotient
+ temp = y_int; y_int = x_int - q * y_int;
+ x_int = temp;
+ temp = ty; ty = tx - q * ty;
+ tx = temp;
+ }
+
+ if (tx < 0) tx += ModularBase<Element>::_modulus;
+
+ // now x_int = gcd (modulus,residue)
+ return x = (Element) tx;
+ }
+
+ Element &axpy (Element &r,
+ const Element &a,
+ const Element &x,
+ const Element &y) const
+ {
+ r = Element(((uint32_t) a * (uint32_t) x + (uint32_t) y) % (uint32_t) ModularBase<Element>::_modulus) ;
+ return r;
+ }
+
+ Element &addin (Element &x, const Element &y) const
+ {
+ uint32_t t = uint32_t((long) x + (long) y);
+ if (t >= (uint32_t) ModularBase<Element>::_modulus) t -= ModularBase<Element>::_modulus;
+ return x = (Element) t;
+ }
+
+ /*! subin.
+ * @todo why \c long here ?
+ */
+ Element &subin (Element &x, const Element &y) const
+ {
+ long t = x - y;
+ if (t < 0) t += ModularBase<Element>::_modulus;
+ return x = (Element) t;
+ }
+
+ Element &mulin (Element &x, const Element &y) const
+ {
+ x = (Element)( ((uint32_t) x * (uint32_t) y) % (uint32_t) ModularBase<Element>::_modulus );
+ return x;
+ }
+
+ Element &divin (Element &x, const Element &y) const
+ {
+ Element temp;
+ inv (temp, y);
+ return mulin (x, temp);
+ }
+
+ Element &negin (Element &x) const
+ {
+ if (x == 0)
+ return x;
+ else
+ return x = Element(ModularBase<Element>::_modulus - x);
+ }
+
+ Element &invin (Element &x) const
+ {
+ return inv (x, x);
+ }
+
+ Element &axpyin (Element &r, const Element &a, const Element &x) const
+ {
+ r = (Element)( ((uint32_t) r + (uint32_t) a * (uint32_t) x) % (uint32_t) ModularBase<Element>::_modulus);
+ return r;
+ }
+
+ private:
+
+ friend class FieldAXPY<Modular<Element> >;
+ friend class DotProductDomain<Modular<Element> >;
+ friend class MVProductDomain<Modular<Element> >;
+
+ // Number of times one can perform an axpy into a long long
+ // before modding out is mandatory.
+ uint64_t _k;
+
+ // Inverse of modulus in floating point
+ double _pinv;
+
+ }; // class Modular<uint8_t>
+
+ /*! Specialization of FieldAXPY for uint8_t modular field */
+
+ template <>
+ class FieldAXPY<Modular<uint8_t> > {
+ public:
+
+ typedef uint8_t Element;
+ typedef Modular<uint8_t> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F),
+ i ( (int)F._k)
+ {
+ _y = 0;
+ }
+
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field),
+ _y (0),
+ i ((int)faxpy._field._k)
+ {}
+
+ FieldAXPY<Modular<uint8_t> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field;
+ _y = faxpy._y;
+ return *this;
+ }
+
+ inline uint64_t& mulacc (const Element &a, const Element &x)
+ {
+ uint32_t t = (uint32_t) a * (uint32_t) x;
+
+ if (!i--) {
+ i = int(_field._k);
+ return _y = _y % (uint32_t) _field._modulus + t;
+ }
+ else
+ return _y += t;
+ }
+
+ inline uint64_t& accumulate (const Element &t)
+ {
+
+ if (!i--) {
+ i = int( _field._k );
+ return _y = _y % (uint32_t) _field._modulus + t;
+ }
+ else
+ return _y += t;
+ }
+
+ inline Element &get (Element &y)
+ {
+ _y %= (uint32_t) _field._modulus;
+ if ((int32_t) _y < 0) _y += _field._modulus;
+ y = (uint8_t) _y;
+ i = int(_field._k);
+ return y;
+ }
+
+ inline FieldAXPY &assign (const Element y)
+ {
+ _y = y;
+ i = int(_field._k);
+ return *this;
+ }
+
+ inline void reset()
+ {
+ _y = 0;
+ }
+
+ private:
+
+ Field _field;
+ uint64_t _y;
+ int i;
+ };
+
+ //! Specialization of DotProductDomain for unsigned short modular field
+
+ template <>
+ class DotProductDomain<Modular<uint8_t> > : private virtual VectorDomainBase<Modular<uint8_t> > {
+ public:
+
+ typedef uint8_t Element;
+
+ DotProductDomain (const Modular<uint8_t> &F) :
+ VectorDomainBase<Modular<uint8_t> > (F)
+ {}
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const;
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const;
+ };
+
+ //! Specialization of MVProductDomain for uint8_t modular field
+
+ template <>
+ class MVProductDomain<Modular<uint8_t> > {
+ public:
+
+ typedef uint8_t Element;
+
+ protected:
+ template <class Vector1, class Matrix, class Vector2>
+ inline Vector1 &mulColDense
+ (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
+ {
+ return mulColDenseSpecialized (VD, w, A, v, typename VectorTraits<typename Matrix::Column>::VectorCategory ());
+ }
+
+ private:
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const;
+
+ mutable std::vector<uint32_t> _tmp;
+ };
+
+}
+
+namespace LinBox
+{
+ /** @brief Specialization of class Modular for uint16_t element type */
+ template <>
+ class Modular<uint16_t> : public FieldInterface, public ModularBase<uint16_t> {
+ public:
+
+ typedef uint16_t Element;
+
+ const Element zero,one, mOne;
+
+ Modular () :
+ zero(0),one(1),mOne(0),_k (0)
+ {}
+ Modular (uint32_t modulus) :
+ ModularBase<Element> (modulus),
+ zero(0),one(1),mOne((Element)(modulus-1)),
+ _k (((uint64_t) -1LL) / ((ModularBase<Element>::_modulus - 1) * (ModularBase<Element>::_modulus - 1))),
+ _pinv (1.0 / (double) ((Element) ModularBase<Element>::_modulus))
+ {
+ linbox_check(modulus<UINT16_MAX);
+ }
+ Modular (const integer &modulus) :
+ ModularBase<Element> ((unsigned long) modulus),
+ zero(0),one(1),mOne(Element(modulus-1)),
+ _k (((uint64_t) -1LL) / ((ModularBase<Element>::_modulus - 1) * (ModularBase<Element>::_modulus - 1))),
+ _pinv (1.0 / (double) ((Element) ModularBase<Element>::_modulus))
+ {
+ linbox_check(modulus<UINT16_MAX);
+ }
+
+ const Modular &operator=(const Modular &F)
+ {
+ ModularBase<Element>::_modulus = F._modulus;
+ _k = F._k;
+ _pinv = F._pinv;
+ F.assign(const_cast<Element&>(one),F.one);
+ F.assign(const_cast<Element&>(zero),F.zero);
+ F.assign(const_cast<Element&>(mOne),F.mOne);
+ return *this;
+ }
+
+ Element &init (Element &x, const integer &y) const
+ {
+ x = abs (y) % integer (ModularBase<Element>::_modulus);
+ if (y < 0)
+ x = Element(ModularBase<Element>::_modulus - x);
+ return x;
+ }
+
+ Element &init (Element &x, const double &y) const
+ {
+ double z = fmod(y, (double)_modulus);
+ if (z < 0)
+ z += (double) _modulus;
+ return x = (Element) (z);
+ }
+
+ Element &init (Element &x, const long int &y ) const
+ {
+ x = Element(abs (y) % (long int) (ModularBase<Element>::_modulus));
+ if (y < 0)
+ x = Element(ModularBase<Element>::_modulus - x);
+ return x;
+ }
+
+ Element &init (Element &x, const int &y ) const
+ {
+ x = Element(abs (y) % (int) (ModularBase<Element>::_modulus));
+ if (y < 0)
+ x = Element(ModularBase<Element>::_modulus - x);
+ return x;
+ }
+
+ Element &init(Element &x) const
+ {
+ return x = 0 ;
+ }
+
+ Element &add (Element &x, const Element &y, const Element &z) const
+ {
+ uint32_t t = (uint32_t) y + (uint32_t) z;
+ if (t >= (uint32_t) ModularBase<Element>::_modulus)
+ t -= ModularBase<Element>::_modulus;
+ return x = (Element) t;
+ }
+
+ Element &sub (Element &x, const Element &y, const Element &z) const
+ {
+ int32_t t = (int32_t) y - (int32_t) z;
+ if (t < 0) t += ModularBase<Element>::_modulus;
+ return x = (Element) t;
+ }
+
+ Element &mul (Element &x, const Element &y, const Element &z) const
+ {
+ return x = (Element) ( ((uint32_t) y * (uint32_t) z) % (uint32_t) ModularBase<Element>::_modulus);
+ }
+
+ Element &div (Element &x, const Element &y, const Element &z) const
+ {
+ Element temp;
+ inv (temp, z);
+ return mul (x, y, temp);
+ }
+
+ Element &neg (Element &x, const Element &y) const
+ {
+ if (y == 0)
+ return x = y;
+ else
+ return x = (Element)( ModularBase<Element>::_modulus - y);
+ }
+
+ Element &inv (Element &x, const Element &y) const
+ {
+ // The extended Euclidean algoritm
+ int32_t x_int, y_int, q, tx, ty, temp;
+ x_int = ModularBase<Element>::_modulus;
+ y_int = y;
+ tx = 0;
+ ty = 1;
+
+ while (y_int != 0) {
+ // always: gcd (modulus,residue) = gcd (x_int,y_int)
+ // sx*modulus + tx*residue = x_int
+ // sy*modulus + ty*residue = y_int
+ q = x_int / y_int; // integer quotient
+ temp = y_int; y_int = x_int - q * y_int;
+ x_int = temp;
+ temp = ty; ty = tx - q * ty;
+ tx = temp;
+ }
+
+ if (tx < 0) tx += ModularBase<Element>::_modulus;
+
+ // now x_int = gcd (modulus,residue)
+ return x = (Element) tx;
+ }
+
+ Element &axpy (Element &r,
+ const Element &a,
+ const Element &x,
+ const Element &y) const
+ {
+ r = (Element)( ((uint32_t) a * (uint32_t) x + (uint32_t) y) % (uint32_t) ModularBase<Element>::_modulus );
+ return r;
+ }
+
+ Element &addin (Element &x, const Element &y) const
+ {
+ uint32_t t = uint32_t( (long) x + (long) y );
+ if (t >= (uint32_t) ModularBase<Element>::_modulus) t -= ModularBase<Element>::_modulus;
+ return x = (Element) t;
+ }
+
+ Element &subin (Element &x, const Element &y) const
+ {
+ long t = x - y;
+ if (t < 0) t += ModularBase<Element>::_modulus;
+ return x = (Element) t;
+ }
+
+ Element &mulin (Element &x, const Element &y) const
+ {
+ x = (Element)( ((uint32_t) x * (uint32_t) y) % (uint32_t) ModularBase<Element>::_modulus);
+ return x;
+ }
+
+ Element &divin (Element &x, const Element &y) const
+ {
+ Element temp;
+ inv (temp, y);
+ return mulin (x, temp);
+ }
+
+ Element &negin (Element &x) const
+ {
+ if (x == 0)
+ return x;
+ else
+ return x = (Element) ( ModularBase<Element>::_modulus - x);
+ }
+
+ Element &invin (Element &x) const
+ {
+ return inv (x, x);
+ }
+
+ Element &axpyin (Element &r, const Element &a, const Element &x) const
+ {
+ r = (Element) ( ((uint32_t) r + (uint32_t) a * (uint32_t) x) % (uint32_t) ModularBase<Element>::_modulus);
+ return r;
+ }
+
+ private:
+
+ friend class FieldAXPY<Modular<Element> >;
+ friend class DotProductDomain<Modular<Element> >;
+ friend class MVProductDomain<Modular<Element> >;
+
+ // Number of times one can perform an axpy into a long long
+ // before modding out is mandatory.
+ uint64_t _k;
+
+ // Inverse of modulus in floating point
+ double _pinv;
+
+ }; // class Modular<uint16_t>
+
+ /*! Specialization of FieldAXPY for uint16_t modular field */
+ template <>
+ class FieldAXPY<Modular<uint16_t> > {
+ public:
+
+ typedef uint16_t Element;
+ typedef Modular<uint16_t> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F),
+ i ((int)F._k)
+ { _y = 0; }
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field), _y (0), i ((int) faxpy._field._k)
+ {}
+
+ FieldAXPY<Modular<uint16_t> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field;
+ _y = faxpy._y;
+ return *this;
+ }
+
+ inline uint64_t& mulacc (const Element &a, const Element &x)
+ {
+ uint64_t t = (uint64_t) ((long long) a * (long long) x);
+
+ if (!i--) {
+ i = (int) _field._k;
+ return _y = _y % (uint64_t) _field._modulus + t;
+ }
+ else
+ return _y += t;
+ }
+
+ inline uint64_t& accumulate (const Element &t)
+ {
+ if (!i--) {
+ i = (int) _field._k;
+ return _y = _y % (uint64_t) _field._modulus + t;
+ }
+ else
+ return _y += t;
+ }
+
+ inline Element &get (Element &y)
+ {
+ _y %= (uint64_t) _field._modulus;
+ if ((int64_t) _y < 0) _y += _field._modulus;
+ y = (uint16_t) _y;
+ i = (int) _field._k;
+ return y;
+ }
+
+ inline FieldAXPY &assign (const Element y)
+ {
+ _y = y;
+ i = (int) _field._k;
+ return *this;
+ }
+
+ inline void reset()
+ {
+ _y = 0;
+ }
+
+ private:
+
+ Field _field;
+ uint64_t _y;
+ int i;
+ };
+
+ //! Specialization of DotProductDomain for unsigned short modular field
+
+ template <>
+ class DotProductDomain<Modular<uint16_t> > : private virtual VectorDomainBase<Modular<uint16_t> > {
+ public:
+
+ typedef uint16_t Element;
+
+ DotProductDomain (const Modular<uint16_t> &F) :
+ VectorDomainBase<Modular<uint16_t> > (F)
+ {}
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const;
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const;
+ };
+
+ //! Specialization of MVProductDomain for uint16_t modular field
+
+ template <>
+ class MVProductDomain<Modular<uint16_t> > {
+ public:
+
+ typedef uint16_t Element;
+
+ protected:
+ template <class Vector1, class Matrix, class Vector2>
+ inline Vector1 &mulColDense
+ (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
+ {
+ return mulColDenseSpecialized (VD, w, A, v, VectorTraits<typename Matrix::Column>::VectorCategory ());
+ }
+
+ private:
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const;
+
+ mutable std::vector<uint64_t> _tmp;
+ };
+
+}
+
+namespace LinBox
+{
+ /** @brief Specialization of class Modular for uint32_t element type */
+ template <>
+ class Modular<uint32_t> : public FieldInterface, public ModularBase<uint32_t> {
+ public:
+
+ typedef uint32_t Element;
+ typedef Modular<Element> Self_t;
+ // typedef ModularBase<Element> Father_t;
+ typedef Modular<uint32_t> Father_t;
+ typedef ModularBase<Element>::RandIter RandIter;
+
+ const Element zero,one,mOne ;
+
+ Modular () :
+ zero(0),one(1),mOne(0)
+ {}
+ Modular (uint32_t modulus) :
+ ModularBase<uint32_t> (modulus),zero(0),one(1),mOne(modulus-1)
+ {
+ init_two_64 ();
+ }
+ Modular (const integer &modulus) :
+ ModularBase<uint32_t> (modulus),zero(0),one(1),mOne(modulus-1)
+ {
+ init_two_64 ();
+ }
+
+ const Modular &operator=(const Modular &F)
+ {
+ ModularBase<Element>::_modulus = F._modulus;
+ _two_64 = F._two_64;
+ F.assign(const_cast<Element&>(one),F.one);
+ F.assign(const_cast<Element&>(zero),F.zero);
+ F.assign(const_cast<Element&>(mOne),F.mOne);
+
+ return *this;
+ }
+
+ Element &init (Element &x, const integer &y ) const
+ {
+ x = abs (y) % integer (ModularBase<Element>::_modulus);
+ if (y < 0) x = ModularBase<Element>::_modulus - x;
+ return x;
+ }
+
+ Element &init (Element &x, const long int &y ) const
+ {
+ x = abs (y) % integer (ModularBase<Element>::_modulus);
+ if (y < 0) x = ModularBase<Element>::_modulus - x;
+ return x;
+ }
+
+ Element &init (Element &x, const int &y ) const
+ {
+ x = abs (y) % integer (ModularBase<Element>::_modulus);
+ if (y < 0) x = ModularBase<Element>::_modulus - x;
+ return x;
+ }
+
+ Element &init (Element &x, const long unsigned int &y ) const
+ {
+ x = Element(y % (ModularBase<Element>::_modulus));
+ return x;
+ }
+
+ Element &init (Element &x, const double &y) const
+ {
+ double z = fmod(y, (double)_modulus);
+ if (z < 0) z += (double) _modulus;
+ return x = (Element) (z);
+ }
+
+ template< class XXX>
+ Element& init(Element & x, const XXX & y) const
+ {
+ return init(x,double(y));
+ }
+
+ Element &init (Element &x) const
+ {
+ return x = zero ;
+ }
+
+
+ Element &add (Element &x, const Element &y, const Element &z) const
+ {
+ x = y + z;
+ if ((uint32_t) x >= (uint32_t) ModularBase<Element>::_modulus) x -= ModularBase<Element>::_modulus;
+ return x;
+ }
+
+ Element &sub (Element &x, const Element &y, const Element &z) const
+ {
+ x = y - z;
+ if ((int32_t) x < 0) x += ModularBase<Element>::_modulus;
+ return x;
+ }
+
+ Element &mul (Element &x, const Element &y, const Element &z) const
+ {
+ return x = Element( ((uint64_t) y * (uint64_t) z) % (uint64_t) ModularBase<Element>::_modulus);
+ }
+
+ Element &div (Element &x, const Element &y, const Element &z) const
+ {
+ Element temp;
+ inv (temp, z);
+ return mul (x, y, temp);
+ }
+
+ Element &neg (Element &x, const Element &y) const
+ {
+ if (y == 0)
+ return x = y;
+ else
+ return x = ModularBase<Element>::_modulus - y;
+ }
+
+ Element &inv (Element &x, const Element &y) const
+ {
+ // The extended Euclidean algoritm
+ int64_t x_int, y_int, q, tx, ty, temp;
+ x_int = ModularBase<Element>::_modulus;
+ y_int = y;
+ tx = 0;
+ ty = 1;
+
+ while (y_int != 0) {
+ // always: gcd (modulus,residue) = gcd (x_int,y_int)
+ // sx*modulus + tx*residue = x_int
+ // sy*modulus + ty*residue = y_int
+ q = x_int / y_int; // integer quotient
+ temp = y_int; y_int = x_int - q * y_int;
+ x_int = temp;
+ temp = ty; ty = tx - q * ty;
+ tx = temp;
+ }
+
+ if (tx < 0) tx += ModularBase<Element>::_modulus;
+
+ // now x_int = gcd (modulus,residue)
+ return x = Element(tx);
+ }
+
+ Element &axpy (Element &r,
+ const Element &a,
+ const Element &x,
+ const Element &y) const
+ {
+ r = Element( ((uint64_t) a * (uint64_t) x + (uint64_t) y) % (uint64_t) ModularBase<Element>::_modulus );
+ if ((int32_t) r < 0) r += ModularBase<Element>::_modulus;
+ return r;
+ }
+
+ Element &addin (Element &x, const Element &y) const
+ {
+ x += y;
+ if ((uint32_t) x >= (uint32_t) ModularBase<Element>::_modulus) x -= ModularBase<Element>::_modulus;
+ return x;
+ }
+
+ Element &subin (Element &x, const Element &y) const
+ {
+ x -= y;
+ if ((int32_t) x < 0) x += ModularBase<Element>::_modulus;
+ return x;
+ }
+
+ Element &mulin (Element &x, const Element &y) const
+ {
+ x = Element( ((uint64_t) x * (uint64_t) y) % (uint64_t) ModularBase<Element>::_modulus );
+ return x;
+ }
+
+ Element &divin (Element &x, const Element &y) const
+ {
+ Element temp;
+ inv (temp, y);
+ return mulin (x, temp);
+ }
+
+ Element &negin (Element &x) const
+ {
+ if (x == 0)
+ return x;
+ else
+ return x = ModularBase<Element>::_modulus - x;
+ }
+
+ Element &invin (Element &x) const
+ {
+ return inv (x, x);
+ }
+
+ Element &axpyin (Element &r, const Element &a, const Element &x) const
+ {
+ r = Element( ((uint64_t) r + (uint64_t) a * (uint64_t) x) % (uint64_t) ModularBase<Element>::_modulus );
+ if ((int32_t) r < 0) r += ModularBase<Element>::_modulus;
+ return r;
+ }
+
+ private:
+
+ void init_two_64 ()
+ {
+ uint64_t two_64 = 2;
+
+ for (int i = 0; i < 6; ++i)
+ two_64 = (two_64 * two_64) % ModularBase<Element>::_modulus;
+
+ _two_64 = (Element) two_64;
+ }
+
+ friend class FieldAXPY<Modular<uint32_t> >;
+ friend class DotProductDomain<Modular<uint32_t> >;
+ friend class MVProductDomain<Modular<uint32_t> >;
+
+ Element _two_64;
+
+ }; // class Modular<uint32_t>
+
+ /*! Specialization of FieldAXPY for unsigned short modular field */
+
+ template <>
+ class FieldAXPY<Modular<uint32_t> > {
+ public:
+
+ typedef uint32_t Element;
+ typedef Modular<uint32_t> Field;
+
+ FieldAXPY (const Field &F) :
+ _field (F), _y(0)
+ { }
+
+ FieldAXPY (const FieldAXPY &faxpy) :
+ _field (faxpy._field), _y (0)
+ {}
+
+ FieldAXPY<Modular<uint32_t> > &operator = (const FieldAXPY &faxpy)
+ {
+ _field = faxpy._field;
+ _y = faxpy._y;
+ return *this;
+ }
+
+ inline uint64_t& mulacc (const Element &a, const Element &x)
+ {
+ uint64_t t = (uint64_t) a * (uint64_t) x;
+ _y += t;
+
+ if (_y < t)
+ return _y += _field._two_64;
+ else
+ return _y;
+ }
+
+ inline uint64_t& accumulate (const Element &t)
+ {
+ _y += t;
+
+ if (_y < t)
+ return _y += _field._two_64;
+ else
+ return _y;
+ }
+
+ inline uint64_t& accumulate_special (const Element &t)
+ {
+ return _y += t;
+ }
+
+ inline Element &get (Element &y) {
+ _y %= (uint64_t) _field._modulus;
+ //if ((int64_t) _y < 0) _y += _field._modulus;
+ return y = (uint32_t) _y;
+ }
+
+ inline FieldAXPY &assign (const Element y)
+ {
+ _y = y;
+ return *this;
+ }
+
+ inline void reset() {
+ _y = 0;
+ }
+
+ private:
+
+ Field _field;
+ uint64_t _y;
+ };
+
+ //! Specialization of DotProductDomain for uint32_t modular field
+
+ template <>
+ class DotProductDomain<Modular<uint32_t> > : private virtual VectorDomainBase<Modular<uint32_t> > {
+ public:
+
+ typedef uint32_t Element;
+
+ DotProductDomain (const Modular<uint32_t> &F) :
+ VectorDomainBase<Modular<uint32_t> > (F)
+ {}
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const;
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const;
+ };
+
+ //! Specialization of MVProductDomain for uint32_t modular field
+
+ template <>
+ class MVProductDomain<Modular<uint32_t> > {
+ public:
+
+ typedef uint32_t Element;
+
+ protected:
+ template <class Vector1, class Matrix, class Vector2>
+ inline Vector1 &mulColDense
+ (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
+ {
+ return mulColDenseSpecialized (VD, w, A, v, typename VectorTraits<typename Matrix::Column>::VectorCategory ());
+ }
+
+ private:
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColDenseSpecialized
+ (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const;
+
+ mutable std::vector<uint64_t> _tmp;
+ };
+
+}
+
+#include "linbox/field/Modular/modular.inl"
+#endif // __LINBOX_field_modular_unsigned_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/Modular/modular.inl b/linbox/field/Modular/modular.inl
new file mode 100644
index 0000000..8223eeb
--- /dev/null
+++ b/linbox/field/Modular/modular.inl
@@ -0,0 +1,771 @@
+/* linbox/field/modular.inl
+ * Copyright (C) 2002 Bradford Hovinen
+ * Copyright (C) 2002 Ahmet Duran
+ * Copyright (C) 2002 B. David Saunders
+ *
+ * Written by Bradford Hovinen <hovinen at cis.udel.edu>,
+ * Ahmet Duran <duran at cis.udel.edu>,
+ * Dave Saunders <saunders at cis.udel.edu>
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+#ifndef __LINBOX_field_modular_INL
+#define __LINBOX_field_modular_INL
+
+//Dan Roche 7-2-04
+#ifndef __LINBOX_MIN
+#define __LINBOX_MIN(a,b) ( (a) < (b) ? (a) : (b) )
+#endif
+
+#include <iostream>
+
+namespace LinBox {
+
+ template <class Vector1, class Vector2>
+ inline uint8_t &DotProductDomain<Modular<uint8_t> >::dotSpecializedDD
+ (uint8_t &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ typename Vector1::const_iterator i = v1.begin ();
+ typename Vector2::const_iterator j = v2.begin ();
+
+ typename Vector1::const_iterator iterend = v1.begin () + v1.size() % _field._k;
+
+ uint64_t y = 0;
+
+ for (; i != iterend; ++i, ++j)
+ y += (uint64_t) *i * (uint64_t) *j;
+
+ y %= (uint64_t) _field._modulus;
+
+ for (; iterend != v1.end (); j += _field._k) {
+ typename Vector1::const_iterator iter_i = iterend;
+ typename Vector2::const_iterator iter_j;
+
+ iterend += _field._k;
+
+ for (iter_j = j; iter_i != iterend; ++iter_i, ++iter_j)
+ y += (uint64_t) *iter_i * (uint64_t) *j;
+
+ y %= (uint64_t) _field._modulus;
+ }
+
+ return res = (uint8_t) y;
+ }
+
+ template <class Vector1, class Vector2>
+ inline uint8_t &DotProductDomain<Modular<uint8_t> >::dotSpecializedDSP
+ (uint8_t &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ typename Vector1::first_type::const_iterator i_idx = v1.first.begin ();
+ typename Vector1::second_type::const_iterator i_elt = v1.second.begin ();
+
+ uint64_t y = 0;
+
+ if (v1.first.size () < _field._k) {
+ for (; i_idx != v1.first.end (); ++i_idx, ++i_elt)
+ y += (uint64_t) *i_elt * (uint64_t) v2[*i_idx];
+
+ return res = uint8_t (y % (uint64_t) _field._modulus);
+ }
+ else {
+ typename Vector1::first_type::const_iterator iterend = v1.first.begin () + v1.first.size() % _field._k;
+
+ for (; i_idx != iterend; ++i_idx, ++i_elt)
+ y += (uint64_t) *i_elt * (uint64_t) v2[*i_idx];
+
+ y %= (uint64_t) _field._modulus;
+
+ while (iterend != v1.first.end ()) {
+ typename Vector1::first_type::const_iterator iter_i_idx = iterend;
+ typename Vector1::second_type::const_iterator iter_i_elt = i_elt;
+
+ iterend += _field._k;
+ i_elt += _field._k;
+
+ for (; iter_i_idx != iterend; ++iter_i_idx, ++iter_i_elt)
+ y += (uint64_t) *iter_i_elt * (uint64_t) v2[*iter_i_idx];
+
+ y %= (uint64_t) _field._modulus;
+ }
+
+ return res = (uint8_t) y;
+ }
+ }
+
+ template <class Vector1, class Vector2>
+ inline uint16_t &DotProductDomain<Modular<uint16_t> >::dotSpecializedDD
+ (uint16_t &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ typename Vector1::const_iterator i = v1.begin ();
+ typename Vector2::const_iterator j = v2.begin ();
+
+ typename Vector1::const_iterator iterend = v1.begin () + v1.size() % _field._k;
+
+ uint64_t y = 0;
+
+ for (; i != iterend; ++i, ++j)
+ y += (uint64_t) *i * (uint64_t) *j;
+
+ y %= (uint64_t) _field._modulus;
+
+ for (; iterend != v1.end (); j += _field._k) {
+ typename Vector1::const_iterator iter_i = iterend;
+ typename Vector2::const_iterator iter_j;
+
+ iterend += _field._k;
+
+ for (iter_j = j; iter_i != iterend; ++iter_i, ++iter_j)
+ y += (uint64_t) *iter_i * (uint64_t) *j;
+
+ y %= (uint64_t) _field._modulus;
+ }
+
+ return res = (uint16_t) y;
+ }
+
+ template <class Vector1, class Vector2>
+ inline uint16_t &DotProductDomain<Modular<uint16_t> >::dotSpecializedDSP
+ (uint16_t &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ typename Vector1::first_type::const_iterator i_idx = v1.first.begin ();
+ typename Vector1::second_type::const_iterator i_elt = v1.second.begin ();
+
+ uint64_t y = 0;
+
+ if (v1.first.size () < _field._k) {
+ for (; i_idx != v1.first.end (); ++i_idx, ++i_elt)
+ y += (uint64_t) *i_elt * (uint64_t) v2[*i_idx];
+
+ return res = (uint16_t) (y % (uint64_t) _field._modulus);
+ }
+ else {
+ typename Vector1::first_type::const_iterator iterend = v1.first.begin () + v1.first.size() % _field._k;
+
+ for (; i_idx != iterend; ++i_idx, ++i_elt)
+ y += (uint64_t) *i_elt * (uint64_t) v2[*i_idx];
+
+ y %= (uint64_t) _field._modulus;
+
+ while (iterend != v1.first.end ()) {
+ typename Vector1::first_type::const_iterator iter_i_idx = iterend;
+ typename Vector1::second_type::const_iterator iter_i_elt = i_elt;
+
+ iterend += _field._k;
+ i_elt += _field._k;
+
+ for (; iter_i_idx != iterend; ++iter_i_idx, ++iter_i_elt)
+ y += (uint64_t) *iter_i_elt * (uint64_t) v2[*iter_i_idx];
+
+ y %= (uint64_t) _field._modulus;
+ }
+
+ return res = (Element) y;
+ }
+ }
+
+ template <class Vector1, class Vector2>
+ inline uint32_t &DotProductDomain<Modular<uint32_t> >::dotSpecializedDD
+ (uint32_t &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ typename Vector1::const_iterator i;
+ typename Vector2::const_iterator j;
+
+ uint64_t y = 0;
+ uint64_t t;
+
+ for (i = v1.begin (), j = v2.begin (); i < v1.end (); ++i, ++j) {
+ t = (uint64_t) *i * (uint64_t) *j;
+ y += t;
+
+ if (y < t)
+ y += _field._two_64;
+ }
+
+ y %= (uint64_t) _field._modulus;
+
+ return res = (uint32_t) y;
+ }
+
+ template <class Vector1, class Vector2>
+ inline uint32_t &DotProductDomain<Modular<uint32_t> >::dotSpecializedDSP
+ (uint32_t &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ typename Vector1::first_type::const_iterator i_idx;
+ typename Vector1::second_type::const_iterator i_elt;
+
+ uint64_t y = 0;
+ uint64_t t;
+
+ for (i_idx = v1.first.begin (), i_elt = v1.second.begin (); i_idx != v1.first.end (); ++i_idx, ++i_elt) {
+ t = (uint64_t) *i_elt * (uint64_t) v2[*i_idx];
+ y += t;
+
+ if (y < t)
+ y += _field._two_64;
+ }
+
+ y %= (uint64_t) _field._modulus;
+
+ return res = (uint32_t)y;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<uint8_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j, j_end;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint32_t>::iterator l, l_end;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ l_end = _tmp.begin () + w.size ();
+
+ do {
+ j = v.begin ();
+ j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
+
+ for (; j != j_end; ++j, ++i)
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
+ *l += *k * *j;
+
+ j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
+
+ for (l =_tmp.begin (); l != l_end; ++l)
+ *l %= VD.field ()._modulus;
+
+ } while (j_end != v.end ());
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<uint8_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j, j_end;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint32_t>::iterator l, l_end;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ l_end = _tmp.begin () + w.size ();
+
+
+ do {
+ j = v.begin ();
+ j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
+
+ for (; j != j_end; ++j, ++i)
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
+ _tmp[k->first] += k->second * *j;
+
+ j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
+
+ for (l =_tmp.begin (); l != l_end; ++l)
+ *l %= VD.field ()._modulus;
+
+ } while (j_end != v.end ());
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<uint8_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j, j_end;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint32_t>::iterator l, l_end;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ l_end = _tmp.begin () + w.size ();
+
+ do {
+ j = v.begin ();
+ j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
+
+ for (; j != j_end; ++j, ++i)
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
+ _tmp[k->first] += k->second * *j;
+
+ j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
+
+ for (l =_tmp.begin (); l != l_end; ++l)
+ *l %= VD.field ()._modulus;
+
+ } while (j_end != v.end ());
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<uint8_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j, j_end;
+ typename Matrix::Column::first_type::const_iterator k_idx;
+ typename Matrix::Column::second_type::const_iterator k_elt;
+ std::vector<uint32_t>::iterator l, l_end;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ l_end = _tmp.begin () + w.size ();
+
+ do {
+ j = v.begin ();
+ j_end = j + __LINBOX_MIN (uint64_t (A.coldim ()), VD.field ()._k);
+
+ for (; j != j_end; ++j, ++i)
+ for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
+ k_idx != i->first.end ();
+ ++k_idx, ++k_elt, ++l)
+ _tmp[*k_idx] += *k_elt * *j;
+
+ j_end += __LINBOX_MIN (uint64_t (A.coldim () - (j_end - v.begin ())), VD.field ()._k);
+
+ for (l =_tmp.begin (); l != l_end; ++l)
+ *l %= VD.field ()._modulus;
+
+ } while (j_end != v.end ());
+
+ typename Vector1::iterator w_j;
+ typedef typename Vector1::value_type val_t ;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = (val_t) *l;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<uint16_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j = v.begin (), j_end;
+ typename Matrix::Column::const_iterator k;
+ // Dan Roche, 7-1-04
+ // std::vector<uint32_t>::iterator l, l_end;
+ std::vector<uint64_t>::iterator l, l_end;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ l_end = _tmp.begin () + w.size ();
+
+ do {
+ j = v.begin ();
+ j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
+
+ for (; j != j_end; ++j, ++i)
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
+ *l += *k * *j;
+
+ j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
+
+ for (l =_tmp.begin (); l != l_end; ++l)
+ *l %= VD.field ()._modulus;
+
+ } while (j_end != v.end ());
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<uint16_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j, j_end;
+ typename Matrix::Column::const_iterator k;
+ // Dan Roche, 7-1-04
+ // std::vector<uint32_t>::iterator l, l_end;
+ std::vector<uint64_t>::iterator l, l_end;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ l_end = _tmp.begin () + w.size ();
+
+ do {
+ j = v.begin ();
+ j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
+
+ for (; j != j_end; ++j, ++i)
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
+ _tmp[k->first] += k->second * *j;
+
+ j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
+
+ for (l =_tmp.begin (); l != l_end; ++l)
+ *l %= VD.field ()._modulus;
+
+ } while (j_end != v.end ());
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<uint16_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j, j_end;
+ typename Matrix::Column::const_iterator k;
+ // Dan Roche, 7-1-04
+ // std::vector<uint32_t>::iterator l, l_end;
+ std::vector<uint64_t>::iterator l, l_end;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ l_end = _tmp.begin () + w.size ();
+
+ do {
+ j = v.begin ();
+ j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
+
+ for (; j != j_end; ++j, ++i)
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
+ _tmp[k->first] += k->second * *j;
+
+ j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
+
+ for (l =_tmp.begin (); l != l_end; ++l)
+ *l %= VD.field ()._modulus;
+
+ } while (j_end != v.end ());
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<uint16_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j, j_end;
+ typename Matrix::Column::first_type::const_iterator k_idx;
+ typename Matrix::Column::second_type::const_iterator k_elt;
+ // Dan Roche, 7-1-04
+ // std::vector<uint32_t>::iterator l, l_end;
+ std::vector<uint64_t>::iterator l, l_end;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ l_end = _tmp.begin () + w.size ();
+
+ do {
+ j = v.begin ();
+ //Dan Roche, 7-2-04
+ //j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
+ j_end = j + __LINBOX_MIN (A.coldim (), VD.field ()._k);
+
+ for (; j != j_end; ++j, ++i)
+ for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
+ k_idx != i->first.end ();
+ ++k_idx, ++k_elt, ++l)
+ _tmp[*k_idx] += *k_elt * *j;
+
+ //j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
+ j_end += __LINBOX_MIN (A.coldim () - (j_end - v.begin ()), VD.field ()._k);
+
+ for (l =_tmp.begin (); l != l_end; ++l)
+ *l %= VD.field ()._modulus;
+
+ } while (j_end != v.end ());
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<uint32_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i) {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
+ t = ((uint64_t) *k) * ((uint64_t) *j);
+
+ *l += t;
+
+ if (*l < t)
+ *l += VD.field ()._two_64;
+ }
+ }
+
+ typename Vector1::iterator w_j;
+ typedef typename Vector1::value_type element;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = (element)(*l % VD.field ()._modulus);
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<uint32_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseSequenceVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i) {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
+ t = ((uint64_t) k->second) * ((uint64_t) *j);
+
+ _tmp[k->first] += t;
+
+ if (_tmp[k->first] < t)
+ _tmp[k->first] += VD.field ()._two_64;
+ }
+ }
+
+ typename Vector1::iterator w_j;
+ typedef typename Vector1::value_type val_t;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = val_t(*l % VD.field ()._modulus);
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<uint32_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseAssociativeVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::const_iterator k;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i) {
+ for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
+ t = ((uint64_t) k->second) * ((uint64_t) *j);
+
+ _tmp[k->first] += t;
+
+ if (_tmp[k->first] < t)
+ _tmp[k->first] += VD.field ()._two_64;
+ }
+ }
+
+ typename Vector1::iterator w_j;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = *l % VD.field ()._modulus;
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MVProductDomain<Modular<uint32_t> >::mulColDenseSpecialized
+ (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseParallelVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j;
+ typename Matrix::Column::first_type::const_iterator k_idx;
+ typename Matrix::Column::second_type::const_iterator k_elt;
+ std::vector<uint64_t>::iterator l;
+
+ uint64_t t;
+
+ if (_tmp.size () < w.size ())
+ _tmp.resize (w.size ());
+
+ std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
+
+ for (j = v.begin (); j != v.end (); ++j, ++i) {
+ for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
+ k_idx != i->first.end ();
+ ++k_idx, ++k_elt, ++l)
+ {
+ t = ((uint64_t) *k_elt) * ((uint64_t) *j);
+
+ _tmp[*k_idx] += t;
+
+ if (_tmp[*k_idx] < t)
+ _tmp[*k_idx] += VD.field ()._two_64;
+ }
+ }
+
+ typename Vector1::iterator w_j;
+ typedef typename Vector1::value_type val_t;
+
+ for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
+ *w_j = val_t(*l % VD.field ()._modulus);
+
+ return w;
+ }
+
+}
+
+#endif // __LINBOX_field_modular_INL
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/NTL/Makefile.am b/linbox/field/NTL/Makefile.am
new file mode 100644
index 0000000..f42b93d
--- /dev/null
+++ b/linbox/field/NTL/Makefile.am
@@ -0,0 +1,46 @@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
+pkgincludesubdir=$(pkgincludedir)/field/NTL
+
+
+NTL_HDRS = \
+ ntl-RR.h \
+ ntl-ZZ_p.h \
+ ntl-ZZ_pE.h \
+ ntl-ZZ_pX.h \
+ ntl-lzz_p.h \
+ ntl-ZZ.h \
+ ntl-lzz_pE.h \
+ ntl-lzz_pX.h \
+ ntl-GF2E.h
+
+
+if LINBOX_HAVE_NTL
+USE_NTL_HDRS = $(NTL_HDRS)
+endif
+
+
+pkgincludesub_HEADERS = \
+ $(USE_NTL_HDRS)
+
+# EXTRA_DIST = \
+ # ntl.doxy
diff --git a/linbox/field/NTL/Makefile.in b/linbox/field/NTL/Makefile.in
new file mode 100644
index 0000000..520e9ee
--- /dev/null
+++ b/linbox/field/NTL/Makefile.in
@@ -0,0 +1,592 @@
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = linbox/field/NTL
+DIST_COMMON = $(am__pkgincludesub_HEADERS_DIST) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
+ $(top_srcdir)/macros/config-header.m4 \
+ $(top_srcdir)/macros/debug.m4 \
+ $(top_srcdir)/macros/expat-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
+ $(top_srcdir)/macros/givaro-check.m4 \
+ $(top_srcdir)/macros/gmp-check.m4 \
+ $(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
+ $(top_srcdir)/macros/libtool.m4 \
+ $(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
+ $(top_srcdir)/macros/linbox-doc.m4 \
+ $(top_srcdir)/macros/linbox-misc.m4 \
+ $(top_srcdir)/macros/linbox-opt.m4 \
+ $(top_srcdir)/macros/ltoptions.m4 \
+ $(top_srcdir)/macros/ltsugar.m4 \
+ $(top_srcdir)/macros/ltversion.m4 \
+ $(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
+ $(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
+ $(top_srcdir)/macros/ntl-check.m4 \
+ $(top_srcdir)/macros/saclib-check.m4 \
+ $(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__pkgincludesub_HEADERS_DIST = ntl-RR.h ntl-ZZ_p.h ntl-ZZ_pE.h \
+ ntl-ZZ_pX.h ntl-lzz_p.h ntl-ZZ.h ntl-lzz_pE.h ntl-lzz_pX.h \
+ ntl-GF2E.h
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
+HEADERS = $(pkgincludesub_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
+BLAS_LIBS = @BLAS_LIBS@
+CC = @CC@
+CCNAM = @CCNAM@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DBG = @DBG@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
+DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
+DEFS = @DEFS@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXPAT_CFLAGS = @EXPAT_CFLAGS@
+EXPAT_LIBS = @EXPAT_LIBS@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
+FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
+GIVARO_CFLAGS = @GIVARO_CFLAGS@
+GIVARO_LIBS = @GIVARO_LIBS@
+GMP_CFLAGS = @GMP_CFLAGS@
+GMP_LIBS = @GMP_LIBS@
+GMP_VERSION = @GMP_VERSION@
+GREP = @GREP@
+IML_CFLAGS = @IML_CFLAGS@
+IML_LIBS = @IML_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIDIA_CFLAGS = @LIDIA_CFLAGS@
+LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
+LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MAPLE_CFLAGS = @MAPLE_CFLAGS@
+MAPLE_HOME = @MAPLE_HOME@
+MAPLE_LIBS = @MAPLE_LIBS@
+MAPLE_VERSION = @MAPLE_VERSION@
+MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NTL_CFLAGS = @NTL_CFLAGS@
+NTL_LIBS = @NTL_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
+RANLIB = @RANLIB@
+RM = @RM@
+SACLIB_CFLAGS = @SACLIB_CFLAGS@
+SACLIB_LIBS = @SACLIB_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TESTS_CFLAGS = @TESTS_CFLAGS@
+VERSION = @VERSION@
+WARN = @WARN@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+pkgincludesubdir = $(pkgincludedir)/field/NTL
+NTL_HDRS = \
+ ntl-RR.h \
+ ntl-ZZ_p.h \
+ ntl-ZZ_pE.h \
+ ntl-ZZ_pX.h \
+ ntl-lzz_p.h \
+ ntl-ZZ.h \
+ ntl-lzz_pE.h \
+ ntl-lzz_pX.h \
+ ntl-GF2E.h
+
+ at LINBOX_HAVE_NTL_TRUE@USE_NTL_HDRS = $(NTL_HDRS)
+pkgincludesub_HEADERS = \
+ $(USE_NTL_HDRS)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/field/NTL/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/field/NTL/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
+ @$(NORMAL_INSTALL)
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
+ done
+
+uninstall-pkgincludesubHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+ for dir in "$(DESTDIR)$(pkgincludesubdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgincludesubHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgincludesubHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool ctags distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkgincludesubHEADERS install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
+
+# EXTRA_DIST = \
+# # ntl.doxy
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/linbox/field/NTL/ntl-GF2E.h b/linbox/field/NTL/ntl-GF2E.h
new file mode 100644
index 0000000..6b3add3
--- /dev/null
+++ b/linbox/field/NTL/ntl-GF2E.h
@@ -0,0 +1,242 @@
+/* linbox/field/ntl-z_pE.h
+ * Copyright (C) 2004 Pascal Giorgi
+ * Copyright (C) 2011 LinBox
+ *
+ * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
+ *
+ * Modified by W. J. Turner <wjturner at acm.org>
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file field/NTL/ntl-GF2E.h
+ * @ingroup field
+ * @ingroup NTL
+ * @brief NO DOC
+ */
+
+#ifndef __LINBOX_field_ntl_gf2e_H
+#define __LINBOX_field_ntl_gf2e_H
+
+#ifndef __LINBOX_HAVE_NTL
+#error "you need NTL here"
+#endif
+
+#include <NTL/GF2XFactoring.h>
+#include <NTL/GF2E.h>
+#include <time.h>
+
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+
+#include "linbox/field/unparametric.h"
+#include "linbox/randiter/unparametric.h"
+#include "linbox/field/field-traits.h"
+
+
+#include "linbox/integer.h"
+
+namespace Givaro
+{
+ template<>
+ // NTL::GF2E& UnparametricField<NTL::GF2E>::init (NTL::GF2E &x, const Integer &y) const
+ NTL::GF2E& Caster(NTL::GF2E &x, const Integer &y)
+ {
+ x=NTL::to_GF2E(static_cast<long>(y));
+ return x;
+ }
+ template<>
+ // NTL::GF2E& UnparametricField<NTL::GF2E>::init (NTL::GF2E &x, const double &y) const
+ NTL::GF2E& Caster(NTL::GF2E &x, const double &y)
+ {
+ x=NTL::to_GF2E(static_cast<long>(y));
+ return x;
+ }
+
+
+ template<>
+ // Integer& UnparametricField<NTL::GF2E>::convert (Integer& x, const NTL::GF2E &y) const {
+ Integer& Caster(Integer& x, const NTL::GF2E &y)
+ {
+ NTL::GF2X poly = rep(y);
+
+ long i;
+ x = 0;
+ for(i = deg(poly); i >= 0; --i) {
+ x <<= 1;
+ x += rep(coeff(poly, i));
+ }
+ return x;
+ }
+
+} // namespace Givaro
+
+
+
+
+// Namespace in which all LinBox library code resides
+namespace LinBox
+{
+ /// \ingroup field
+
+ class NTL_GF2E_Initialiser {
+ public :
+ NTL_GF2E_Initialiser( const Integer & p, size_t k = 1) {
+ linbox_check(p == 2);
+ // if(p != 2) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be 2");
+ NTL::GF2X irredPoly = NTL::BuildSparseIrred_GF2X((long) k);
+ NTL::GF2E::init(irredPoly);
+
+ }
+
+ // template <class ElementInt>
+ // NTL_GF2E_Initialiser(const ElementInt& d) {
+ // NTL::ZZ_p::init (NTL::to_ZZ(d));
+ // }
+
+ // NTL_GF2E_Initialiser (const NTL::ZZ& d) {
+ // NTL::ZZ_p::init(d);
+ // }
+
+ };
+
+
+ /*
+ * Define a parameterized class to easily handle UnparametricField<NTL::GF2E> field
+ */
+
+ class NTL_GF2E : public NTL_GF2E_Initialiser, public FFPACK::UnparametricOperations<NTL::GF2E> {
+ public:
+ typedef NTL::GF2E Element ;
+ typedef FFPACK::UnparametricOperations<Element> Father_t ;
+ typedef UnparametricRandIter<Element> RandIter;
+
+ const Element zero,one,mOne ;
+
+ NTL_GF2E (const integer &p, const integer &k) :
+ NTL_GF2E_Initialiser(p,k),Father_t ()
+ ,zero( NTL::to_GF2E(0)),one( NTL::to_GF2E(1)),mOne(-one)
+ { }
+
+ bool isZero (const Element& a) const
+ {
+ return NTL::IsZero(a);
+ }
+
+
+ bool isOne (const Element& a) const
+ {
+ return NTL::IsOne(a);
+ }
+
+ integer& characteristic (integer &c) const
+ {
+ return c = 2;
+ }
+
+ integer& cardinality(integer& c) const
+ {
+ c=1;
+ c<<= Element::degree();
+ return c;
+ }
+
+ Element& inv(Element& x, const Element& y) const
+ {
+ x=NTL::to_GF2E(1)/y;
+ return x;
+ }
+
+ Element& invin(Element& x) const
+ {
+ x=NTL::to_GF2E(1)/x;
+ return x;
+ }
+
+ std::istream& read(std::istream& is, Element& x) const
+ {
+ long tmp;
+ is>>tmp;
+ x=NTL::to_GF2E(tmp);
+ return is;
+ }
+ }; // end o class NTL_GF2E
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template <class Element>
+ struct ClassifyRing<UnparametricRandIter<Element> >;
+
+ template <>
+ struct ClassifyRing<UnparametricRandIter<NTL::GF2E> > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ template<>
+ class UnparametricRandIter<NTL::GF2E> {
+ public:
+ typedef NTL::GF2E Element;
+ UnparametricRandIter<NTL::GF2E>(const NTL_GF2E & F,
+ const size_t& size = 0,
+ const size_t& seed = 0
+ ) :
+ _size(size), _seed(seed)
+ {
+ if(_seed == 0)
+ NTL::SetSeed(NTL::to_ZZ(time(0)));
+ else
+ NTL::SetSeed(NTL::to_ZZ(_seed));
+ }
+
+ UnparametricRandIter<NTL::GF2E>(const UnparametricRandIter<NTL::GF2E>& R) :
+ _size(R._size), _seed(R._seed)
+
+ {
+ if(_seed == 0)
+ NTL::SetSeed(NTL::to_ZZ(time(0)));
+ else
+ NTL::SetSeed(NTL::to_ZZ(_seed));
+ }
+
+ Element& random (Element& x) const
+ {
+ NTL::random(x);
+ return x;
+ }
+
+ protected:
+ size_t _size;
+ size_t _seed;
+ };
+
+
+}
+
+#endif //__LINBOX_ntl_gf2e_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/NTL/ntl-RR.h b/linbox/field/NTL/ntl-RR.h
new file mode 100644
index 0000000..d15ce01
--- /dev/null
+++ b/linbox/field/NTL/ntl-RR.h
@@ -0,0 +1,334 @@
+/* linbox/field/ntl-RR.h
+ * Copyright (C) 1999-2005 William J Turner,
+ * 2001 Bradford Hovinen
+ * Copyright (C) 2011 LinBox
+ *
+ * Written by W. J. Turner <wjturner at acm.org>,
+ * Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/*! @file field/NTL/ntl-RR.h
+ * @ingroup field
+ * @ingroup NTL
+ * @brief NO DOC
+ */
+
+#ifndef __LINBOX_field_ntl_rr_H
+#define __LINBOX_field_ntl_rr_H
+
+#include "linbox/linbox-config.h"
+
+#ifndef __LINBOX_HAVE_NTL
+#error "you need NTL here"
+#endif
+
+
+#include <NTL/tools.h>
+#include <NTL/RR.h>
+
+#include "linbox/util/debug.h"
+
+#include "linbox/field/unparametric.h"
+#include "linbox/randiter/unparametric.h"
+#include "linbox/field/field-traits.h"
+
+#include "linbox/integer.h"
+
+namespace Givaro
+{
+ /** Initialization of field element from an integer.
+ * Behaves like C++ allocator construct.
+ * This function assumes the output field element x has already been
+ * constructed, but that it is not already initialized.
+ * For now, this is done by converting the integer type to a C++
+ * long and then to the element type through the use of static cast and
+ * NTL's to_RR function.
+ * This, of course, assumes such static casts are possible.
+ * This function should be changed in the future to avoid using long.
+ * @return reference to field element.
+ * @param x field element to contain output (reference returned).
+ * @param y integer.
+ */
+ template <>
+ NTL::RR& Caster(NTL::RR& x, const Integer& y)
+ {
+ return x = NTL::to_RR(static_cast<const long&>(y));
+ }
+ template <>
+ NTL::RR& Caster(NTL::RR& x, const double& y)
+ {
+ return x = NTL::to_RR((long)(y));
+ }
+ template <>
+ NTL::RR& Caster(NTL::RR& x, const int& y)
+ {
+ return x = NTL::to_RR((long)(y));
+ }
+
+ template <>
+ NTL::RR& Caster(NTL::RR& x, const long int& y)
+ {
+ return x = NTL::to_RR((long)(y));
+ }
+
+ /** Conversion of field element to an integer.
+ * This function assumes the output field element x has already been
+ * constructed, but that it is not already initialized.
+ * For now, this is done by converting the element type to a C++
+ * long and then to the integer type through the use of static cast and
+ * NTL's to_long function.
+ * This, of course, assumes such static casts are possible.
+ * This function should be changed in the future to avoid using long.
+ * @return reference to integer.
+ * @param x reference to integer to contain output (reference returned).
+ * @param y constant reference to field element.
+ */
+ template <>
+ Integer& Caster(Integer& x, const NTL::RR& y)
+ {
+ return x = static_cast<Integer>(to_long(y));
+ }
+} // namespace Givaro
+
+
+
+
+// Namespace in which all LinBox library code resides
+namespace LinBox
+{
+
+ class NTL_RR_Initialiser {
+ public :
+ NTL_RR_Initialiser () { }
+ };
+
+
+
+ /** @name class RR.
+ \brief
+ * Rational number field.
+ * This field is provided as a convenience in a few places.
+ * Use with caution because expression swell.
+ *
+ * This specialization allows the \ref UnparametricField template class to be
+ * used to wrap NTL's RR class as a LinBox field.
+ \ingroup field
+ */
+ //@{
+
+
+ struct NTL_RR: public NTL_RR_Initialiser, public FFPACK::UnparametricOperations<NTL::RR> {
+ typedef NTL::RR Element ;
+ typedef FFPACK::UnparametricOperations<Element> Father_t ;
+ typedef UnparametricRandIter<Element> RandIter;
+
+ const Element zero,one,mOne ;
+
+ NTL_RR() :
+ NTL_RR_Initialiser(),Father_t ()
+ ,zero( NTL::to_RR(0)),one( NTL::to_RR(1)),mOne(-one)
+ {
+ // no default - allow initialization of ZZ_p directly by user.
+ }
+
+
+ /** Multiplicative Inverse.
+ * x = 1 / y
+ * This function assumes both field elements have already been
+ * constructed and initialized.
+ * @return reference to x.
+ * @param x field element (reference returned).
+ * @param y field element.
+ */
+ Element& inv(Element& x, const Element& y) const
+ {
+ return x = NTL::inv(y);
+ }
+
+ /** Zero equality.
+ * Test if field element is equal to zero.
+ * This function assumes the field element has already been
+ * constructed and initialized.
+ * In this specialization, NTL's IsZero function is called.
+ * @return boolean true if equals zero, false if not.
+ * @param x field element.
+ */
+ bool isZero(const Element& x) const
+ {
+ return static_cast<bool>(IsZero(x));
+ }
+
+ /** One equality.
+ * Test if field element is equal to one.
+ * This function assumes the field element has already been
+ * constructed and initialized.
+ * In this specialization, NTL's IsOne function is called.
+ * @return boolean true if equals one, false if not.
+ * @param x field element.
+ */
+ bool isOne(const Element& x) const
+ {
+ return static_cast<bool>(IsOne(x));
+ }
+
+ /** Inplace Multiplicative Inverse.
+ * x = 1 / x
+ * This function assumes both field elements have already been
+ * constructed and initialized.
+ * @return reference to x.
+ * @param x field element (reference returned).
+ */
+ Element& invin(Element& x) const
+ {
+ return x = NTL::inv(x);
+ }
+
+ /** Print field.
+ * @return output stream to which field is written.
+ * @param os output stream to which field is written.
+ */
+ std::ostream& write(std::ostream& os) const
+ {
+ return os << "unparameterized field Element";
+ }
+
+ integer & cardinality(integer &c) const
+ {
+ return c = -1L;
+ }
+
+ integer & characteristic(integer &c) const
+ {
+ return c = 0UL;
+ }
+
+ std::ostream &write (std::ostream &os, const Element &x) const {
+ return FFPACK::UnparametricOperations<Element>::write(os,x);
+ }
+
+ Element& init (Element& x) const
+ {
+ return x;
+ }
+
+ template <typename Src>
+ Element& init (Element& x, const Src& s) const
+ {
+ return Caster (x, s);
+ }
+
+ template <typename T>
+ T& convert (T &x, const Element &y) const
+ {
+ return Caster (x,y);
+ }
+
+
+ };
+
+ template <>
+ class UnparametricRandIter<NTL::RR> {
+ typedef NTL::RR Element ;
+ protected:
+ integer _size,_seed;
+ public:
+
+ UnparametricRandIter<NTL::RR> (const NTL_RR & F,
+ const integer& size = 0,
+ const integer& seed = 0) :
+ _size(size), _seed(seed)
+ {
+ if (_seed == integer(0)) _seed = integer(time(NULL));
+
+ // integer cardinality;
+ // F.cardinality(cardinality);
+ // if (_size > cardinality)
+ // _size = 0;
+
+#ifdef TRACE
+ std::cout << "created random generator with size " << _size
+ << " and seed " << _seed << std::endl;
+#endif // TRACE
+
+ // Seed random number generator
+ NTL::SetSeed(NTL::to_ZZ(static_cast<long>(_seed)));
+ }
+
+
+ /** Random field element creator.
+ * This returns a random field element from the information supplied
+ * at the creation of the generator.
+ * This generator uses the built-in C++ random number generator instead of
+ * NTL's random function because the NTL function does not allow as much
+ * control over the sampling size as the generic LinBox template. This
+ * specialization is included only to allow conversion to an NTL
+ * object.
+ * @return random field element
+ */
+ Element& random(Element &elt) const
+ {
+ // NTL::random(elt);
+ // Create new random elements
+ if (_size == 0)
+ elt = rand();
+ else
+ elt = static_cast<double>((double(rand())/RAND_MAX)*double(_size));
+
+#ifdef TRACE
+ double temp ;
+ NTL::conv(temp, elt);
+ std::cout << "random double = " << temp << " random Element = " << elt << std::endl;
+#endif // TRACE
+
+ return elt;
+
+ } // element& operator() (void)
+
+ };
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template<class Element>
+ struct ClassifyRing<UnparametricField<Element> >;
+
+ template<>
+ struct ClassifyRing<NTL_RR >{
+ typedef RingCategories::ModularTag categoryTag;
+ };
+ //@}
+} // namespace LinBox
+
+#endif // __LINBOX_field_ntl_rr_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/NTL/ntl-ZZ.h b/linbox/field/NTL/ntl-ZZ.h
new file mode 100644
index 0000000..ab6053f
--- /dev/null
+++ b/linbox/field/NTL/ntl-ZZ.h
@@ -0,0 +1,771 @@
+/* Copyright (C) LinBox
+ * Author: Zhendong Wan
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/** @file field/NTL/ntl-ZZ.h
+ * @ingroup field
+ * @brief NO DOC
+ */
+
+#ifndef __LINBOX_ntl_zz_H
+#define __LINBOX_ntl_zz_H
+
+#include <NTL/ZZ.h>
+#include "linbox/integer.h"
+#include <iostream>
+#include "linbox/util/debug.h"
+#include "linbox/randiter/ntl-ZZ.h"
+#include "linbox/field/field-traits.h"
+
+namespace LinBox
+{
+
+ template <class Ring>
+ struct ClassifyRing ;
+
+ class NTL_ZZ;
+
+ template <>
+ struct ClassifyRing<NTL_ZZ>
+ {
+ typedef RingCategories::IntegerTag categoryTag;
+ };
+
+ template<class Field>
+ class FieldAXPY;
+
+ /// \brief the integer ring. \ingroup ring
+ class NTL_ZZ {
+
+ public:
+ typedef NTL_ZZRandIter RandIter;
+ typedef NTL_ZZ Father_t ;
+
+ typedef NTL::ZZ Element;
+ Element zero,one,mOne;
+
+ NTL_ZZ(int p = 0, int exp = 1)
+ {
+ if( p != 0 ) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be 0 (no modulus)");
+ if( exp != 1 ) throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
+ }
+
+ inline integer& cardinality (integer& c) const
+ {
+ return c = -1;
+ }
+
+ inline integer& characteristic (integer& c)const
+ {
+ return c = 0;
+ }
+
+ template<class IntType>
+ inline IntType & characteristic (IntType& c)const
+ {
+ return c = 0;
+ }
+
+ std::ostream& write (std::ostream& out) const
+ {
+ return out << "NTL ZZ Ring";
+ }
+
+ std::istream& read (std::istream& in) const
+ {
+ return in;
+ }
+
+ /** @brief
+ * Init x from y.
+ */
+ template<class Element2>
+ inline Element& init (Element& x, const Element2& y) const
+ {
+
+ NTL::conv (x, y);
+
+ return x;
+ }
+
+ /** @brief
+ * Init from a NTL::ZZ
+ */
+ inline Element& init (Element& x, const Element& y) const
+ {
+
+ x = y;
+
+ return x;
+ }
+
+ /** @brief
+ * Init from an int64_t
+ */
+ inline Element& init (Element& x, const int64_t& y) const
+ {
+ bool isNeg = false;
+ uint64_t t;
+ if( y < 0 ) {
+ isNeg = true;
+ t = uint64_t(y * -1);
+ }
+ else t = (uint64_t) y;
+ init(x,t);
+ if( isNeg ) x *= -1;
+ return x;
+ }
+
+ /** @brief
+ * Init from a uint64_t
+ */
+ inline Element& init (Element& x, const uint64_t& y) const
+ {
+ uint64_t shift = (uint64_t)1 << 32;
+ uint32_t temp = uint32_t(y % shift);
+ NTL::conv (x,temp);
+ x <<= 32;
+ temp = (uint32_t)(y / shift);
+ x += temp;
+ return x;
+ }
+
+ /** @brief
+ * I don't know how to init from integer efficiently.
+ */
+ // c_str is safer than data, Z. W and BDS
+ inline Element& init (Element& x, const integer& y) const
+ {
+
+ return x=NTL::to_ZZ((std::string(y)).c_str());
+ }
+
+ /** @brief
+ * Convert y to an Element.
+ */
+ inline integer& convert (integer& x, const Element& y) const
+ {
+ bool Neg=false;
+ if (sign(y) <0)
+ Neg=true;
+ long b = NumBytes(y);
+ unsigned char* byteArray;
+ byteArray = new unsigned char[(size_t)b ];
+ BytesFromZZ(byteArray, y, b);
+
+ integer base(256);
+ x= integer(0);
+
+ for(long i = b - 1; i >= 0; --i) {
+ x *= base;
+ x += integer(byteArray[i]);
+ }
+ delete [] byteArray;
+ if (Neg)
+ x=-x;
+ return x;
+ }
+
+ inline double& convert (double& x, const Element& y) const
+ {
+ return x=NTL::to_double(y);
+ }
+
+
+
+ /** @brief
+ * x = y.
+ */
+ inline Element& assign (Element& x, const Element& y) const
+ {
+ return x = y;
+ }
+
+ /** @brief
+ * Test if x == y
+ */
+ inline bool areEqual (const Element& x ,const Element& y) const
+ {
+ return x == y;
+ }
+
+ /** @brief
+ * Test if x == 0
+ */
+ inline bool isZero (const Element& x) const
+ {
+ return NTL::IsZero (x);
+ }
+
+ /** @brief
+ * Test if x == 1
+ */
+ inline bool isOne (const Element& x) const
+ {
+ return NTL::IsOne (x);
+ }
+
+ // arithmetic
+
+ /** @brief
+ * return x = y + z
+ */
+ inline Element& add (Element& x, const Element& y, const Element& z) const
+ {
+
+ NTL::add (x, y, z);
+
+ return x;
+ }
+
+ /** @brief
+ * return x = y - z
+ */
+ inline Element& sub (Element& x, const Element& y, const Element& z) const
+ {
+
+ NTL::sub (x, y, z);
+
+ return x;
+ }
+
+ /** @brief
+ * return x = y * z
+ */
+ template <class Int>
+ inline Element& mul (Element& x, const Element& y, const Int& z) const
+ {
+
+ NTL::mul (x, y, z);
+
+ return x;
+ }
+
+ /** @brief
+ * If z divides y, return x = y / z,
+ * otherwise, throw an exception
+ */
+ inline Element& div (Element& x, const Element& y, const Element& z) const
+ {
+
+ Element q, r;
+
+ NTL::DivRem (q, r, y, z);
+
+ if (NTL::IsZero (r))
+ return x = q;
+
+ else
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"Div: not dividable");
+ }
+
+ /** @brief
+ * If y is a unit, return x = 1 / y,
+ * otherwsie, throw an exception
+ */
+ inline Element& inv (Element& x, const Element& y) const
+ {
+
+ if ( NTL::IsOne (y)) return x = y;
+
+ else if ( NTL::IsOne (-y)) return x = y;
+
+ else
+ throw PreconditionFailed(__func__,__FILE__,__LINE__,"Inv: Not invertible");
+ }
+
+ /** @brief
+ * return x = -y;
+ */
+ inline Element& neg (Element& x, const Element& y) const
+ {
+
+ NTL::negate (x, y);
+
+ return x;
+ }
+
+
+ /** @brief
+ * return r = a x + y
+ */
+ template <class Int>
+ inline Element& axpy (Element& r, const Element& a, const Int& x, const Element& y) const
+ {
+
+ NTL::mul (r, a, x);
+
+ return r += y;
+ }
+
+
+ // inplace operator
+
+ /** @brief
+ * return x += y;
+ */
+ inline Element& addin (Element& x, const Element& y) const
+ {
+
+ return x += y;
+ }
+
+ /** @brief
+ * return x -= y;
+ */
+ inline Element& subin (Element& x, const Element& y) const
+ {
+
+ return x -= y;
+ }
+
+ /** @brief
+ * return x *= y;
+ */
+ template<class Int>
+ inline Element& mulin (Element& x, const Int& y) const
+ {
+
+ return x *= y;
+ }
+
+ /** @brief
+ * If y divides x, return x /= y,
+ * otherwise throw an exception
+ */
+ inline Element& divin (Element& x, const Element& y) const
+ {
+
+ div (x, x, y);
+
+ return x;
+ }
+
+ /** @brief
+ * If x is a unit, x = 1 / x,
+ * otherwise, throw an exception.
+ */
+ inline Element& invin (Element& x) {
+
+ if (NTL::IsOne (x)) return x;
+
+ else if (NTL::IsOne (-x)) return x;
+
+ else throw PreconditionFailed(__func__,__FILE__,__LINE__,"Div: not dividable");
+ }
+
+ /** @brief
+ * return x = -x;
+ */
+ inline Element& negin (Element& x) const
+ {
+
+ NTL::negate (x, x);
+
+ return x;
+ }
+
+ /** @brief
+ * return r += a x
+ */
+ template <class Int>
+ inline Element& axpyin (Element& r, const Element& a, const Int& x) const
+ {
+
+ return r += a * x;
+ }
+
+
+ // IO
+
+ /** @brief
+ * out << y;
+ */
+ std::ostream& write(std::ostream& out,const Element& y) const
+ {
+
+ out << y;
+
+ return out;
+ }
+
+
+ /** @brief
+ * read x from istream in
+ */
+ std::istream& read(std::istream& in, Element& x) const
+ {
+
+ return in >> x;
+ }
+
+
+ /** some PIR function
+ */
+
+ /** @brief
+ * Test if x is a unit.
+ */
+ inline bool isUnit (const Element& x) const
+ {
+
+ return (NTL::IsOne (x) || NTL::IsOne (-x));
+ }
+
+ /** @brief
+ * return g = gcd (a, b)
+ */
+ inline Element& gcd (Element& g, const Element& a, const Element& b) const
+ {
+
+ NTL::GCD (g, a, b);
+
+ return g;
+ }
+
+ /** @brief
+ * return g = gcd (g, b)
+ */
+ inline Element& gcdin (Element& g, const Element& b) const
+ {
+
+ NTL::GCD (g, g, b);
+
+ return g;
+ }
+
+ /** @brief
+ * g = gcd(a, b) = a*s + b*t.
+ * The coefficients s and t are defined according to the standard
+ * Euclidean algorithm applied to |a| and |b|, with the signs then
+ * adjusted according to the signs of a and b.
+ */
+ inline Element& xgcd (Element& g, Element& s, Element& t, const Element& a, const Element& b)const
+ {
+
+ NTL::XGCD (g,s,t,a,b);
+
+ return g;
+ }
+
+ /** @brief
+ * c = lcm (a, b)
+ */
+ inline Element& lcm (Element& c, const Element& a, const Element& b) const
+ {
+
+
+ if (NTL::IsZero (a) || NTL::IsZero (b)) return c = NTL::ZZ::zero();
+
+ else {
+ Element g;
+
+ NTL::GCD (g, a, b);
+
+ NTL::mul (c, a, b);
+
+ c /= g;
+
+ NTL::abs (c, c);
+
+ return c;
+ }
+ }
+
+ /** @brief
+ * l = lcm (l, b)
+ */
+ inline Element& lcmin (Element& l, const Element& b) const
+ {
+
+ if (NTL::IsZero (l) || NTL::IsZero (b))
+
+ return l = NTL::ZZ::zero();
+
+ else {
+
+ Element g;
+
+ NTL::GCD (g, l, b);
+
+ l *= b;
+
+ l /= g;
+
+ NTL::abs (l, l);
+
+ return l;
+ }
+ }
+
+
+
+
+
+ // some specail function
+
+ /** @brief
+ * x = floor ( sqrt(y)).
+ */
+
+ inline Element& sqrt (Element& x, const Element& y) const
+ {
+
+ NTL::SqrRoot(x,y);
+
+ return x;
+ }
+
+ /** @brief
+ * Requires 0 <= x < m, m > 2 * a_bound * b_bound,
+ * a_bound >= 0, b_bound > 0
+ * This routine either returns 0, leaving a and b unchanged,
+ * or returns 1 and sets a and b so that
+ * (1) a = b x (mod m),
+ * (2) |a| <= a_bound, 0 < b <= b_bound, and
+ * (3) gcd(m, b) = gcd(a, b).
+ */
+
+ inline long reconstructRational (Element& a, Element& b, const Element& x, const Element& m,
+ const Element& a_bound, const Element& b_bound) const
+ {
+
+ return NTL::ReconstructRational(a,b,x,m,a_bound,b_bound);
+ }
+
+
+ /** @brief
+ * q = floor (x/y);
+ */
+ inline Element& quo (Element& q, const Element& a, const Element& b) const
+ {
+
+ NTL::div (q, a, b);
+
+ return q;
+ }
+
+ /** @brief
+ * r = remindar of a / b
+ */
+ inline Element& rem (Element& r, const Element& a, const Element& b) const
+ {
+
+ NTL::rem (r, a, b);
+
+ return r;
+ }
+
+ /** @brief
+ * a = quotient (a, b)
+ */
+ inline Element& quoin (Element& a, const Element& b) const
+ {
+
+ return a /= b;
+
+ }
+
+ /** @brief
+ * a = quotient (a, b)
+ */
+ inline Element& remin (Element& x, const Element& y) const
+ {
+ return x %= y;
+ }
+
+
+ /** @brief
+ * q = [a/b], r = a - b*q
+ * |r| < |b|, and if r != 0, sign(r) = sign(b)
+ */
+ inline void quoRem (Element& q, Element& r, const Element& a, const Element& b) const
+ {
+
+ NTL::DivRem(q,r,a,b);
+ }
+
+ /** @brief
+ * Test if b | a.
+ */
+ inline bool isDivisor (const Element& a, const Element& b) const
+ {
+
+ if ( NTL::IsZero (a) ) return true;
+
+ else if (NTL::IsZero (b)) return false;
+
+ else {
+ Element r;
+
+ NTL::rem (r, a, b); //weird order changed, dpritcha 2004-07-19
+
+ return NTL::IsZero (r);
+ }
+ }
+
+ /** compare two elements, a and b
+ * return 1, if a > b
+ * return 0, if a = b;
+ * return -1. if a < b
+ */
+ inline long compare (const Element& a, const Element& b) const
+ {
+
+ return NTL::compare (a, b);
+ }
+
+ /** return the absolute value
+ * x = abs (a);
+ */
+ inline Element& abs (Element& x, const Element& a) const
+ {
+
+ NTL::abs (x, a);
+
+ return x;
+ }
+
+
+ static inline int getMaxModulus()
+ {
+ return 0;
+ } // no modulus
+
+ };
+
+
+ template<>
+ class FieldAXPY<NTL_ZZ> {
+ public:
+ typedef NTL_ZZ Field;
+ typedef Field::Element Element;
+
+ /** Constructor.
+ * A faxpy object if constructed from a Field and a field element.
+ * Copies of this objects are stored in the faxpy object.
+ * @param F field F in which arithmetic is done
+ */
+ FieldAXPY (const Field &F) :
+ _field (F)
+ {
+ _y = 0;
+ }
+
+ /** Copy constructor.
+ * @param faxpy
+ */
+ FieldAXPY (const FieldAXPY<Field> &faxpy) :
+ _field (faxpy._field), _y (faxpy._y)
+ {}
+
+ /** Assignment operator
+ * @param faxpy
+ */
+ FieldAXPY<Field> &operator = (const FieldAXPY &faxpy)
+ {
+ _y = faxpy._y;
+ return *this;
+ }
+
+ /** Add a*x to y
+ * y += a*x.
+ * @param a constant reference to element a
+ * @param x constant reference to element x
+ * allow optimal multiplication, such as integer * int
+ */
+ template<class Element1>
+ inline Element& mulacc (const Element &a, const Element1 &x)
+ {
+ return _y += a * x;
+ }
+
+ inline Element& accumulate (const Element &t)
+ {
+ return _y += t;
+ }
+
+ /** Add a*x to y
+ * y += a*x.
+ * @param a constant reference to element a
+ * @param x constant reference to element x
+ * allow optimal multiplication, such as integer * int
+ */
+ template<class Element1>
+ inline Element& mulacc (const Element1 &a, const Element &x)
+ {
+ return _y += a * x;
+ }
+
+ inline Element& mulacc (const Element& a, const Element& b)
+ {
+
+ return _y += a * b;
+ }
+
+
+ /** Retrieve y
+ *
+ * Performs the delayed modding out if necessary
+ */
+ inline Element &get (Element &y) { y = _y; return y; }
+
+ /** Assign method.
+ * Stores new field element for arithmetic.
+ * @return reference to self
+ * @param y constant reference to element a
+ */
+ inline FieldAXPY &assign (const Element& y)
+ {
+ _y = y;
+ return *this;
+ }
+
+ inline void reset()
+ {
+ _y = 0;
+ }
+
+ private:
+
+ /// Field in which arithmetic is done
+ /// Not sure why it must be mutable, but the compiler complains otherwise
+ Field _field;
+
+ /// Field element for arithmetic
+ Element _y;
+
+ };
+}
+
+#endif //__LINBOX_ntl_zz_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/NTL/ntl-ZZ_p.h b/linbox/field/NTL/ntl-ZZ_p.h
new file mode 100644
index 0000000..332f96b
--- /dev/null
+++ b/linbox/field/NTL/ntl-ZZ_p.h
@@ -0,0 +1,500 @@
+/* linbox/field/ntl.h
+ * Copyright (C) 1999-2005 William J Turner,
+ * 2001 Bradford Hovinen
+ * Copyright (C) 2011 LinBox
+ *
+ * Written by W. J. Turner <wjturner at acm.org>,
+ * Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/*! @file field/NTL/ntl-ZZ_p.h
+ * @ingroup field
+ * @ingroup NTL
+ * @brief NO DOC
+ */
+
+#ifndef __LINBOX_field_ntl_zz_p_H
+#define __LINBOX_field_ntl_zz_p_H
+
+#ifndef __LINBOX_HAVE_NTL
+#error "you need NTL here"
+#endif
+
+#include <sys/time.h>
+#include <NTL/ZZ_p.h>
+#include <NTL/ZZ.h>
+
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+
+#include "linbox/field/unparametric.h"
+#include "linbox/randiter/unparametric.h"
+#include "linbox/field/field-traits.h"
+
+
+
+#include "linbox/integer.h"
+
+namespace Givaro
+{
+
+
+ /** Conversion of field element to an Integer.
+ * This function assumes the output field element x has already been
+ * constructed, but that it is not already initialized.
+ * This done by converting to a std::string : inefficient but correct.
+ * @return reference to Integer.
+ * @param x reference to Integer to contain output (reference returned).
+ * @param y constant reference to field element.
+ */
+ template <>
+ Integer& Caster(Integer& x, const NTL::ZZ_p& y)
+ {
+ NTL::ZZ iy = y._ZZ_p__rep;
+
+ long nb = NTL::NumBytes(iy);
+ unsigned char *txt;
+ typedef unsigned char u_char;
+ txt = new u_char[nb + 68];
+ // if (!txt) Error("out of memory");
+ BytesFromZZ(txt, iy, nb);
+
+ x = 0;
+ for (long i = 0; i < nb; i++) {
+ x += Integer( (unsigned long)txt[i] )<<(8*i) ;
+ }
+ delete [] txt;
+ return x;
+ }
+
+ //dpritcha
+ template<>
+ double& Caster(double& x, const NTL::ZZ_p& y)
+ {
+ x = NTL::to_double(NTL::rep(y));
+ return x;
+ }
+
+ /**\brief Initialization of field element from an Integer.
+ * Behaves like C++ allocator construct.
+ * This function assumes the output field element x has already been
+ * constructed, but that it is not already initialized.
+ * This done by converting to a std::string : inefficient but correct.
+ * @return reference to field element.
+ * @param x field element to contain output (reference returned).
+ * @param y Integer.
+ \ingroup field
+ */
+ template <>
+ NTL::ZZ_p& Caster(NTL::ZZ_p& x, const Integer& y)
+ {
+ return x = NTL::to_ZZ_p( NTL::to_ZZ( (static_cast<const std::string>(y)).c_str() ) );
+ }
+ template <>
+ NTL::ZZ_p& Caster(NTL::ZZ_p& x, const double& y)
+ {
+ return x = NTL::to_ZZ_p( NTL::to_ZZ((long)(y) ) );
+ }
+ template <>
+ NTL::ZZ_p& Caster(NTL::ZZ_p& x, const int& y)
+ {
+ return x = NTL::to_ZZ_p( NTL::to_ZZ((long)(y) ) );
+ }
+ template <>
+ NTL::ZZ_p& Caster(NTL::ZZ_p& x, const unsigned long& y)
+ {
+ return x = NTL::to_ZZ_p( NTL::to_ZZ((long)(y) ) );
+ }
+ template <>
+ NTL::ZZ_p& Caster(NTL::ZZ_p& x, const unsigned int& y)
+ {
+ return x = NTL::to_ZZ_p( NTL::to_ZZ((long)(y) ) );
+ }
+} // namespace Givaro
+
+
+// Namespace in which all LinBox library code resides
+namespace LinBox
+{
+
+
+ class NTL_ZZ_p_Initialiser {
+ public :
+ NTL_ZZ_p_Initialiser( const Integer & q, size_t e = 1) {
+ linbox_check(e == 1);
+ if ( q > 0 )
+ NTL::ZZ_p::init(NTL::to_ZZ((std::string(q)).data())); // it's an error if q not prime, e not 1
+ }
+
+ template <class ElementInt>
+ NTL_ZZ_p_Initialiser(const ElementInt& d) {
+ NTL::ZZ_p::init (NTL::to_ZZ(d));
+ }
+
+ NTL_ZZ_p_Initialiser (const NTL::ZZ& d) {
+ NTL::ZZ_p::init(d);
+ }
+
+ NTL_ZZ_p_Initialiser () { }
+
+ };
+
+ /**
+ *
+ * @brief Wrapper of zz_p from NTL.
+ * Uses nice mod p via floating pt trick.
+ *
+ */
+ struct NTL_ZZ_p: public NTL_ZZ_p_Initialiser, public FFPACK::UnparametricOperations<NTL::ZZ_p> {
+ typedef NTL::ZZ_p Element ;
+ typedef FFPACK::UnparametricOperations<Element> Father_t ;
+
+ typedef UnparametricRandIter<Element> RandIter;
+
+ const Element zero,one,mOne ;
+
+ /** @name NTL_ZZ_p
+ * @brief Arbitrary precision integers modulus a positive integer.
+
+ * While NTL allows any integer to serve as the modulus, only prime
+ * moduli yield fields. Therefore, while arthmetic operations may be
+ * valid for any modulus, only prime moduli are supported in this
+ * implementation. The primality of the modulus will not be checked, so
+ * it is the programmer's responsibility to supply a prime modulus.
+ * These specializations allow the \ref UnparametricField template class to be
+ * used to wrap NTL's <code>ZZ_p</code> class as a LinBox field.
+ */
+ //@{
+ //! @param q,e
+ NTL_ZZ_p(integer q, size_t e = 1) :
+ NTL_ZZ_p_Initialiser(q,e),Father_t ()
+ ,zero( NTL::to_ZZ_p(0)),one( NTL::to_ZZ_p(1)),mOne(-one)
+ {
+ // no default - allow initialization of ZZ_p directly by user.
+ }
+
+ //! @param d,e
+ NTL_ZZ_p( NTL::ZZ d, size_t e = 1) :
+ NTL_ZZ_p_Initialiser(d),Father_t()
+ ,zero( NTL::to_ZZ_p(0)),one( NTL::to_ZZ_p(1)),mOne(-one)
+ {
+ linbox_check(e == 1);
+ }
+
+ //! NULL constructor
+ NTL_ZZ_p() :
+ NTL_ZZ_p_Initialiser(), Father_t()
+ ,zero( NTL::to_ZZ_p(0)),one( NTL::to_ZZ_p(1)),mOne(-one)
+ {}
+ //@}
+
+ Element& init(Element& x, const integer& y) const
+ {
+ return Caster(x,y);
+ }
+
+ Element& init(Element& x, const double& y) const
+ {
+ double z = fmod(y,NTL::to_double(Element::modulus()));
+ if (z > 0) z += 0.5;
+ else z -= 0.5;
+ return x = NTL::to_ZZ_p(static_cast<long>(z)); //rounds towards 0
+ }
+
+ /** Specialization for NTL::ZZ
+ *
+ * @return reference to field element.
+ * @param x field element to contain output (reference returned)
+ * @param y NTL::ZZ.
+ */
+ Element& init(Element& x, const NTL::ZZ& y) const
+ {
+ return x = NTL::to_ZZ_p( y );
+ }
+
+ Element& init(Element& x) const
+ {
+ return x = NTL::to_ZZ_p( 0L );
+ }
+
+ Element& init(Element& x, const Element& y) const
+ {
+ return x = y ;
+ }
+
+ template <class ANY> //dpritcha--FIX
+ Element& init(Element& x, const ANY& y) const
+ {
+ return x = NTL::to_ZZ_p((long)(y));
+ }
+
+ /** Specialization for NTL::ZZ.
+ *
+ * @return reference to NTL::ZZ
+ * @param x NTL::ZZ to contain output (reference returned).
+ * @param y constant reference to field element.
+ */
+ NTL::ZZ& convert(NTL::ZZ& x, const Element& y) const
+ {
+ return x = y._ZZ_p__rep;
+ }
+
+ /** Conversion of field element to an integer.
+ * This function assumes the output field element x has already been
+ * constructed, but that it is not already initialized.
+ * This done by converting to a std::string : inefficient but correct.
+ * @return reference to integer.
+ * @param x reference to integer to contain output (reference returned).
+ * @param y constant reference to field element.
+ */
+ integer& convert(integer& x, const Element& y) const
+ {
+ NTL::ZZ iy = y._ZZ_p__rep;
+
+ long nb = NTL::NumBytes(iy);
+ unsigned char *txt;
+ typedef unsigned char u_char;
+ txt = new u_char[nb + 68];
+ // if (!txt) Error("out of memory");
+ BytesFromZZ(txt, iy, nb);
+
+ x = 0;
+ for (long i = 0; i < nb; i++) {
+ x += LinBox::integer( (unsigned long)txt[i] )<<(8*i) ;
+ }
+ delete [] txt;
+ return x;
+ };
+
+ double& convert(double& x, const Element& y) const
+ {
+ x = NTL::to_double(NTL::rep(y));
+ return x;
+ }
+
+ template <class ANY>
+ ANY& convert(ANY& x, const Element& y) const
+ {
+ return x = (ANY)(rep(y));
+ }
+
+ static inline integer getMaxModulus()
+ {
+ return integer( -1 );
+ }
+
+ Element& pow( Element& res, const Element& x, long exp ) const
+ {
+ NTL::power( res, x, exp );
+ return res;
+ }
+
+ Element& powin( Element& x, long exp ) const
+ {
+ return x = NTL::power(x,exp);
+ }
+
+ /** Cardinality.
+ * Return integer representing cardinality of the field.
+ * Returns the modulus of the field, which should be prime.
+ * @return integer representing cardinality of the field
+ */
+ integer& cardinality(integer& c) const
+ {
+ return c = static_cast<integer>(to_long(Element::modulus()));
+ }
+
+ integer cardinality() const
+ {
+ return static_cast<integer>(to_long(Element::modulus()));
+ }
+
+ /** Characteristic.
+ * Return integer representing characteristic of the field.
+ * Returns the modulus of the field, which should be prime.
+ * @return integer representing characteristic of the field.
+ */
+ integer& characteristic(integer& c) const
+ //FIXME we shouldn't go thru long here as p may be larger than that.
+ // check if NTL has cast ZZp to gmp integers.
+ {
+ return c = static_cast<integer>(to_long(Element::modulus()));
+ }
+
+ size_t& characteristic(size_t & c) const
+ {
+ return c = to_long(Element::modulus());
+ }
+
+ integer characteristic() const
+ {
+ return static_cast<integer>(to_long(Element::modulus()));
+ }
+
+ /** Multiplicative Inverse.
+ * x = 1 / y
+ * This function assumes both field elements have already been
+ * constructed and initialized.
+ * @return reference to x.
+ * @param x field element (reference returned).
+ * @param y field element.
+ */
+ Element&
+ inv(Element& x, const Element& y) const
+ {
+ return x = NTL::inv(y);
+ }
+
+ /** Zero equality.
+ * Test if field element is equal to zero.
+ * This function assumes the field element has already been
+ * constructed and initialized.
+ * In this specialization, NTL's IsZero function is called.
+ * @return boolean true if equals zero, false if not.
+ * @param x field element.
+ */
+ bool isZero(const Element& x) const
+ {
+ return static_cast<bool>(IsZero(x));
+ }
+
+ /** One equality.
+ * Test if field element is equal to one.
+ * This function assumes the field element has already been
+ * constructed and initialized.
+ * In this specialization, NTL's IsOne function is called.
+ * @return boolean true if equals one, false if not.
+ * @param x field element.
+ */
+ bool isOne(const Element& x) const
+ {
+ return static_cast<bool>(IsOne(x));
+ }
+
+ /** Inplace Multiplicative Inverse.
+ * x = 1 / x
+ * This function assumes both field elements have already been
+ * constructed and initialized.
+ * @return reference to x.
+ * @param x field element (reference returned).
+ */
+ Element& invin(Element& x) const
+ {
+ return x = NTL::inv(x);
+ }
+
+ /** Print field.
+ * @return output stream to which field is written.
+ * @param os output stream to which field is written.
+ */
+ std::ostream& write(std::ostream& os) const
+ {
+ return os << "unparameterized field Element with p = "
+ << Element::modulus();
+ }
+
+ /** Print field.
+ * @return output stream to which field is written.
+ * @param os output stream to which field is written.
+ * @param x
+ */
+ std::ostream &write (std::ostream &os, const Element &x) const
+ {
+ return FFPACK::UnparametricOperations<Element>::write(os,x);
+ }
+ };
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template <>
+ struct ClassifyRing<NTL_ZZ_p > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ /// Constructor for random field element generator
+ template <>
+ class UnparametricRandIter<NTL::ZZ_p> {
+ protected:
+ integer _size,_seed;
+ public:
+
+ UnparametricRandIter<NTL::ZZ_p> (const NTL_ZZ_p & F,
+ const integer& size = 0,
+ const integer& seed = 0) :
+ _size(size), _seed(seed)
+ {
+ if (_seed == integer(0)) _seed = integer(time(NULL));
+
+ integer cardinality;
+ F.cardinality(cardinality);
+ if (_size > cardinality)
+ _size = 0;
+
+#ifdef TRACE
+ std::cout << "created random generator with size " << _size
+ << " and seed " << _seed << std::endl;
+#endif // TRACE
+
+ // Seed random number generator
+ NTL::SetSeed(NTL::to_ZZ(static_cast<long>(_seed)));
+ }
+
+ // UnparametricRandIter<NTL::ZZ_p>(const NTL_ZZ_p& R) :
+ // _size(R._size), _seed(R._seed)
+ // {
+ // if(_seed == 0)
+ // NTL::SetSeed(NTL::to_ZZ(time(0)));
+ // else
+ // NTL::SetSeed(NTL::to_ZZ( static_cast<long>(_seed)) );
+ // }
+
+
+ /// Random field element creator.
+ NTL::ZZ_p& random(NTL::ZZ_p& x) const
+ {
+ if (_size == 0) {
+ return x = NTL::random_ZZ_p();
+ }
+ else {
+ return x = NTL::to_ZZ_p(NTL::RandomBnd(static_cast<long>(_size)));
+ }
+ }
+
+
+ };
+
+
+} // namespace LinBox
+
+#endif // __LINBOX_field_ntl_zz_p_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/NTL/ntl-ZZ_pE.h b/linbox/field/NTL/ntl-ZZ_pE.h
new file mode 100644
index 0000000..15234e8
--- /dev/null
+++ b/linbox/field/NTL/ntl-ZZ_pE.h
@@ -0,0 +1,419 @@
+/* Copyright (C) LinBox
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file field/NTL/ntl-ZZ_pE.h
+ * @ingroup field
+ * @ingroup NTL
+ * @brief NO DOC
+ */
+
+#ifndef __LINBOX_field_ntl_zz_pe_H
+#define __LINBOX_field_ntl_zz_pe_H
+
+#ifndef __LINBOX_HAVE_NTL
+#error "you need NTL here"
+#endif
+
+#include <time.h>
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+#include <NTL/ZZ_pXFactoring.h>
+#include <NTL/ZZ_pE.h>
+#include <NTL/ZZ.h>
+
+#include "linbox/field/unparametric.h"
+#include "linbox/randiter/unparametric.h"
+#include "linbox/field/field-traits.h"
+
+#ifdef __LINBOX_XMLENABLED
+
+#include "linbox/util/xml/linbox-reader.h"
+#include "linbox/util/xml/linbox-writer.h"
+
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <vector>
+
+#endif //__LINBOX_XMLENABLED
+
+
+
+#include "linbox/integer.h"
+
+namespace Givaro
+{
+
+ template<>
+ NTL::ZZ_pE& Caster(NTL::ZZ_pE &x, const Integer &y)
+ {
+ x=NTL::to_ZZ_pE(static_cast<long>(y));
+ return x;
+ }
+ template<>
+ NTL::ZZ_pE& Caster(NTL::ZZ_pE &x, const double &y)
+ {
+ x=NTL::to_ZZ_pE(static_cast<long>(y));
+ return x;
+ }
+
+ // Rich Seagraves, 7-15-03
+ // On the orders of Dr Saunders, I'm re-writing init & convert so that
+ // they convert a ZZpE into a padic number, ie a0 + a1x + a2x^2 +... ->
+ // a0 + a1*p + a2*p^2 + ...
+ //
+
+ Integer& Caster(Integer& c, const NTL::ZZ_pE& e)
+ {
+ NTL::ZZ_pX poly = rep(e);
+ //Integer base = _p;
+ Integer base = static_cast<Integer>(to_long(NTL::ZZ_p::modulus()));
+ long i;
+
+ c = 0;
+ for(i = deg(poly); i >= 0; --i) {
+ c *= base;
+ c += NTL::to_long(rep(coeff(poly, i)));
+ }
+
+ return c;
+ }
+} // namespace Givaro
+
+// Namespace in which all LinBox library code resides
+namespace LinBox
+{
+
+ class NTL_ZZ_pE_Initialiser {
+ public :
+ NTL_ZZ_pE_Initialiser( const Integer & p, size_t k ) {
+ // linbox_check(e == 1);
+ // if ( q > 0 )
+ // NTL::ZZ_p::init(NTL::to_ZZ((std::string(q)).data())); // it's an error if q not prime, e not 1
+ NTL::ZZ_p::init(NTL::to_ZZ(std::string(p).data()));
+ NTL::ZZ_pX irredPoly = NTL::BuildIrred_ZZ_pX ((long) k);
+ NTL::ZZ_pE::init(irredPoly);
+
+ }
+
+ // template <class ElementInt>
+ // NTL_ZZ_pE_Initialiser(const ElementInt& d) {
+ // NTL::ZZ_p::init (NTL::to_ZZ(d));
+ // }
+
+ // NTL_ZZ_pE_Initialiser (const NTL::ZZ& d) {
+ // NTL::ZZ_p::init(d);
+ // }
+
+ };
+
+
+
+ /**
+ * @brief Wrapper of ZZ_pE from NTL
+ * Define a parameterized class to handle easily UnparametricField<NTL::ZZ_pE> field
+ */
+ class NTL_ZZ_pE : public NTL_ZZ_pE_Initialiser, public UnparametricOperations<NTL::ZZ_pE> {
+ public:
+ typedef NTL::ZZ_pE Element ;
+ typedef FFPACK::UnparametricOperations<Element> Father_t ;
+
+ const Element zero,one,mOne ;
+
+
+ NTL_ZZ_pE (const integer &p, const integer &k) :
+ NTL_ZZ_pE_Initialiser(p,k),Father_t ()
+ ,zero( NTL::to_ZZ_pE(0)),one( NTL::to_ZZ_pE(1)),mOne(-one)
+
+
+ {
+
+ }
+
+
+ bool isZero (const Element& a) const
+ {
+ return NTL::IsZero(a);
+ }
+
+
+ bool isOne (const Element& a) const
+ {
+ return NTL::IsOne(a);
+ }
+
+
+
+ integer& characteristic (integer &c) const
+ {
+ return c=static_cast<integer>(to_long(NTL::ZZ_p::modulus()));
+ //NTL::ZZ_p::modulus();
+ }
+
+
+ integer& cardinality(integer& c) const
+ {
+ c=static_cast<integer>(to_long(NTL::ZZ_p::modulus()));
+ c=pow(c,Element::degree());
+ return c;
+ }
+
+ Element& inv(Element& x, const Element& y) const
+ {
+ x=NTL::to_ZZ_pE(1)/y;
+ return x;
+ }
+
+ Element& invin(Element& x) const
+ {
+ x=NTL::to_ZZ_pE(1)/x;
+ return x;
+ }
+
+
+ std::istream& read(std::istream& is, Element& x) const
+ {
+ long tmp;
+ is>>tmp;
+ x=NTL::to_ZZ_pE(tmp);
+ return is;
+ }
+
+
+
+#ifdef __LINBOX_XMLENABLED
+
+
+ bool toTag(LinBox::Writer &W) const
+ {
+ std::string s;
+ NTL::ZZ_pX poly = Element::modulus();
+ long i;
+
+ W.setTagName("field");
+ W.setAttribute("implDetail", "ntl-ZZpE");
+ W.setAttribute("cardinality", LinBox::Writer::numToString(s, _card));
+
+ W.addTagChild();
+ W.setTagName("finite");
+
+ W.addTagChild();
+ W.setTagName("characteristic");
+ W.addNum(_p);
+ W.upToParent();
+
+ W.addTagChild();
+ W.setTagName("extension");
+ W.addNum(deg(poly) + 1);
+ W.upToParent();
+
+ W.addTagChild();
+ W.setTagName("polynomial");
+
+ for(i = 0; i <= deg(poly); ++i) {
+ W.addNum(coeff(poly, i));
+ }
+ W.upToParent();
+ W.upToParent();
+ W.upToParent();
+
+ return true;
+ }
+
+
+ std::ostream &write(std::ostream &os) const
+ {
+ LinBox::Writer W;
+ if( toTag(W) )
+ W.write(os);
+
+ return os;
+ }
+
+
+ // Elemnt Reading & writing functions
+ // BIG NOTE: It was decided that for extension fields, the elements
+ // would be represented using a single number that has the following
+ // property: for an element e in ZZp[x], with e = a0 + a1x + a2x^2 + ...,
+ // represent e as "<cn>n</cn>" where n = a0 + a1 * p + a2 * p^2 + ...
+ //
+
+
+ bool toTag(LinBox::Writer &W, const Element &e) const
+ {
+ NTL::ZZ_pX poly = rep(e);
+ NTL::ZZ accum, base = NTL::ZZ_p::modulus();
+ long i;
+ std::string s;
+
+ accum = 0;
+ for(i = deg(poly); i >= 0; --i) {
+ accum *= base;
+ accum += rep(coeff(poly, i));
+ }
+
+
+ W.setTagName("cn");
+ W.addDataChild(LinBox::Writer::numToString(s, accum));
+
+ return true;
+ }
+
+
+ std::ostream &write(std::ostream &os, const Element &e) const
+ {
+
+ LinBox::Writer W;
+ if( toTag(W, e))
+ W.write(os);
+
+ return os;
+ }
+
+
+
+
+ bool fromTag(LinBox::Reader &R, Element &e) const
+ {
+ NTL::ZZ total, base = NTL::ZZ_p::modulus(), rem;
+ std::stringstream ss;
+
+ if(!R.expectTagName("cn") || !R.expectChildTextNum(total))
+ return false;
+
+ ss << "[";
+ while(total > 0) {
+ rem = total % base;
+ total /= base;
+ ss << rem;
+ if(total > 0) ss << " ";
+ }
+
+ ss << "]";
+
+ ss >> e; // use the extraction stream operator
+
+ return true;
+ }
+
+
+ std::istream &read(std::istream &is, Element &e) const
+ {
+ LinBox::Reader R(is);
+ if( !fromTag(R, e)) {
+ is.setstate(std::istream::failbit);
+ if(!R.initalized()) {
+ is.setstate(std::istream::badbit);
+ }
+ }
+
+ return is;
+ }
+
+
+#endif
+
+
+ }; // end of class NTL_ZZ_pE
+
+
+
+
+
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template<>
+ struct ClassifyRing<UnparametricRandIter<NTL::ZZ_pE> > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+
+
+}
+
+namespace LinBox
+{
+
+
+ template<>
+ class UnparametricRandIter<NTL::ZZ_pE> {
+ public:
+ typedef NTL::ZZ_pE Element;
+ UnparametricRandIter<NTL::ZZ_pE>(const NTL_ZZ_pE & F ,
+ const integer& size =0,
+ const integer& seed =0
+ ) :
+ _size(size), _seed(seed)
+ {
+ if(_seed == 0)
+ NTL::SetSeed(NTL::to_ZZ(time(0)));
+ else
+ NTL::SetSeed( NTL::to_ZZ(static_cast<long>(seed)) );
+ }
+
+#ifdef __LINBOX_XMLENABLED
+ UnparametricRandIter<NTL::ZZ_pE>(LinBox::Reader &R)
+ {
+ if(!R.expectTagName("randiter")) return;
+ if(!R.expectAttributeNum("seed", _seed) || !R.expectAttributeNum("size", _size)) return;
+
+ if(_seed == 0) _seed = time(NULL);
+
+ NTL::SetSeed(NTL::to_ZZ(_seed));
+ }
+#endif
+
+
+ UnparametricRandIter<NTL::ZZ_pE>(const UnparametricRandIter<NTL::ZZ_pE>& R) :
+ _size(R._size), _seed(R._seed)
+
+ {
+ if(_seed == 0)
+ NTL::SetSeed(NTL::to_ZZ(time(0)));
+ else
+ NTL::SetSeed(NTL::to_ZZ( static_cast<long>(_seed)) );
+ }
+
+ NTL::ZZ_pE& random (NTL::ZZ_pE& x) const
+ {
+ NTL::random(x);
+ return x;
+ }
+
+ protected:
+ size_t _size;
+ size_t _seed;
+ };
+}
+#endif //__LINBOX_field_ntl_zz_pe_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/NTL/ntl-ZZ_pX.h b/linbox/field/NTL/ntl-ZZ_pX.h
new file mode 100644
index 0000000..e7a0003
--- /dev/null
+++ b/linbox/field/NTL/ntl-ZZ_pX.h
@@ -0,0 +1,341 @@
+/* Copyright (C) 2005 LinBox
+ * written by Daniel Roche, August 2005
+ * Copyright (C) 2011 LinBox
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file field/NTL/ntl-ZZ_p.h
+ * @ingroup field
+ * @ingroup NTL
+ * @brief NO DOC
+ */
+
+#ifndef __LINBOX_field_ntl_zz_px_H
+#define __LINBOX_field_ntl_zz_px_H
+
+#ifndef __LINBOX_HAVE_NTL
+#error "you need NTL here"
+#endif
+
+#include <vector>
+#include <NTL/ZZ_pX.h>
+
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+
+#include "linbox/field/unparametric.h"
+#include "linbox/field/NTL/ntl-ZZ_p.h"
+#include "linbox/integer.h"
+
+
+// namespace in which all LinBox code resides
+namespace LinBox
+{
+ class NTL_ZZ_pX_Initialiser {
+ public :
+ NTL_ZZ_pX_Initialiser( const Integer & q, size_t e = 1) {
+ // linbox_check(e == 1);
+ if ( q > 0 )
+ NTL::ZZ_p::init(NTL::to_ZZ((std::string(q)).data())); // it's an error if q not prime, e not 1
+ }
+
+ // template <class ElementInt>
+ // NTL_ZZ_p_Initialiser(const ElementInt& d) {
+ // NTL::ZZ_p::init (NTL::to_ZZ(d));
+ // }
+
+ // NTL_ZZ_p_Initialiser (const NTL::ZZ& d) {
+ // NTL::ZZ_p::init(d);
+ // }
+
+ };
+
+ /** Ring (in fact, a unique factorization domain) of polynomial with
+ * coefficients in class NTL_ZZ_p (integers mod a wordsize prime).
+ * All the same functions as any other ring, with the addition of:
+ * Coeff (type), CoeffField (type), getCoeffField, setCoeff, getCoeff,
+ * leadCoeff, deg
+ */
+ class NTL_ZZ_pX : public NTL_ZZ_pX_Initialiser, public FFPACK::UnparametricOperations<NTL::ZZ_pX> {
+ public:
+ typedef NTL::ZZ_pX Element ;
+ typedef FFPACK::UnparametricOperations<Element> Father_t ;
+ typedef UnparametricRandIter<Element> RandIter;
+
+ const Element zero,one,mOne ;
+
+
+ typedef NTL_ZZ_p CoeffField;
+ typedef NTL::ZZ_p Coeff;
+ // typedef NTL::ZZ_pX Element;
+
+ /** Standard LinBox field constructor. The paramters here
+ * (prime, exponent) are only used to initialize the coefficient field.
+ */
+ NTL_ZZ_pX( const integer& p, size_t e = 1 ) :
+ NTL_ZZ_pX_Initialiser(p,e),Father_t ()
+ , zero( NTL::to_ZZ_pX(0)),one( NTL::to_ZZ_pX(1)),mOne(-one)
+ , _CField(p,e)
+ {}
+
+ /** Constructor from a coefficient field */
+ NTL_ZZ_pX( CoeffField cf ) :
+ NTL_ZZ_pX_Initialiser(cf.cardinality()),Father_t ()
+ ,zero( NTL::to_ZZ_pX(0)),one( NTL::to_ZZ_pX(1)),mOne(-one)
+ ,_CField(cf)
+ {}
+
+ /** Initialize p to the constant y (p = y*x^0) */
+ template <class ANY>
+ Element& init( Element& p, const ANY& y ) const
+ {
+ Coeff temp;
+ _CField.init( temp, y );
+ return p = temp;
+ }
+
+ /** Initialize p to the constant y (p = y*x^0) */
+ Element& init( Element& p, const Coeff& y ) const
+ {
+ return p = y;
+ }
+
+ /** Initialize p from a vector of coefficients.
+ * The vector should be ordered the same way NTL does it: the front
+ * of the vector corresponds to the trailing coefficients, and the back
+ * of the vector corresponds to the leading coefficients. That is,
+ * v[i] = coefficient of x^i.
+ */
+ template <class ANY>
+ Element& init( Element& p, const std::vector<ANY>& v ) const
+ {
+ p = 0;
+ Coeff temp;
+ for( long i = 0; i < (long)v.size(); ++i ) {
+ _CField.init( temp, v[ (size_t) i ] );
+ if( !_CField.isZero(temp) )
+ NTL::SetCoeff( p, i, temp );
+ }
+ return p;
+ }
+
+ /** Initialize p from a vector of coefficients.
+ * The vector should be ordered the same way NTL does it: the front
+ * of the vector corresponds to the trailing coefficients, and the back
+ * of the vector corresponds to the leading coefficients. That is,
+ * v[i] = coefficient of x^i.
+ */
+ Element& init( Element& p, const std::vector<Coeff>& v ) const
+ {
+ p = 0;
+ for( long i = 0; i < (long)v.size(); ++i )
+ NTL::SetCoeff( p, i, v[ (size_t) i ] );
+ return p;
+ }
+
+ /** Convert p to a vector of coefficients.
+ * The vector will be ordered the same way NTL does it: the front
+ * of the vector corresponds to the trailing coefficients, and the back
+ * of the vector corresponds to the leading coefficients. That is,
+ * v[i] = coefficient of x^i.
+ */
+ template< class ANY >
+ std::vector<ANY>& convert( std::vector<ANY>& v, const Element& p ) const
+ {
+ v.clear();
+ ANY temp;
+ for( long i = 0; i <= this->deg(p); ++i ) {
+ _CField.convert( temp, NTL::coeff( p, i ) );
+ v.push_back( temp );
+ }
+ return v;
+ }
+
+ /** Convert p to a vector of coefficients.
+ * The vector will be ordered the same way NTL does it: the front
+ * of the vector corresponds to the trailing coefficients, and the back
+ * of the vector corresponds to the leading coefficients. That is,
+ * v[i] = coefficient of x^i.
+ */
+ std::vector<Coeff>& convert( std::vector<Coeff>& v, const Element& p ) const
+ {
+ v.clear();
+ for( long i = 0; i <= (long)this->deg(p); ++i )
+ v.push_back( NTL::coeff(p,i) );
+ return v;
+ }
+
+ /** Test if an element equals zero */
+ bool isZero( const Element& x ) const
+ {
+ return ( (this->deg(x) == 0) &&
+ ( _CField.isZero( NTL::ConstTerm(x) ) ) );
+ }
+
+ /** Test if an element equals one */
+ bool isOne( const Element& x ) const
+ {
+ return ( (this->deg(x) == 0) &&
+ ( _CField.isOne( NTL::ConstTerm(x) ) ) );
+ }
+
+ /** The LinBox field for coefficients */
+ const CoeffField& getCoeffField() const
+ {
+ return _CField;
+ }
+
+ /** Get the degree of a polynomial
+ * Unlike NTL, deg(0)=0.
+ */
+ size_t deg( const Element& p ) const
+ {
+ long temp = NTL::deg(p);
+ if( temp == -1 ) return 0;
+ else return static_cast<size_t>(temp);
+ }
+
+ /** r will be set to the reverse of p. */
+ Element& rev( Element& r, const Element& p ) {
+ NTL::reverse(r,p);
+ return r;
+ }
+
+ /** r is itself reversed. */
+ Element& revin( Element& r ) {
+ return r = NTL::reverse(r);
+ }
+
+ /** Get the leading coefficient of this polynomial. */
+ Coeff& leadCoeff( Coeff& c, const Element& p ) const
+ {
+ c = NTL::LeadCoeff(p);
+ return c;
+ }
+
+ /** Get the coefficient of x^i in a given polynomial */
+ Coeff& getCoeff( Coeff& c, const Element& p, size_t i ) const
+ {
+ c = NTL::coeff( p, (long)i );
+ return c;
+ }
+
+ /** Set the coefficient of x^i in a given polynomial */
+ Element& setCoeff( Element& p, size_t i, const Coeff& c ) const
+ {
+ NTL::SetCoeff(p,(long)i,c);
+ return p;
+ }
+
+ /** Get the quotient of two polynomials */
+ Element& quo( Element& res, const Element& a, const Element& b ) const
+ {
+ NTL::div(res,a,b);
+ return res;
+ }
+
+ /** a = quotient of a, b */
+ Element& quoin( Element& a, const Element& b ) const
+ {
+ return a /= b;
+ }
+
+ /** Get the remainder under polynomial division */
+ Element& rem( Element& res, const Element& a, const Element& b ) const
+ {
+ NTL::rem(res,a,b);
+ return res;
+ }
+
+ /** a = remainder of a,b */
+ Element& remin( Element& a, const Element& b ) const
+ {
+ return a %= b;
+ }
+
+ /** Get the quotient and remainder under polynomial division */
+ void quorem( Element& q, Element& r,
+ const Element& a, const Element& b ) const
+ {
+ NTL::DivRem(q,r,a,b);
+ }
+
+ /** Get characteristic of the field - same as characteristic of
+ * coefficient field. */
+ integer& characteristic( integer& c ) const
+ {
+ return _CField.characteristic(c);
+ }
+
+ /** Get the cardinality of the field. Since the cardinality is
+ * infinite, by convention we return -1.
+ */
+ integer& cardinality( integer& c ) const
+ {
+ return c = static_cast<integer>(-1);
+ }
+
+ static inline integer getMaxModulus()
+ {
+ return CoeffField::getMaxModulus();
+ }
+
+ /** Write a description of the field */
+ // Oustide of class definition so write(ostream&,const Element&) from
+ // UnparametricField still works.
+ std::ostream& write( std::ostream& os ) const
+ {
+ return os << "Polynomial ring using NTL::ZZ_pX";
+ }
+
+ std::ostream &write (std::ostream &os, const Element &x) const { return FFPACK::UnparametricOperations<Element>::write(os,x); }
+
+
+ private:
+ /** Conversion to scalar types doesn't make sense and should not be
+ * used. Use getCoeff or leadCoeff to get the scalar values of
+ * specific coefficients, and then convert them using coeffField()
+ * if needed.
+ */
+ template< class ANY >
+ ANY& convert( ANY& x, const Element& y ) const
+ {
+ return x;
+ }
+
+ CoeffField _CField;
+ }; // end of class NTL_ZZ_pX
+
+
+} // end of namespace LinBox
+
+#endif // __LINBOX_field_ntl_zz_px_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/NTL/ntl-lzz_p.h b/linbox/field/NTL/ntl-lzz_p.h
new file mode 100644
index 0000000..17dd533
--- /dev/null
+++ b/linbox/field/NTL/ntl-lzz_p.h
@@ -0,0 +1,348 @@
+/* linbox/field/ntl-lzz_p.h
+ * Copyright (C) 1999-2005 W. J. Turner,
+ * 2001 Bradford Hovinen
+ * Copyright (C) 2011 LinBox
+ *
+ * Written by W. J. Turner <wjturner at acm.org>,
+ * Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ *
+ */
+
+/*! @file field/NTL/ntl-lzz_p.h
+ * @ingroup field
+ * @ingroup NTL
+ * @brief NO DOC
+ */
+
+#ifndef __LINBOX_field_ntl_lzz_p_H
+#define __LINBOX_field_ntl_lzz_p_H
+
+#ifndef __LINBOX_HAVE_NTL
+#error "you need NTL here"
+#endif
+
+#include <time.h>
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+#include <NTL/lzz_p.h>
+#include <NTL/ZZ.h>
+
+#include "linbox/field/unparametric.h"
+#include "linbox/randiter/unparametric.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/integer.h"
+
+#include "linbox/integer.h"
+
+namespace Givaro
+{
+
+ /** Initialization of field element from an integer.
+ * This Uses NTL's <code>to_zz_p</code> function.
+ *
+ * @return reference to field element.
+ * @param x field element to contain output (reference returned).
+ * @param y Integer.
+ */
+ template <>
+ NTL::zz_p& Caster(NTL::zz_p& x, const Integer& y)
+ {
+ return x = NTL::to_zz_p( y%NTL::zz_p::modulus() );
+ }
+ template <>
+ NTL::zz_p& Caster(NTL::zz_p& x, const double& y)
+ {
+ return x = NTL::to_zz_p((long)(y)%NTL::zz_p::modulus());
+ }
+
+ /** Conversion of field element to an Integer.
+ * This function assumes the output field element x has already been
+ * constructed, but that it is not already initialized.
+ * For now, this is done by converting the element type to a C++
+ * long and then to the Integer type through the use of static cast and
+ * NTL's to_long function.
+ * This, of course, assumes such static casts are possible.
+ * This function should be changed in the future to avoid using long.
+ * @return reference to Integer.
+ * @param x reference to Integer to contain output (reference returned).
+ * @param y constant reference to field element.
+ */
+ template <>
+ Integer& Caster(Integer& x, const NTL::zz_p& y)
+ {
+ return x = static_cast<Integer>(rep(y));
+ }
+} // namespace Givaro
+
+// Namespace in which all LinBox library code resides
+namespace LinBox
+{
+
+ class NTL_zz_p_Initialiser {
+ public :
+ NTL_zz_p_Initialiser( const Integer & q, size_t e = 1) {
+ linbox_check(e == 1);
+ if ( q > 0 )
+ // NTL::zz_p::init(NTL::to_ZZ((std::string(q)).data())); // it's an error if q not prime, e not 1
+ NTL::zz_p::init(q); // it's an error if q not prime, e not 1
+ }
+
+ template <class ElementInt>
+ NTL_zz_p_Initialiser(const ElementInt& d) {
+ NTL::zz_p::init (NTL::to_ZZ(d));
+ }
+
+ NTL_zz_p_Initialiser () { }
+
+ };
+
+ /**
+ * \brief long ints modulo a positive integer.
+ *
+ * While NTL allows any int to serve as the modulus, only prime
+ * moduli yield fields. The primality of the modulus will not be checked, so
+ * it is the programmer's responsibility to supply a prime modulus if a field is
+ * wanted.
+ * These specializations allow the \ref UnparametricField template class to be
+ * used to wrap NTL's <code>zz_p</code> class as a LinBox field.
+ * Uses nice trick for mod p via floating point.
+ \ingroup field
+ */
+ struct NTL_zz_p: public NTL_zz_p_Initialiser, public FFPACK::UnparametricOperations<NTL::zz_p> {
+ typedef NTL::zz_p Element ;
+ typedef FFPACK::UnparametricOperations<Element> Father_t ;
+ typedef UnparametricRandIter<NTL::zz_p> RandIter;
+
+ const Element zero,one,mOne ;
+
+
+ //public UnparametricField<Element> {
+ NTL_zz_p(integer p, size_t e = 1) :
+ NTL_zz_p_Initialiser(p,e),Father_t ()
+ ,zero( NTL::to_zz_p(0)),one( NTL::to_zz_p(1)),mOne(-one)
+ {}
+
+ NTL_zz_p() :
+ NTL_zz_p_Initialiser(2,1), Father_t()
+ ,zero( NTL::to_zz_p(0)),one( NTL::to_zz_p(1)),mOne(-one)
+ {}
+
+ Element& init(Element& x, const double& y) const
+ {
+ double z = fmod(y,(double)Element::modulus());
+ if (z > 0) z += 0.5;
+ else z -= 0.5;
+ return x = NTL::to_zz_p(static_cast<long>(z)); //rounds towards 0
+ }
+
+ Element &init (Element &x, const integer &y=0) const
+ {
+ NTL::ZZ tmp= NTL::to_ZZ(std::string(y).data());
+ return x = NTL::to_zz_p(tmp);
+ }
+
+ template <class ANY>
+ Element& init(Element& x, const ANY& y) const
+ {
+ return x = NTL::to_zz_p((long)(y));
+ }
+
+ template <class ANY>
+ ANY& convert(ANY& x, const Element& y) const
+ {
+ return x = (ANY)(rep(y));
+ }
+
+ static inline integer getMaxModulus()
+ {
+ return integer( NTL_SP_BOUND );
+ }
+
+ Element& pow( Element& res, const Element& x, long exp ) const
+ {
+ NTL::power( res, x, exp );
+ return res;
+ }
+
+ Element& powin( Element& x, long exp ) const
+ {
+ return x = NTL::power(x,exp);
+ }
+ /** Cardinality.
+ * Return integer representing cardinality of the field.
+ * Returns the modulus of the field, which should be prime.
+ * @return integer representing cardinality of the field
+ */
+
+ integer& cardinality(integer& c) const
+ {
+ return c = static_cast<integer>(Element::modulus());
+ }
+
+ integer cardinality() const
+ {
+ return static_cast<integer>(Element::modulus());
+ }
+
+ /** Characteristic.
+ * Return integer representing characteristic of the field.
+ * Returns the modulus of the field, which should be prime.
+ * @return integer representing characteristic of the field.
+ */
+
+ integer& characteristic(integer& c) const
+ {
+ return c = static_cast<integer>(Element::modulus());
+ }
+
+ integer characteristic() const
+ {
+ return static_cast<integer>(Element::modulus());
+ }
+
+ /** Multiplicative Inverse.
+ * x = 1 / y
+ * This function assumes both field elements have already been
+ * constructed and initialized.
+ * @return reference to x.
+ * @param x field element (reference returned).
+ * @param y field element.
+ */
+ Element&
+ inv(Element& x, const Element& y) const
+ {
+ return x = NTL::inv(y);
+ }
+
+ /** Zero equality.
+ * Test if field element is equal to zero.
+ * This function assumes the field element has already been
+ * constructed and initialized.
+ * In this specialization, NTL's IsZero function is called.
+ * @return boolean true if equals zero, false if not.
+ * @param x field element.
+ */
+ bool isZero(const Element& x) const
+ {
+ return static_cast<bool>(NTL::IsZero(x));
+ }
+
+ /** One equality.
+ * Test if field element is equal to one.
+ * This function assumes the field element has already been
+ * constructed and initialized.
+ * In this specialization, NTL's IsOne function is called.
+ * @return boolean true if equals one, false if not.
+ * @param x field element.
+ */
+ bool isOne(const Element& x) const
+ {
+ return static_cast<bool>(NTL::IsOne(x));
+ }
+
+ /** Inplace Multiplicative Inverse.
+ * x = 1 / x
+ * This function assumes both field elements have already been
+ * constructed and initialized.
+ * @return reference to x.
+ * @param x field element (reference returned).
+ */
+ Element& invin(Element& x) const
+ {
+ return x = NTL::inv(x);
+ }
+
+ /** Print field.
+ * @return output stream to which field is written.
+ * @param os output stream to which field is written.
+ */
+ std::ostream& write(std::ostream& os) const
+ {
+ return os << "unparameterized field Element with p = "
+ << Element::modulus();
+ }
+
+ std::ostream &write (std::ostream &os, const Element &x) const { return FFPACK::UnparametricOperations<Element>::write(os,x); }
+ };
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template <>
+ struct ClassifyRing<NTL_zz_p> {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ template<>
+ class UnparametricRandIter<NTL::zz_p> {
+ public:
+ /// Constructor for random field element generator
+
+ UnparametricRandIter<NTL::zz_p> (const NTL_zz_p & F=NTL_zz_p(),
+ const integer& size=0,
+ const integer& seed=0) :
+ _size(size), _seed(seed)
+ {
+ if (_seed == integer(0)) _seed = integer(time(NULL));
+
+ integer cardinality;
+ F.cardinality(cardinality);
+ if (_size > cardinality)
+ _size = 0;
+
+#ifdef TRACE
+ std::cout << "created random generator with size " << _size
+ << " and seed " << _seed << std::endl;
+#endif // TRACE
+
+ // Seed random number generator
+ NTL::SetSeed(NTL::to_ZZ(static_cast<long>(_seed)));
+ }
+
+ /// Random field element creator.
+ NTL::zz_p& random(NTL::zz_p& x) const
+ {
+ if (_size == 0) {
+ return x = NTL::random_zz_p();
+ }
+ else {
+ return x = NTL::to_zz_p(NTL::RandomBnd(static_cast<long>(_size)));
+ }
+ }
+ protected :
+ integer _size,_seed ;
+ };
+
+} // namespace LinBox
+
+#endif // __LINBOX_field_ntl_lzz_p_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/NTL/ntl-lzz_pE.h b/linbox/field/NTL/ntl-lzz_pE.h
new file mode 100644
index 0000000..bc81612
--- /dev/null
+++ b/linbox/field/NTL/ntl-lzz_pE.h
@@ -0,0 +1,268 @@
+/* linbox/field/ntl-z_pE.h
+ * Copyright (C) 2004 Pascal Giorgi
+ * Copyright (C) 2011 LinBox
+ *
+ * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
+ *
+ * Modified by W. J. Turner <wjturner at acm.org>
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file field/NTL/ntl-lzz_pE.h
+ * @ingroup field
+ * @ingroup NTL
+ * @brief NO DOC
+ */
+
+#ifndef __LINBOX_field_ntl_lzz_pe_H
+#define __LINBOX_field_ntl_lzz_pe_H
+
+#ifndef __LINBOX_HAVE_NTL
+#error "you need NTL here"
+#endif
+
+#include <NTL/lzz_pXFactoring.h>
+#include <NTL/lzz_pE.h>
+#include <time.h>
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+
+#include "linbox/field/unparametric.h"
+#include "linbox/randiter/unparametric.h"
+#include "linbox/field/field-traits.h"
+
+
+
+#include "linbox/integer.h"
+
+namespace Givaro
+{
+ template<>
+ NTL::zz_pE& Caster(NTL::zz_pE &x, const Integer &y)
+ {
+ x=NTL::to_zz_pE(static_cast<long>(y));
+ return x;
+ }
+ template<>
+ NTL::zz_pE& Caster(NTL::zz_pE &x, const double &y)
+ {
+ x=NTL::to_zz_pE(static_cast<long>(y));
+ return x;
+ }
+
+ template<>
+ Integer& Caster (Integer& x, const NTL::zz_pE &y) {
+ NTL::zz_pX poly = rep(y);
+ Integer base = static_cast<Integer>(NTL::zz_p::modulus());
+ long i = deg(poly)+1;
+ x = 0;
+ for( ; i-- ; ) {
+ x *= base;
+ x += NTL::to_long(rep(coeff(poly, i)));
+ }
+ return x;
+ }
+} // namespace Givaro
+
+
+
+// Namespace in which all LinBox library code resides
+namespace LinBox
+{
+
+ //! use ZZ_pEBak mechanism too ?
+ class NTL_zz_pE_Initialiser {
+ public :
+ NTL_zz_pE_Initialiser( const Integer & p, const Integer & k) {
+ NTL::zz_p::init( (long) p);
+ NTL::zz_pX irredPoly = NTL::BuildIrred_zz_pX ((long) k);
+ NTL::zz_pE::init(irredPoly);
+
+ }
+
+ // template <class ElementInt>
+ // NTL_zz_pE_Initialiser(const ElementInt& d) {
+ // NTL::ZZ_p::init (NTL::to_ZZ(d));
+ // }
+
+ // NTL_zz_pE_Initialiser (const NTL::ZZ& d) {
+ // NTL::ZZ_p::init(d);
+ // }
+
+ };
+
+
+
+
+
+ /*! @brief zz_pE
+ * Define a parameterized class to easily handle UnparametricField<NTL::zz_pE> field
+ */
+
+ /// \brief for large cardinality, small prime. \ingroup field
+ class NTL_zz_pE : public NTL_zz_pE_Initialiser, public FFPACK::UnparametricOperations<NTL::zz_pE> {
+ public:
+ typedef NTL::zz_pE Element ;
+ typedef FFPACK::UnparametricOperations<Element> Father_t ;
+ typedef UnparametricRandIter<Element> RandIter;
+
+ const Element zero,one,mOne ;
+
+ NTL_zz_pE (const integer &p, const integer &k) :
+ NTL_zz_pE_Initialiser(p,k),Father_t ()
+ ,zero( NTL::to_zz_pE(0)),one( NTL::to_zz_pE(1)),mOne(-one)
+
+ {
+
+ }
+
+ Element& random (Element& x) const
+ {
+ NTL::random(x);
+ return x;
+ }
+
+
+ bool isZero (const Element& a) const
+ {
+ return NTL::IsZero(a);
+ }
+
+
+ bool isOne (const Element& a) const
+ {
+ return NTL::IsOne(a);
+ }
+
+
+
+ integer& characteristic (integer &c) const
+ {
+ return c = static_cast<integer>(NTL::zz_p::modulus());
+ }
+
+
+ integer& cardinality(integer& c) const
+ {
+ NTL::ZZ card = Element::cardinality();
+ long b = NumBytes(card);
+ unsigned char* byteArray;
+ byteArray = new unsigned char[(size_t)b ];
+ BytesFromZZ(byteArray, card, b);
+
+ integer base(256);
+ c= integer(0);
+
+ for(long i = b - 1; i >= 0; --i) {
+ c *= base;
+ c += integer(byteArray[i]);
+ }
+ delete [] byteArray;
+
+ return c;
+ }
+
+
+
+ Element& inv(Element& x, const Element& y) const
+ {
+ x=one/y;
+ return x;
+ }
+
+ Element& invin(Element& x) const
+ {
+ x=one/x;
+ return x;
+ }
+
+
+
+ std::istream& read(std::istream& is, Element& x) const
+ {
+ long tmp;
+ is>>tmp;
+ x=NTL::to_zz_pE(tmp);
+ return is;
+ }
+ }; // end o class NTL_zz_pE
+
+
+
+
+
+
+ template <class Ring>
+ struct ClassifyRing;
+
+ template<>
+ struct ClassifyRing<UnparametricRandIter<NTL::zz_pE> > {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ template<>
+ class UnparametricRandIter<NTL::zz_pE> {
+ public:
+ typedef NTL::zz_pE Element;
+ UnparametricRandIter<NTL::zz_pE>(const NTL_zz_pE & F ,
+ const size_t& size = 0,
+ const size_t& seed = 0
+ ) :
+ _size(size), _seed(seed)
+ {
+ if(_seed == 0)
+ NTL::SetSeed(NTL::to_ZZ(time(0)));
+ else
+ NTL::SetSeed(NTL::to_ZZ(_seed));
+ }
+
+ UnparametricRandIter<NTL::zz_pE>(const UnparametricRandIter<NTL::zz_pE>& R) :
+ _size(R._size), _seed(R._seed)
+
+ {
+ if(_seed == 0)
+ NTL::SetSeed(NTL::to_ZZ(time(0)));
+ else
+ NTL::SetSeed(NTL::to_ZZ(_seed));
+ }
+
+ Element& random (Element& x) const
+ {
+ NTL::random(x);
+ return x;
+ }
+
+ protected:
+ size_t _size;
+ size_t _seed;
+ };
+}
+
+#endif //__LINBOX_ntl_lzz_pe_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/NTL/ntl-lzz_pX.h b/linbox/field/NTL/ntl-lzz_pX.h
new file mode 100644
index 0000000..74167d4
--- /dev/null
+++ b/linbox/field/NTL/ntl-lzz_pX.h
@@ -0,0 +1,329 @@
+/* Copyright (C) 2005 LinBox
+ * Copyright (C) 2011 LinBox
+ *
+ *
+ * Written by Daniel Roche, August 2005
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file field/NTL/ntl-lzz_pX.h
+ * @ingroup field
+ * @ingroup NTL
+ * @brief NO DOC
+ */
+
+#ifndef __LINBOX_field_ntl_lzz_px_H
+#define __LINBOX_field_ntl_lzz_px_H
+
+#ifndef __LINBOX_HAVE_NTL
+#error "you need NTL here"
+#endif
+
+#include <vector>
+#include <NTL/lzz_pX.h>
+
+
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
+
+#include "linbox/field/unparametric.h"
+#include "linbox/field/NTL/ntl-lzz_p.h"
+#include "linbox/integer.h"
+
+
+// Namespace in which all LinBox code resides
+namespace LinBox
+{
+ class NTL_zz_pX_Initialiser {
+ public :
+ NTL_zz_pX_Initialiser( const Integer & q, size_t e = 1) {
+ linbox_check(e == 1);
+ if ( q > 0 )
+ NTL::zz_p::init(q); // it's an error if q not prime, e not 1
+ }
+
+ // template <class ElementInt>
+ // NTL_zz_pX_Initialiser(const ElementInt& d) {
+ // NTL::ZZ_p::init (NTL::to_ZZ(d));
+ // }
+
+ NTL_zz_pX_Initialiser () { }
+
+ };
+
+ /** Ring (in fact, a unique factorization domain) of polynomial with
+ * coefficients in class NTL_zz_p (integers mod a wordsize prime).
+ * All the same functions as any other ring, with the addition of:
+ * Coeff (type), CoeffField (type), getCoeffField, setCoeff, getCoeff,
+ * leadCoeff, deg
+ */
+ class NTL_zz_pX : public NTL_zz_pX_Initialiser, public FFPACK::UnparametricOperations<NTL::zz_pX> {
+ public:
+ typedef NTL::zz_pX Element ;
+ typedef FFPACK::UnparametricOperations<Element> Father_t ;
+ typedef UnparametricRandIter<Element> RandIter;
+
+
+ typedef NTL_zz_p CoeffField;
+ typedef NTL::zz_p Coeff;
+ // typedef NTL::zz_pX Element;
+
+ const Element zero,one,mOne ;
+
+
+ /** Standard LinBox field constructor. The paramters here
+ * (prime, exponent) are only used to initialize the coefficient field.
+ */
+ NTL_zz_pX( const integer& p, size_t e = 1 ) :
+ // UnparametricField<NTL::zz_pX>(p, e), _CField(p,e)
+ NTL_zz_pX_Initialiser(p,e),Father_t ()
+ , zero( NTL::to_zz_pX(0)),one( NTL::to_zz_pX(1)),mOne(-one)
+ , _CField(p,e)
+ {}
+
+ /** Constructor from a coefficient field */
+ NTL_zz_pX( CoeffField cf ) :
+ NTL_zz_pX_Initialiser(cf.cardinality()),Father_t ()
+ ,zero( NTL::to_zz_pX(0)),one( NTL::to_zz_pX(1)),mOne(-one)
+ ,_CField(cf)
+ {}
+
+ /** Initialize p to the constant y (p = y*x^0) */
+ template <class ANY>
+ Element& init( Element& p, const ANY& y ) const
+ {
+ Coeff temp;
+ _CField.init( temp, y );
+ return p = temp;
+ }
+
+ /** Initialize p to the constant y (p = y*x^0) */
+ Element& init( Element& p, const Coeff& y ) const
+ {
+ return p = y;
+ }
+
+ /** Initialize p from a vector of coefficients.
+ * The vector should be ordered the same way NTL does it: the front
+ * of the vector corresponds to the trailing coefficients, and the back
+ * of the vector corresponds to the leading coefficients. That is,
+ * v[i] = coefficient of x^i.
+ */
+ template <class ANY>
+ Element& init( Element& p, const std::vector<ANY>& v ) const
+ {
+ p = 0;
+ Coeff temp;
+ for( long i = 0; i < (long)v.size(); ++i ) {
+ _CField.init( temp, v[ (size_t) i ] );
+ if( !_CField.isZero(temp) )
+ NTL::SetCoeff( p, i, temp );
+ }
+ return p;
+ }
+
+ /** Initialize p from a vector of coefficients.
+ * The vector should be ordered the same way NTL does it: the front
+ * of the vector corresponds to the trailing coefficients, and the back
+ * of the vector corresponds to the leading coefficients. That is,
+ * v[i] = coefficient of x^i.
+ */
+ Element& init( Element& p, const std::vector<Coeff>& v ) const
+ {
+ p = 0;
+ for( long i = 0; i < (long)v.size(); ++i )
+ NTL::SetCoeff( p, i, v[ (size_t) i ] );
+ return p;
+ }
+
+ /** Convert p to a vector of coefficients.
+ * The vector will be ordered the same way NTL does it: the front
+ * of the vector corresponds to the trailing coefficients, and the back
+ * of the vector corresponds to the leading coefficients. That is,
+ * v[i] = coefficient of x^i.
+ */
+ template< class ANY >
+ std::vector<ANY>& convert( std::vector<ANY>& v, const Element& p ) const
+ {
+ v.clear();
+ ANY temp;
+ for( long i = 0; i <= this->deg(p); ++i ) {
+ _CField.convert( temp, NTL::coeff( p, i ) );
+ v.push_back( temp );
+ }
+ return v;
+ }
+
+ /** Convert p to a vector of coefficients.
+ * The vector will be ordered the same way NTL does it: the front
+ * of the vector corresponds to the trailing coefficients, and the back
+ * of the vector corresponds to the leading coefficients. That is,
+ * v[i] = coefficient of x^i.
+ */
+ std::vector<Coeff>& convert( std::vector<Coeff>& v, const Element& p ) const
+ {
+ v.clear();
+ for( long i = 0; i <= (long)this->deg(p); ++i )
+ v.push_back( NTL::coeff(p,i) );
+ return v;
+ }
+
+ /** Test if an element equals zero */
+ bool isZero( const Element& x ) const
+ {
+ return ( (this->deg(x) == 0) &&
+ ( _CField.isZero( NTL::ConstTerm(x) ) ) );
+ }
+
+ /** Test if an element equals one */
+ bool isOne( const Element& x ) const
+ {
+ return ( (this->deg(x) == 0) &&
+ ( _CField.isOne( NTL::ConstTerm(x) ) ) );
+ }
+
+ /** The LinBox field for coefficients */
+ const CoeffField& getCoeffField() const
+ { return _CField; }
+
+ /** Get the degree of a polynomial
+ * Unlike NTL, deg(0)=0.
+ */
+ size_t deg( const Element& p ) const
+ {
+ long temp = NTL::deg(p);
+ if( temp == -1 ) return 0;
+ else return static_cast<size_t>(temp);
+ }
+
+ /** r will be set to the reverse of p. */
+ Element& rev( Element& r, const Element& p ) {
+ NTL::reverse(r,p);
+ return r;
+ }
+
+ /** r is itself reversed. */
+ Element& revin( Element& r ) {
+ return r = NTL::reverse(r);
+ }
+
+ /** Get the leading coefficient of this polynomial. */
+ Coeff& leadCoeff( Coeff& c, const Element& p ) const
+ {
+ c = NTL::LeadCoeff(p);
+ return c;
+ }
+
+ /** Get the coefficient of x^i in a given polynomial */
+ Coeff& getCoeff( Coeff& c, const Element& p, size_t i ) const
+ {
+ c = NTL::coeff( p, (long)i );
+ return c;
+ }
+
+ /** Set the coefficient of x^i in a given polynomial */
+ Element& setCoeff( Element& p, size_t i, const Coeff& c ) const
+ {
+ NTL::SetCoeff(p,(long)i,c);
+ return p;
+ }
+
+ /** Get the quotient of two polynomials */
+ Element& quo( Element& res, const Element& a, const Element& b ) const
+ {
+ NTL::div(res,a,b);
+ return res;
+ }
+
+ /** a = quotient of a, b */
+ Element& quoin( Element& a, const Element& b ) const
+ {
+ return a /= b;
+ }
+
+ /** Get the remainder under polynomial division */
+ Element& rem( Element& res, const Element& a, const Element& b ) const
+ {
+ NTL::rem(res,a,b);
+ return res;
+ }
+
+ /** a = remainder of a,b */
+ Element& remin( Element& a, const Element& b ) const
+ {
+ return a %= b;
+ }
+
+ /** Get the quotient and remainder under polynomial division */
+ void quorem( Element& q, Element& r,
+ const Element& a, const Element& b ) const
+ {
+ NTL::DivRem(q,r,a,b);
+ }
+
+ /** Get characteristic of the field - same as characteristic of
+ * coefficient field. */
+ integer& characteristic( integer& c ) const
+ { return _CField.characteristic(c); }
+
+ /** Get the cardinality of the field. Since the cardinality is
+ * infinite, by convention we return -1.
+ */
+ integer& cardinality( integer& c ) const
+ { return c = static_cast<integer>(-1); }
+
+ static inline integer getMaxModulus()
+ { return CoeffField::getMaxModulus(); }
+ /** Write a description of the field */
+ // Oustide of class definition so write(ostream&,const Element&) from
+ // UnparametricField still works.
+ std::ostream& write( std::ostream& os ) const
+ {
+ return os << "Polynomial ring using NTL::zz_pX";
+ }
+
+ private:
+ /** Conversion to scalar types doesn't make sense and should not be
+ * used. Use getCoeff or leadCoeff to get the scalar values of
+ * specific coefficients, and then convert them using coeffField()
+ * if needed.
+ */
+ template< class ANY >
+ ANY& convert( ANY& x, const Element& y ) const
+ { return x; }
+
+ CoeffField _CField;
+ }; // end of class NTL_zz_pX
+
+
+
+} // end of namespace LinBox
+
+#endif // __LINBOX_field_ntl_lzz_px_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/PID-double.h b/linbox/field/PID-double.h
index ebcade2..790f126 100644
--- a/linbox/field/PID-double.h
+++ b/linbox/field/PID-double.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/PID-double.h
* Copyright (C) 2004 Pascal Giorgi
*
@@ -7,10 +5,13 @@
* Pascal Giorgi pascal.giorgi at ens-lyon.fr
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -32,8 +33,8 @@
#ifndef __LINBOX_pid_double_H
#define __LINBOX_pid_double_H
-#include <linbox/field/unparametric.h>
-#include <linbox/field/field-traits.h>
+#include "linbox/field/unparametric.h"
+#include "linbox/field/field-traits.h"
namespace LinBox
{
@@ -335,3 +336,12 @@ namespace LinBox
#endif //__LINBOX_pid_double_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/PID-integer.h b/linbox/field/PID-integer.h
index b888c73..165c05d 100644
--- a/linbox/field/PID-integer.h
+++ b/linbox/field/PID-integer.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/PID-integer.h
* Copyright (C) 2004 Pascal Giorgi
*
@@ -7,10 +5,13 @@
* Pascal Giorgi pascal.giorgi at ens-lyon.fr
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/** @file field/PID-integer.h
@@ -34,17 +35,17 @@
#include <limits.h>
#include <iostream>
// #include <gmp++/gmp++_int.h>
-#include <linbox/integer.h>
-#include <linbox/field/unparametric.h>
-#include <linbox/field/field-traits.h>
-#include <linbox/field/gmp-rational.h>
+#include "linbox/integer.h"
+#include "linbox/field/unparametric.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/field/gmp-rational.h"
namespace LinBox
{
template <class Ring>
- class ClassifyRing;
+ struct ClassifyRing;
/*! \ingroup integers
* @brief Domain for integer operations.
@@ -120,7 +121,7 @@ namespace LinBox
*/
inline Element& gcd (Element& g, const Element& a, const Element& b) const
{
- return ::Givaro::gcd(g,a,b);
+ return Givaro::gcd(g,a,b);
}
/** @brief gcdin(g, b)
@@ -140,7 +141,11 @@ namespace LinBox
*/
inline Element& xgcd (Element& g, Element& s, Element& t, const Element& a, const Element& b) const
{
- return ::Givaro::gcd(g,a,b,s,t);
+#if (GIVARO_VERSION < 30500) // newer givaro has gcd with constant signature "guvab"
+ return Givaro::gcd(g,a,b,s,t);
+#else
+ return Givaro::gcd(g,s,t,a,b);
+#endif
}
/** @brief lcm (c, a, b)
@@ -181,7 +186,7 @@ namespace LinBox
inline void reconstructRational (Element& a, Element& b, const Element& x, const Element& m) const
{
- RationalReconstruction(a,b, x, m, ::Givaro::sqrt(m), true, true);
+ RationalReconstruction(a,b, x, m, Givaro::sqrt(m), true, true);
}
inline void reconstructRational (Element& a, Element& b, const Element& x, const Element& m, const Element& bound) const
@@ -259,7 +264,7 @@ namespace LinBox
*/
inline Element& sqrt(Element& x, const Element& y) const
{
- return ::Givaro::sqrt(x,y);
+ return Givaro::sqrt(x,y);
}
inline Element powtwo(Element& z, const Element& x) const
@@ -319,6 +324,28 @@ namespace LinBox
return x=Element(y);
}
+ inline Element& init(Element& x, const unsigned long& y) const
+ {
+ return x=Element(y);
+ }
+
+ inline Element& init(Element& x, const long& y) const
+ {
+ return x=Element(y);
+ }
+
+ inline Element& init(Element& x, const unsigned int & y) const
+ {
+ return x=Element(y);
+ }
+
+ inline Element& init(Element& x, const int& y) const
+ {
+ return x=Element(y);
+ }
+
+
+
inline integer& convert(integer& x, const Element& y) const
{
return x=y;
@@ -538,3 +565,12 @@ namespace LinBox
#endif //__LINBOX_pid_integer_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/PID-ntl-zz_p.h b/linbox/field/PID-ntl-zz_p.h
new file mode 100644
index 0000000..e48429d
--- /dev/null
+++ b/linbox/field/PID-ntl-zz_p.h
@@ -0,0 +1,93 @@
+/* Copyright (C) 2010 LinBox
+ * written by bds
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+
+#ifndef __LINBOX_ntl_pid_zz_p_H
+#define __LINBOX_ntl_pid_zz_p_H
+
+#include "linbox/field/NTL/ntl-lzz_p.h"
+#include "linbox/util/debug.h"
+#include "linbox/linbox-config.h"
+#include <NTL/ZZ.h>
+#include "linbox/field/field-traits.h"
+
+// Namespace in which all LinBox library code resides
+namespace LinBox
+{
+ template <class Ring>
+ struct ClassifyRing;
+
+ class NTL_PID_zz_p;
+
+ template<>
+ struct ClassifyRing<NTL_PID_zz_p> {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+ /** \brief extend Wrapper of zz_p from NTL. Add PID functions
+ \ingroup field
+ */
+ struct NTL_PID_zz_p: public NTL_zz_p
+ {
+ protected: long _modulus;
+ public:
+ NTL_PID_zz_p(long pp, int exp = 1) :
+ NTL_zz_p(pp), _modulus(pp)
+ {
+ if( exp != 1 ) throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
+ }
+
+ Element& gcd(Element& g, const Element& a, const Element& b) const
+ { g = NTL::GCD(NTL::rep(a), NTL::rep(b));
+ g = NTL::GCD(NTL::rep(g), _modulus);
+ return g;
+ }
+
+ Element& gcdin(Element& a, const Element& b) const
+ { return gcd(a,a, b); }
+
+ bool isUnit(const Element& a) const
+ { return 1 == NTL::GCD(NTL::rep(a), _modulus); }
+
+ Element& div(Element& c, const Element& a, const Element& b) const
+ { return c = NTL::rep(a)/NTL::GCD(NTL::rep(a),NTL::rep(b)); }
+ Element& divin(Element& a, const Element& b) const
+ { return div(a, a, b); }
+
+ static inline double getMaxModulus() { return (double)NTL_SP_BOUND; }
+ };
+
+} // namespace LinBox
+
+#endif // __LINBOX_ntl_pid_zz_p_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/PIR-modular-int32.h b/linbox/field/PIR-modular-int32.h
index f3a8ded..ae1168a 100644
--- a/linbox/field/PIR-modular-int32.h
+++ b/linbox/field/PIR-modular-int32.h
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,16 +16,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_pir_modular_int32_H
#define __LINBOX_pir_modular_int32_H
-#include <linbox/field/modular-int32.h>
+#include "linbox/field/modular.h"
#ifndef LINBOX_MAX_INT
#define LINBOX_MAX_INT 2147483647
#endif
@@ -32,7 +33,7 @@
#ifndef LINBOX_MAX_MODULUS
#define LINBOX_MAX_MODULUS 1073741824
#endif
-#include <linbox/field/field-traits.h>
+#include "linbox/field/field-traits.h"
// Namespace in which all LinBox code resides
namespace LinBox
@@ -246,7 +247,7 @@ namespace LinBox
private:
static void GCD (int32_t& g, int32_t a, int32_t b) {
- int32_t u, v, q, r;
+ int32_t u, v, /* q,*/ r;
if (a < 0) {
if (a < -LINBOX_MAX_INT) throw PreconditionFailed(__func__,__FILE__,__LINE__,"XGCD: integer overflow");
@@ -262,7 +263,7 @@ namespace LinBox
u = a; v = b;
while (v != 0) {
- q = u / v;
+ // q = u / v;
r = u % v;
u = v;
v = r;
@@ -371,16 +372,16 @@ namespace LinBox
typedef PIRModular<int32_t> Field;
FieldAXPY (const Field &F) :
- _F (F),_y(0)
+ _field (F),_y(0)
{}
FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F), _y (0)
+ _field (faxpy._field), _y (0)
{}
FieldAXPY<PIRModular<int32_t> > &operator = (const FieldAXPY &faxpy) {
- _F = faxpy._F;
+ _field = faxpy._field;
_y = faxpy._y;
return *this;
}
@@ -389,7 +390,7 @@ namespace LinBox
uint64_t t = (uint64_t) a * (uint64_t) x;
_y += t;
if (_y < t)
- return _y += _F._two64;
+ return _y += _field._two64;
else
return _y;
}
@@ -397,13 +398,13 @@ namespace LinBox
inline uint64_t& accumulate (const Element &t) {
_y += t;
if (_y < (uint64_t)t)
- return _y += _F._two64;
+ return _y += _field._two64;
else
return _y;
}
inline Element& get (Element &y) {
- y =_y % (uint64_t) _F.modulus;
+ y = Element(_y % (uint64_t) _field.modulus);
return y;
}
@@ -418,7 +419,7 @@ namespace LinBox
protected:
- Field _F;
+ Field _field;
uint64_t _y;
};
@@ -449,11 +450,11 @@ namespace LinBox
y += t;
if (y < t)
- y += _F._two64;
+ y += _field._two64;
}
- y %= (uint64_t) _F.modulus;
- return res = y;
+ y %= (uint64_t) _field.modulus;
+ return res = Element(y);
}
@@ -471,13 +472,13 @@ namespace LinBox
y += t;
if (y < t)
- y += _F._two64;
+ y += _field._two64;
}
- y %= (uint64_t) _F.modulus;
+ y %= (uint64_t) _field.modulus;
- return res = y;
+ return res = (Element)y;
}
};
@@ -688,3 +689,12 @@ namespace LinBox
#include "linbox/randiter/modular.h"
#endif //__LINBOX_pir_modular_int32_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/PIR-ntl-ZZ_p.h b/linbox/field/PIR-ntl-ZZ_p.h
index 19cc2c8..8575a02 100644
--- a/linbox/field/PIR-ntl-ZZ_p.h
+++ b/linbox/field/PIR-ntl-ZZ_p.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* written by Zhendong Wan
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,25 +17,25 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_pir_ntl_zz_p_H
#define __LINBOX_pir_ntl_zz_p_H
-#include <linbox/field/unparametric.h>
+#include "linbox/field/unparametric.h"
#include "linbox/linbox-config.h"
-#include <linbox/util/debug.h>
+#include "linbox/util/debug.h"
#include <NTL/ZZ.h>
#include <NTL/ZZ_p.h>
-#include "linbox/field/ntl-ZZ_p.h"
-#include <linbox/vector/vector-domain.h>
+#include "linbox/field/NTL/ntl-ZZ_p.h"
+#include "linbox/vector/vector-domain.h"
#include <sstream>
-#include <linbox/integer.h>
-#include <linbox/field/field-traits.h>
+#include "linbox/integer.h"
+#include "linbox/field/field-traits.h"
namespace LinBox
{
@@ -56,28 +57,35 @@ namespace LinBox
\ingroup field
*/
- class PIR_ntl_ZZ_p : public UnparametricField<NTL::ZZ_p> {
+ class PIR_ntl_ZZ_p : public NTL_ZZ_p {
+ //public UnparametricField<NTL::ZZ_p> {
+ // typedef UnparametricField<NTL::ZZ_p> Father_t ;
+ typedef NTL_ZZ_p Father_t ;
public:
- typedef NTL::ZZ_p Element;
-
- template <class Element2>
- PIR_ntl_ZZ_p(const Element2& d) {
+ typedef Father_t::Element Element;
- NTL::ZZ_p::init (NTL::to_ZZ(d));
+ template <class Int_t>
+ PIR_ntl_ZZ_p(const Int_t& d) :
+ Father_t(d)
+ {
+ // NTL::ZZ_p::init (NTL::to_ZZ(d));
}
- PIR_ntl_ZZ_p (const NTL::ZZ& d) {
-
- NTL::ZZ_p::init(d);
-
+ PIR_ntl_ZZ_p (const NTL::ZZ& d) :
+ Father_t(d)
+ {
+ // NTL::ZZ_p::init(d);
}
- PIR_ntl_ZZ_p (const integer& d, int exp = 1 ) {
+ PIR_ntl_ZZ_p (const integer& d, int e = 1 ) :
+ Father_t(d,e)
+ {
- if(exp != 1) throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
+ // if(e != 1) throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
+ linbox_check(e == 1);
- NTL::ZZ_p::init (NTL::to_ZZ(((std::string)d). c_str()));
+ // NTL::ZZ_p::init (NTL::to_ZZ(((std::string)d). c_str()));
}
@@ -558,14 +566,14 @@ namespace LinBox
* @param F field F in which arithmetic is done
*/
FieldAXPY (const Field &F) :
- _F (F)
+ _field (F)
{ _y = NTL::ZZ::zero(); }
/** Copy constructor.
* @param faxpy
*/
FieldAXPY (const FieldAXPY<Field> &faxpy) :
- _F (faxpy._F), _y (faxpy._y)
+ _field (faxpy._field), _y (faxpy._y)
{}
/** Assignment operator
@@ -615,7 +623,7 @@ namespace LinBox
/// Field in which arithmetic is done
/// Not sure why it must be mutable, but the compiler complains otherwise
- Field _F;
+ Field _field;
/// Field element for arithmetic
NTL::ZZ _y;
@@ -886,3 +894,12 @@ namespace LinBox
#endif //__LINBOX_pir_ntl_zz_p_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/abstract.h b/linbox/field/abstract.h
index 26faa9e..8b41378 100644
--- a/linbox/field/abstract.h
+++ b/linbox/field/abstract.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/abstract.h
* Copyright (C) 1999-2001 William J Turner,
* 2001 Bradford Hovinen
@@ -7,10 +5,13 @@
* Written by William J Turner <wjturner at math.ncsu.edu>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_abstract_H
@@ -430,3 +431,12 @@ namespace LinBox
#endif // __LINBOX_abstract_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/archetype.h b/linbox/field/archetype.h
index e83c2cc..03136e8 100644
--- a/linbox/field/archetype.h
+++ b/linbox/field/archetype.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/archetype.h
* Copyright (C) 1999-2005 William J Turner,
* 2001 Bradford Hovinen
@@ -7,10 +5,13 @@
* Written by W. J. Turner <wjturner at acm.org>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*
* ------------------------------------
* 2002-05-14 William J. Turner <wjturner at acm.org>
@@ -43,6 +44,7 @@
#define __LINBOX_field_archetype_H
#include <iostream>
+#include "linbox/util/debug.h"
#include "linbox/field/field-interface.h"
#include "linbox/field/abstract.h"
#include "linbox/field/envelope.h"
@@ -92,6 +94,8 @@ namespace LinBox
/// @name Object Management
//@{
+ Element one,zero,mOne ;
+
/** \brief Copy constructor.
*
* Each field class is expected to provide a copy constructor.
@@ -103,7 +107,8 @@ namespace LinBox
* random element generator to which
* <tt> F._randIter_ptr</tt> points.
*/
- FieldArchetype (const FieldArchetype &F)
+ FieldArchetype (const FieldArchetype &F) :
+ one(F.one),zero(F.zero),mOne(F.mOne)
{
if (F._field_ptr != 0) _field_ptr = F._field_ptr->clone ();
if (F._elem_ptr != 0) _elem_ptr = F._elem_ptr->clone ();
@@ -146,6 +151,9 @@ namespace LinBox
if (F._field_ptr != 0) _field_ptr = F._field_ptr->clone ();
if (F._elem_ptr != 0) _elem_ptr = F._elem_ptr->clone ();
if (F._randIter_ptr != 0) _randIter_ptr = F._randIter_ptr->clone ();
+ one = F.one ;
+ zero = F.zero ;
+ mOne = F.mOne ;
}
return *this;
@@ -169,8 +177,10 @@ namespace LinBox
*/
Element &init (Element &x, const integer &n = 0 ) const
{
- if (x._elem_ptr != 0) delete x._elem_ptr;
- x._elem_ptr = _elem_ptr->clone ();
+ // if (x._elem_ptr != 0) delete x._elem_ptr;
+ // x._elem_ptr = _elem_ptr->clone ();
+ if (x._elem_ptr == 0)
+ x._elem_ptr = _elem_ptr->clone ();
_field_ptr->init (*x._elem_ptr, n);
return x;
}
@@ -207,8 +217,9 @@ namespace LinBox
*/
Element &assign (Element &x, const Element &y) const
{
- if (x._elem_ptr == 0)
- x._elem_ptr = _elem_ptr->clone ();
+ linbox_check(x._elem_ptr != 0);
+ // if (x._elem_ptr == 0)
+ // x._elem_ptr = _elem_ptr->clone ();
_field_ptr->assign (*x._elem_ptr, *y._elem_ptr);
return x;
@@ -631,7 +642,10 @@ namespace LinBox
* @param f
*/
template<class Field_qcq>
- FieldArchetype (Field_qcq *f) { constructor (f, f); }
+ FieldArchetype (Field_qcq *f)
+ {
+ constructor (f, f);
+ }
//@} Implementation-Specific Methods
@@ -673,6 +687,9 @@ namespace LinBox
_field_ptr = field_ptr->clone ();
_elem_ptr = static_cast<ElementAbstract*> (new typename Field_qcq::Element ());
_randIter_ptr = static_cast<RandIterAbstract*> (new typename Field_qcq::RandIter (*field_ptr));
+ one = static_cast<ElementAbstract*> (new typename Field_qcq::Element (field_ptr->one) );
+ zero = static_cast<ElementAbstract*> (new typename Field_qcq::Element (field_ptr->zero ) );
+ mOne = static_cast<ElementAbstract*> (new typename Field_qcq::Element (field_ptr->mOne ) );
}
/** Template method for constructing archetype from a class not derived
@@ -705,3 +722,12 @@ namespace LinBox
#endif // __LINBOX_field_archetype_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/block-ring.h b/linbox/field/block-ring.h
index 8cc4828..a4252da 100644
--- a/linbox/field/block-ring.h
+++ b/linbox/field/block-ring.h
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/fields/blas-ring.h
* Copyright (C) 2007 LinBox Team
*
* Written by JP May, with tweaks by D. Saunders, Z. Wan
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
@@ -14,9 +30,8 @@
#include <iostream>
#include "linbox/matrix/blas-matrix.h"
#include "linbox/field/field-interface.h"
-//#include "linbox/matrix/blas-domain.h"
#include "linbox/algorithms/blas-domain.h"
-#include "fflas-ffpack/fflas/fflas.h"
+#include <fflas-ffpack/fflas/fflas.h>
namespace LinBox
{
@@ -33,11 +48,11 @@ namespace LinBox
template < class _Field >
class BlockRing : public FieldInterface {
public:
- _Field _F;
- BlasMatrixDomain<_Field> _D;
+ _Field _field;
+ BlasMatrixDomain<_Field> _blasMatrixDomain;
size_t _b;
- typedef BlasMatrix<typename _Field::Element> Matrix;
+ typedef BlasMatrix<_Field> Matrix;
typedef typename _Field::Element Scalar;
@@ -95,7 +110,7 @@ namespace LinBox
size_t rows = A.matrix->rowdim();
size_t cols = A.matrix->coldim();
- set(new Matrix(rows, cols));
+ set(new Matrix(A.matrix->field(),rows, cols));
Scalar* a=A.matrix->getPointer();
Scalar* b= matrix->getPointer();
@@ -127,6 +142,7 @@ namespace LinBox
}; // class Element
+ Element one,zero,mOne;
class RandIter {
typedef typename _Field::RandIter FieldRandIter;
@@ -138,7 +154,7 @@ namespace LinBox
RandIter(const BlockRing<_Field>& BR,
const integer size=0,
const integer seed=0) :
- r(BR._F, size, seed), dim(BR._b) {}
+ r(BR._field, size, seed), dim(BR._b) {}
Element& random(Element& e) const
{
@@ -153,13 +169,21 @@ namespace LinBox
BlockRing(const _Field& F, size_t d=1) :
- _F(F), _D(F), _b(d)
- {}
+ _field(F), _blasMatrixDomain(F), _b(d)
+ {
+ one.set(new Matrix(_field,d,d));
+ zero.set(new Matrix(_field,d,d));
+ mOne.set(new Matrix(_field,d,d)) ;
+ _blasMatrixDomain.setIdentity(*(one.matrix));
+ _blasMatrixDomain.setZero(*(zero.matrix));
+ for (size_t i = 0 ;i < d ;++i)
+ mOne.matrix->setEntry(i,i,_field.mOne);
+ }
Element& init(Element& B) const
{
// B is garbage from memory
- B.set(new Matrix(_b,_b));
+ B.set(new Matrix(_field,_b,_b));
return B;
}
@@ -171,11 +195,11 @@ namespace LinBox
if (r == 0) r = _b;
if (c == 0) c = _b;
- B.set(new Matrix(r,c));
+ B.set(new Matrix(_field,r,c));
size_t k = ( (r < c) ? r : c );
- typename _Field::Element N; _F.init(N, n);
+ typename _Field::Element N; _field.init(N, n);
for (size_t i = 0; i < k; ++i) (B.matrix)->setEntry(i, i, N);
@@ -187,14 +211,14 @@ namespace LinBox
template <typename ints>
ints& convert(ints& x) const
{
- return _F.convert(x);
+ return _field.convert(x);
}
template <typename ints>
ints& convert(ints& x, const Element &A) const
{
- return _F.convert(x, *(A.matrix->getPointer()));
+ return _field.convert(x, *(A.matrix->getPointer()));
}
Element& assign(Element &A, const Element &B) const
@@ -207,9 +231,9 @@ namespace LinBox
{
// c = p^(b^2)
- _F.cardinality(c);
+ _field.cardinality(c);
- if(c > 1) // _F is a finite field
+ if(c > 1) // _field is a finite field
{
integer tmp, n;
n = _b*_b;
@@ -221,17 +245,17 @@ namespace LinBox
integer& characteristic(integer &c) const
{
- return _F.characteristic(c);
+ return _field.characteristic(c);
}
unsigned long cardinality() const
{
- return _F. cardinality() ;
+ return _field. cardinality() ;
}
unsigned long characteristic() const
{
- return _F. characteristic() ;
+ return _field. characteristic() ;
}
@@ -252,7 +276,7 @@ namespace LinBox
Element& mul(Element& C, const Element& A, const Element& B) const
{
- _D.mul(*(C.matrix), *(A.matrix), *(B.matrix));
+ _blasMatrixDomain.mul(*(C.matrix), *(A.matrix), *(B.matrix));
return C;
}
@@ -260,21 +284,21 @@ namespace LinBox
//non-commutative: use mulin_left: A = A*B
Element& mulin(Element& A, const Element& B) const
{
- _D.mulin_left(*(A.matrix), *(B.matrix));
+ _blasMatrixDomain.mulin_left(*(A.matrix), *(B.matrix));
return A;
}
// D = A*X+Y
Element& axpy(Element& D, const Element& A, const Element& X, const Element& Y) const
{
- _D.axpy(*(D.matrix), *(A.matrix), *(X.matrix), *(Y.matrix));
+ _blasMatrixDomain.axpy(*(D.matrix), *(A.matrix), *(X.matrix), *(Y.matrix));
return D;
}
// R = A*X+R
Element& axpyin(Element& R, const Element& A, const Element& X) const
{
- _D.axpyin(*(R.matrix), *(A.matrix), *(X.matrix));
+ _blasMatrixDomain.axpyin(*(R.matrix), *(A.matrix), *(X.matrix));
return R;
}
@@ -288,7 +312,7 @@ namespace LinBox
int nullflag = 0;
- _D.inv(*(B.matrix), *(A.matrix), nullflag);
+ _blasMatrixDomain.inv(*(B.matrix), *(A.matrix), nullflag);
if (nullflag)
throw PreconditionFailed(__func__,__FILE__,__LINE__,"InvMatrix: inverse undefined");
@@ -302,10 +326,10 @@ namespace LinBox
int nullflag = 0;
- //_D.invin(A, A, nullflag);
+ //_blasMatrixDomain.invin(A, A, nullflag);
Element B; init(B, A.matrix->rowdim(), A.matrix->coldim());
- _D.inv(*(B.matrix), *(A.matrix), nullflag);
+ _blasMatrixDomain.inv(*(B.matrix), *(A.matrix), nullflag);
if (nullflag)
throw PreconditionFailed(__func__,__FILE__,__LINE__,"InvMatrix: inverse undefined");
@@ -320,7 +344,7 @@ namespace LinBox
Element& div(Element& C, const Element& A, const Element& B) const
{
- _D.right_solve(*(C.matrix),*(B.matrix),*(A.matrix));
+ _blasMatrixDomain.right_solve(*(C.matrix),*(B.matrix),*(A.matrix));
return C;
}
@@ -328,7 +352,7 @@ namespace LinBox
//A = A*B^{-1};
Element& divin( Element& A, const Element& B) const
{
- _D.right_solve(*(B.matrix),*(A.matrix));
+ _blasMatrixDomain.right_solve(*(B.matrix),*(A.matrix));
return A;
}
@@ -347,16 +371,16 @@ namespace LinBox
Scalar* b=B.matrix->getPointer();
Scalar* c=C.matrix->getPointer();
- //FFLAS::fcopy(_F, rows*cols, b, 1, c, 1); // C = B
+ //FFLAS::fcopy((typename Field::Father_t)_field, rows*cols, b, 1, c, 1); // C = B
for(size_t i=0; i < rows*cols; ++i) {
- _F.add(*c,*a,*b);
+ _field.add(*c,*a,*b);
++a; ++b; c++;
}
- //Scalar alpha; _F.init(alpha, 1);
- //FFLAS::faxpy(_F, rows*cols, alpha, a, 1, c, 1);
+ //Scalar alpha; _field.init(alpha, 1);
+ //FFLAS::faxpy((typename Field::Father_t)_field, rows*cols, alpha, a, 1, c, 1);
return C;
}
@@ -371,7 +395,7 @@ namespace LinBox
Scalar* b=B.matrix->getPointer();
for(size_t i=0; i < r*c; ++i) {
- _F.addin(*a,*b);
+ _field.addin(*a,*b);
++a; ++b;
}
@@ -392,7 +416,7 @@ namespace LinBox
for(size_t i=0; i < rows*cols; ++i) {
- _F.sub(*c,*a,*b);
+ _field.sub(*c,*a,*b);
++a; ++b; c++;
}
@@ -410,7 +434,7 @@ namespace LinBox
Scalar* b=B.matrix->getPointer();
for(size_t i=0; i < r*c; ++i) {
- _F.subin(*a,*b);
+ _field.subin(*a,*b);
++a; ++b;
}
@@ -428,7 +452,7 @@ namespace LinBox
Scalar* b=B.matrix->getPointer();
for(size_t i=0; i < r*c; ++i) {
- _F.neg(*b,*a);
+ _field.neg(*b,*a);
++a; ++b;
}
@@ -445,7 +469,7 @@ namespace LinBox
Scalar* a=A.matrix->getPointer();
for(size_t i=0; i < r*c; ++i) {
- _F.negin(*a);
+ _field.negin(*a);
++a;
}
@@ -463,7 +487,7 @@ namespace LinBox
for(size_t i=0; i < r*c; ++i) {
- if(!_F.areEqual(*a,*b)) {
+ if(!_field.areEqual(*a,*b)) {
return false;
}
@@ -487,12 +511,12 @@ namespace LinBox
for(size_t j=1; j <= n; ++j)
{
if(i==j) { // on the diagonal
- if(!_F.isOne(*x)) {
+ if(!_field.isOne(*x)) {
return false;
}
}
else {
- if(!_F.isZero(*x)) {
+ if(!_field.isZero(*x)) {
return false;
}
}
@@ -515,7 +539,7 @@ namespace LinBox
for(size_t i=0; i < r*c; ++i)
{
- if(!_F.isZero(*x)) {
+ if(!_field.isZero(*x)) {
return false;
}
@@ -529,7 +553,7 @@ namespace LinBox
//stubs for read and write field
std::ostream& write(std::ostream& os) const
{
- return _F.write(os << "Dimension " << _b << " square matrices over ");
+ return _field.write(os << "Dimension " << _b << " square matrices over ");
}
@@ -542,14 +566,14 @@ namespace LinBox
// wrapped read and write element
std::ostream& write(std::ostream& os, const Element& A) const
{
- return (A.matrix)->write(os << std::endl, _F);
+ return (A.matrix)->write(os << std::endl);
}
std::istream& read(std::istream& is, const Element& A) const
{
- return (A.matrix)->read(is, _F);
+ return (A.matrix)->read(is, _field);
}
@@ -587,3 +611,12 @@ namespace LinBox
#endif // __LINBOX_blockring_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/envelope.h b/linbox/field/envelope.h
index d9f1f70..497e593 100644
--- a/linbox/field/envelope.h
+++ b/linbox/field/envelope.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/envelope.h
* Copyright (C) 1999-2001 William J Turner,
* 2001 Bradford Hovinen
@@ -7,10 +5,13 @@
* Written by William J Turner <wjturner at math.ncsu.edu>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*
* ------------------------------------
* 2002-05-14 William J. Turner <wjturner at acm.org>
@@ -87,13 +88,16 @@ namespace LinBox
/** Default constructor.
* In this implementation, this means copying the field \c E._field.
*/
- FieldEnvelope (void) {}
+ FieldEnvelope (void) :
+ one(),zero(),mOne()
+ {}
/** Constructor from field to be wrapped.
* @param F Field object to be wrapped.
*/
FieldEnvelope (const Field& F) :
_field (F)
+ ,one(Element(F.one)),zero(Element(F.zero)),mOne(Element(F.mOne))
{}
/** Copy constructor.
@@ -105,6 +109,7 @@ namespace LinBox
*/
FieldEnvelope (const FieldEnvelope& E) :
_field (E._field)
+ ,one((E.one)),zero((E.zero)),mOne((E.mOne))
{}
#ifdef __LINBOX_XMLENABLED
@@ -561,6 +566,8 @@ namespace LinBox
/// Wrapped field.
Field _field;
+ public:
+ Element one,zero,mOne ;
}; // class FieldEnvelope
} // namespace LinBox
@@ -569,3 +576,12 @@ namespace LinBox
#endif // __LINBOX_field_envelope_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/field-interface.h b/linbox/field/field-interface.h
index dd254c8..641c8ec 100644
--- a/linbox/field/field-interface.h
+++ b/linbox/field/field-interface.h
@@ -1,9 +1,23 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/field-interface.h
* Copyright (C) 2002 David Saunders
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * For licensing information see COPYING
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
*/
#ifndef __LINBOX_field_interface_H
@@ -63,3 +77,12 @@ namespace LinBox
#endif // __LINBOX_field_interface_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/field-traits.h b/linbox/field/field-traits.h
index c24e615..af9c9c2 100644
--- a/linbox/field/field-traits.h
+++ b/linbox/field/field-traits.h
@@ -1,18 +1,31 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/field-traits.h
* Copyright (C) June 2004 Dan Roche
- * see COPYING for permissions etc.
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_field_traits_H
#define __LINBOX_field_traits_H
-#include <linbox/integer.h>
+#include "linbox/integer.h"
// Namespace in which all LinBox library code resides
-namespace LinBox
-{
+namespace LinBox {
/*! \brief some basic information about each field or ring.
\ingroup field
@@ -25,40 +38,40 @@ namespace LinBox
* integer is a valid modulus for the given field.
* maxExponent and goodExponent do the same for the prime power.
*/
-
- class RingCategories {
-
- public:
-
- //generic ring.
+ namespace RingCategories {
+ //! generic ring.
struct GenericTag{};
- //If it is isomorphic to Z/mZ, for some m or its extensions.
+ //! If it is isomorphic to Z/mZ, for some m or its extensions.
struct ModularTag : public virtual GenericTag{};
- //If it is isomorphic to Z
+ //! If it is isomorphic to Z
struct IntegerTag : public virtual GenericTag{};
- //If it is isomorphic to Q
+ //! If it is isomorphic to Q
struct RationalTag : public virtual GenericTag{};
- };
+ }
+ /*! Default ring category.
+ */
template <class Field>
- struct ClassifyRing
- {
+ struct ClassifyRing {
typedef RingCategories::GenericTag categoryTag;
};
+ /*! FieldTrait.
+ */
template <class Field>
- struct FieldTraits
- {
+ struct FieldTraits {
typedef typename ClassifyRing<Field>::categoryTag categoryTag;
static integer& maxModulus( integer& i )
{
return i = static_cast<integer>(Field::getMaxModulus());
}
+
static uint64_t & maxModulus( uint64_t& i )
{
return i = static_cast<uint64_t>(Field::getMaxModulus());
}
+
static uint32_t & maxModulus( uint32_t& i )
{
return i = static_cast<uint32_t>(Field::getMaxModulus());
@@ -97,8 +110,48 @@ namespace LinBox
}
};
+
+} // Namespace LinBox
+
+namespace LinBox { /* areFieldEqual */
+
+ template<class _Field1, class _Field2>
+ bool areFieldEqual (const _Field1 &F, const _Field2 &G)
+ {
+ return false ;
+ }
+
+ template<class _Field, class _Category>
+ bool areFieldEqualSpecialised(const _Field &F, const _Field &G,
+ const _Category & m)
+ {
+ return true ;
+ }
+
+ template<class _Field>
+ bool areFieldEqualSpecialised(const _Field &F, const _Field &G,
+ const RingCategories::ModularTag & m)
+ {
+ return ( F.characteristic() == G.characteristic() ) ;
+ }
+
+ template<class _Field>
+ bool areFieldEqual (const _Field &F, const _Field &G)
+ {
+ return areFieldEqualSpecialised( F,G,typename FieldTraits<_Field>::categoryTag() ) ;
+ }
+
} // Namespace LinBox
#endif // __LINBOX_field_traits_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/field.doxy b/linbox/field/field.doxy
index 2ceb934..cdb156c 100644
--- a/linbox/field/field.doxy
+++ b/linbox/field/field.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** \ingroup linbox
* \defgroup field field
diff --git a/linbox/field/gf2.h b/linbox/field/gf2.h
index b6812cf..79a4b36 100644
--- a/linbox/field/gf2.h
+++ b/linbox/field/gf2.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/gf2.h
* Copyright (C) 2003-2007 The LinBox group
*
@@ -7,7 +5,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_field_gf2_H
@@ -17,12 +33,19 @@
#include <climits>
#include <cmath>
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
#include "linbox/integer.h"
#include "linbox/field/field-interface.h"
-#include "linbox/util/debug.h"
#include "linbox/vector/bit-vector.h"
-#include "linbox/linbox-config.h"
#include "linbox/field/field-traits.h"
+// #include "linbox/vector/vector-domain.h"
+
+#ifndef __PATHCC__
+#define stdBitReference std::_Bit_reference
+#else
+#define stdBitReference std::vector<bool>::reference
+#endif
// Namespace in which all LinBox code resides
namespace LinBox
@@ -52,7 +75,7 @@ namespace LinBox
class GF2 : public FieldInterface {
public:
- const bool zero,one,mone;
+ const bool zero,one,mOne;
/** Element type
@@ -72,10 +95,10 @@ namespace LinBox
/** Default constructor.
*/
GF2 () :
- zero(false),one(true),mone(true)
+ zero(false),one(true),mOne(true)
{}
GF2 (int p, int exp = 1) :
- zero(false),one(true),mone(true)
+ zero(false),one(true),mOne(true)
{
if(p != 2) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be 2");
if(exp != 1) throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
@@ -88,7 +111,7 @@ namespace LinBox
* @param F Modular object.
*/
GF2 (const GF2 & F ) :
- zero(false),one(true),mone(true) {}
+ zero(false),one(true),mOne(true) {}
/** Assignment operator.
* Required by the archetype
@@ -111,22 +134,22 @@ namespace LinBox
* @param x field base element to contain output (reference returned).
* @param y integer.
*/
- Element &init (Element &x, const int &y = 0) const
+ Element &init (Element &x, const int &y ) const
{
return x = y & 1;
}
- Element &init (Element &x, const unsigned int &y = 0) const
+ Element &init (Element &x, const unsigned int &y ) const
{
return x = y & 1;
}
- Element &init (Element &x, const long &y = 0) const
+ Element &init (Element &x, const long &y ) const
{
return x = y & 1;
}
- Element &init (Element &x, const unsigned long &y = 0) const
+ Element &init (Element &x, const unsigned long &y ) const
{
return x = y & 1;
}
@@ -146,12 +169,18 @@ namespace LinBox
return x = static_cast<long>(y) & 1;
}
+
+ Element &init(Element&x) const
+ {
+ return x = false;
+ }
+
BitVector::reference init (BitVector::reference x, const integer &y = 0) const
{
return x = long (y) & 1;
}
- std::_Bit_reference init (std::_Bit_reference x, const integer &y = 0) const
+ stdBitReference init (stdBitReference x, const integer &y = 0) const
{
return x = long (y) & 1;
}
@@ -168,7 +197,7 @@ namespace LinBox
return x = y;
}
- std::_Bit_reference convert (std::_Bit_reference x, Element y) const
+ stdBitReference convert (stdBitReference x, Element y) const
{
return x = y;
}
@@ -228,7 +257,7 @@ namespace LinBox
return x = y;
}
- std::_Bit_reference assign (std::_Bit_reference x, Element y) const
+ stdBitReference assign (stdBitReference x, Element y) const
{
return x = y;
}
@@ -362,7 +391,7 @@ namespace LinBox
* @param x
* @return \c is
*/
- std::istream &read (std::istream &is, std::_Bit_reference x) const
+ std::istream &read (std::istream &is, stdBitReference x) const
{ bool a; is >> a; x=a; return is;
}
@@ -405,7 +434,7 @@ namespace LinBox
* @param y
* @param z
*/
- std::_Bit_reference add (std::_Bit_reference x, Element y, Element z) const
+ stdBitReference add (stdBitReference x, Element y, Element z) const
{
return x = y ^ z;
}
@@ -439,7 +468,7 @@ namespace LinBox
* @param y
* @param z
*/
- std::_Bit_reference sub (std::_Bit_reference x, Element y, Element z) const
+ stdBitReference sub (stdBitReference x, Element y, Element z) const
{
return x = y ^ z;
}
@@ -473,7 +502,7 @@ namespace LinBox
* @param y
* @param z
*/
- std::_Bit_reference mul (std::_Bit_reference x, Element y, Element z) const
+ stdBitReference mul (stdBitReference x, Element y, Element z) const
{
return x = y & z;
}
@@ -508,7 +537,7 @@ namespace LinBox
* @param y
* @param z
*/
- std::_Bit_reference div (std::_Bit_reference x, Element y, Element z ) const
+ stdBitReference div (stdBitReference x, Element y, Element z ) const
{
return x = y;
}
@@ -541,7 +570,7 @@ namespace LinBox
* @param x
* @param y
*/
- std::_Bit_reference neg (std::_Bit_reference x, Element y) const
+ stdBitReference neg (stdBitReference x, Element y) const
{
return x = y;
}
@@ -574,7 +603,7 @@ namespace LinBox
* @param x
* @param y
*/
- std::_Bit_reference inv (std::_Bit_reference x, Element y) const
+ stdBitReference inv (stdBitReference x, Element y) const
{
return x = y;
}
@@ -604,7 +633,7 @@ namespace LinBox
* @param x
* @param y
*/
- std::_Bit_reference axpy (std::_Bit_reference r,
+ stdBitReference axpy (stdBitReference r,
Element a,
Element x,
Element y) const
@@ -659,7 +688,7 @@ namespace LinBox
* @param x
* @param y
*/
- std::_Bit_reference addin (std::_Bit_reference x, Element y) const
+ stdBitReference addin (stdBitReference x, Element y) const
{
return x = x ^ y;
}
@@ -692,7 +721,7 @@ namespace LinBox
* @param x
* @param y
*/
- std::_Bit_reference subin (std::_Bit_reference x, Element y) const
+ stdBitReference subin (stdBitReference x, Element y) const
{
return x = x ^ y;
}
@@ -725,9 +754,9 @@ namespace LinBox
* @param x
* @param y
*/
- Element& mulin (std::_Bit_reference& x, Element y) const
+ stdBitReference mulin (stdBitReference x, Element y) const
{
- return mulin((bool&)x,y);
+ return x = (bool)x & y;
}
/** Inplace Division.
@@ -761,7 +790,7 @@ namespace LinBox
* @param y
* @bug y is unused
*/
- std::_Bit_reference divin (std::_Bit_reference x, Element y ) const
+ stdBitReference divin (stdBitReference x, Element y ) const
{
return x;
}
@@ -793,7 +822,7 @@ namespace LinBox
* @param x
* @bug y is unused
*/
- std::_Bit_reference negin (std::_Bit_reference x) const
+ stdBitReference negin (stdBitReference x) const
{
return x;
}
@@ -823,7 +852,7 @@ namespace LinBox
* @return reference to x.
* @param x
*/
- std::_Bit_reference invin (std::_Bit_reference x) const
+ stdBitReference invin (stdBitReference x) const
{
return x;
}
@@ -860,7 +889,7 @@ namespace LinBox
* @param a
* @param x
*/
- std::_Bit_reference axpyin (std::_Bit_reference r, Element a, Element x) const
+ stdBitReference axpyin (stdBitReference r, Element a, Element x) const
{
return r = r ^ (a & x);
}
@@ -871,7 +900,7 @@ namespace LinBox
* @param a
* @param x
*/
- Element &axpyin (Element &r, const std::_Bit_reference a, Element x) const
+ Element &axpyin (Element &r, const stdBitReference a, Element x) const
{
return r ^= a & x;
}
@@ -882,7 +911,7 @@ namespace LinBox
* @param a
* @param x
*/
- std::_Bit_reference axpyin (std::_Bit_reference r, const std::_Bit_reference a, Element x) const
+ stdBitReference axpyin (stdBitReference r, const stdBitReference a, Element x) const
{
return r = r ^ (a & x);
}
@@ -893,7 +922,7 @@ namespace LinBox
* @param a
* @param x
*/
- Element &axpyin (Element &r, Element a, const std::_Bit_reference x) const
+ Element &axpyin (Element &r, Element a, const stdBitReference x) const
{
return r ^= a & static_cast<bool>(x);
}
@@ -904,7 +933,7 @@ namespace LinBox
* @param a
* @param x
*/
- std::_Bit_reference axpyin (std::_Bit_reference r, Element a, const std::_Bit_reference x) const
+ stdBitReference axpyin (stdBitReference r, Element a, const stdBitReference x) const
{
return r = r ^ (a & static_cast<bool>(x));
}
@@ -915,7 +944,7 @@ namespace LinBox
* @param a
* @param x
*/
- Element &axpyin (Element &r, const std::_Bit_reference a, const std::_Bit_reference x) const
+ Element &axpyin (Element &r, const stdBitReference a, const stdBitReference x) const
{
return r ^= a & static_cast<bool>(x);
}
@@ -926,7 +955,7 @@ namespace LinBox
* @param a
* @param x
*/
- std::_Bit_reference axpyin (std::_Bit_reference r, const std::_Bit_reference a, const std::_Bit_reference x) const
+ stdBitReference axpyin (stdBitReference r, const stdBitReference a, const stdBitReference x) const
{
return r = r ^ (a & static_cast<bool>(x));
}
@@ -942,328 +971,18 @@ namespace LinBox
} // namespace LinBox
-
-// Specialization of GivaroField for GF2
-#include "linbox/field/givaro-field.h"
-namespace LinBox
-{
-
- /**
- \brief give LinBox fields an allure of Givaro Fields
- \ingroup field
-
- * This class adds the necessary requirements allowing
- * the construction of an extension of a LinBox field.
- */
- template<>
- struct GivaroField<LinBox::GF2> : public LinBox::GF2
- {
- typedef LinBox::GF2 BaseField;
- typedef BaseField::Element TT;
- typedef Signed_Trait<TT>::unsigned_type UTT;
- typedef TT Rep;
- typedef GivaroField<BaseField> Self_t;
- typedef Rep Element;
- typedef UTT Residu_t;
-
- Element zero, one;
- GivaroField(const BaseField& bf) :
- BaseField(bf)
- {
- this->init(zero,0UL);
- this->init(one, 1UL);
- }
-
-
- // -- amxy: r <- c - a * b mod p
- Rep& amxy (Rep& r, const Rep a, const Rep b, const Rep c) const
- {
- Rep tmp;
- this->mul(tmp, a, b);
- this->assign(r,c);
- return this->subin(r,tmp);
- }
- std::_Bit_reference amxy (std::_Bit_reference r, const Rep a, const Rep b, const Rep c) const
- {
- Rep tmp;
- this->mul(tmp, a, b);
- this->assign(r,c);
- return this->subin(r,tmp);
- }
-
-
- // -- maxpy: r <- y - a * x
- Rep& maxpy (Rep& r, const Rep a, const Rep x, const Rep y) const
- {
- Rep tmp; this->mul(tmp, a, x);
- return this->sub(r,y,tmp);
- }
- std::_Bit_reference maxpy (std::_Bit_reference r, const Rep a, const Rep x, const Rep y) const
- {
- Rep tmp; this->mul(tmp, a, x);
- return this->sub(r,y,tmp);
- }
- // -- axmyin: r <- a * x - r
- Rep& axmyin (Rep& r, const Rep a, const Rep x) const
- {
- maxpyin(r,a,x);
- return negin(r);
- }
- std::_Bit_reference axmyin (std::_Bit_reference r, const Rep a, const Rep x) const
- {
- maxpyin(r,a,x);
- return negin(r);
- }
- // -- maxpyin: r <- r - a * x
- Rep& maxpyin (Rep& r, const Rep a, const Rep x) const
- {
- Rep tmp; this->mul(tmp, a, x);
- return this->subin(r,tmp);
- }
- std::_Bit_reference maxpyin (std::_Bit_reference r, const Rep a, const Rep x) const
- {
- Rep tmp; this->mul(tmp, a, x);
- return this->subin(r,tmp);
- }
-
-
-
- bool areNEqual ( const Rep a, const Rep b) const
- {
- return ! this->areEqual(a,b);
- }
-
- // Access to the modulus, characteristic, size, exponent
- UTT residu() const
- {
- integer c;
- BaseField::characteristic(c);
- return UTT(c);
- }
-
- UTT characteristic() const
- {
- integer c; BaseField::characteristic(c); return UTT(c);
- }
- UTT cardinality() const
- {
- integer c; BaseField::cardinality(c); return UTT(c);
- }
- UTT exponent() const
- {
- return 1;
- }
- UTT size() const
- { integer c; BaseField::cardinality(c); return UTT(c);
- }
-
-
- // ----- random generators
- template<class RandIter> Rep& random(RandIter& g, Rep& r) const
- {
- return r = g() ;
- }
- template<class RandIter> Rep& random(RandIter& g, Rep& r, long s) const
- {
- return r = g() ;
- }
- template<class RandIter> Rep& random(RandIter& g, Rep& r, const Rep& b) const
- {
- return r = g() ;
- }
- template<class RandIter> Rep& nonzerorandom(RandIter& g, Rep& r) const
- {
- return r = g() ;
- }
- template<class RandIter> Rep& nonzerorandom(RandIter& g, Rep& r, long s) const
- {
- return r = g() ;
- }
- template<class RandIter> Rep& nonzerorandom(RandIter& g, Rep& r, const Rep& b) const
- {
- return r = g() ;
- }
-
- template<class RandIter> std::_Bit_reference random(RandIter& g, std::_Bit_reference r) const
- {
- return r = g() ;
- }
- template<class RandIter> std::_Bit_reference random(RandIter& g, std::_Bit_reference r, long s) const
- {
- return r = g() ;
- }
- template<class RandIter> std::_Bit_reference random(RandIter& g, std::_Bit_reference r, const std::_Bit_reference b) const
- {
- return r = g() ;
- }
- template<class RandIter> std::_Bit_reference nonzerorandom(RandIter& g, std::_Bit_reference r) const
- {
- return r = g() ;
- }
- template<class RandIter> std::_Bit_reference nonzerorandom(RandIter& g, std::_Bit_reference r, long s) const
- {
- return r = g() ;
- }
- template<class RandIter> std::_Bit_reference nonzerorandom(RandIter& g, std::_Bit_reference r, const Rep& b) const
- {
- return r = g() ;
- }
- template<class RandIter> std::_Bit_reference nonzerorandom(RandIter& g, std::_Bit_reference r, const std::_Bit_reference b) const
- {
- return r = g() ;
- }
-
- };
-
-}
-
+// #define LINBOX_field_gf2_H
+// #include "linbox/vector/vector-domain.h"
// Specialization of homomorphism for basefield
-#include "linbox/field/hom.h"
-#include "linbox/field/givaro-extension.h"
-namespace LinBox
-{
-
- template <>
- class Hom<GF2,GF2> {
-
- public:
- typedef GF2 Target;
- typedef GF2 Source;
- typedef Source::Element SrcElt;
- typedef Target::Element Elt;
-
- Hom(const Source& S, const Target& ) :
- _source (S)
- {}
- Elt& image(Elt& t, const SrcElt& s)
- {
- return _source.assign (t, s);
- }
- SrcElt& preimage(SrcElt& s, const Elt& t)
- {
- return _source.assign (s, t);
- }
- const Source& source()
- {
- return _source;
- }
- const Target& target()
- {
- return _source;
- }
-
- protected:
- Source _source;
- };
-
- template<class Target >
- class Hom<GF2, Target > {
- public:
- typedef GF2 Source;
- typedef typename GF2::Element SrcElt;
- typedef typename Target::Element Elt;
-
- Hom(const Source& S, const Target& T) :
- _source(S), _target(T)
- { }
- Elt& image(Elt& t, const SrcElt& s)
- {
- return _source.convert(t,s);
- }
- SrcElt& preimage(SrcElt& s, const Elt& t)
- {
- return _target.convert(s,t);
- }
- std::_Bit_reference preimage(std::_Bit_reference s, const Elt& t) const
- {
- int ts;
- return s = _target.convert(ts, t);
- }
-
- const Source& source()
- {
- return _source;
- }
- const Target& target()
- {
- return _target;
- }
-
- private:
- Source _source;
- Target _target;
- }; // end Hom
-
-
-
- template<>
- class Hom < GF2, GivaroExtension<GF2> > {
- typedef GF2 Source;
- typedef GivaroExtension<GF2> Target;
- public:
- typedef Source::Element SrcElt;
- typedef Target::Element Elt;
-
- //Hom(){}
- /**
- * Construct a homomorphism from a specific source ring S and target
- * field T with Hom(S, T). The default behaviour is error.
- * Specializations define all actual homomorphisms.
- */
- Hom(const Source& S, const Target& T) :
- _source(S), _target(T)
- {}
-
- /**
- * image(t, s) implements the homomorphism, assigning the
- * t the value of the image of s under the mapping.
- *
- * The default behaviour is a no-op.
- */
- Elt& image(Elt& t, const SrcElt& s) const
- {
- return _target.assign(t,s);
- }
-
- /** If possible, preimage(s,t) assigns a value to s such that
- * the image of s is t. Otherwise behaviour is unspecified.
- * An error may be thrown, a conventional value may be set, or
- * an arb value set.
- *
- * The default behaviour is a no-op.
- */
- SrcElt& preimage(SrcElt& s, const Elt& t) const
- {
- return _target.convert(s, t);
- }
- std::_Bit_reference preimage(std::_Bit_reference s, const Elt& t) const
- {
- bool ts;
- return s = _target.convert(ts, t);
- }
-
- const Source& source() const
- {
- return _source;
- }
- const Target& target() const
- {
- return _target;
- }
-
- private:
- Source _source;
- Target _target;
- }; // end Hom
-}
+#include "linbox/randiter/gf2.h"
// #include <bits/stl_bvector.h>
namespace std
{
//! @todo JGD 05.11.2009 : it should be in bits/stl_bvector.h ...
- inline void swap(_Bit_reference __x, _Bit_reference __y)
+ inline void swap(stdBitReference __x, stdBitReference __y)
{
bool __tmp = __x;
__x = __y;
@@ -1272,8 +991,16 @@ namespace std
}
-#include "linbox/randiter/gf2.h"
#include "linbox/field/gf2.inl"
#endif // __LINBOX_field_gf2_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/gf2.inl b/linbox/field/gf2.inl
index de6ab58..063587d 100644
--- a/linbox/field/gf2.inl
+++ b/linbox/field/gf2.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/gf2.inl
* Copyright (C) 2003 Bradford Hovinen
*
@@ -7,7 +5,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_field_gf2_INL
@@ -16,15 +32,6 @@
#include <iostream>
#include <time.h>
-#include "linbox/field/gf2.h"
-#include "linbox/vector/vector-domain.h"
-#include "linbox/vector/vector-traits.h"
-#include "linbox/vector/bit-vector.h"
-#include "linbox/vector/stream.h"
-#include "linbox/randiter/mersenne-twister.h"
-#include "linbox/blackbox/diagonal.h"
-#include "linbox/matrix/matrix-domain.h"
-
#include <cctype> //isdigit
template<typename Vector>
@@ -38,1116 +45,15 @@ std::ostream& afficheVector (std::ostream& o, const Vector& C)
}
-namespace LinBox
-{
-
- // Specialization of canonical vector types
-
- template <>
- class RawVector<bool>
- {
- public:
- typedef BitVector Dense;
- typedef std::vector<size_t> Sparse;
- typedef std::vector<size_t> SparseSeq;
- typedef std::vector<size_t> SparseMap;
- typedef std::vector<size_t> SparsePar;
- };
-
- // Specialization of DotProductDomain for GF2
-
- template <>
- class DotProductDomain<GF2> : private virtual VectorDomainBase<GF2>
- {
- public:
-
- typedef bool Element;
-
- DotProductDomain (const GF2 &F) :
- VectorDomainBase<GF2> (F)
- {}
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const;
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const;
-
- template <class Vector1, class Vector2>
- inline BitVector::reference dotSpecializedDD (BitVector::reference res, const Vector1 &v1, const Vector2 &v2) const;
-
- template <class Vector1, class Vector2>
- inline BitVector::reference dotSpecializedDSP (BitVector::reference res, const Vector1 &v1, const Vector2 &v2) const;
- };
-
- // Specialization of vector domain
-
- template <>
- class VectorDomain<GF2> : private virtual VectorDomainBase<GF2>, private DotProductDomain<GF2>
- {
- public:
- typedef bool Element;
-
- VectorDomain (const VectorDomain &VD) :
- VectorDomainBase<GF2> (VD._F), DotProductDomain<GF2> (VD._F)
- {}
-
- VectorDomain &operator = (const VectorDomain &) { return *this; }
-
- const GF2 &field () const
- { return _F; }
-
- template <class Vector>
- inline std::ostream &write (std::ostream &os, const Vector &x) const
- { return writeSpecialized (os, x, typename VectorTraits<Vector>::VectorCategory ()); }
-
- template <class Vector>
- inline std::istream &read (std::istream &is, Vector &x) const
- { return readSpecialized (is, x, typename VectorTraits<Vector>::VectorCategory ()); }
-
- template <class Vector1, class Vector2>
- inline Vector1 © (Vector1 &res, const Vector2 &v) const
- { return copySpecialized (res, v,
- typename VectorTraits<Vector1>::VectorCategory (),
- typename VectorTraits<Vector2>::VectorCategory ()); }
-
- template <class Vector1, class Vector2>
- inline Vector1 © (Vector1 &res, const Vector2 &v, size_t i, size_t len = 0) const
- { return copySpecialized (res, v, i, len,
- typename VectorTraits<Vector1>::VectorCategory ()); }
-
- template <class Vector1, class Vector2>
- inline bool areEqual (const Vector1 &v1, const Vector2 &v2) const
- { return areEqualSpecialized (v1, v2,
- typename VectorTraits<Vector1>::VectorCategory (),
- typename VectorTraits<Vector2>::VectorCategory ()); }
-
- template <class Vector>
- inline bool isZero (const Vector &v) const
- { return isZeroSpecialized (v, typename VectorTraits<Vector>::VectorCategory ()); }
-
- template <class Vector1, class Vector2>
- inline Element &dot (Element &res, const Vector1 &v1, const Vector2 &v2) const
- { return dotSpecialized (res, v1, v2,
- typename VectorTraits<Vector1>::VectorCategory (),
- typename VectorTraits<Vector2>::VectorCategory ()); }
-
- template <class Vector1, class Vector2>
- inline BitVector::reference dot (BitVector::reference res, const Vector1 &v1, const Vector2 &v2) const
- { return dotSpecialized (res, v1, v2,
- typename VectorTraits<Vector1>::VectorCategory (),
- typename VectorTraits<Vector2>::VectorCategory ()); }
-
- template <class Vector1, class Vector2>
- inline Element &dotprod (Element &res, const Vector1 &v1, const Vector2 &v2) const
- { return dot (res, v1, v2); }
-
- template <class Vector1, class Vector2, class Vector3>
- inline Vector1 &add (Vector1 &res, const Vector2 &y, const Vector3 &x) const
- { return addSpecialized (res, y, x,
- typename VectorTraits<Vector1>::VectorCategory (),
- typename VectorTraits<Vector2>::VectorCategory (),
- typename VectorTraits<Vector3>::VectorCategory ()); }
-
- template <class Vector1, class Vector2>
- inline Vector1 &addin (Vector1 &y, const Vector2 &x) const
- { return addinSpecialized (y, x,
- typename VectorTraits<Vector1>::VectorCategory (),
- typename VectorTraits<Vector2>::VectorCategory ()); }
-
- template <class Vector1, class Vector2, class Vector3>
- inline Vector1 &sub (Vector1 &res, const Vector2 &y, const Vector3 &x) const
- { return addSpecialized (res, y, x,
- typename VectorTraits<Vector1>::VectorCategory (),
- typename VectorTraits<Vector2>::VectorCategory (),
- typename VectorTraits<Vector3>::VectorCategory ()); }
-
- template <class Vector1, class Vector2>
- inline Vector1 &subin (Vector1 &y, const Vector2 &x) const
- { return addinSpecialized (y, x,
- typename VectorTraits<Vector1>::VectorCategory (),
- typename VectorTraits<Vector2>::VectorCategory ()); }
-
- template <class Vector1, class Vector2>
- inline Vector1 &neg (Vector1 &res, const Vector2 &x) const
- { copy (res, x); return res; }
-
- template <class Vector>
- inline Vector &negin (Vector &y) const
- { return y; }
-
- template <class Vector1, class Vector2>
- inline Vector1 &mul (Vector1 &res, const Vector2 &x, const Element a) const
- { return mulSpecialized (res, x, a, typename VectorTraits<Vector1>::VectorCategory ()); }
-
- template <class Vector>
- inline Vector &mulin (Vector &x, const Element a) const
- { return mulinSpecialized (x, a, typename VectorTraits<Vector>::VectorCategory ()); }
-
- template <class Vector1, class Vector2, class Vector3>
- inline Vector1 &axpy (Vector1 &res, const Element a, const Vector2 &x, const Vector3 &y) const
- { if (a) add (res, x, y); else this->copy (res, y); return res; }
-
- template <class Vector1, class Vector2>
- inline Vector1 &axpyin (Vector1 &y, const Element a, const Vector2 &x) const
- { if (a) addin (y, x); return y; }
-
- VectorDomain (const GF2 &F) :
- VectorDomainBase<GF2> (F), DotProductDomain<GF2> (F)
- {}
-
-
- // Specialized function implementations
- template <class Vector>
- std::ostream &writeSpecialized (std::ostream &os, const Vector &x,
- VectorCategories::DenseZeroOneVectorTag) const;
- template <class Vector>
- std::ostream &writeSpecialized (std::ostream &os, const Vector &x,
- VectorCategories::SparseZeroOneVectorTag) const;
-
- template <class Vector>
- std::istream &readSpecialized (std::istream &is, const Vector &x,
- VectorCategories::DenseZeroOneVectorTag) const;
- template <class Vector>
- std::istream &readSpecialized (std::istream &is, const Vector &x,
- VectorCategories::SparseZeroOneVectorTag) const;
-
- template <class Vector1, class Vector2>
- bool areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const;
-
- template <class Vector1, class Vector2>
- bool areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const;
- template <class Vector1, class Vector2>
- inline bool areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const
- { return areEqual (v2, v1); }
- template <class Vector1, class Vector2>
- bool areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const;
-
-
- template <class Vector>
- bool isZeroSpecialized (const Vector &v, VectorCategories::DenseZeroOneVectorTag) const;
- template <class Vector>
- inline bool isZeroSpecialized (const Vector &v,
- VectorCategories::SparseZeroOneVectorTag) const
- { return v.empty (); }
-
- template <class Vector1, class Vector2>
- inline Vector1 ©Specialized (Vector1 &res, const Vector2 &v,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const
- { std::copy (v.wordBegin (), v.wordEnd (), res.wordBegin ()); return res; }
-
- template <class Vector1, class Vector2>
- inline Vector1 ©Specialized (Vector1 &res, const Vector2 &v, size_t i, size_t len, VectorCategories::DenseZeroOneVectorTag) const
- {
- std::copy (v.begin (), (len == 0) ? v.end () : v.begin () + len, res.begin () + i);
- return res;
- }
- template <class Vector1, class Vector2>
- inline Vector1 ©Specialized (Vector1 &res, const Vector2 &v, size_t i, size_t len, VectorCategories::DenseVectorTag) const
- {
- std::copy (v.begin (), (len == 0) ? v.end () : v.begin () + len, res.begin () + i);
- return res;
- }
-
-
-
- template <class Vector1, class Vector2>
- Vector1 ©Specialized (Vector1 &res, const Vector2 &v,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const;
- template <class Vector1, class Vector2>
- Vector1 ©Specialized (Vector1 &res, const Vector2 &v,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const;
- template <class Vector1, class Vector2>
- inline Vector1 ©Specialized (Vector1 &res, const Vector2 &v,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const
- { res = v; return res; }
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecialized (Element &res, const Vector1 &v1, const Vector2 &v2,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const
- { return DotProductDomain<GF2>::dotSpecializedDD (res, v1, v2); }
- template <class Vector1, class Vector2>
- inline Element &dotSpecialized (Element &res, const Vector1 &v1, const Vector2 &v2,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const
- { return DotProductDomain<GF2>::dotSpecializedDSP (res, v1, v2); }
- template <class Vector1, class Vector2>
- inline Element &dotSpecialized (Element &res, const Vector1 &v1, const Vector2 &v2,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const
- { return DotProductDomain<GF2>::dotSpecializedDSP (res, v2, v1); }
- template <class Vector1, class Vector2>
- Element &dotSpecialized (Element &res, const Vector1 &v1, const Vector2 &v2,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const;
-
- template <class Vector1, class Vector2>
- inline BitVector::reference dotSpecialized (BitVector::reference res, const Vector1 &v1, const Vector2 &v2,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const
- { return DotProductDomain<GF2>::dotSpecializedDD (res, v1, v2); }
- template <class Vector1, class Vector2>
- inline BitVector::reference dotSpecialized (BitVector::reference res, const Vector1 &v1, const Vector2 &v2,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const
- { return DotProductDomain<GF2>::dotSpecializedDSP (res, v1, v2); }
- template <class Vector1, class Vector2>
- inline BitVector::reference dotSpecialized (BitVector::reference res, const Vector1 &v1, const Vector2 &v2,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const
- { return DotProductDomain<GF2>::dotSpecializedDSP (res, v2, v1); }
- template <class Vector1, class Vector2>
- BitVector::reference dotSpecialized (BitVector::reference res, const Vector1 &v1, const Vector2 &v2,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const;
-
- template <class Vector1, class Vector2, class Vector3>
- Vector1 &addSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const;
- template <class Vector1, class Vector2, class Vector3>
- Vector1 &addSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const
- { copy (res, y); addin (res, x); }
- template <class Vector1, class Vector2, class Vector3>
- Vector1 &addSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const;
-
- template <class Vector1, class Vector2>
- Vector1 &addinSpecialized (Vector1 &y, const Vector2 &x,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const;
- template <class Vector1, class Vector2>
- Vector1 &addinSpecialized (Vector1 &y, const Vector2 &x,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const;
- template <class Vector1, class Vector2>
- Vector1 &addinSpecialized (Vector1 &y, const Vector2 &x,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const
- { Vector1 xp, res; copy (xp, x); add (res, y, xp); copy (y, res); return y; }
- template <class Vector1, class Vector2>
- Vector1 &addinSpecialized (Vector1 &y, const Vector2 &x,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const
- { Vector1 res; add (res, y, x); this->copy (y, res); return y; }
-
- template <class Vector1, class Vector2>
- Vector1 &mulSpecialized (Vector1 &res, const Vector2 &x, const Element a,
- VectorCategories::DenseZeroOneVectorTag ) const
- { if (a) this->copy (res, x); else std::fill (res.wordBegin (), res.wordEnd (), 0); return res; }
- template <class Vector1, class Vector2>
- Vector1 &mulSpecialized (Vector1 &res, const Vector2 &x, const Element a,
- VectorCategories::SparseZeroOneVectorTag ) const
- { if (a) this->copy (res, x); else res.clear (); return res; }
-
- template <class Vector>
- inline Vector &mulinSpecialized (Vector &x, const Element a,
- VectorCategories::DenseZeroOneVectorTag) const
- { if (!a) std::fill (x.wordBegin (), x.wordEnd (), 0); return x; }
-
- template <class Vector>
- inline Vector &mulinSpecialized (Vector &x, const Element a,
- VectorCategories::SparseZeroOneVectorTag ) const
- { if (!a) x.clear (); return x; }
-
- template <class Vector1, class Vector2, class Vector3>
- inline Vector1 &addSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
- VectorCategories::GenericVectorTag,
- VectorCategories::GenericVectorTag,
- VectorCategories::GenericVectorTag) const
- {
- typename LinBox::Vector<GF2>::Sparse v;
- typename LinBox::Vector<GF2>::Sparse w;
- typename LinBox::Vector<GF2>::Sparse u;
-
- copy (v, x);
- copy (w, y);
- add (u, w, v);
- copy (res, u);
-
- return u;
- }
-
- template <class Vector1, class Vector2, class Vector3>
- inline Vector1 &subSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
- VectorCategories::GenericVectorTag,
- VectorCategories::GenericVectorTag,
- VectorCategories::GenericVectorTag) const
- {
- typename LinBox::Vector<GF2>::Sparse v;
- typename LinBox::Vector<GF2>::Sparse w;
- typename LinBox::Vector<GF2>::Sparse u;
-
- copy (v, x);
- copy (w, y);
- sub (u, w, v);
- copy (res, u);
-
- return u;
- }
- };
-
- // Specialization of RandomDenseStream
- template<size_t bitsize> struct MTrandomInt {
- template<typename M32Twister>
- unsigned __LINBOX_INT32 operator() (M32Twister& MT) const
- {
- return MT.randomInt();
- }
- };
-
- template<> struct MTrandomInt<64> {
- template<typename M32Twister>
- unsigned __LINBOX_INT64 operator() (M32Twister& MT) const
- {
- unsigned __LINBOX_INT64 tmp = MT.randomInt();
- tmp <<=32;
- return tmp += MT.randomInt();
- }
- };
-
- class RandomDenseStreamGF2 : public VectorStream<BitVector>
- {
- public:
- typedef BitVector Vector;
-
- RandomDenseStreamGF2 (const GF2 &, uint32_t seed, size_t n, size_t m = 0) :
- MT (seed), _n (n), _m (m), _j (0)
- {}
-
- Vector &get (Vector &v)
- {
- Vector::word_iterator i;
-
- if (_m > 0 && _j++ >= _m)
- return v;
-
- for (i = v.wordBegin (); i != v.wordEnd (); i++)
- *i = MTrandomInt<__LINBOX_BITSOF_LONG>()(MT);
-
- const size_t zeroing = __LINBOX_BITSOF_LONG - (v.size() % __LINBOX_BITSOF_LONG);
- *(v.wordRbegin()) <<= zeroing;
- *(v.wordRbegin()) >>= zeroing;
- return v;
- }
-
- size_t size () const
- { return _m; }
- size_t pos () const
- { return _j; }
- size_t dim () const
- { return _n; }
- operator bool () const
- { return _m == 0 || _j < _m; }
- void reset () { _j = 0; }
-
- private:
- MersenneTwister MT;
- size_t _n;
- size_t _m;
- size_t _j;
- };
-
- // Specialization of RandomSparseStream
-
- template <class _Vector = Vector<GF2>::Sparse>
- class RandomSparseStreamGF2 : public VectorStream<_Vector>
- {
- public:
- typedef GF2 Field;
- typedef _Vector Vector;
-
- RandomSparseStreamGF2 (const GF2 &, uint32_t seed, double p, size_t n, size_t m = 0) :
- MT (seed), _n (n), _m (m), _j (0)
- { setP (p); }
-
- RandomSparseStreamGF2 (const GF2 &F, const GF2RandIter& r, double p, size_t n, size_t m = 0) :
- MT (r.getMT()), _n (n), _m (m), _j (0)
- { setP (p); }
-
- Vector &get (Vector &v);
-
- size_t size () const
- { return _m; }
- size_t pos () const
- { return _j; }
- size_t dim () const
- { return _n; }
- operator bool () const
- { return _m == 0 || _j < _m; }
- void reset () { _j = 0; }
-
- void setP (double p)
- {
- linbox_check ((p >= 0.0) && (p <= 1.0));
- _p = p;
- _1_log_1mp = 1 / log (1 - _p);
- }
-
- private:
- MersenneTwister MT;
- size_t _n;
- double _p;
- double _1_log_1mp;
- size_t _m;
- size_t _j;
- };
-
- template <class _Vector>
- _Vector &RandomSparseStreamGF2<_Vector>::get (_Vector &v)
- {
- size_t i = (size_t) -1;
- double val;
- int skip;
-
- if (_m > 0 && _j++ >= _m)
- return v;
-
- v.clear ();
-
- while (1) {
- val = (double) MT.randomDouble ();
- skip = (int) (ceil (log (val) * _1_log_1mp));
-
- if (skip <= 0)
- i++;
- else
- i += skip;
-
- if (i >= _n) break;
-
- v.push_back (i);
- }
-
- return v;
- }
-
- template <class Vector1, class Vector2>
- inline bool &DotProductDomain<GF2>::dotSpecializedDD
- (bool &res,
- const Vector1 &v1,
- const Vector2 &v2) const
- {
- linbox_check (v1.size () == v2.size ());
-
- unsigned long t = 0;
- typename Vector1::const_word_iterator i = v1.wordBegin ();
- typename Vector2::const_word_iterator j = v2.wordBegin ();
-
- while (i != v1.wordEnd () - 1)
- t ^= *i++ & *j++;
-
- const size_t zeroing = __LINBOX_BITSOF_LONG - (v1.size() % __LINBOX_BITSOF_LONG);
- unsigned long lastdot = *i & *j;
- lastdot <<= zeroing;
- lastdot >>= zeroing;
-
- t ^= lastdot;
- return res = __LINBOX_PARITY(t);
- }
-
- template <class Vector1, class Vector2>
- inline bool &DotProductDomain<GF2>::dotSpecializedDSP
- (bool &res,
- const Vector1 &v1,
- const Vector2 &v2) const
- {
- typename Vector2::const_iterator i;
-
- res = 0;
-
- for (i = v2.begin (); i != v2.end (); ++i)
- res ^= v1[*i];
-
- return res;
- }
-
- template <class Vector1, class Vector2>
- inline BitVector::reference DotProductDomain<GF2>::dotSpecializedDD
- (BitVector::reference res,
- const Vector1 &v1,
- const Vector2 &v2) const
- {
- bool tmp;
- return res = dotSpecializedDD(tmp, v1, v2);
- }
-
- template <class Vector1, class Vector2>
- inline BitVector::reference DotProductDomain<GF2>::dotSpecializedDSP
- (BitVector::reference res,
- const Vector1 &v1,
- const Vector2 &v2) const
- {
- typename Vector2::const_iterator i;
-
- res = 0;
-
- for (i = v2.begin (); i != v2.end (); ++i)
- res ^= v1[*i];
-
- return res;
- }
-
- template <class Vector>
- std::ostream &VectorDomain<GF2>::writeSpecialized (std::ostream &os, const Vector &x,
- VectorCategories::DenseZeroOneVectorTag) const
- {
-
-
- // TO BE REMOVED
- os << "writeSpec DenseZO, of size " << x.size() << ' ';
-
- os << "[ ";
-
- for (typename Vector::const_iterator i = x.begin (); i != x.end (); ++i)
- os << *i << ' ';
-
- os << ']';
-
- os << "( ";
-
- for (typename Vector::const_word_iterator i = x.wordBegin (); i != x.wordEnd (); ++i)
- os << *i << ' ';
-
- os << ')';
-
- return os;
- }
-
- template <class Vector>
- std::ostream &VectorDomain<GF2>::writeSpecialized (std::ostream &os, const Vector &x,
- VectorCategories::SparseZeroOneVectorTag) const
- {
- typename Vector::const_iterator i;
- size_t idx = 0;
-
- // TO BE REMOVED
- os << "writeSpec SparseZO, of size " << x.size() << ' ';
- os << "[ ";
-
- for (i = x.begin (); i != x.end (); ++i) {
- while (++idx <= *i)
- os << 0 << ' ';
-
- os << 1 << ' ';
- }
- os << ']';
-
- return os;
- }
-
- template <class Vector>
- std::istream &VectorDomain<GF2>::readSpecialized (std::istream &is, const Vector &x,
- VectorCategories::DenseZeroOneVectorTag) const
- {
- typename Vector::iterator i;
- char c;
-
- do { is >> c ; } while (!std::isdigit (c));
-
- is.unget ();
-
- for (i = x.begin (); i != x.end (); ++i)
- is >> *i;
-
- return is;
- }
-
- template <class Vector>
- std::istream &VectorDomain<GF2>::readSpecialized (std::istream &is, const Vector &x,
- VectorCategories::SparseZeroOneVectorTag) const
- {
- char c;
- size_t idx;
-
- do { is >> c ; } while (!std::isdigit (c));
-
- is.unget ();
- x.clear ();
-
- while (1) {
- is >> c;
-
- if (!std::isdigit (c) && c != ' ') break;
- is.unget ();
- is >> idx;
- x.push_back (idx);
- }
-
- return is;
- }
-
- template <class Vector1, class Vector2>
- bool VectorDomain<GF2>::areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const
- {
- typename Vector1::const_iterator i = v1.begin ();
- typename Vector2::const_iterator j = v2.begin ();
- size_t idx = 0;
-
- for (; j != v2.end (); ++j, ++i, ++idx) {
- while (idx < *j) {
- if (*i) return false;
- ++idx;
- ++i;
- }
-
- if (!*i) return false;
- }
-
- for (; i != v1.end (); ++i)
- if (*i) return false;
-
- return true;
- }
-
- template <class Vector1, class Vector2>
- bool VectorDomain<GF2>::areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const
- {
- typename Vector1::const_word_iterator i = v1.wordBegin ();
- typename Vector2::const_word_iterator j = v2.wordBegin ();
- for (; j != v2.wordEnd (); ++j, ++i)
- if (*i != *j) return false;
- return true;
- }
-
- template <class Vector1, class Vector2>
- bool VectorDomain<GF2>::areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const
- { return v1 == v2;}
-
- template <class Vector>
- bool VectorDomain<GF2>::isZeroSpecialized (const Vector &v,
- VectorCategories::DenseZeroOneVectorTag) const
- {
- typename Vector::const_word_iterator i;
-
- for (i = v.wordBegin (); i != v.wordEnd (); ++i)
- if (*i) return false;
-
- return true;
- }
-
- template <class Vector1, class Vector2>
- Vector1 &VectorDomain<GF2>::copySpecialized (Vector1 &res, const Vector2 &v,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const
- {
- typename Vector2::const_iterator i;
- size_t idx = 0;
-
- res.clear ();
-
- for (i = v.begin (); i != v.end (); ++i, ++idx)
- if (*i) res.push_back (idx);
-
- return res;
- }
-
- template <class Vector1, class Vector2>
- Vector1 &VectorDomain<GF2>::copySpecialized (Vector1 &res, const Vector2 &v,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const
- {
- size_t sparsesize = *(v.rbegin());
- if (sparsesize > res.size()) res.resize( *(v.rbegin()) );
- std::fill (res.wordBegin (), res.wordEnd (), 0);
-
- for (typename Vector2::const_iterator i = v.begin ();
- i != v.end ();
- ++i)
- res[*i] = true;
- return res;
- }
-
- template <class Vector1, class Vector2>
- bool &VectorDomain<GF2>::dotSpecialized (bool &res, const Vector1 &v1, const Vector2 &v2,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const
- {
- typename Vector1::const_iterator i = v1.begin ();
- typename Vector2::const_iterator j = v2.begin ();
- res = false;
-
- while (i != v1.end () || j != v2.end ()) {
- while (i != v1.end () && (j == v2.end () || *i < *j)) { res = !res; ++i; }
- while (j != v2.end () && (i == v1.end () || *j < *i)) { res = !res; ++j; }
- if (i != v1.end () && j != v2.end () && *i == *j) { ++i; ++j; }
- }
-
- return res;
- }
-
- template <class Vector1, class Vector2, class Vector3>
- Vector1 &VectorDomain<GF2>::addSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const
- {
- linbox_check (res.size () == y.size ());
- linbox_check (res.size () == x.size ());
-
- typename Vector1::word_iterator i = res.wordBegin ();
- typename Vector2::const_word_iterator j = y.wordBegin ();
- typename Vector3::const_word_iterator k = x.wordBegin ();
-
- for (; i != res.wordEnd (); ++i)
- *i = *j++ ^ *k++;
-
- return res;
- }
-
- template <class Vector1, class Vector2, class Vector3>
- Vector1 &VectorDomain<GF2>::addSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const
- {
- typename Vector2::const_iterator i = y.begin ();
- typename Vector3::const_iterator j = x.begin ();
-
- res.clear ();
-
- while (i != y.end () || j != x.end ()) {
- while (i != y.end () && (j == x.end () || *i < *j)) { res.push_back (*i); ++i; }
- while (j != x.end () && (i == y.end () || *j < *i)) { res.push_back (*j); ++j; }
- if (i != y.end () && j != x.end () && *i == *j) { ++i; ++j; }
- }
-
- return res;
- }
-
- template <class Vector1, class Vector2>
- Vector1 &VectorDomain<GF2>::addinSpecialized (Vector1 &y, const Vector2 &x,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const
- {
- linbox_check (y.size () == x.size ());
-
- typename Vector1::word_iterator i = y.wordBegin ();
- typename Vector2::const_word_iterator j = x.wordBegin ();
-
- for (; i != y.wordEnd (); ++i, ++j)
- *i ^= *j;
-
- return y;
- }
-
- template <class Vector1, class Vector2>
- Vector1 &VectorDomain<GF2>::addinSpecialized (Vector1 &y, const Vector2 &x,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const
- {
- typename Vector2::const_iterator i;
-
- for (i = x.begin (); i != x.end (); ++i)
- y[*i] = !y[*i];
-
- return y;
- }
-
- // Specialization of MatrixDomain for GF2
- template <>
- class MatrixDomain<GF2>
- {
- public:
- MatrixDomain (const GF2 &F) :
- _VD (F)
- {}
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &vectorMul (Vector1 &w, const Matrix &A, const Vector2 &v) const
- { return mulSpecialized (w, A, v, typename MatrixTraits<Matrix>::MatrixCategory ()); }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
- MatrixCategories::RowMatrixTag) const
- {
- return mulRowSpecialized (w, A, v, typename VectorTraits<Vector1>::VectorCategory ());
- }
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
- MatrixCategories::ColMatrixTag) const
- {
- return mulColSpecialized (w, A, v,
- typename VectorTraits<Vector1>::VectorCategory (),
- typename VectorTraits<Vector2>::VectorCategory ());
- }
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
- MatrixCategories::RowColMatrixTag) const
- { return mulRowSpecialized (w, A, v, typename VectorTraits<Vector1>::VectorCategory ()); }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulRowSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseZeroOneVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulRowSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseZeroOneVectorTag) const;
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const;
-
- VectorDomain<GF2> _VD;
- };
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MatrixDomain<GF2>::mulRowSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseZeroOneVectorTag) const
- {
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstRowIterator i = A.rowBegin ();
- typename Vector1::iterator j = w.begin ();
-
- for (; j != w.end (); ++j, ++i)
- _VD.dot (*j, v, *i);
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MatrixDomain<GF2>::mulRowSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseZeroOneVectorTag) const
- {
- typename Matrix::ConstRowIterator i = A.rowBegin ();
- GF2::Element t;
- unsigned int idx = 0;
-
- w.clear ();
-
- for (; i != A.rowEnd (); ++i, ++idx) {
- _VD.dot (t, v, *i);
-
- if (t)
- w.push_back (t);
- }
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2 >
- Vector1 &MatrixDomain<GF2>::mulColSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::DenseZeroOneVectorTag) const
- {
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j = v.begin ();
-
- _VD.subin (w, w);
-
- for (; j != v.end (); ++j, ++i)
- _VD.axpyin (w, *j, *i);
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MatrixDomain<GF2>::mulColSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseZeroOneVectorTag,
- VectorCategories::SparseZeroOneVectorTag) const
- {
- linbox_check (A.rowdim () == w.size ());
-
- typename Vector2::const_iterator j = v.begin ();
-
- _VD.subin (w, w);
-
- for (; j != v.end (); ++j) {
- typename Matrix::ConstColIterator i = A.colBegin () + *j;
- _VD.axpyin (w, true, *i);
- }
-
- return w;
- }
-
- // Specialization of diagonal for GF2
- template <>
- class Diagonal<GF2, VectorTraits<Vector<GF2>::Dense>::VectorCategory> : public BlackboxArchetype {
- public:
-
- typedef GF2 Field;
- typedef Vector<GF2>::Dense Vector;
- typedef BlackboxArchetype Blackbox;
- typedef bool Element;
-
- Diagonal (const Field &, const BitVector &y) :
- _v (y)
- {}
-
- /// The field.
- const Field& field() const
- {return *(new GF2());}
-
- Blackbox *clone() const
- { return new Diagonal (*this); }
-
-
- template <class OutVector, class InVector>
- OutVector& apply (OutVector& y, const InVector& x) const
- {
- linbox_check (y.size () == x.size ());
- linbox_check (y.size () == _v.size ());
- typename InVector::const_iterator j1 = x.begin();
- typename OutVector::iterator i = y.begin();
- BitVector::const_iterator j2 = _v.begin();
- for (; i != y.end (); ++i, ++j1, ++j2)
- *i = *j1 & *j2;
- return y;
- }
-
- Vector& apply (Vector& y, const Vector& x) const
- {
- linbox_check (y.size () == x.size ());
- linbox_check (y.size () == _v.size ());
-
- BitVector::word_iterator i = y.wordBegin ();
- BitVector::const_word_iterator j1 = x.wordBegin (), j2 = _v.wordBegin ();
-
- for (; i != y.wordEnd (); ++i, ++j1, ++j2)
- *i = *j1 & *j2;
-
- return y;
- }
-
- template <class OutVector, class InVector>
- OutVector& applyTranspose (OutVector& y, const InVector& x) const
- { return apply (y, x); }
-
- size_t rowdim () const
- { return _v.size (); }
- size_t coldim () const
- { return _v.size (); }
-
- /** Get an entry and store it in the given value
- * @param x Element in which to store result
- * @param i Row index
- * @param j Column index
- * @return Reference to x
- */
- Element &getEntry (Element &x, size_t i, size_t j) const
- {
- return (i==j?x=this->_v[i]:x=false);
- }
-
- private:
-
- // Bit vector of elements
- BitVector _v;
-
- }; // template <Field, Vector> class Diagonal<DenseVectorTag>
-
-} // namespace LinBox
-
-#include "linbox/switch/cekstv.h"
-namespace LinBox
-{
- // Specialization of Butterfly switch object
- template <>
- class CekstvSwitch<GF2>
- {
- public:
- typedef GF2 Field;
- /// Typedef
- typedef Field::Element Element;
- typedef CekstvSwitch<Field> Self_t;
- typedef CekstvSwitchFactory<Field> Factory;
-
- /** Constructor from a field and a field element.
- * @param F field in which arithmetic is done
- * @param switches vector of switches
- */
- CekstvSwitch (const Field::Element &a) :
- _a (a)
- {}
-
- ~CekstvSwitch () {}
-
- bool apply (const Field &F, Element &x, Element &y) const
- {
- F.axpyin (x, _a, y);
- F.addin (y, x);
- return true;
- }
-
- bool applyTranspose (const Field &F, Element &x, Element &y) const
- {
- F.addin (x, y);
- F.axpyin (y, _a, x);
- return true;
- }
-
- bool apply (const Field &F, std::_Bit_reference x, std::_Bit_reference y) const
- {
- F.axpyin (x, _a, y);
- F.addin (y, x);
- return true;
- }
-
- bool applyTranspose (const Field &F, std::_Bit_reference x, std::_Bit_reference y) const
- {
- F.addin (x, y);
- F.axpyin (y, _a, x);
- return true;
- }
-
- template<typename _Tp1>
- struct rebind
- {
- typedef CekstvSwitch<_Tp1> other;
-
- // special rebind operator() with two fields,
- // indeed local field is not stored in the switch
- void operator() (other *& Ap, const Self_t& A, const _Tp1& T, const Field& F) {
- typename _Tp1::Element u;
- Hom<Field, _Tp1>(F,T).image(u, A._a);
- Ap = new other(u);
- }
- };
-
-
- private:
-
- // Parameter of this 2x2 block
- Field::Element _a;
- };
+#endif // __LINBOX_field_gf2_INL
-} // namespace LinBox
-#endif // __LINBOX_field_gf2_INL
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
diff --git a/linbox/field/givaro-extension.h b/linbox/field/givaro-extension.h
deleted file mode 100644
index 5b2f451..0000000
--- a/linbox/field/givaro-extension.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/givaro-gfq.h
- * Copyright (C) 2005 JGD
- *
- * Time-stamp: <22 Jun 10 10:02:34 Jean-Guillaume.Dumas at imag.fr>
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-/*! @file field/givaro-extension.h
- * @ingroup field
- * @brief NO DOC
- */
-
-#ifndef __LINBOX_field_givaro_extension_H
-#define __LINBOX_field_givaro_extension_H
-
-
-#include <linbox/integer.h>
-#include <linbox/field/field-traits.h>
-#include <linbox/field/field-interface.h>
-#include <linbox/util/debug.h>
-#include "linbox/linbox-config.h"
-#include <linbox/field/field-traits.h>
-#include <linbox/field/givaro-gfq.h>
-
-#ifdef __LINBOX_XMLENABLED
-
-#include "linbox/util/xml/linbox-reader.h"
-#include "linbox/util/xml/linbox-writer.h"
-
-#include <iostream>
-#include <string>
-#include <vector>
-
-#endif //__LINBOX_XMLENABLED
-
-//---------------------------------------------
-// Files of Givaro library
-#include <givaro/givextension.h>
-#include <givaro/giv_randiter.h>
-//---------------------------------------------
-// To convert linbox fields to Givaro interface
-#include <linbox/field/givaro-field.h>
-
-//---------------------------------------------
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
- template <class Ring>
- struct ClassifyRing;
-
- template< class BaseField>
- class GivaroExtension;
-
-#if !defined(__INTEL_COMPILER) && !defined(__CUDACC__)
- template<>
-#endif
- template< class BaseField>
- struct ClassifyRing<GivaroExtension<BaseField> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
-#if !defined(__INTEL_COMPILER) && !defined(__CUDACC__)
- template<>
-#endif
- template< class BaseField>
- struct FieldTraits< GivaroExtension<BaseField> >
- {
- typedef RingCategories::ModularTag categoryTag;
-
- static integer& maxModulus( integer& i )
- {
- return FieldTraits<BaseField>::maxModulus(i);
- }
-
- static bool goodModulus( const integer& i )
- {
- return FieldTraits<BaseField>::goodModulus(i);
- }
-
- // After that degree might not be correct ...
- static integer& maxExponent( integer& i )
- {
- return i = 2147483648UL;
- }
- static bool goodExponent( const integer& i )
- {
- integer max;
- return ( i >= 1 && i <= maxExponent( max ) );
- }
- };
-
-
- /** This template class is defined to be in phase with the LinBox
- * archetype.
- * Most of all methods are inherited from Extension class
- * of Givaro.
- * These class allow to construct only extension field with a prime characteristic.
- */
- template< class BaseField = GivaroGfq>
- class GivaroExtension : public ::Givaro::Extension<GivaroField<BaseField> >, public FieldInterface {
-
- typedef GivaroExtension<GivaroField<BaseField> > Self_t;
- typedef ::Givaro::Extension<GivaroField<BaseField> > Extension_t;
- public:
- using Extension_t::zero;
- using Extension_t::one;
-
- /** Element type.
- * This type is inherited from the Givaro class Extension
- */
- typedef typename ::Givaro::Extension<GivaroField<BaseField> >::Element Element;
-
- /** RandIter type.
- * This type is inherited from the Givaro class GFqDom<TAG>
- */
- typedef ::Givaro::GIV_ExtensionrandIter< ::Givaro::Extension<GivaroField<BaseField> >, LinBox::integer > RandIter;
-
-
- GivaroExtension()
- {}
-
-
- /** Constructor from an integer.
- */
- GivaroExtension(const integer& p, const integer& k=1) :
- ::Givaro::Extension<GivaroField<BaseField> >(static_cast<typename ::Givaro::Extension< GivaroField< BaseField > >::Residu_t >(int32_t(p)), static_cast<typename ::Givaro::Extension< GivaroField< BaseField > >::Residu_t>(int32_t(k)))
- {
- }
-
- /** Constructor extension of a base field.
- */
- GivaroExtension(const BaseField& bF, const integer& ext=1) :
- ::Givaro::Extension<GivaroField<BaseField> >( GivaroField<BaseField>(bF),
- static_cast<typename ::Givaro::Extension< GivaroField< BaseField > >::Residu_t>(int32_t(ext)))
- {
- }
-
-
- /** Copy Constructor
- */
- GivaroExtension(const Self_t& F) :
- ::Givaro::Extension<GivaroField<BaseField> >(F) {
- }
-
- }; // class GivaroExtension
-
-
-
- /** This template class is define just to be in phase with the LinBox
- * archetype.
- * Most of all methods are inherited from Extension class
- * of Givaro.
- * these class allow to construct only extension field with a prime characteristic.
- */
-#ifndef __INTEL_COMPILER
- template<>
- #endif
- class GivaroExtension<GivaroGfq> : public ::Givaro::Extension< ::Givaro::GFqDom<int32_t> >, public FieldInterface {
-
- typedef GivaroExtension<GivaroGfq> Self_t;
- public:
-
- /** Element type.
- * This type is inherited from the Givaro class Extension
- */
- typedef ::Givaro::Extension< ::Givaro::GFqDom<int32_t> >::Element Element;
-
- /** RandIter type.
- * This type is inherited from the Givaro class GFqDom<TAG>
- */
- typedef ::Givaro::GIV_ExtensionrandIter< ::Givaro::Extension< ::Givaro::GFqDom<int32_t> >, LinBox::integer > RandIter;
-
- /** Constructor from an integer.
- */
- GivaroExtension(const integer& p, const integer& k=1) :
- ::Givaro::Extension< ::Givaro::GFqDom<int32_t> >(static_cast< ::Givaro::Extension< ::Givaro::GFqDom<int32_t> >::Residu_t>(int32_t(p)),
- static_cast< ::Givaro::Extension< ::Givaro::GFqDom<int32_t> >::Residu_t>(int32_t(k)))
- {
- }
-
- /** Constructor extension of a base field.
- */
- GivaroExtension(const GivaroGfq& bF, const integer& ext=1) :
- ::Givaro::Extension< ::Givaro::GFqDom<int32_t> >( static_cast< const ::Givaro::Extension< ::Givaro::GFqDom< int32_t > >::BaseField_t &>(bF),
- static_cast< ::Givaro::Extension< ::Givaro::GFqDom<int32_t> >::Residu_t >(int32_t(ext)))
- {
- }
-
-
- /** Copy Constructor.
- */
- GivaroExtension(const Self_t& F) :
- ::Givaro::Extension< ::Givaro::GFqDom<int32_t> >(F)
- { }
-
-
- }; // class GivaroExtension
-
-
-
-} // namespace LinBox
-
-
-
-// Specialization of homomorphism for basefield
-#include "linbox/field/hom.h"
-namespace LinBox
-{
- /// NO DOC
- template< class BaseField>
- class Hom < BaseField, GivaroExtension<BaseField> > {
- typedef BaseField Source;
- typedef GivaroExtension<BaseField> Target;
- public:
- typedef typename Source::Element SrcElt;
- typedef typename Target::Element Elt;
-
- //Hom(){}
- /** Constructor.
- * Construct a homomorphism from a specific source ring S and target
- * field T with Hom(S, T). The default behaviour is error.
- * Specializations define all actual homomorphisms.
- */
- Hom(const Source& S, const Target& T) :
- _source(S), _target(T)
- {}
-
- /** Image.
- * image(t, s) implements the homomorphism, assigning the
- * t the value of the image of s under the mapping.
- *
- * The default behaviour is a no-op.
- */
- Elt& image(Elt& t, const SrcElt& s) const
- {
- return _target.assign(t, s);
- }
-
- /** Preimage.
- * If possible, preimage(s,t) assigns a value to s such that
- * the image of s is t. Otherwise behaviour is unspecified.
- * An error may be thrown, a conventional value may be set, or
- * an arb value set.
- *
- * The default behaviour is a no-op.
- */
- SrcElt& preimage(SrcElt& s, const Elt& t) const
- {
- // return _target.getEntry(s, Degree(0), t);
- return _target.convert(s, t);
- }
-
- const Source& source() const
- {
- return _source;
- }
- const Target& target() const
- {
- return _target;
- }
-
- private:
- Source _source;
- Target _target;
- }; // end Hom
-}
-#endif // __LINBOX_field_givaro_extension_H
-
diff --git a/linbox/field/givaro-field.h b/linbox/field/givaro-field.h
deleted file mode 100644
index 65760b1..0000000
--- a/linbox/field/givaro-field.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/givaro-field.h
- * Copyright (C) 2009 JGD
- *
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-#ifndef __LINBOX_givaro_field_H
-#define __LINBOX_givaro_field_H
-
-#include <givaro/givconfig.h>
-#include <linbox/integer.h>
-#include <linbox/field/field-traits.h>
-#include <linbox/field/field-interface.h>
-#include <givaro/givconfig.h>
-
-namespace LinBox
-{
-
- /**
- \brief give LinBox fields an allure of Givaro Fields
- \ingroup field
-
- * This class adds the necessary requirements allowing
- * the construction of an extension of a LinBox field
- * or a givaro polynomial of a LinBox field ...
- */
- template< class BaseField >
- struct GivaroField : public BaseField
- {
- typedef typename BaseField::Element TT;
- typedef typename Signed_Trait<TT>::unsigned_type UTT;
- typedef TT Rep;
- typedef GivaroField<BaseField> Self_t;
- typedef Rep Element;
- typedef UTT Residu_t;
-
- Element zero, one;
- GivaroField() :
- BaseField()
- {
- this->init(zero,0UL);
- this->init(one, 1UL);
- }
- GivaroField(const BaseField& bf) :
- BaseField(bf)
- {
- this->init(zero,0UL);
- this->init(one, 1UL);
- }
-
-
- // -- axmy: r <- a * x - y
- Rep& axmy (Rep& r, const Rep a, const Rep x, const Rep y) const
- {
- Rep tmp; this->mul(tmp, a, x);
- return this->sub(r,tmp,y);
- }
-
- // -- maxpy: r <- y - a * x
- Rep& maxpy (Rep& r, const Rep a, const Rep x, const Rep y) const
- {
- Rep tmp; this->mul(tmp, a, x);
- return this->sub(r,y,tmp);
- }
-
- // -- axmyin: r <- a * x - r
- Rep& axmyin (Rep& r, const Rep a, const Rep x) const
- {
- maxpyin(r,a,x);
- return negin(r);
- }
-
- // -- maxpyin: r <- r - a * x
- Rep& maxpyin (Rep& r, const Rep a, const Rep x) const
- {
- Rep tmp; this->mul(tmp, a, x);
- return this->subin(r,tmp);
- }
-
- bool areNEqual ( const Rep a, const Rep b) const
- {
- return ! this->areEqual(a,b);
- }
-
- // Access to the modulus, characteristic, size, exponent
- UTT residu() const
- { integer c; BaseField::characteristic(c); return UTT(c); }
- UTT characteristic() const { integer c; BaseField::characteristic(c); return UTT(c); }
- integer& characteristic(integer& i) const { return BaseField::characteristic(i); }
- UTT cardinality() const { integer c; BaseField::cardinality(c); return UTT(c); }
- UTT exponent() const
- { return 1; }
- UTT size() const { integer c; BaseField::cardinality(c); return UTT(c); }
-
-
- // ----- random generators
- template<class RandIter> Rep& random(RandIter& g, Rep& r) const
- { return this->init(r,g()) ; }
- template<class RandIter> Rep& random(RandIter& g, Rep& r, long s) const
- { return this->init(r,g()) ; }
- template<class RandIter> Rep& random(RandIter& g, Rep& r, const Rep& b) const
- { return this->init(r,g()) ; }
- template<class RandIter> Rep& nonzerorandom(RandIter& g, Rep& r) const
- { do { this->init(r,g()); } while( this->isZero(r) ); return r; }
- template<class RandIter> Rep& nonzerorandom(RandIter& g, Rep& r, long s) const
- { do { this->init(r,g()); } while( this->isZero(r) ); return r; }
- template<class RandIter> Rep& nonzerorandom(RandIter& g, Rep& r, const Rep& b) const
- { do { this->init(r,g()); } while( this->isZero(r) ); return r; }
-
- };
-
-
-
-} // end namespace LinBox
-
-#endif // __LINBOX_givaro_field_H
-
diff --git a/linbox/field/givaro-gfq.h b/linbox/field/givaro-gfq.h
deleted file mode 100644
index 5f112b6..0000000
--- a/linbox/field/givaro-gfq.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/givaro-gfq.h
- * Copyright (C) 2002 Pascal Giorgi
- *
- * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
- * JGD 12.06.2002 : -- I don't see the need of *(new in convert
- * JGD 19.09.2003 : added isZero
- * WJT 24.06.2005 : Removed using declarations
- *
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-/*! @file field/givaro-gfq.h
- *
- * @warning This wrapper works only with an improved version of Givaro ;
- * This version of givaro won't be available for public yet ;
- * But it is available on my web page ;
- * You can send me a mail to get it or for others details.
- */
-
-#ifndef __LINBOX_field_givaro_gfq_H
-#define __LINBOX_field_givaro_gfq_H
-
-
-#include <linbox/integer.h>
-#include <linbox/field/field-traits.h>
-#include <linbox/field/field-interface.h>
-#include <linbox/util/debug.h>
-#include <linbox/field/hom.h>
-#include "linbox/linbox-config.h"
-
-
-//------------------------------------
-// Files of Givaro library
-
-
-#include <givaro/givgfq.h>
-#include <givaro/giv_randiter.h>
-#include <givaro/givpoly1factor.h>
-//------------------------------------
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
- template <class Ring>
- struct ClassifyRing;
-
- class GivaroGfq;
-
- template<>
- struct ClassifyRing<GivaroGfq> {
- typedef RingCategories::ModularTag categoryTag;
- };
-
-
- class GivaroGfq;
-
- template<>
- inline integer& FieldTraits<GivaroGfq>::maxModulus( integer& i )
- { return i = integer( 32749 ); } // prevprime( 2^15 )
-
- template<>
- inline bool FieldTraits<GivaroGfq>::goodModulus( const integer& i )
- {
- integer max;
- if( i < 2 || i > FieldTraits<GivaroGfq>::maxModulus(max) )
- return false;
- return probab_prime( i, 10 );
- }
-
- template<>
- inline integer& FieldTraits<GivaroGfq>::maxExponent( integer& i )
- { return i = 20; } // Cardinality must be <= 2^20
-
-
- /** Wrapper of Givaro's GFqDom<int32_t> class.
- \ingroup field
-
- * This class allows to construct only extension fields with a prime characteristic.
- */
- class GivaroGfq : public ::Givaro::GFqDom<int32_t>, public FieldInterface {
-
- public:
-
- /** Element type.
- * This type is inherited from the Givaro class GFqDom<int32_t>
- */
- typedef ::Givaro::GFqDom<int32_t>::Rep Element;
-
- /** RandIter type
- * This type is inherited from the Givaro class GFqDom<TAG>
- */
- typedef ::Givaro::GIV_randIter< ::Givaro::GFqDom<int32_t>, LinBox::integer > RandIter;
-
- /** Empty Constructor
- */
- GivaroGfq() :
- ::Givaro::GFqDom<int32_t>()
- { }
-
- /** Constructor from an integer
- * this constructor use the ZpzDom<TAG> constructor
- */
- GivaroGfq(const integer& p, const integer& k=1) :
- ::Givaro::GFqDom<int32_t>(static_cast<UTT>(int32_t(p)), static_cast<UTT>(int32_t(k)))
- {
- //enforce that the cardinality must be <2^16, for givaro-gfq
- int32_t pl=p;
- for(int32_t i=1;i<k;++i) pl*=(int32_t)p;
- if(!FieldTraits<GivaroGfq>::goodModulus(p))
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus be between 2 and 2^15 and prime");
- else if(pl>(1<<20)) throw PreconditionFailed(__func__,__FILE__,__LINE__,"cardinality must be < 2^20");
-
- }
-
- // Dan Roche 6-15-04
- // This constructor takes a vector of ints that represent the polynomial
- // to use (for modular arithmetic on the extension field).
- // Mostly copied from givaro/givgfq.inl
- GivaroGfq(const integer& p, const integer& k, const std::vector<integer>& modPoly) :
- ::Givaro::GFqDom<int32_t>(static_cast<UTT>(int32_t(p)), static_cast<UTT>(int32_t(k)))
- {
-
- //enforce that the cardinality must be <2^16, for givaro-gfq
- int32_t pl=p;
- for(int32_t i=1;i<k;++i) pl*=(int32_t)p;
- if(!FieldTraits<GivaroGfq>::goodModulus(p)) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus be between 2 and 2^15 and prime");
- else if(pl>=(1<<16)) throw PreconditionFailed(__func__,__FILE__,__LINE__,"cardinality must be < 2^16");
-
- if( k < 2 ) throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be >1 if polynomial is specified");
-
- if(modPoly.size() != (size_t)(k+1)) throw PreconditionFailed(__func__,__FILE__,__LINE__,"Polynomial must be of order k+1");
-
- ::Givaro::GFqDom<int32_t> Zp(p,1);
- typedef ::Givaro::Poly1FactorDom< ::Givaro::GFqDom<int32_t>, ::Givaro::Dense > PolDom;
- PolDom Pdom( Zp );
- PolDom::Element Ft, F, G, H;
-
- ::Givaro::Poly1Dom< ::Givaro::GFqDom<int32_t>, ::Givaro::Dense >::Rep tempVector(k+1);
- for( int i = 0; i < k+1; i++ )
- tempVector[i] = modPoly[i] % p;
- Pdom.assign( F, tempVector );
-
- Pdom.give_prim_root(G,F);
- Pdom.assign(H,G);
-
- typedef ::Givaro::Poly1PadicDom< ::Givaro::GFqDom<int32_t>, ::Givaro::Dense > PadicDom;
- PadicDom PAD(Pdom);
-
- PAD.eval(_log2pol[1],H);
- for (UTT i = 2; i < _qm1; ++i) {
- Pdom.mulin(H, G);
- Pdom.modin(H, F);
- PAD.eval(_log2pol[i], H);
- }
-
- for (UTT i = 0; i < _q; ++i)
- _pol2log[ _log2pol[i] ] = 1;
-
- UTT a,b,r,P=p;
- for (UTT i = 1; i < _q; ++i) {
- a = _log2pol[i];
- r = a & P;
- if (r == (P - 1))
- b = a - r;
- else
- b = a + 1;
- _plus1[i] = _pol2log[b] - _qm1;
- }
-
- _plus1[_qm1o2] = 0;
-
- }
-
- /** Characteristic.
- * Return integer representing characteristic of the domain.
- * Returns a positive integer to all domains with finite characteristic,
- * and returns 0 to signify a domain of infinite characteristic.
- * @return integer representing characteristic of the domain.
- */
- integer& characteristic(integer& c) const
- {return c=integer(static_cast<int32_t>(::Givaro::GFqDom<int32_t>::characteristic()));}
-
- int32_t characteristic() const
- {return static_cast<int32_t>(::Givaro::GFqDom<int32_t>::characteristic());}
-
-
- /** Cardinality.
- * Return integer representing cardinality of the domain.
- * Returns a non-negative integer for all domains with finite
- * cardinality, and returns -1 to signify a domain of infinite
- * cardinality.
- * @return integer representing cardinality of the domain
- */
- integer& cardinality(integer& c) const
- { return c=integer(static_cast<int32_t>(::Givaro::GFqDom<int32_t>::size()));}
-
-
- integer cardinality() const
- { return integer(static_cast<int32_t>(::Givaro::GFqDom<int32_t>::cardinality()));}
-
-
- /** Initialization of field base Element from an integer.
- * Behaves like C++ allocator construct.
- * This function assumes the output field base Element x has already been
- * constructed, but that it is not already initialized.
- * We assume that the type of Element is short int.
- * this methos is just a simple cast.
- * @return reference to field base Element.
- * @param x field base Element to contain output (reference returned).
- * @param y integer.
- */
- Element& init(Element& x , const integer& y = 0) const
- { return ::Givaro::GFqDom<int32_t>::init( x, int32_t(y % (integer) _q));}
-
- // TO BE OPTIMIZED
- Element& init(Element& x , const float y) const
- { return ::Givaro::GFqDom<int32_t>::init( x, (double)y);}
-
- template<class YYY>
- Element& init(Element& x , const YYY& y) const
- { return ::Givaro::GFqDom<int32_t>::init( x, y);}
-
- /** Conversion of field base Element to an integer.
- * This function assumes the output field base Element x has already been
- * constructed, but that it is not already initialized.
- * @return reference to an integer.
- * @param x integer to contain output (reference returned).
- * @param y constant field base Element.
- */
- integer& convert(integer& x, const Element& y) const
- {
- int32_t tmp;
- return x = integer(::Givaro::GFqDom<int32_t>::convert(tmp,y));
- }
- // TO BE OPTIMIZED
- float& convert(float& x, const Element& y) const
- {
- double tmp;
- ::Givaro::GFqDom<int32_t>::convert( tmp, y);
- return x = (float)tmp;
- }
-
- template<class XXX>
- XXX& convert(XXX& x, const Element& y) const
- {
- return ::Givaro::GFqDom<int32_t>::convert( x, y);
- }
-
- //bool isZero(const Element& x) const { return ::Givaro::GFqDom<int32_t>::isZero(x); }
-
-
- }; // class GivaroGfq
-
-
- template<>
- class Hom <GivaroGfq,GivaroGfq> {
- public:
- typedef GivaroGfq Source;
- typedef GivaroGfq Target;
-
- typedef Source::Element SrcElt;
- typedef Target::Element Elt;
-
- //Hom(){}
- /**
- * Construct a homomorphism from a specific source ring S and target
- * field T with Hom(S, T).
- * Specializations define all actual homomorphisms.
- */
- Hom(const Source& S, const Target& T) :
- _source(S), _target(T)
- { }
-
- /**
- * image(t, s) implements the homomorphism, assigning the
- * t the value of the image of s under the mapping.
- *
- * The default behaviour goes through integers.
- */
- Elt& image(Elt& t, const SrcElt& s)
- {
- return _target.init(t, _source.convert(tmp,s));
- }
-
- /** If possible, preimage(s,t) assigns a value to s such that
- * the image of s is t. Otherwise behaviour is unspecified.
- * An error may be thrown, a conventional value may be set, or
- * an arb value set.
- *
- * The default behaviour goes through integers.
- */
- SrcElt& preimage(SrcElt& s, const Elt& t)
- {
- return _source.init(s, _target.convert(tmp,t));
- }
- const Source& source() { return _source;}
- const Target& target() { return _target;}
-
- private:
- integer tmp;
- Source _source;
- Target _target;
- }; // end Hom
-
-
-
-} // namespace LinBox
-
-#endif // __LINBOX_field_givaro_gfq_H
-
diff --git a/linbox/field/givaro-montg.h b/linbox/field/givaro-montg.h
deleted file mode 100644
index 244c029..0000000
--- a/linbox/field/givaro-montg.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/givaro-gfq.h
- * Copyright (C) 2004 Jean-Guillaume Dumas
- *
- * Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
- *
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-/* WARNING this wrapper works only with an improved version of Givaro.
- * This version of givaro won't be available for public yet.
- * But it is available on my web page.
- * You can send me a mail to get it or for others details.
- */
-
-#ifndef __LINBOX_field_givaro_montgomery_H
-#define __LINBOX_field_givaro_montgomery_H
-
-
-#include <linbox/integer.h>
-#include <linbox/field/field-interface.h>
-#include <linbox/util/debug.h>
-#include "linbox/linbox-config.h"
-#include <linbox/field/field-traits.h>
-
-//------------------------------------
-// Files of Givaro library
-
-
-#include <givaro/givmontg32.h>
-#include <givaro/giv_randiter.h>
-//------------------------------------
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
-
- template <class Ring>
- struct ClassifyRing;
-
- class GivaroMontg;
-
- template<>
- struct ClassifyRing<GivaroMontg> {
- typedef RingCategories::ModularTag categoryTag;
- };
- /**
- \brief wrapper of Givaro's ::Givaro::Montgomery< ::Givaro::Std32>.
- \ingroup field
-
- * This class is a modular representation with a ::Givaro::Montgomery reduction
- */
- class GivaroMontg : public ::Givaro::Montgomery< ::Givaro::Std32>, public FieldInterface {
-
- public:
-
- /** Element type.
- * This type is inherited from the Givaro class ::Givaro::Montgomery< ::Givaro::Std32>
- */
- typedef ::Givaro::Montgomery< ::Givaro::Std32>::Rep Element;
-
- /** RandIter type
- * This type is inherited from the Givaro class ::Givaro::Montgomery< ::Givaro::Std32>
- */
- typedef ::Givaro::GIV_randIter< ::Givaro::Montgomery< ::Givaro::Std32>, LinBox::integer > RandIter;
-
- /** Constructor from an integer
- * this constructor use the ZpzDom<TAG> constructor
- */
- GivaroMontg(const integer& p) :
- ::Givaro::Montgomery< ::Givaro::Std32>(static_cast<uint32_t>(long(p)))
- { }
-
- /** Constructor from an integer (takes degree of extension as 2nd parameter, must be 1)
- * this constructor use the ZpzDom<TAG> constructor
- */
- GivaroMontg(const integer& p, const integer& k) :
- ::Givaro::Montgomery< ::Givaro::Std32>(static_cast<uint32_t>(long(p)))
- {
-
- if (k!=1)
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
- }
-
- /** Characteristic.
- * Return integer representing characteristic of the domain.
- * Returns a positive integer to all domains with finite characteristic,
- * and returns 0 to signify a domain of infinite characteristic.
- * @return integer representing characteristic of the domain.
- */
- integer& characteristic(integer& c) const
- {
- return c=integer(static_cast<long>(::Givaro::Montgomery< ::Givaro::Std32>::characteristic()));
- }
-
- long characteristic() const
- {
- return static_cast<long>(::Givaro::Montgomery< ::Givaro::Std32>::characteristic());
- }
-
-
- /** Cardinality.
- * Return integer representing cardinality of the domain.
- * Returns a non-negative integer for all domains with finite
- * cardinality, and returns -1 to signify a domain of infinite
- * cardinality.
- * @return integer representing cardinality of the domain
- */
- integer& cardinality(integer& c) const
- {
- return c=integer(static_cast<long>(::Givaro::Montgomery< ::Givaro::Std32>::size()));
- }
-
- long cardinality() const
- {
- return static_cast<long>(::Givaro::Montgomery< ::Givaro::Std32>::size());
- }
-
-
- /** Initialization of field base Element from an integer.
- * Behaves like C++ allocator construct.
- * This function assumes the output field base Element x has already been
- * constructed, but that it is not already initialized.
- * We assume that the type of Element is short int.
- * this methos is just a simple cast.
- * @return reference to field base Element.
- * @param x field base Element to contain output (reference returned).
- * @param y integer.
- */
- Element& init(Element& x , const integer& y=0) const
- {
- return ::Givaro::Montgomery< ::Givaro::Std32>::init( x,long(y % (integer)_p));
- }
-
- Element& init(Element& x , const double y) const
- {
- return ::Givaro::Montgomery< ::Givaro::Std32>::init( x, y);
- }
-
- /** Conversion of field base element to an integer.
- * This function assumes the output field base element x has already been
- * constructed, but that it is not already initialized.
- * @return reference to an integer.
- * @param x integer to contain output (reference returned).
- * @param y constant field base element.
- */
- integer& convert(integer& x, const Element& y) const
- {
- long tmp;
- // return x = *(new integer(Montgomery< ::Givaro::Std32>::convert(tmp,y)));
- return x = integer(::Givaro::Montgomery< ::Givaro::Std32>::convert(tmp,y));
- }
-
- double& convert(double& x, const Element& y) const
- {
- return ::Givaro::Montgomery< ::Givaro::Std32>::convert( x, y);
- }
-
-#if 0
- bool isZero(const Element& x) const
- {
- return ::Givaro::Montgomery< ::Givaro::Std32>::isZero(x);
- }
-#endif
-
- static inline int getMaxModulus() { return 40504; }
-
- }; // class GivaroMontg
-
-
-
-} // namespace LinBox
-
-#endif // __LINBOX_field_givaro_montgomery_H
-
diff --git a/linbox/field/givaro-rational.h b/linbox/field/givaro-rational.h
deleted file mode 100644
index de21742..0000000
--- a/linbox/field/givaro-rational.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/givaro-rational.h
- * Copyright (C) 2004 Gilles Villard
- *
- * Created Gilles Villard < Gilles.Villard at ens-lyon.fr>
- * ven oct 8 13:30:05 CEST 2004
- * see COPYING for licence information
- */
-
-
-#ifndef __LINBOX_givaro_rational_H
-#define __LINBOX_givaro_rational_H
-
-
-#include "linbox/integer.h"
-#include "linbox/field/unparametric.h"
-#include <linbox/field/field-traits.h>
-
-
-//------------------------------------
-// Files of Givaro library
-
-#include "givaro/givrational.h"
-//------------------------------------
-
-
-namespace LinBox
-{
-
- template <class Ring>
- struct ClassifyRing;
-
- class GivaroRational;
-
- template<>
- struct ClassifyRing<GivaroRational> {
- typedef RingCategories::RationalTag categoryTag;
- };
-
- class GivaroRational : public UnparametricField< ::Givaro::Rational>
- {
-
- public:
-
- /** Element type.
- *
- */
- typedef ::Givaro::Rational Element;
-
-
- Element& init(Element& x , const integer& y) const
- {
- return x=Element(y);
- }
-
- Element& init(Element& x , const integer& n,const integer& d) const
- {
- return x=Element(n,d);
- }
-
- template<class XX>
- Element& init(Element& x , const XX& y) const
- {
- return x=Element(y);
- }
-
- integer& convert(integer& i, const Element& r) const
- {
- return i=r.nume();
- }
-
-
- Element& assign(Element& x , const Element& y) const
- {
- return x=y;
- }
-
- // x = numerator of y
- integer& get_num (integer& x, const Element& y) const
- {
- return x = y.nume();
- }
-
- // x = denominator of y
- integer& get_den (integer& x, const Element& y) const
- {
- return x = y.deno();
- }
-
-
- }; // class
-
-
-
-} // namespace LinBox
-
-
-// Specialization of homomorphism for basefield
-#include "linbox/field/hom.h"
-namespace LinBox
-{
- template <class _Target>
- class Hom<GivaroRational, _Target> {
-
- public:
- typedef GivaroRational Source;
- typedef _Target Target;
- typedef typename Source::Element SrcElt;
- typedef typename Target::Element Elt;
-
- Hom(const Source& S, const Target& T) :
- _source (S), _target(T)
- {
-}
- Elt& image(Elt& t, const SrcElt& s)
- {
- _source. get_num (num, s);
- _source. get_den (den, s);
- if (den == 1) {
- return _target.init(t,num);
- }
- else if (num == 1) {
- _target.init(t,den);
- return _target.invin(t);
- }
- else {
- _target. init (tmp, den);
- _target. init (t, num);
- return _target. divin (t, tmp);
-
-}
- // _target. init (t, den);
- // return _target. invin (t);
-
-}
- SrcElt& preimage(SrcElt& s, const Elt& t)
- {
- _target. convert (num, t);
- _source. init (s, num);
- return s;
-
-}
- const Source& source() {
-return _source;
-}
- const Target& target() {
-return _target;
-}
-
- protected:
- integer num, den;
- Elt tmp;
- Source _source;
- Target _target;
- }; // end Hom
-
- template <>
- class Hom<GivaroRational,GivaroRational> {
-
- public:
- typedef GivaroRational Source;
- typedef Source Target;
- typedef Source::Element SrcElt;
- typedef Target::Element Elt;
-
- Hom(const Source& S, const Target& T) :
- _source (S), _target(T)
- {
-}
- Elt& image(Elt& t, const SrcElt& s) {
- _target.assign(t, s);
- return t;
-
-
-}
- SrcElt& preimage(SrcElt& s, const Elt& t)
- {
- _source.assign(s, t);
- return s;
-
-}
- const Source& source() {
-return _source;
-}
- const Target& target() {
-return _target;
-}
-
- protected:
- Source _source;
- Target _target;
- }; // end Hom
-
-}
-
-#endif // __LINBOX_givaro_rational_H
-
diff --git a/linbox/field/givaro-zpz.h b/linbox/field/givaro-zpz.h
deleted file mode 100644
index e2bc9d9..0000000
--- a/linbox/field/givaro-zpz.h
+++ /dev/null
@@ -1,454 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/givaro-zpz.h
- * Copyright (C) 2002 Pascal Giorgi
- *
- * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
- *
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-/* WARNING this wrapper works only with an improved version of Givaro.
- * This version of givaro won't be available for public yet.
- * But it is available on my web page.
- * You can send me a mail to get it or for others details.
- */
-
-#ifndef __LINBOX_field_givaro_zpz_H
-#define __LINBOX_field_givaro_zpz_H
-
-
-#include "linbox/linbox-config.h"
-#include "linbox/integer.h"
-#include "linbox/field/field-interface.h"
-#include "linbox/util/debug.h"
-#include "linbox/vector/vector-domain.h"
-//-------------------------------------
-// Files of Givaro library
-#include <givaro/givzpz.h>
-#include <givaro/giv_randiter.h>
-#include <linbox/field/field-traits.h>
-
-//--------------------------------------
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
- /* This wrappers allows to use three sorts of givaro fields :
- * Elements represent by a 32 bits integer
- * Elements represent by a 16 bits integer
- * Elements represent in Zech log representation by a 16 bits integer
- *
- * To use this fields with the wrapper below just replace the template
- * parameter by the Tag appropriated.
- * "Givaro::Std16" for 16 bits integer
- * "Givaro::Std32" for 32 bits integer
- * "Givaro::Log16" for Zech log representation in 16 bits
- */
- template<class Field>
- class DotProductDomain;
- template<class Field>
- class FieldAXPY;
-
- template <class Ring>
- struct ClassifyRing;
-
- template <class TAG>
- class GivaroZpz;
-
- template<class Tag>
- struct ClassifyRing<GivaroZpz<Tag> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
- /** \brief wrapper of Givaro's ZpzDom.
- \ingroup field
-
- * Most methods are inherited from ::Givaro::ZpzDom< ::Givaro::Std16>, ::Givaro::ZpzDom< ::Givaro::Std32>
- * and ::Givaro::ZpzDom<log16> classes of Givaro.
- * These classes allow to construct only finite field with a prime modulus.
- */
-
- template <class TAG> class GivaroZpz : public ::Givaro::ZpzDom<TAG>, public FieldInterface
- {
-
- private:
-
- /* friend class DotProductDomain<GivaroZpz<TAG> > ;
- friend class FieldAXPY<GivaroZpz<TAG> >; */
-
- public:
-
- //typedef integer Integer;
-
- /** Element type.
- * This type is inherited from the Givaro class ::Givaro::ZpzDom<TAG>
- */
- typedef typename ::Givaro::ZpzDom<TAG>::Rep Element;
-
- /** RandIter type
- * This type is inherited from the Givaro class ::Givaro::ZpzDom<TAG>
- */
- typedef ::Givaro::GIV_randIter< ::Givaro::ZpzDom<TAG>, integer > RandIter;
-
- /** Constructor from an integer
- * this constructor use the ::Givaro::ZpzDom<TAG> constructor
- */
- GivaroZpz (const integer &p) :
- ::Givaro::ZpzDom<TAG> (static_cast<typename ::Givaro::ZpzDom<TAG>::Residu_t> (p))
- {}
-
-
- /** Constructor from an integer (takes degree of extension as 2nd parameter, must be 1)
- * this constructor use the ::Givaro::ZpzDom<TAG> constructor
- */
- GivaroZpz (const integer &p, const integer& k) :
- ::Givaro::ZpzDom<TAG> (static_cast<typename ::Givaro::ZpzDom<TAG>::Residu_t> (p))
- {
-
- if (k!=1)
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
- }
-
- /** Copy constructor.
- * This copy constructor use the ::Givaro::ZpzDom<TAG> copy constructor
- */
- GivaroZpz (const GivaroZpz<TAG>& F) :
- ::Givaro::ZpzDom<TAG> (F)
- {}
-
-
-#if 0
- // Rich Seagraves 7-16-2003
- // As is, this operator is an infinite loop
- // By not providing an operator= in GivaroZpz,
- // the operator= in the base class (::Givaro::ZpzDom<TAG>) is called
- // automatically by the rules of C++, which I'm guessing is
- // the "Right Thing" for this operator
- //
- /** Operator =
- */
- /*
- GivaroZpz<TAG>& operator= (const GivaroZpz<TAG>& F)
- {
- return (*this)=F;
- }
- */
-#endif
-
- /** Characteristic.
- * Return integer representing characteristic of the domain.
- * @return integer representing characteristic of the domain.
- */
- integer &characteristic (integer &c) const
- {
- return c = integer (::Givaro::ZpzDom<TAG>::size ());
- }
-
- long characteristic() const
- {
- return static_cast<int>(::Givaro::ZpzDom<TAG>::size());
- }
-
- /** Cardinality.
- * Return integer representing cardinality of the domain.
- * @return integer representing cardinality of the domain
- */
- integer &cardinality (integer &c) const
- {
- return c = integer (::Givaro::ZpzDom<TAG>::size ());
- }
-
- integer cardinality () const
- {
- return integer (::Givaro::ZpzDom<TAG>::size ());
- }
-
- /** Conversion of field base element to an integer.
- * This function assumes the output field base element x has already been
- * constructed, but that it is not already initialized.
- * @return reference to an integer.
- * @param x integer to contain output (reference returned).
- * @param y constant field base element.
- */
- integer &convert (integer &x, const Element &y) const
- {
- return x = integer (y);
- }
-
- double &convert (double& x, const Element& y) const
- {
- return x = static_cast<double>(y);
- }
-
- template<class Type>
- Type &convert (Type& x, const Element& y) const
- {
- return x = static_cast<Type>(y);
- }
-
-
- /** Initialization of field base element from an integer.
- * Behaves like C++ allocator construct.
- * This function assumes the output field base element x has already been
- * constructed, but that it is not already initialized.
- * @return reference to field base element.
- * @param x field base element to contain output (reference returned).
- * @param y integer.
- */
- Element &init (Element &x , const integer &y = 0) const
- {
- //
- // AU 28/03/07 no cast to long allows to use ::Givaro::ZpzDom<integer>
- //
- //Givaro::ZpzDom<TAG>::init (x, (long) (y% integer(this->_p)));
- ::Givaro::ZpzDom<TAG>::init (x, (y% integer(this->_p)));
- return x;
- }
-
-
- Element &init (Element &x , const double &y ) const
- {
- double z = fmod(y, (double) this->_p);
- if (z < 0) z += (double) this->_p;
- z += 0.5;
- return x = static_cast<Element>(z); //rounds towards 0
- }
-
- static uint64_t getMaxModulus();
-
- }; // class GivaroZpz<TAG>
-
-
- template <> uint64_t GivaroZpz< ::Givaro::Std32>::getMaxModulus() { return 46339; } // 2^15.5-1
- template <> uint64_t GivaroZpz< ::Givaro::Std64>::getMaxModulus() { return 3037000499ULL; } // 2^15.5-1
- template <> uint64_t GivaroZpz< ::Givaro::Unsigned32>::getMaxModulus() { return 65535; } // 2^16-1
- template <> uint64_t GivaroZpz< ::Givaro::Std16>::getMaxModulus() { return 255; } // 2^8-1
- template <> uint64_t GivaroZpz< ::Givaro::Log16>::getMaxModulus() { return 32767; } // 2^15 - 1
-
- /** Specialisation of the convert function for the zech log representation
- * of givaro-zpz (GivaroZpz< ::Givaro::Log16>.
- * this function translates the internal representation to the real
- * value of the element.
- * This can have no sense but can be usefull
- * NB : the init function for this specialisation does the same thing.
- * the function transaltes the values to her internal representation.
- */
- template <> integer& GivaroZpz< ::Givaro::Log16>::convert(integer& x, const Element& y) const
- {
- if (y>=this->_p) return x = 0;
- int tmp = _tab_rep2value[y];
- return x = integer (tmp);
- }
-
- template <> double& GivaroZpz< ::Givaro::Log16>::convert(double& x, const Element& y) const
- {
- if (y>=this->_p) return x = 0.0;
- int tmp = _tab_rep2value[y];
- return x = (double) tmp;
- }
-
- template <> GivaroZpz< ::Givaro::Log16>::Element& GivaroZpz< ::Givaro::Log16>::init(GivaroZpz< ::Givaro::Log16>::Element& x, const double& y) const
- {
- double z = fmod(y, (double) this->_p);
- if (z < 0) z += this->_p;
- z += 0.5;
- return x = _tab_value2rep[static_cast<long>(z)]; //rounds towards 0
- }
-
- template <> GivaroZpz< ::Givaro::Log16>::Element& GivaroZpz< ::Givaro::Log16>::init(GivaroZpz< ::Givaro::Log16>::Element& x, const integer& y) const
- {
- int tmp =(int) (y % (integer)this->_p);
- if (tmp < 0 ) tmp += this->_p;
- return x = _tab_value2rep[tmp];
- }
-
- /* Specialization of FieldAXPY for GivaroZpz< ::Givaro::Std32> Field */
-
-
- template <>
- class FieldAXPY<GivaroZpz< ::Givaro::Std32> > {
- public:
-
- typedef GivaroZpz< ::Givaro::Std32>::Element Element;
- typedef GivaroZpz< ::Givaro::Std32> Field;
-
- FieldAXPY (const Field &F) :
- _F (F) , Corr(uint64_t(-1) % (uint64_t)F.characteristic() +1)
- { _y = 0; }
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F), _y (0) , Corr(faxpy.Corr)
- {}
-
- FieldAXPY<GivaroZpz< ::Givaro::Std32> > &operator = (const FieldAXPY &faxpy)
- { _F = faxpy._F; _y = faxpy._y; Corr = faxpy.Corr; return *this; }
-
- inline uint64_t& mulacc (const Element &a, const Element &x)
- {
- uint64_t t = (uint64_t) a * (uint64_t) x;
- _y += t;
- if (_y < t)
- return _y += Corr;
- else
- return _y;
- }
-
- inline uint64_t& accumulate (const Element &t)
- {
- _y += t;
- if (_y < (uint64_t)t)
- return _y += Corr;
- else
- return _y;
- }
-
- inline Element &get (Element &y) {
- _y %= (uint64_t) _F.characteristic();
- if ((int64_t) _y < 0) _y += _F.characteristic();
- y = (uint32_t) _y;
- return y;
- }
-
- inline FieldAXPY &assign (const Element y)
- { _y = y; return *this; }
-
- inline void reset() {
- _y = 0;
- }
-
- private:
-
- Field _F;
- uint64_t _y;
- uint64_t Corr;
- };
-
-
-
-
- /* Specialization of FieldAXPY for GivaroZpz< ::Givaro::Std32> Field */
-
- template <>
- class FieldAXPY<GivaroZpz< ::Givaro::Std16> > {
- public:
-
- typedef GivaroZpz< ::Givaro::Std16>::Element Element;
- typedef GivaroZpz< ::Givaro::Std16> Field;
-
- FieldAXPY (const Field &F) :
- _F (F) , Corr(uint32_t(-1) % (uint32_t)F.characteristic() +1)
- { _y = 0; }
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F), _y (0) , Corr(faxpy.Corr)
- {}
-
- FieldAXPY<GivaroZpz< ::Givaro::Std16> > &operator = (const FieldAXPY &faxpy)
- { _F = faxpy._F; _y = faxpy._y; Corr = faxpy.Corr; return *this; }
-
- inline uint32_t& mulacc (const Element &a, const Element &x)
- {
- uint32_t t = (uint32_t) a * (uint32_t) x;
- _y += t;
-
- if (_y < t)
- return _y += Corr;
- else
- return _y;
- }
-
- inline uint32_t& accumulate (const Element &t)
- {
- _y += t;
-
- if (_y < (uint32_t)t)
- return _y += Corr;
- else
- return _y;
- }
-
- inline Element &get (Element &y) {
- _y %= (uint32_t) _F.characteristic();
- if ((int32_t) _y < 0) _y += _F.characteristic();
- y = (uint16_t) _y;
- return y;
- }
-
- inline FieldAXPY &assign (const Element y)
- { _y = y; return *this; }
-
- inline void reset() {
- _y = 0;
- }
-
- private:
-
- Field _F;
- uint32_t _y;
- uint32_t Corr;
- };
-
-
-
- // Specialization of DotProductDomain for GivaroZpz< ::Givaro::Std32> field
-
- template <>
- class DotProductDomain<GivaroZpz< ::Givaro::Std32> > : private virtual VectorDomainBase<GivaroZpz< ::Givaro::Std32> > {
-
- public:
-
- typedef GivaroZpz< ::Givaro::Std32>::Element Element;
-
- DotProductDomain (const GivaroZpz< ::Givaro::Std32> &F) :
- VectorDomainBase<GivaroZpz< ::Givaro::Std32> > (F) ,
- Corr(uint64_t(-1) % (uint64_t)F.characteristic() +1),
- Max(uint64_t(-1))
- {}
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const;
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const;
-
- private:
- uint64_t Corr;
- uint64_t Max;
- };
-
- // Specialization of DotProductDomain for GivaroZpz< ::Givaro::Std16> field
-
- template <>
- class DotProductDomain<GivaroZpz< ::Givaro::Std16> > : private virtual VectorDomainBase<GivaroZpz< ::Givaro::Std16> > {
-
- public:
-
- typedef GivaroZpz< ::Givaro::Std16>::Element Element;
-
- DotProductDomain (const GivaroZpz< ::Givaro::Std16> &F) :
- VectorDomainBase<GivaroZpz< ::Givaro::Std16> > (F) ,
- Corr(uint32_t(-1) % (uint32_t)F.characteristic() +1),
- Max(uint32_t(-1))
- {}
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const;
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const;
-
- private:
- uint32_t Corr;
- uint32_t Max;
- };
-
-} // namespace LinBox
-
-#include "linbox/field/givaro-zpz.inl"
-
-#endif // __LINBOX_field_givaro_zpz_H
-
diff --git a/linbox/field/givaro-zpz.inl b/linbox/field/givaro-zpz.inl
deleted file mode 100644
index fad0af3..0000000
--- a/linbox/field/givaro-zpz.inl
+++ /dev/null
@@ -1,257 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/givaro-zpz.inl
- * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
- *
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-
-
-
-#ifndef __LINBOX_givaro_zpz_INL
-#define __LINBOX_givaro_zpz_INL
-
-
-#include <iostream>
-#include "linbox/integer.h"
-
-namespace LinBox
-{
-
-
-
- template <class Vector1, class Vector2>
- inline GivaroZpz< ::Givaro::Std32>::Element &DotProductDomain<GivaroZpz< ::Givaro::Std32> >::dotSpecializedDD
- (GivaroZpz< ::Givaro::Std32>::Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
- uint64_t inter,best ;
- inter=best=0;
- if (v1.size()==0) return res=GivaroZpz< ::Givaro::Std32>::Element(0);
- else {
-
- uint64_t size = v1.size();
- uint64_t min = Max / (Corr+ (uint64_t)(_F.characteristic()-1)*(uint64_t)(_F.characteristic()-1));
- uint64_t min_size = (size < min ? size : min);
- uint64_t good1 = (size > min_size ? size - min_size: 0);
- uint64_t good2 = (long)(size / min_size)* min_size ;
- uint64_t good_size = (good1 > good2 ? good1 : good2 );
-
- typename Vector1::const_iterator i=v1.begin();
- typename Vector2::const_iterator j=v2.begin();
-
- unsigned long k=0;
-
- for (;k<min_size;i++,j++,k++)
- best+=(uint64_t)*i * (uint64_t)*j;
-
- for (inter=best;k<good_size;inter=best) {
- for (unsigned long l=0;l<min_size;i++,j++,k++,l++)
- best+= (uint64_t)*i * (uint64_t)*j;
- if (inter > best) best+=Corr;
- }
-
- for (;k<size;i++,j++,k++)
- best+= (uint64_t)*i * (uint64_t)*j;
- if (inter > best) best+=Corr;
-
-
- return res = best % (uint64_t)_F.characteristic();
- }
- }
-
- template <class Vector1, class Vector2>
- inline GivaroZpz< ::Givaro::Std32>::Element &DotProductDomain<GivaroZpz< ::Givaro::Std32> >::dotSpecializedDSP
- (GivaroZpz< ::Givaro::Std32>::Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
- uint64_t inter,best ;
- inter=best=0;
- if ((v1.first).size()== 0)
- return res=GivaroZpz< ::Givaro::Std32>::Element(0);
- else {
- uint64_t size = (v1.first).size();
- uint64_t min = Max / (Corr+ (uint64_t)(_F.characteristic()-1)*(uint64_t)(_F.characteristic()-1));
- uint64_t min_size = (size < min ? size : min);
- uint64_t good1 = (size > min_size ? size - min_size: 0);
- uint64_t good2 = (long)(size / min_size)* min_size ;
- uint64_t good_size = (good1 > good2 ? good1 : good2 );
-
- typename Vector1::first_type::const_iterator i_idx = v1.first.begin ();
- typename Vector1::second_type::const_iterator i_elt = v1.second.begin ();
-
- unsigned long k=0;
-
- for (;k<min_size;i_idx++,i_elt++,k++)
- best+=(uint64_t)*i_elt * (uint64_t)v2[*i_idx];
-
- for (inter=best;k<good_size;inter=best) {
- for (unsigned long l=0;l<min_size;i_idx++,i_elt++,k++,l++)
- best+= (uint64_t)*i_elt * (uint64_t)v2[*i_idx];
- if (inter > best) best+=Corr;
- }
-
- for (;k<size;i_idx++,i_elt++,k++)
- best+= (uint64_t)*i_elt * (uint64_t)v2[*i_idx];
- if (inter > best) best+=Corr;
-
- return res = best % _F.characteristic();
- }
- }
-
-
-
- template <class Vector1, class Vector2>
- inline GivaroZpz< ::Givaro::Std16>::Element &DotProductDomain<GivaroZpz< ::Givaro::Std16> >::dotSpecializedDD
- (GivaroZpz< ::Givaro::Std16>::Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
- uint32_t inter,best ;
- inter=best=0;
- if (v1.size() == 0)
- return res=GivaroZpz< ::Givaro::Std16>::Element(0);
- else {
- uint32_t size = v1.size();
- uint32_t min = Max / (Corr+ ((uint32_t)_F.characteristic()-1)*(uint32_t)(_F.characteristic()-1));
- uint32_t min_size = (size < min ? size : min);
- uint32_t good1 = (size > min_size ? size - min_size: 0);
- uint32_t good2 = (long)(size / min_size)* min_size ;
- uint32_t good_size = (good1 > good2 ? good1 : good2 );
-
-
- typename Vector1::const_iterator i=v1.begin();
- typename Vector2::const_iterator j=v2.begin();
-
- uint32_t k=0;
-
- for (;k<min_size;i++,j++,k++)
- best+=(uint32_t)*i * (uint32_t)*j;
-
- for (inter=best;k<good_size;inter=best) {
- for (unsigned long l=0;l<min_size;i++,j++,k++,l++)
- best+= (uint32_t)*i * (uint32_t)*j;
- if (inter > best) best+=Corr;
- }
-
- for (;k<size;i++,j++,k++)
- best+= (uint32_t)*i * (uint32_t)*j;
- if (inter > best) best+=Corr;
-
- return res = best % (uint32_t)_F.characteristic();
- }
- }
-
- template <class Vector1, class Vector2>
- inline GivaroZpz< ::Givaro::Std16>::Element &DotProductDomain<GivaroZpz< ::Givaro::Std16> >::dotSpecializedDSP
- (GivaroZpz< ::Givaro::Std16>::Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
- uint32_t inter,best ;
- inter=best=0;
- if ((v1.first).size()==0)
- return res=GivaroZpz< ::Givaro::Std16>::Element(0);
- else {
- uint32_t size = (v1.first).size();
- uint32_t min = Max / (Corr+ (uint32_t)(_F.characteristic()-1)*(uint32_t)(_F.characteristic()-1));
- uint32_t min_size = (size < min ? size : min);
- uint32_t good1 = (size > min_size ? size - min_size: 0);
- uint32_t good2 = (long)(size / min_size)* min_size ;
- uint32_t good_size = (good1 > good2 ? good1 : good2 );
-
- typename Vector1::first_type::const_iterator i_idx = v1.first.begin ();
- typename Vector1::second_type::const_iterator i_elt = v1.second.begin ();
- uint32_t k=0;
-
- for (;k<min_size;i_idx++,i_elt++,k++)
- best+=(uint32_t)*i_elt * (uint32_t)v2[*i_idx];
-
- for (inter=best;k<good_size;inter=best) {
- for (unsigned long l=0;l<min_size;i_idx++,i_elt++,k++,l++)
- best+= (uint32_t)*i_elt * (uint32_t)v2[*i_idx];
- if (inter > best) best+=Corr;
- }
-
- for (;k<size;i_idx++,i_elt++,k++)
- best+= (uint32_t)*i_elt * (uint32_t)v2[*i_idx];
- if (inter > best) best+=Corr;
-
- return res = best % (uint32_t)_F.characteristic();
- }
- }
-
-
-#ifdef XMLENABLED
-
- template<>
- bool GivaroZpz< ::Givaro::Std16>::toTag(Writer &W) const
- {
- string s;
- int16_t m = ZpzDom< ::Givaro::Std16>::residu();
-
- W.setTagName("field");
- W.setAttribute("implDetail", "givaro-zpz-std16");
- W.setAttribute("cardinality", Writer::numToString(s, m));
-
- W.addTagChild();
- W.setTagName("finite");
-
- W.addTagChild();
- W.setTagName("characteristic");
- W.addNum(m);
- W.upToParent();
- W.upToParent();
-
- return true;
- }
-
- template <>
- bool GivaroZpz< ::Givaro::Std32>::toTag(Writer &W) const
- {
- string s;
- int32_t m = ZpzDom< ::Givaro::Std32>::residu();
-
- W.setTagName("field");
- W.setAttribute("implDetail", "givaro-zpz-std32");
- W.setAttribute("cardinality", Writer::numToString(s, m));
-
- W.addTagChild();
- W.setTagName("finite");
-
- W.addTagChild();
- W.setTagName("characteristic");
- W.addNum(m);
- W.upToParent();
-
- W.upToParent();
-
- return true;
- }
-
- template <>
- bool GivaroZpz<Log16>::toTag(Writer &W) const
- {
- string s;
- int16_t m = ZpzDom<Log16>::residu();
-
- W.setTagName("field");
- W.setAttribute("implDetail", "givaro-zpz-log16");
- W.setAttribute("cardinality", Writer::numToString(s, m));
-
- W.addTagChild();
- W.setTagName("finite");
-
- W.addTagChild();
- W.setTagName("characteristic");
- W.addNum(m);
- W.upToParent();
-
- W.upToParent();
-
- return true;
- }
-#endif
-
-
-}
-
-#endif //__LINBOX_givaro_zpz_INL
-
diff --git a/linbox/field/givaro.h b/linbox/field/givaro.h
index 4d4f735..6f35ff4 100644
--- a/linbox/field/givaro.h
+++ b/linbox/field/givaro.h
@@ -1,21 +1,48 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/givaro.h
* Copyright (C) 2002 Pascal Giorgi
*
* Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_field_givaro_H
#define __LINBOX_field_givaro_H
-#include <linbox/field/field-traits.h>
-#include "linbox/field/givaro-zpz.h"
-#include "linbox/field/givaro-montg.h"
-#include "linbox/field/givaro-gfq.h"
-#include "linbox/field/givaro-extension.h"
+#include "linbox/field/field-traits.h"
+#include "linbox/field/Givaro/givaro-zpz.h"
+#include "linbox/field/Givaro/givaro-montg.h"
+#include "linbox/field/Givaro/givaro-gfq.h"
+#include "linbox/field/Givaro/givaro-rational.h"
+#include "linbox/field/Givaro/givaro-extension.h"
+#include "linbox/field/Givaro/givaro-field.h"
+#include "linbox/field/Givaro/givaro-field-gf2.h"
#endif // __LINBOX_field_givaro_H
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/gmp-rational.h b/linbox/field/gmp-rational.h
index ecb3e26..c300923 100644
--- a/linbox/field/gmp-rational.h
+++ b/linbox/field/gmp-rational.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/gmp-rational.h
* Copyright (C) 2001, 2002 Bradford Hovinen
*
@@ -7,7 +5,25 @@
*
* ----------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
#ifndef __LINBOX_field_gmp_rational_H
@@ -23,14 +39,14 @@
#include "linbox/element/gmp-rational.h"
#include "linbox/linbox-config.h"
#include "linbox/util/debug.h"
-#include <linbox/field/field-traits.h>
+#include "linbox/field/field-traits.h"
// Namespace in which all LinBox library code resides
namespace LinBox
{
// Forward declarations
- class GMPRationalRandIter;;
+ class GMPRationalRandIter ;
/**
* \brief Field of rational numbers using GMP
@@ -58,7 +74,7 @@ namespace LinBox
const integer _zero;
const integer _one;
- const integer _neg_one;
+ const integer _mOne;
public:
@@ -75,7 +91,7 @@ namespace LinBox
const Element zero;
const Element one;
- const Element neg_one;
+ const Element mOne;
/** @name Object Management
* x <- convert (y)
@@ -89,8 +105,8 @@ namespace LinBox
*/
GMPRationalField (const GMPRationalField &) :
- _cardinality (0), _characteristic (0), _zero (0), _one (1), _neg_one (-1),
- zero (_zero, _one), one (_one, _one), neg_one (_neg_one, _one)
+ _cardinality (0), _characteristic (0), _zero (0), _one (1), _mOne (-1),
+ zero (_zero, _one), one (_one, _one), mOne (_mOne, _one)
{}
/** Destructor.
@@ -139,6 +155,41 @@ namespace LinBox
return x;
}
+ Element &init (Element &x, const Element &y) const
+ {
+ mpq_set (x.rep, y.rep);
+ return x;
+ }
+
+ Element &init (Element &x, const int &y ) const
+ {
+ mpq_set_si (x. rep, (long)y,1L);
+ //mpq_canonicalize (x.rep);
+ return x;
+ }
+
+ Element &init (Element &x, const long int &y ) const
+ {
+ mpq_set_si (x. rep, (long)y,1L);
+ //mpq_canonicalize (x.rep);
+ return x;
+ }
+
+ Element &init (Element &x, const unsigned int &y ) const
+ {
+ mpq_set_ui (x. rep, (unsigned long)y,1L);
+ //mpq_canonicalize (x.rep);
+ return x;
+ }
+
+ Element &init (Element &x, const long unsigned int &y ) const
+ {
+ mpq_set_ui (x. rep, (long unsigned)y,1L);
+ //mpq_canonicalize (x.rep);
+ return x;
+ }
+
+
/** Conversion of field element to an integer.
* This function assumes the output field element x has already been
* constructed, but that it is not already initialized.
@@ -697,8 +748,8 @@ namespace LinBox
//@} Common Object Interface
GMPRationalField (int p = 0, int exp = 1) :
- _cardinality (0), _characteristic (0), _zero (0), _one (1), _neg_one (-1),
- zero (_zero, _one), one (_one, _one), neg_one (_neg_one, _one)
+ _cardinality (0), _characteristic (0), _zero (0), _one (1), _mOne (-1),
+ zero (_zero, _one), one (_one, _one), mOne (_mOne, _one)
{
if(p != 0) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be 0 (no modulus)");
if(exp != 1) throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
@@ -781,3 +832,12 @@ namespace LinBox
#endif // __LINBOX_field_gmp_rational_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/hom.h b/linbox/field/hom.h
index ac34e9a..76e9e51 100644
--- a/linbox/field/hom.h
+++ b/linbox/field/hom.h
@@ -1,9 +1,25 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/hom.h
* Copyright(C) LinBox
* Written by David Saunders
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_hom_H
@@ -12,10 +28,10 @@
#include "linbox/linbox-config.h"
#include "linbox/field/modular.h"
#include "linbox/field/PID-integer.h"
-#include <linbox/util/error.h>
+#include "linbox/util/error.h"
#ifdef __LINBOX_HAVE_NTL
-#include <linbox/field/ntl-ZZ.h>
+#include "linbox/field/NTL/ntl-ZZ.h"
#endif //__LINBOX_HAVE_NTL
namespace LinBox
@@ -451,5 +467,214 @@ namespace LinBox
}
#endif //__LINBOX_field_gmp_rational_H
+#ifdef __LINBOX_field_gf2_H
+namespace LinBox
+{
+
+ template <>
+ class Hom<GF2,GF2> {
+
+ public:
+ typedef GF2 Target;
+ typedef GF2 Source;
+ typedef Source::Element SrcElt;
+ typedef Target::Element Elt;
+
+ Hom(const Source& S, const Target& ) :
+ _source (S)
+ {}
+ Elt& image(Elt& t, const SrcElt& s)
+ {
+ return _source.assign (t, s);
+ }
+ SrcElt& preimage(SrcElt& s, const Elt& t)
+ {
+ return _source.assign (s, t);
+ }
+ const Source& source()
+ {
+ return _source;
+ }
+ const Target& target()
+ {
+ return _source;
+ }
+
+ protected:
+ Source _source;
+ };
+
+ template<class Target >
+ class Hom<GF2, Target > {
+ public:
+ typedef GF2 Source;
+ typedef typename GF2::Element SrcElt;
+ typedef typename Target::Element Elt;
+
+ Hom(const Source& S, const Target& T) :
+ _source(S), _target(T)
+ { }
+ Elt& image(Elt& t, const SrcElt& s)
+ {
+ return _source.convert(t,s);
+ }
+ SrcElt& preimage(SrcElt& s, const Elt& t)
+ {
+ return _target.convert(s,t);
+ }
+ stdBitReference preimage(stdBitReference s, const Elt& t) const
+ {
+ int ts;
+ return s = _target.convert(ts, t);
+ }
+
+ const Source& source()
+ {
+ return _source;
+ }
+ const Target& target()
+ {
+ return _target;
+ }
+
+ private:
+ Source _source;
+ Target _target;
+ }; // end Hom
+
+
+}
+
+#include "linbox/field/Givaro/givaro-extension.h"
+namespace LinBox
+{
+ template<>
+ class Hom < GF2, GivaroExtension<GF2> > {
+ typedef GF2 Source;
+ typedef GivaroExtension<GF2> Target;
+ public:
+ typedef Source::Element SrcElt;
+ typedef Target::Element Elt;
+
+ //Hom(){}
+ /**
+ * Construct a homomorphism from a specific source ring S and target
+ * field T with Hom(S, T). The default behaviour is error.
+ * Specializations define all actual homomorphisms.
+ */
+ Hom(const Source& S, const Target& T) :
+ _source(S), _target(T)
+ {}
+
+ /**
+ * image(t, s) implements the homomorphism, assigning the
+ * t the value of the image of s under the mapping.
+ *
+ * The default behaviour is a no-op.
+ */
+ Elt& image(Elt& t, const SrcElt& s) const
+ {
+ return _target.assign(t,s);
+ }
+
+ /** If possible, preimage(s,t) assigns a value to s such that
+ * the image of s is t. Otherwise behaviour is unspecified.
+ * An error may be thrown, a conventional value may be set, or
+ * an arb value set.
+ *
+ * The default behaviour is a no-op.
+ */
+ SrcElt& preimage(SrcElt& s, const Elt& t) const
+ {
+ return _target.convert(s, t);
+ }
+ stdBitReference preimage(stdBitReference s, const Elt& t) const
+ {
+ bool ts;
+ return s = _target.convert(ts, t);
+ }
+
+ const Source& source() const
+ {
+ return _source;
+ }
+ const Target& target() const
+ {
+ return _target;
+ }
+
+ private:
+ Source _source;
+ Target _target;
+ }; // end Hom
+}
+#endif // __LINBOX_field_gf2_H
+
+#ifdef __LINBOX_field_givaro_gfq_H
+namespace LinBox
+{
+ template<>
+ class Hom <GivaroGfq,GivaroGfq> {
+ public:
+ typedef GivaroGfq Source;
+ typedef GivaroGfq Target;
+
+ typedef Source::Element SrcElt;
+ typedef Target::Element Elt;
+
+ //Hom(){}
+ /**
+ * Construct a homomorphism from a specific source ring S and target
+ * field T with Hom(S, T).
+ * Specializations define all actual homomorphisms.
+ */
+ Hom(const Source& S, const Target& T) :
+ _source(S), _target(T)
+ { }
+
+ /**
+ * image(t, s) implements the homomorphism, assigning the
+ * t the value of the image of s under the mapping.
+ *
+ * The default behaviour goes through integers.
+ */
+ Elt& image(Elt& t, const SrcElt& s)
+ {
+ return _target.init(t, _source.convert(tmp,s));
+ }
+
+ /** If possible, preimage(s,t) assigns a value to s such that
+ * the image of s is t. Otherwise behaviour is unspecified.
+ * An error may be thrown, a conventional value may be set, or
+ * an arb value set.
+ *
+ * The default behaviour goes through integers.
+ */
+ SrcElt& preimage(SrcElt& s, const Elt& t)
+ {
+ return _source.init(s, _target.convert(tmp,t));
+ }
+ const Source& source() { return _source;}
+ const Target& target() { return _target;}
+
+ private:
+ integer tmp;
+ Source _source;
+ Target _target;
+ }; // end Hom
+}
+#endif
+
+
+
#endif // __LINBOX_hom_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/integers.doxy b/linbox/field/integers.doxy
index c9de777..df1b199 100644
--- a/linbox/field/integers.doxy
+++ b/linbox/field/integers.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/*! @ingroup ring
* @defgroup integers Integers
diff --git a/linbox/field/lidia-gfq.h b/linbox/field/lidia-gfq.h
index 27292ba..9a4d5f4 100644
--- a/linbox/field/lidia-gfq.h
+++ b/linbox/field/lidia-gfq.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/lidia-gfq.h
* Copyright (C) 2002 Pascal Giorgi
*
@@ -7,7 +5,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
@@ -26,10 +42,10 @@
//-----------------------------------
// Files of LinBox library
#include "linbox/integer.h"
-#include <linbox/field/field-interface.h>
+#include "linbox/field/field-interface.h"
#include "linbox/randiter/lidia-gfq.h"
#include "linbox/linbox-config.h"
-#include <linbox/field/field-traits.h>
+#include "linbox/field/field-traits.h"
#ifdef __LINBOX_XMLENABLED
@@ -749,3 +765,12 @@ namespace LinBox
#endif // __LINBOX_lidia_gfq_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/lidia.doxy b/linbox/field/lidia.doxy
index 29a18e2..55c60a4 100644
--- a/linbox/field/lidia.doxy
+++ b/linbox/field/lidia.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 Brice Boyer, part of LinBox, GNU LGPL, see COPYING
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/*! @ingroup field
@defgroup LiDIA LiDIA
diff --git a/linbox/field/lidia.h b/linbox/field/lidia.h
index 1225d24..0574b13 100644
--- a/linbox/field/lidia.h
+++ b/linbox/field/lidia.h
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/lidia.h
* Copyright (C) 2002 Pascal Giorgi
*
* Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_field_lidia_H
@@ -15,3 +31,12 @@
#endif // __LINBOX_field_lidia_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/local2_32.h b/linbox/field/local2_32.h
index 9b644cd..d8ef40a 100644
--- a/linbox/field/local2_32.h
+++ b/linbox/field/local2_32.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* written by bds, wan
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -28,9 +29,9 @@
#include "linbox/field/unparametric.h"
#include "linbox/util/debug.h"
#include "linbox/linbox-config.h"
-#include <linbox/field/field-traits.h>
-#include <linbox/integer.h>
-#include <linbox/field/field-traits.h>
+#include "linbox/field/field-traits.h"
+#include "linbox/integer.h"
+#include "linbox/field/field-traits.h"
namespace LinBox
{
@@ -38,7 +39,7 @@ namespace LinBox
template<typename Ring>
struct ClassifyRing;
- class Local2_32;
+ struct Local2_32;
template<>
struct ClassifyRing<Local2_32> {
@@ -325,3 +326,12 @@ namespace LinBox
#endif // __LINBOX_local2_32_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/map.h b/linbox/field/map.h
index 8671657..bec7aae 100644
--- a/linbox/field/map.h
+++ b/linbox/field/map.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2008 LinBox
* Written by JGD
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -106,3 +107,12 @@ namespace LinBox
#endif // __LINBOX_map_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/modular-balanced-double.h b/linbox/field/modular-balanced-double.h
deleted file mode 100644
index b2ec674..0000000
--- a/linbox/field/modular-balanced-double.h
+++ /dev/null
@@ -1,316 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/modular-balanced-double.h
- * Copyright (C) 2003 Pascal Giorgi
- * 2005,2008 Clement Pernet
- * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
- * and Clement Pernet <Clement.Pernet at imag.fr>
- *
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-/*! @file field/modular-balanced-double.h
- * @ingroup field
- * @brief Balanced representation of <code>Z/mZ</code> over \c double .
- */
-
-#ifndef __LINBOX_modular_balanced_double_H
-#define __LINBOX_modular_balanced_double_H
-
-#ifdef __INTEL_COMPILER
-#define FmodF fmodf
-#else
-#define FmodF fmod
-#endif
-
-#include "linbox/linbox-config.h"
-#include "linbox/integer.h"
-#include "linbox/vector/vector-domain.h"
-#include "linbox/field/field-interface.h"
-#include "linbox/field/field-traits.h"
-#include "linbox/util/field-axpy.h"
-#include "linbox/util/debug.h"
-#include <math.h>
-#include "linbox/field/field-traits.h"
-#include "linbox/randiter/modular-balanced.h"
-#include "linbox/randiter/nonzero.h"
-
-#include "fflas-ffpack/field/modular-balanced-double.h"
-
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
- template< class Element >
- class ModularBalanced;
-
- template <class Ring>
- struct ClassifyRing;
-
- template <class Element>
- struct ClassifyRing<ModularBalanced<Element> >;
-
- template <>
- struct ClassifyRing<ModularBalanced<double> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
- class MultiModDouble;
-
- /*! \ingroup modular
- * Centered representation of \f$\mathbf{Z}/m\mathbf{Z}\f$.
- * If \c m is the modulus, then elements are represented in \f[ \left
- * \llbracket \left \lceil -\frac{m-1}{2} \right \rceil, \left \lceil
- * \frac{m-1}{2} \right \rceil \right \rrbracket.\f] This
- * representation allows more accumulations before a reduction is
- * necessary, at the cost of a more expensive reduction.
- */
- template<>
- class ModularBalanced<double> : public FieldInterface,
- public FFPACK::ModularBalanced<double> {
-
- protected:
-
- public:
- friend class FieldAXPY<ModularBalanced<double> >;
- friend class DotProductDomain<ModularBalanced<double> >;
- friend class MultiModDouble;
-
- typedef double Element;
- typedef ModularBalancedRandIter<double> RandIter;
- typedef NonzeroRandIter<ModularBalanced<double>, RandIter > NonZeroRandIter;
-
- static ClassifyRing <ModularBalanced<double> >::categoryTag getCategory()
- {
- return ClassifyRing<ModularBalanced<double> >::categoryTag();
- }
-
- ModularBalanced (const integer& p) :
- FFPACK::ModularBalanced<double>((unsigned long)p)
- {
-#ifdef DEBUG
- if (p > (integer) ULONG_MAX)
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"prime too big");
- if(modulus <= 1)
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
- if(modulus > getMaxModulus())
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
-#endif
-
- }
-
- integer &cardinality (integer &c) const
- {
- return c = integer(modulus);
- }
-
- integer &characteristic (integer &c) const
- {
- return c = integer(modulus);
- }
-
- long unsigned characteristic(long unsigned int&p) const { return FFPACK::ModularBalanced<double>::characteristic(p) ; }
- double & convert(double &x, const Element &y) const { return FFPACK::ModularBalanced<double>::convert(x,y) ; }
- float & convert(float&x, const Element &y) const { return FFPACK::ModularBalanced<double>::convert(x,y) ; }
- unsigned long characteristic()const{return FFPACK::ModularBalanced<double>::characteristic();}
- unsigned long cardinality()const{return FFPACK::ModularBalanced<double>::cardinality();}
-
- integer &convert (integer &x, const Element &y) const
- {
- return x = integer (y);
- }
-
- Element &init (Element &x, const integer &y) const
- {
- x = (Element)(y%lmodulus);
- if (x<mhalf_mod) return x += modulus ;
- else if (x>half_mod) return x -= modulus ;
- return x ;
- }
-
- //! @bug faux si modulus==2
- inline bool isMinusOne (const Element &x) const
- {
- return (x == -1.);
- }
-
- unsigned long AccBound(const Element&r) const
- {
- Element one, zero ; init(one,1UL) ; init(zero,0UL);
- double max_double = (double) (1ULL<<DBL_MANT_DIG) - modulus ;
- double p = std::max(half_mod,-mhalf_mod) ;
- if (areEqual(zero,r))
- return (unsigned long) (double(max_double)/p) ;
- else if (areEqual(one,r))
- {
- if (modulus>= getMaxModulus())
- return 0 ;
- else
- return (unsigned long) (double(max_double)/(p*p)) ;
- }
- else
- throw LinboxError("Bad input, expecting 0 or 1");
- return 0;
- }
-
- };
-
- //! Specialization of FieldAXPY.
- template <>
- class FieldAXPY<ModularBalanced<double> > {
- public:
-
- typedef double Element;
- typedef ModularBalanced<double> Field;
-
- FieldAXPY (const Field &F) :
- _F (F),
- _y(0.) , _bound( (double) ((1ULL << 53) - (int) (_F.modulus*_F.modulus)))
- {}
-
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F),
- _y(faxpy._y), _bound(faxpy._bound)
- {}
-
- FieldAXPY<ModularBalanced<double> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- _y= faxpy._y;
- _bound= faxpy._bound;
- return *this;
- }
-
- inline Element& mulacc (const Element &a, const Element &x)
- {
- // Element tmp= a*x;
- // return accumulate(tmp);
- return accumulate(a*x);
- }
-
- inline Element& accumulate (const Element &tmp)
- {
- _y += tmp;
- if (_y > _bound)
- return _y = fmod (_y, _F.modulus);
- else
- return _y;
- }
- inline Element& subumulate (const Element &tmp)
- {
- _y -= tmp;
- if (_y < 0)
- return _y += _F.modulus;
- else
- return _y;
- }
-
- inline Element& get (Element &y) {
- _y = fmod (_y, _F.modulus);
- return y=_y ;
- }
-
- inline FieldAXPY &assign (const Element y) {
- _y = y;
- return *this;
- }
-
- inline void reset() {
- _y = 0.;
- }
-
- inline Element& set (const Element &tmp) {
- _y = tmp;
- if (_y > _bound)
- return _y = fmod (_y, _F.modulus);
- else
- return _y;
- }
-
- private:
-
- Field _F;
- double _y;
- double _bound;
- };
-
-
- //! Specialization of DotProductDomain.
- template <>
- class DotProductDomain<ModularBalanced<double> > : private virtual VectorDomainBase<ModularBalanced<double> > {
- private:
- double _bound;
- size_t _nmax;
-
- public:
- typedef double Element;
- DotProductDomain (const ModularBalanced<double> &F) :
- VectorDomainBase<ModularBalanced<double> > (F), _bound( (double) ( (1ULL<<53) - (int) (_F.modulus*_F.modulus)))
- {
- _nmax= (size_t)floor((double(1<<26)* double(1<<26)*2.)/ (_F.modulus * _F.modulus));
- }
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- double y = 0.;
- double t = 0.;
- if (v1.size() < _nmax) {
- for (size_t i = 0; i< v1.size();++i)
- y += v1[i] * v2[i] ;
- y = fmod(y, _F.modulus);
- }
- else{
- size_t i=0;
- for (;i< v1.size()- _nmax ;i=i+_nmax){
- for (size_t j=i;j<i+_nmax;++j)
- y += v1[j] * v2[j];
- t+=fmod(y, _F.modulus);
- y=0.;
- }
- for (;i < v1.size();++i)
- y += v1[i] * v2[i];
- t+=fmod(y, _F.modulus);
- y = fmod(t, _F.modulus);
- }
- return res = y;
- }
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- double y = 0.;
- double t =0.;
-
-
- if (v1.first.size() < _nmax) {
- for (size_t i=0;i<v1.first.size();++i)
- y+= v1.second[i] * v2[v1.first[i]];
- y = fmod(y, _F.modulus);
- }
- else {
- size_t i=0;
- for (;i< v1.first.size()- _nmax ;i=i+_nmax){
- for (size_t j=i;j<i+_nmax;++j)
- y += v1.second[j] * v2[v1.first[j]];
- t+=fmod(y, _F.modulus);
- y=0.;
- }
- for (;i < v1.first.size();++i)
- y += v1.second[i] * v2[v1.first[i]];
- t+= fmod(y, _F.modulus);
- y = fmod(t, _F.modulus);
- }
- return res = y;
- }
- };
-}
-
-#endif //__LINBOX_modular_balanced_double_H
-
diff --git a/linbox/field/modular-balanced-float.h b/linbox/field/modular-balanced-float.h
deleted file mode 100644
index e550bf7..0000000
--- a/linbox/field/modular-balanced-float.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* field/modular-balanced-float.h
- * Copyright (C) 2003 Pascal Giorgi
- * 2005,2008 Clement Pernet
- * Written by Clement Pernet <clement.pernet at gmail.com>
- * Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
- * Modified Brice Boyer <bboyer at imag.fr>
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-/*! @file field/modular-balanced-float.h
- * @ingroup field
- * @brief Balanced representation of <code>Z/mZ</code> over \c float .
- */
-
-#ifndef __LINBOX_modular_balanced_float_H
-#define __LINBOX_modular_balanced_float_H
-
-#ifdef __INTEL_COMPILER
-#define FmodF fmodf
-#else
-#define FmodF fmod
-#endif
-
-#include "linbox/linbox-config.h"
-#include "linbox/integer.h"
-#include "linbox/vector/vector-domain.h"
-#include "linbox/field/field-interface.h"
-#include "linbox/field/field-traits.h"
-#include "linbox/util/field-axpy.h"
-#include "linbox/util/debug.h"
-#include <math.h>
-#include <linbox/field/field-traits.h>
-#include "linbox/randiter/modular-balanced.h"
-#include "linbox/randiter/nonzero.h"
-
-#include "fflas-ffpack/field/modular-balanced-float.h"
-
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
- template< class Element >
- class ModularBalanced;
-
- template <class Ring>
- struct ClassifyRing;
-
- template <class Element>
- struct ClassifyRing<ModularBalanced<Element> >;
-
- template <>
- struct ClassifyRing<ModularBalanced<float> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
- class MultiModFloat;
-
- /// \ingroup field
- template <>
- class ModularBalanced<float> : public FieldInterface,
- public FFPACK::ModularBalanced<float> {
- public :
- typedef float Element;
-
- protected:
-
- public:
- friend class FieldAXPY<ModularBalanced<Element> >;
- friend class DotProductDomain<ModularBalanced<Element> >;
- friend class MultiModFloat;
-
- typedef ModularBalancedRandIter<Element> RandIter;
- typedef NonzeroRandIter<ModularBalanced<Element>, RandIter > NonZeroRandIter;
-
- static ClassifyRing <ModularBalanced<Element> >::categoryTag
- getCategory()
- {
- return ClassifyRing<ModularBalanced<Element> >::categoryTag();
- }
-
- ModularBalanced (const integer& p) :
- FFPACK::ModularBalanced<float>((unsigned long)p)
- {
-#ifdef DEBUG
- if(modulus <= 1)
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
- if(modulus > getMaxModulus())
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
- // check integer not too big.
-#endif
-
- }
-
-
- inline integer &cardinality (integer &c) const
- {
- return c = integer(modulus);
- }
-
- inline integer &characteristic (integer &c) const
- {
- return c = integer(modulus);
- }
-
- long unsigned characteristic(long unsigned int&p)const{return FFPACK::ModularBalanced<float>::characteristic(p) ; }
- unsigned long characteristic()const{return FFPACK::ModularBalanced<float>::characteristic();}
- unsigned long cardinality()const{return FFPACK::ModularBalanced<float>::cardinality();}
- double&convert(double &x,const Element&y)const{return FFPACK::ModularBalanced<float>::convert(x,y) ; }
- float&convert(float&x,const Element&y)const{return FFPACK::ModularBalanced<float>::convert(x,y) ; }
-
-
- inline integer &convert (integer &x, const Element &y) const
- {
- // if ( y < 0. )
- // return x = integer (y + modulus) ;
- // else
- return x = integer (y);
- }
-
-
- inline Element &init (Element &x, const integer &y) const
- {
- x = (Element)(y%lmodulus);
- if (x > half_mod) return x -= modulus;
- else if (x < mhalf_mod) return x += modulus;
-
- return x;
- }
-
- inline bool isMinusOne (const Element &x) const
- {
- return (x == -1.);
- }
-
- unsigned long AccBound(const Element&r) const
- {
- Element one, zero ; init(one,1UL) ; init(zero,0UL);
- double max_double = (double) (1ULL<<FLT_MANT_DIG) - modulus ;
- double p = std::max(half_mod,-mhalf_mod) ;
- if (areEqual(zero,r))
- return (unsigned long) (double(max_double)/p) ;
- else if (areEqual(one,r))
- {
- if (modulus>= getMaxModulus())
- return 0 ;
- else
- return (unsigned long) (double(max_double)/(p*p)) ;
- }
- else
- throw LinboxError("Bad input, expecting 0 or 1");
- return 0;
- }
-
- };
-
- template <>
- class FieldAXPY<ModularBalanced<float> > {
- public:
- typedef float Element;
- typedef ModularBalanced<Element> Field;
-
- FieldAXPY (const Field &F) :
- _F (F),
- _y(0.) , _bound( (Element) (((1ULL << 24) - (int) (_F.modulus*_F.modulus))))
- {}
-
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F),
- _y(faxpy._y), _bound(faxpy._bound)
- {}
-
- FieldAXPY<ModularBalanced<Element> > &operator = (const FieldAXPY &faxpy) {
- _F = faxpy._F;
- _y= faxpy._y;
- _bound= faxpy._bound;
- return *this;
- }
-
- inline Element& mulacc (const Element &a, const Element &x) {
- // Element tmp= a*x;
- // return accumulate(tmp);
- return accumulate(a*x);
- }
-
- inline Element& accumulate (const Element &tmp) {
- _y += tmp;
- if (_y > _bound)
- return _y = fmodf (_y, _F.modulus);
- else
- return _y;
- }
- inline Element& subumulate (const Element &tmp) {
- _y -= tmp;
- if (_y < 0)
- return _y += _F.modulus;
- else
- return _y;
- }
-
- inline Element& get (Element &y) {
- _y = fmodf (_y, _F.modulus);
- return y=_y ;
- }
-
- inline FieldAXPY &assign (const Element y) {
- _y = y;
- return *this;
- }
-
- inline void reset() {
- _y = 0.;
- }
-
- inline Element& set (const Element &tmp) {
- _y = tmp;
- if (_y > _bound)
- return _y = fmodf (_y, _F.modulus);
- else
- return _y;
- }
-
- private:
- Field _F;
- Element _y;
- Element _bound;
- };
-
-
- template <>
- class DotProductDomain<ModularBalanced<float> > : private virtual VectorDomainBase<ModularBalanced<float> > {
- public:
- typedef float Element;
- DotProductDomain (const ModularBalanced<Element> &F) :
- VectorDomainBase<ModularBalanced<Element> > (F), _bound( (Element) ( (1ULL<<24) - (int) (_F.modulus*_F.modulus)))
- {
- _nmax= (size_t)floor((Element(1<<11)* Element(1<<11)*2.)/ (_F.modulus * _F.modulus));
- }
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- Element y = 0.;
- Element t = 0.;
- if (v1.size() < _nmax) {
- for (size_t i = 0; i< v1.size();++i)
- y += v1[i] * v2[i] ;
- y = fmodf(y, _F.modulus);
- }
- else{
- size_t i=0;
- for (;i< v1.size()- _nmax ;i=i+_nmax){
- for (size_t j=i;j<i+_nmax;++j)
- y += v1[j] * v2[j];
- t+= fmodf(y, _F.modulus);
- y=0.;
- }
- for (;i < v1.size();++i)
- y += v1[i] * v2[i];
- t+= fmodf(y, _F.modulus);
- y = fmodf(t, _F.modulus);
- }
- return res = y;
- }
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- Element y = 0.;
- Element t =0.;
-
-
- if (v1.first.size() < _nmax) {
- for (size_t i=0;i<v1.first.size();++i)
- y+= v1.second[i] * v2[v1.first[i]];
- y = fmodf(y, _F.modulus);
- }
- else {
- size_t i=0;
- for (;i< v1.first.size()- _nmax ;i=i+_nmax){
- for (size_t j=i;j<i+_nmax;++j)
- y += v1.second[j] * v2[v1.first[j]];
- t+=fmodf(y, _F.modulus);
- y=0.;
- }
- for (;i < v1.first.size();++i)
- y += v1.second[i] * v2[v1.first[i]];
- t+= fmodf(y, _F.modulus);
- y = fmodf(t, _F.modulus);
- }
- return res = y;
- }
- private:
- Element _bound;
- size_t _nmax;
-
- };
-} // Namespace LinBox
-
-#include "linbox/randiter/modular-balanced.h"
-#include "linbox/randiter/nonzero.h"
-
-#undef FmodF
-
-#endif //__LINBOX_modular_balanced_float_H
-
diff --git a/linbox/field/modular-balanced-int32.h b/linbox/field/modular-balanced-int32.h
deleted file mode 100644
index 44f49c3..0000000
--- a/linbox/field/modular-balanced-int32.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* Copyright (C) 2009 LinBox
- * Written by C Pernet
- * updated to compilable condition by <brice.boyer at imag.fr>
- *
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-/*! @file field/modular-balanced-int32_t.h
- * @ingroup field
- * @brief Balanced representation of <code>Z/mZ</code> over \c int32_t .
- */
-
-#ifndef __LINBOX_modular_balanced_int32_H
-#define __LINBOX_modular_balanced_int32_H
-
-
-#include "linbox/linbox-config.h"
-#include "linbox/integer.h"
-#include "linbox/vector/vector-domain.h"
-#include "linbox/field/field-interface.h"
-#include "linbox/field/field-traits.h"
-#include "linbox/util/field-axpy.h"
-#include "linbox/util/debug.h"
-#include "linbox/field/field-traits.h"
-#include "linbox/field/modular-int32.h"
-
-#include "fflas-ffpack/field/modular-balanced-int32.h"
-
-#ifndef LINBOX_MAX_INT /* 2147483647 */
-#define LINBOX_MAX_INT INT32_MAX
-#endif
-
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
- template< class Element >
- class ModularBalanced;
- template< class Element >
- class ModularBalancedRandIter;
- template< class Field, class RandIter >
- class NonzeroRandIter;
-
-
- template <class Ring>
- struct ClassifyRing;
-
- template<class Element>
- struct ClassifyRing<ModularBalanced<Element> >;
-
- template<>
- struct ClassifyRing<ModularBalanced<int32_t> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
- /// \ingroup field
- template <>
- class ModularBalanced<int32_t> : public FieldInterface,
- public FFPACK::ModularBalanced<int32_t> {
- protected:
- // int32_t modulus;
- // int32_t halfmodulus;
- // int32_t nhalfmodulus;
- // double modulusinv;
-
- public:
-
- friend class FieldAXPY<ModularBalanced<int32_t> >;
- friend class DotProductDomain<ModularBalanced<int32_t> >;
-
- typedef int32_t Element;
- typedef ModularBalancedRandIter<int32_t> RandIter;
- typedef NonzeroRandIter<ModularBalanced<int32_t>,RandIter> NonZeroRandIter;
-
- ModularBalanced(int32_t p, int32_t e=1) :
- FFPACK::ModularBalanced<int32_t>(p,e)
- {}
-
- integer &cardinality (integer &c) const
- {
- return c = modulus;
- }
-
- integer &characteristic (integer &c) const
- {
- return c = modulus;
- }
-
- unsigned long characteristic()const{return FFPACK::ModularBalanced<int32_t>::characteristic();}
- unsigned long cardinality ()const{return FFPACK::ModularBalanced<int32_t>::cardinality();}
-
- // this function converts an int to a natural number ?
- integer &convert (integer &x, const Element &y) const
- {
- if(y >= 0)
- return x = y;
- else
- return x = y + modulus;
- }
-
- Element &init (Element &x, const integer &y) const
- {
- x = y % (long)modulus;
-
- if (x < nhalfmodulus)
- x += modulus;
- else if (x > halfmodulus)
- x -= modulus;
-
- return x;
- }
-
-
- };
-
- template <>
- class FieldAXPY<ModularBalanced<int32_t> > {
- public:
-
- typedef int32_t Element;
- typedef ModularBalanced<int32_t> Field;
-
- FieldAXPY (const Field &F) :
- _F (F),_y(0),_times(0)
- { }
-
-
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F), _y (0),_times(0)
- {}
-
- FieldAXPY<ModularBalanced<int32_t> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- _y = faxpy._y;
- _times = faxpy._times;
- return *this;
- }
-
- inline int64_t& mulacc (const Element &a, const Element &x)
- {
- int64_t t = (int64_t) a * (int64_t) x;
- if (_times < blocksize) {
- ++_times;
- return _y += t;
- }
-
- else {
- _times = 1;
- normalize();
- return _y += t;
- }
- }
-
- inline int64_t& accumulate (const Element &t)
- {
- if (_times < blocksize) {
- ++_times;
- return _y += t;
- }
-
- else {
- _times = 1;
- normalize();
- return _y += t;
- }
- }
-
- inline Element& get (Element &y)
- {
-
- normalize();
-
- y = _y;
-
- if (y > _F.halfmodulus)
- y -= _F.modulus;
- else if (y < _F.nhalfmodulus)
- y += _F.modulus;
-
- return y;
- }
-
- inline FieldAXPY &assign (const Element y)
- {
- _y = y;
- return *this;
- }
-
- inline void reset()
- {
- _y = 0;
- }
-
- private:
-
- Field _F;
- int64_t _y;
- int32_t _times;
- static const int32_t blocksize = 32;
-
- inline void normalize() {
- _y = (int32_t)_y -(int32_t)(int64_t)((double) _y * _F.modulusinv) * (int32_t)_F.modulus;
- }
-
- };
-
-
- template <>
- class DotProductDomain<ModularBalanced<int32_t> > : private virtual VectorDomainBase<ModularBalanced<int32_t> > {
-
- private:
- const int32_t blocksize;
-
- public:
- typedef int32_t Element;
- DotProductDomain (const ModularBalanced<int32_t> &F) :
- VectorDomainBase<ModularBalanced<int32_t> > (F) ,blocksize(32)
- { }
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- typename Vector1::const_iterator pv1,pv1e;
- typename Vector2::const_iterator pv2;
-
- int64_t y = 0;
- int64_t t;
- // int32_t times = 0;
-
- pv1 = pv1e = v1.begin();
- pv2 = v2.begin();
-
- for(size_t i = 0; i < v1.size() / blocksize ;++i) {
- pv1e = pv1e + blocksize;
- for(;pv1 != pv1e;++pv1,++pv2) {
- t = (((int64_t) *pv1 ) * ((int64_t) *pv2 ));
- y += t;
- }
- normalize(y);
- }
-
- for(;pv1 != v1.end(); ++pv1, ++pv2) {
- t = (((int64_t) *pv1 ) * ((int64_t) *pv2 ));
- y += t;
- }
-
- normalize(y);
- res = y;
-
- if (res > _F.halfmodulus) res -= _F.modulus;
- else if(res < _F.nhalfmodulus) res += _F.modulus;
-
- return res;
-
- }
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- typename Vector1::first_type::const_iterator i_idx, i_idxe;
- typename Vector1::second_type::const_iterator i_elt;
-
- int64_t y = 0;
- int64_t t;
-
- i_idx = i_idxe = v1.first.begin();
- i_elt = v1.second.begin();
-
- for(size_t i = 0; i < v1.first.size() / blocksize ; ++i) {
- i_idxe = i_idxe + blocksize;
- for(;i_idx!= i_idxe;++i_idx, ++i_elt) {
- t = ( (int64_t) *i_elt ) * ( (int64_t) v2[*i_idx] );
- y += t;
- }
- normalize(y);
- }
-
-
- for(;i_idx!= v1.first.end();++i_idx, ++i_elt) {
- t = ( (int64_t) *i_elt ) * ( (int64_t) v2[*i_idx] );
- y += t;
- }
-
- normalize(y);
-
- res = y;
- if (res > _F.halfmodulus) res -= _F.modulus;
- else if(res < _F.nhalfmodulus) res += _F.modulus;
-
- return res;
- }
-
- inline void normalize(int64_t& _y) const
- {
- _y = (int32_t)_y -(int32_t)(int64_t)((double) _y * _F.modulusinv) * (int32_t)_F.modulus;
- }
-
- };
-}
-
-#include "linbox/randiter/modular-balanced.h"
-#endif //__LINBOX_modular_balanced_int32_H
-
diff --git a/linbox/field/modular-balanced-int64.h b/linbox/field/modular-balanced-int64.h
deleted file mode 100644
index d39bedf..0000000
--- a/linbox/field/modular-balanced-int64.h
+++ /dev/null
@@ -1,330 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* Copyright (C) 2010 LinBox
- * Adapted by B Boyer <brice.boyer at imag.fr>
- * (from other modular-balanced* files)
- *
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-/*! @file field/modular-balanced-int64.h
- * @ingroup field
- * @brief Balanced representation of <code>Z/mZ</code> over \c int64_t .
- */
-
-#ifndef __LINBOX_modular_balanced_int64_H
-#define __LINBOX_modular_balanced_int64_H
-
-#include "linbox/linbox-config.h"
-#include "linbox/integer.h"
-#include "linbox/vector/vector-domain.h"
-#include "linbox/field/field-interface.h"
-#include "linbox/field/field-traits.h"
-#include "linbox/util/field-axpy.h"
-#include "linbox/util/debug.h"
-#include "linbox/field/field-traits.h"
-
-#include "fflas-ffpack/field/modular-balanced-int64.h"
-
-#ifndef LINBOX_MAX_INT64
-#ifdef __x86_64__
-#define LINBOX_MAX_INT64 INT64_MAX
-#else
-#define LINBOX_MAX_INT64 INT64_MAX
-#endif
-#endif
-
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
- template< class Element >
- class ModularBalanced;
- template< class Element >
- class ModularBalancedRandIter;
-
- template <class Ring>
- struct ClassifyRing;
-
- template<class Element>
- struct ClassifyRing<ModularBalanced<Element> >;
-
- template<>
- struct ClassifyRing<ModularBalanced<int64_t> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
- /// \ingroup field
- template <>
- class ModularBalanced<int64_t> : public FieldInterface
- public FFPACK::ModularBalanced<int64_t> {
- protected:
- // int64_t modulus;
- // int64_t halfmodulus;
- // int64_t nhalfmodulus;
- // double modulusinv;
-
- public:
-
- friend class FieldAXPY<ModularBalanced<int64_t> >;
- friend class DotProductDomain<ModularBalanced<int64_t> >;
-
- typedef int64_t Element;
- typedef ModularBalancedRandIter<int64_t> RandIter;
-
- integer &cardinality (integer &c) const
- {
- return c = modulus;
- }
-
- integer &characteristic (integer &c) const
- {
- return c = modulus;
- }
-
- // this function converts an int to a natural number ?
- integer &convert (integer &x, const Element &y) const
- {
- if(y >= 0)
- return x = y;
- else
- return x = y + modulus;
- }
-
- Element &init (Element &x, const integer &y) const
- {
- x = y % (long) (modulus);
- if (x < nhalfmodulus) x += modulus;
- else if (x > halfmodulus) x -= modulus;
- return x;
- }
-
-
- private:
-
- };
-
- template <>
- class FieldAXPY<ModularBalanced<int64_t> > {
- public:
-
- typedef int64_t Element;
- typedef ModularBalanced<int64_t> Field;
-
- FieldAXPY (const Field &F) :
- _F (F),_y(0),_times(0)
- {
- }
-
-
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F), _y (0),_times(0)
- {}
-
- FieldAXPY<ModularBalanced<int64_t> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- _y = faxpy._y;
- _times = faxpy._times;
- return *this;
- }
-
- inline int64_t& mulacc (const Element &a, const Element &x)
- {
- int64_t t = (int64_t) a * (int64_t) x;
- if (_times < blocksize)
- {
- ++_times;
- return _y += t;
- }
-
- else {
- _times = 1;
- normalize();
- return _y += t;
- }
- }
-
- inline int64_t& accumulate (const Element &t)
- {
- if (_times < blocksize)
- {
- ++_times;
- return _y += t;
- }
-
- else {
- _times = 1;
- normalize();
- return _y += t;
- }
- }
-
- inline Element& get (Element &y)
- {
-
- normalize();
-
- y = _y;
-
- if (y > _F.halfmodulus)
- y -= _F.modulus;
- else if (y < _F.nhalfmodulus)
- y += _F.modulus;
-
- return y;
- }
-
- inline FieldAXPY &assign (const Element y)
- {
- _y = y;
- return *this;
- }
-
- inline void reset()
- {
- _y = 0;
- }
-
- private:
-
- Field _F;
- int64_t _y;
- int64_t _times;
- //!@todo tune me ?
- static const int64_t blocksize = 32;
-
- inline void normalize()
- {
- _y = (int64_t)_y -(int64_t)(int64_t)((double) _y * _F.modulusinv) * (int64_t)_F.modulus;
- }
-
- };
-
-
- template <>
- class DotProductDomain<ModularBalanced<int64_t> > : private virtual VectorDomainBase<ModularBalanced<int64_t> > {
-
- private:
- const int64_t blocksize;
-
- public:
- typedef int64_t Element;
- DotProductDomain (const ModularBalanced<int64_t> &F) :
- VectorDomainBase<ModularBalanced<int64_t> > (F) ,blocksize(32)
- { }
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- typename Vector1::const_iterator pv1,pv1e;
- typename Vector2::const_iterator pv2;
-
- int64_t y = 0;
- int64_t t;
- int64_t times = 0;
-
- pv1 = pv1e = v1.begin();
- pv2 = v2.begin();
-
- for(int i = 0; i < v1.size() / blocksize ;++i)
- {
- pv1e = pv1e + blocksize;
- for(;pv1 != pv1e;++pv1,++pv2)
- {
- t = (((int64_t) *pv1 ) * ((int64_t) *pv2 ));
- y += t;
- }
- normalize(y);
- }
-
- for(;pv1 != v1.end(); ++pv1, ++pv2)
- {
- t = (((int64_t) *pv1 ) * ((int64_t) *pv2 ));
- y += t;
- }
-
- normalize(y);
- res = y;
-
- if (res > _F.halfmodulus) res -= _F.modulus;
- else if(res < _F.nhalfmodulus) res += _F.modulus;
-
- return res;
-
- }
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- typename Vector1::first_type::const_iterator i_idx, i_idxe;
- typename Vector1::second_type::const_iterator i_elt;
-
- int64_t y = 0;
- int64_t t;
-
- i_idx = i_idxe = v1.first.begin();
- i_elt = v1.second.begin();
-
- for(int i = 0; i < v1.first.size() / blocksize ; ++i)
- {
- i_idxe = i_idxe + blocksize;
- for(;i_idx!= i_idxe;++i_idx, ++i_elt)
- {
- t = ( (int64_t) *i_elt ) * ( (int64_t) v2[*i_idx] );
- y += t;
- }
- normalize(y);
- }
-
-
- for(;i_idx!= v1.first.end();++i_idx, ++i_elt)
- {
- t = ( (int64_t) *i_elt ) * ( (int64_t) v2[*i_idx] );
- y += t;
- }
-
- normalize(y);
-
- res = y;
- if (res > _F.halfmodulus) res -= _F.modulus;
- else if(res < _F.nhalfmodulus) res += _F.modulus;
-
- return res;
- }
-
- inline void normalize(int64_t& _y) const
- {
- _y = (int64_t)_y -(int64_t)(int64_t)((double) _y * _F.modulusinv) * (int64_t)_F.modulus;
- }
-
- };
-}
-
-#undef LINBOX_MAX_INT64
-
-#include "linbox/randiter/modular.h" // do not unse _LB_MAX inside this one !
-
-
-#endif //__LINBOX_modular_balanced_int64_H
-
diff --git a/linbox/field/modular-balanced.h b/linbox/field/modular-balanced.h
index 4c4cda3..5dd8d17 100644
--- a/linbox/field/modular-balanced.h
+++ b/linbox/field/modular-balanced.h
@@ -1,10 +1,26 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/modular-balanced.h
* Copyright (C) 2010 LinBox
* Written by Brice Boyer <brice.boyer at imag.fr>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/** @file field/modular-balanced.h
@@ -17,11 +33,20 @@
#ifndef __LINBOX_modular_balanced_H
#define __LINBOX_modular_balanced_H
-#include "linbox/field/modular-balanced-float.h"
-#include "linbox/field/modular-balanced-double.h"
-#include "linbox/field/modular-balanced-int32.h"
+#include "linbox/field/Modular/modular-balanced-float.h"
+#include "linbox/field/Modular/modular-balanced-double.h"
+#include "linbox/field/Modular/modular-balanced-int32.h"
#ifdef __LINBOX_HAVE_INT64
-#include "linbox/field/modular-balanced-int64.h"
+#include "linbox/field/Modular/modular-balanced-int64.h"
#endif
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/modular-byte.h b/linbox/field/modular-byte.h
deleted file mode 100644
index d6d28aa..0000000
--- a/linbox/field/modular-byte.h
+++ /dev/null
@@ -1,750 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* Copyright (C) 2010 LinBox
- *
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*! @file field/modular-byte.h
- * @ingroup field
- * @brief representation of <code>Z/mZ</code> over \c byte .
- */
-#ifndef __LINBOX_modular_bit_H
-#define __LINBOX_modular_bit_H
-
-
-#include "linbox/linbox-config.h"
-#include "linbox/integer.h"
-#include "linbox/vector/vector-domain.h"
-#include "linbox/field/field-interface.h"
-#include "linbox/field/field-traits.h"
-#include "linbox/util/debug.h"
-#include <linbox/field/field-traits.h>
-
-#ifndef LINBOX_MAX_INT8 /* 127 */
-#define LINBOX_MAX_INT8 INT8_MAX
-#endif
-
-#ifdef __ICC
-#pragma warning(disable:2259)
-#endif
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
- template<class Element>
- class Modular;
-
- template<class Element>
- class ModularRandIter;
-
- template<class Field>
- class FieldAXPY;
-
- template<class Field>
- class DotProductDomain;
-
- template<class Field>
- class MVProductDomain;
-
- template <class Ring>
- struct ClassifyRing;
-
- template <class Element>
- struct ClassifyRing<Modular<Element> >;
-
- template <>
- struct ClassifyRing<Modular<int8_t> >{
- typedef RingCategories::ModularTag categoryTag;
- };
-
- /** \brief Specialization of Modular to signed 8 bit element type with efficient dot product.
- *
- * Efficient element operations for dot product, mul, axpy, by using floating point
- * inverse of modulus (borrowed from NTL) and some use of non-normalized intermediate values.
- *
- * Requires: modulus < 2^7.
- * Intended use: prime modulus < 2^7.
- \ingroup field
- */
- template <>
- class Modular<int8_t> : public FieldInterface {
- public:
- typedef int8_t Element;
- protected:
- Element modulus;
- unsigned long lmodulus ;
- double modulusinv;
- public:
- friend class FieldAXPY<Modular<Element> >;
- friend class DotProductDomain<Modular<Element> >;
- friend class MVProductDomain<Modular<Element> >;
-
- typedef ModularRandIter<Element> RandIter;
-
- //default modular field,taking 65521 as default modulus
- Modular () :
- modulus(13),lmodulus(13)
- {
- modulusinv=1/(double)13;
- }
-
- Modular (int value, int exp = 1) :
- modulus(Element(value)),lmodulus((unsigned int)value)
- {
- modulusinv = 1 / ((double) value);
-#ifdef DEBUG
- if(exp != 1) throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
- if(value <= 1) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
- integer max;
- if(value > FieldTraits< Modular<Element> >::maxModulus(max)) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
-#endif
- }
-
- Modular(const Modular<Element>& mf) :
- modulus(mf.modulus),lmodulus(mf.lmodulus),modulusinv(mf.modulusinv)
- {}
-
- Modular &operator=(const Modular<Element> &F)
- {
- modulus = F.modulus;
- lmodulus = F.lmodulus;
- modulusinv = F.modulusinv;
- return *this;
- }
-
-
- inline integer &cardinality (integer &c) const
- {
- return c = modulus;
- }
-
- inline integer &characteristic (integer &c) const
- {
- return c = modulus;
- }
-
- inline unsigned long cardinality () const
- {
- return lmodulus;
- }
-
- inline unsigned long characteristic () const
- {
- return lmodulus;
- }
-
-
- inline integer &convert (integer &x, const Element &y) const
- {
- return x = y;
- }
-
- inline std::ostream &write (std::ostream &os) const
- {
- return os << "Element mod " << (int)modulus;
- }
-
- inline std::istream &read (std::istream &is)
- {
- int prime;
- is >> prime;
- modulus = (Element) prime;
- modulusinv = 1 /((double) modulus );
-#ifdef DEBUG
- if(prime <= 1) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
- integer max;
- if(prime > FieldTraits< Modular<Element> >::maxModulus(max)) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
-#endif
-
- return is;
- }
-
- inline std::ostream &write (std::ostream &os, const Element &x) const
- {
- return os << x;
- }
-
- inline std::istream &read (std::istream &is, Element &x) const
- {
- integer tmp;
- is >> tmp;
- init(x,tmp);
- return is;
- }
-
-
- inline Element &init (Element &x, const integer &y) const
- {
- x =(Element)((int16_t) (y % (long) (modulus)));
- if (x < 0) x += modulus;
- return x;
- }
-
- inline Element& init(Element& x, int y =0) const
- {
- x = y % modulus;
- if ( x < 0 ) x += modulus;
- return x;
- }
-
- inline Element& init(Element& x, long y) const
- {
- x = y % modulus;
- if ( x < 0 ) x += modulus;
- return x;
- }
-
- inline Element& init(Element& x, long unsigned y) const
- {
- x = Element (y % lmodulus);
- if ( x < 0 ) x += modulus;
- return x;
- }
-
-
- inline Element& assign(Element& x, const Element& y) const
- {
- return x=y;
- }
-
-
- inline bool areEqual (const Element &x, const Element &y) const
- {
- return x == y;
- }
-
- inline bool isZero (const Element &x) const
- {
- return x == 0;
- }
-
- inline bool isOne (const Element &x) const
- {
- return x == 1;
- }
-
- inline Element &add (Element &x, const Element &y, const Element &z) const
- {
- x = y + z;
- if ( (uint8_t)x >= modulus )
- x =Element(( (uint8_t)x )- modulus);
- return x;
- }
-
- inline Element &sub (Element &x, const Element &y, const Element &z) const
- {
- x = y - z;
- if (x < 0) x += modulus;
- return x;
- }
-
- inline Element &mul (Element &x, const Element &y, const Element &z) const
- {
- Element q;
-
- double ab=((double) y)* ((double) z);
- q = (Element)(ab*modulusinv); // q could be off by (+/-) 1
- x = (Element) (ab - ((double) q )* ((double) modulus));
-
-
- if (x >= modulus)
- x -= modulus;
- else if (x < 0)
- x += modulus;
-
- return x;
- }
-
- inline Element &div (Element &x, const Element &y, const Element &z) const
- {
- Element temp;
- inv (temp, z);
- return mul (x, y, temp);
- }
-
- inline Element &neg (Element &x, const Element &y) const
- {
- if(y==0) return x=0;
- else return x=modulus-y;
- }
-
- inline Element &inv (Element &x, const Element &y) const
- {
- Element d, t;
- XGCD(d, x, t, y, modulus);
-#ifdef DEBUG
- if (d != 1)
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"InvMod: inverse undefined");
-#endif
- if (x < 0)
- return x += modulus;
- else
- return x;
- }
-
- inline Element &axpy (Element &r,
- const Element &a,
- const Element &x,
- const Element &y) const
- {
- Element q;
-
- double ab = ((double) a)* ((double) x) + y;
- q = (Element)(ab*modulusinv); // q could be off by (+/-) 1
- r = (Element) (ab - ((double) q )* ((double) modulus));
-
-
- if (r >= modulus)
- r -= modulus;
- else if (x < 0)
- r += modulus;
-
- return r;
-
- }
-
- inline Element &addin (Element &x, const Element &y) const
- {
- x += y;
- if ( ((uint8_t) x) >= modulus )
- x = Element( ((uint8_t) x)-modulus );
- return x;
- }
-
- inline Element &subin (Element &x, const Element &y) const
- {
- x -= y;
- if (x < 0) x += modulus;
- return x;
- }
-
- inline Element &mulin (Element &x, const Element &y) const
- {
- return mul(x,x,y);
- }
-
- inline Element &divin (Element &x, const Element &y) const
- {
- return div(x,x,y);
- }
-
- inline Element &negin (Element &x) const
- {
- if (x == 0) return x;
- else return x = modulus - x;
- }
-
- inline Element &invin (Element &x) const
- {
- return inv (x, x);
- }
-
- inline Element &axpyin (Element &r, const Element &a, const Element &x) const
- {
-
-
- Element q;
-
- double ab = ((double) a)* ((double) x) + r;
- q = (Element)(ab*modulusinv); // q could be off by (+/-) 1
- r = (Element) (ab - ((double) q )* ((double) modulus));
-
-
- if (r >= modulus)
- r -= modulus;
- else if (x < 0)
- r += modulus;
-
- return r;
- }
-
- static inline Element getMaxModulus()
- {
- return INT8_MAX;
- } // 2^7-1
-
-
- private:
-
- static void XGCD(Element& d, Element& s, Element& t, Element a, Element b)
- {
- Element u, v, u0, v0, u1, v1, u2, v2, q, r;
-
- Element aneg = 0, bneg = 0;
-
- if (a < 0) {
-#ifdef DEBUG
- if (a < -LINBOX_MAX_INT8) throw PreconditionFailed(__func__,__FILE__,__LINE__,"XGCD: integer overflow");
-#endif
- a = -a;
- aneg = 1;
- }
-
- if (b < 0) {
-#ifdef DEBUG
- if (b < -LINBOX_MAX_INT8) throw PreconditionFailed(__func__,__FILE__,__LINE__,"XGCD: integer overflow");
-#endif
- b = -b;
- bneg = 1;
- }
-
- u1 = 1; v1 = 0;
- u2 = 0; v2 = 1;
- u = a; v = b;
-
- while (v != 0) {
- q = u / v;
- r = u % v;
- u = v;
- v = r;
- u0 = u2;
- v0 = v2;
- u2 = u1 - q*u2;
- v2 = v1- q*v2;
- u1 = u0;
- v1 = v0;
- }
-
- if (aneg)
- u1 = -u1;
-
- if (bneg)
- v1 = -v1;
-
- d = u;
- s = u1;
- t = v1;
- }
-
- };
-
- template <>
- class FieldAXPY<Modular<int8_t> > {
- public:
-
- typedef int8_t Element;
- typedef Modular<int8_t> Field;
-
- FieldAXPY (const Field &F) :
- _F (F),_y(0)
- {
- }
-
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F), _y (0)
- {}
-
- FieldAXPY<Modular<int8_t> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- _y = faxpy._y;
-
- return *this;
- }
-
- inline uint64_t& mulacc (const Element &a, const Element &x)
- {
- uint64_t t = ( (uint16_t) a ) * ( (uint16_t) x );
- return _y +=t;
- }
-
- inline uint64_t& accumulate (const Element &t)
- {
- return _y += t;
- }
-
- inline Element& get (Element &y)
- {
- y =_y % (uint64_t) _F.modulus;
- return y;
- }
-
- inline FieldAXPY &assign (const Element y)
- {
- _y = y;
- return *this;
- }
-
- inline void reset()
- {
- _y = 0;
- }
-
- private:
-
- Field _F;
- uint64_t _y;
- uint8_t _two_64;
- };
-
-
- template <>
- class DotProductDomain<Modular<int8_t> > : private virtual VectorDomainBase<Modular<int8_t> > {
-
- public:
- typedef int8_t Element;
- DotProductDomain (const Modular<int8_t> &F) :
- VectorDomainBase<Modular<int8_t> > (F)
- { }
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- typename Vector1::const_iterator i;
- typename Vector2::const_iterator j;
-
- uint64_t y = 0;
- // uint64_t t;
-
- for (i = v1.begin (), j = v2.begin (); i < v1.end (); ++i, ++j) {
- y += ( (uint16_t) *i ) * ( (uint16_t) *j );
- }
-
-
- y %= (uint64_t) _F.modulus;
-
- return res = y;
-
- }
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
- typename Vector1::first_type::const_iterator i_idx;
- typename Vector1::second_type::const_iterator i_elt;
-
- uint64_t y = 0;
-
- for (i_idx = v1.first.begin (), i_elt = v1.second.begin (); i_idx != v1.first.end (); ++i_idx, ++i_elt) {
- y += ( (uint16_t) *i_elt ) * ( (uint16_t) v2[*i_idx] );
- }
-
- y %= (uint64_t) _F.modulus;
-
- return res = y;
-
- }
-
- };
-
-
- template <>
- class MVProductDomain<Modular<int8_t> >
- {
- public:
-
- typedef int8_t Element;
-
- protected:
- template <class Vector1, class Matrix, class Vector2>
- inline Vector1 &mulColDense
- (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
- {
- return mulColDenseSpecialized
- (VD, w, A, v, VectorTraits<typename Matrix::Column>::VectorCategory ());
- }
-
- private:
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const;
-
- mutable std::vector<uint64_t> _tmp;
- };
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int8_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseVectorTag) const
- {
-
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i) {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
- t = ((uint16_t) *k) * ((uint16_t) *j);
-
- *l += t;
-
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int8_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const
- {
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i) {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
- t = ((uint16_t) k->second) * ((uint16_t) *j);
-
- _tmp[k->first] += t;
-
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int8_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const
- {
-
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i) {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
- t = ((uint16_t) k->second) * ((uint16_t) *j);
-
- _tmp[k->first] += t;
-
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int8_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<int8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const
- {
-
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::first_type::const_iterator k_idx;
- typename Matrix::Column::second_type::const_iterator k_elt;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i) {
- for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
- k_idx != i->first.end ();
- ++k_idx, ++k_elt, ++l)
- {
- t = ((uint16_t) *k_elt) * ((uint16_t) *j);
-
- _tmp[*k_idx] += t;
-
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
-}
-
-#ifdef __ICC
-#pragma warning(enable:2259)
-#endif
-
-#include "linbox/randiter/modular.h"
-#endif //__LINBOX_modular_bit_H
-
diff --git a/linbox/field/modular-crooked-double.h b/linbox/field/modular-crooked-double.h
deleted file mode 100644
index c8b695b..0000000
--- a/linbox/field/modular-crooked-double.h
+++ /dev/null
@@ -1,576 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-
-/* linbox/field/modular-crooked-double.h
- * Copyright (C) 2010 LinBox
- *
- * adapted from field/modular-balanced-double.h
- * by Brice Boyer <brice.boyer at imag.fr>
- *
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-/*! @file field/modular-crooked-double.h
- * @ingroup field
- * @brief Crooked representation of <code>Z/mZ</code> over \c double .
- * This is a balanced representation with more positive (or negative) representants.
- * Being tested.
- */
-#ifndef __LINBOX_modular_crooked_double_H
-#define __LINBOX_modular_crooked_double_H
-
-
-#include "linbox/linbox-config.h"
-#include "linbox/integer.h"
-#include "linbox/vector/vector-domain.h"
-#include "linbox/field/field-interface.h"
-#include "linbox/field/field-traits.h"
-#include "linbox/util/field-axpy.h"
-#include "linbox/util/debug.h"
-#include <cmath>
-#include "linbox/field/field-traits.h"
-#include "linbox/randiter/modular-crooked.h"
-#include "linbox/randiter/nonzero.h"
-#include <iostream>
-
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
- template< class Element >
- class ModularCrooked;
-
- template <class Ring>
- struct ClassifyRing;
-
- template <class Element>
- struct ClassifyRing<ModularCrooked<Element> >;
-
- template <>
- struct ClassifyRing<ModularCrooked<double> >
- {
- typedef RingCategories::ModularTag categoryTag;
- };
-
- class MultiModDouble;
-
- /// \ingroup field
- template <>
- class ModularCrooked<double> : public FieldInterface {
-
- protected:
-
- double modulus;
- double up_mod;
- double lo_mod;
- unsigned long lmodulus;
-
- public:
-
- friend class FieldAXPY<ModularCrooked<double> >;
- friend class DotProductDomain<ModularCrooked<double> >;
- friend class MultiModDouble;
-
- typedef double Element;
- typedef ModularCrookedRandIter<double> RandIter;
- typedef NonzeroRandIter<ModularCrooked<double>,RandIter> NonZeroRandIter;
-
- static ClassifyRing <ModularCrooked<double> >::categoryTag
- getCategory()
- {
- return ClassifyRing<ModularCrooked<double> >::categoryTag();
- }
-
- ModularCrooked () {}
-
- ModularCrooked (int32_t p, float f = 0.5, int exp = 1) :
- modulus((double)p), up_mod( std::ceil((p-1.)*f) ), lo_mod( up_mod-modulus+1 ),lmodulus (p)
- {
-#ifdef DEBUG
- if(modulus <= 1)
- throw PreconditionFailed(__func__,
- __LINE__,
- "modulus must be > 1");
- if( exp != 1 ) throw PreconditionFailed(__func__,
- __LINE__,
- "exponent must be 1");
- integer max;
- if (modulus > (double) FieldTraits<ModularCrooked<double> >::maxModulus(max))
- throw PreconditionFailed (__func__,
- __LINE__,
- "modulus is too big");
-#endif
- }
-
- ModularCrooked (double p, float f = 0.5) :
- modulus((double)p), up_mod( std::ceil((p-1.)*f) ), lo_mod( up_mod-modulus+1 ),lmodulus (p)
- {
-#ifdef DEBUG
- if (modulus <= 1)
- throw PreconditionFailed(__func__,
- __LINE__,
- "modulus must be > 1");
- integer max;
- if (modulus > (double) FieldTraits<ModularCrooked<double> >::maxModulus(max))
- throw PreconditionFailed (__func__,
- __LINE__,
- "modulus is too big");
-#endif
- }
-
- ModularCrooked (long int p, float f = 0.5) :
- modulus((double)p), up_mod( std::ceil((p-1.)*f) ), lo_mod( up_mod-modulus+1 ),lmodulus (p)
- {
-#ifdef DEBUG
- if ((double) modulus <= 1)
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
- integer max;
- if ((double) modulus > (double) FieldTraits<ModularCrooked<double> >::maxModulus(max))
- throw PreconditionFailed (__func__,
- __LINE__,
- "modulus is too big");
-#endif
- }
-
- ModularCrooked (const integer& p, float f = 0.5) :
- modulus((double)p), up_mod( std::ceil((double)(p-1)*f) ), lo_mod( up_mod-modulus+1 ),lmodulus (p)
- {
-#ifdef DEBUG
- if(modulus <= 1)
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
- if(modulus > getMaxModulus())
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
-#endif
-
- }
-
- ModularCrooked (const ModularCrooked<double>& mf) :
- modulus (mf.modulus)
- ,up_mod (mf.up_mod)
- ,lo_mod (mf.lo_mod)
- ,lmodulus (mf.lmodulus)
- {}
-
- const ModularCrooked &operator= (const ModularCrooked<double> &F)
- {
- modulus = F.modulus;
- up_mod = F.up_mod;
- lo_mod = F.lo_mod;
- lmodulus= F.lmodulus;
- return *this;
- }
-
-
- inline integer &cardinality (integer &c) const
- {
- return c = integer(modulus);
- }
-
- inline integer &characteristic (integer &c) const
- {
- return c = integer(modulus);
- }
-
- inline size_t characteristic () const
- {
- return modulus;
- }
-
-
- inline integer &convert (integer &x, const Element &y) const
- {
- if ( y < 0. ) return x = integer (y + modulus) ;
- else return x = integer (y);
- }
-
- inline double &convert (double &x, const Element& y) const
- {
- return x=y;
- }
-
- inline float &convert (float &x, const Element& y) const
- {
- return x=y;
- }
-
- std::ostream &write (std::ostream &os) const
- {
- // os << modulus << '(' << lo_mod << ',' << up_mod << ')' << std::endl;
- os << "crooked double mod " << int(modulus) << " @ " ;
- os.precision(2) ;
- os << (double)up_mod/(modulus-1);
- os.precision();
- return os ;
- }
-
- std::istream &read (std::istream &is)
- {
- is >> modulus;
-#ifdef DEBUG
- if(modulus <= 1)
- throw PreconditionFailed (__func__,
- __LINE__,
- "modulus must be > 1");
- if(modulus > getMaxModulus())
- throw PreconditionFailed (__func__,
- __LINE__,
- "modulus is too big");
-#endif
- return is;
- }
-
- std::ostream &write (std::ostream &os, const Element &x) const
- {
- return os << int(x);
- }
-
- std::istream &read (std::istream &is, Element &x) const
- {
- integer tmp;
- // JGD : should'nt it be double tmp ???
- is >> tmp;
- init(x,tmp);
- return is;
- }
-
-
- inline Element &init (Element &x, const integer &y) const {
- x = (Element)(y%lmodulus);
- if (x < lo_mod) return x += modulus;
- if (x > up_mod) x -= modulus;
-
- return x;
- }
-
- inline Element& init(Element& x, const double y =0) const
- {
-
- x = drem (y, modulus);
- if (x < lo_mod) return x += modulus;
- if (x > up_mod) x -= modulus;
- return x;
- }
-
- inline Element& assign(Element& x, const Element& y) const
- {
- return x = y;
- }
-
- inline bool areEqual (const Element &x, const Element &y) const
- {
- return x == y;
- }
-
- inline bool isZero (const Element &x) const
- {
- return x == 0.;
- }
-
- inline bool isOne (const Element &x) const
- {
- return x == 1.;
- }
-
- inline bool isMinusOne (const Element &x) const
- {
- return (x == -1.);
- }
-
- inline Element &add (Element &x,
- const Element &y,
- const Element &z) const
- {
- x = y + z;
- if ( x < lo_mod ) return x += modulus;
- if ( x > up_mod ) x -= modulus;
- return x;
- }
-
- inline Element &sub (Element &x,
- const Element &y,
- const Element &z) const
- {
- x = y - z;
- if (x < lo_mod ) return x += modulus;
- if (x > up_mod ) x -= modulus;
- return x;
- }
-
- inline Element &mul (Element &x, const Element &y, const Element &z) const
- {
- x = y * z;
- return init (x,x);
- }
-
- inline Element &div (Element &x, const Element &y, const Element &z) const
- {
- Element temp;
- inv (temp, z);
- return mul (x, y, temp);
- }
-
- inline Element &neg (Element &x, const Element &y) const
- {
- return x = -y;
- }
-
- inline Element &inv (Element &x, const Element &y) const
- {
- // The extended Euclidean algoritm
- int x_int, y_int, q, tx, ty, temp;
- x_int = int (modulus);
- y_int = (y < 0.) ? int(y + modulus) : int(y);
- tx = 0;
- ty = 1;
-
- while (y_int != 0) {
- // always: gcd (modulus,residue) = gcd (x_int,y_int)
- // sx*modulus + tx*residue = x_int
- // sy*modulus + ty*residue = y_int
- q = x_int / y_int; // integer quotient
- temp = y_int; y_int = x_int - q * y_int;
- x_int = temp;
- temp = ty; ty = tx - q * ty;
- tx = temp;
- }
- if ( tx < lo_mod ) return x = tx + modulus;
- if ( tx > up_mod ) return x = tx - modulus;
- return x = (double) tx;
- }
-
- inline Element &axpy (Element &r,
- const Element &a,
- const Element &x,
- const Element &y) const
- {
- r = a * x + y;
- return init (r, r);
- }
-
- inline Element &addin (Element &x, const Element &y) const
- {
- x += y;
- if ( x < lo_mod ) return x += modulus;
- if ( x > up_mod ) x -= modulus;
- return x;
- }
-
- inline Element &subin (Element &x, const Element &y) const
- {
- x -= y;
- if ( x < lo_mod ) return x += modulus;
- if ( x > up_mod ) x -= modulus;
- return x;
- }
-
- inline Element &mulin (Element &x, const Element &y) const
- {
- return mul(x,x,y);
- }
-
- inline Element &divin (Element &x, const Element &y) const
- {
- return div(x,x,y);
- }
-
- inline Element &negin (Element &x) const
- {
- return x = -x;
- }
-
- inline Element &invin (Element &x) const
- {
- return inv (x, x);
- }
-
- inline Element &axpyin (Element &r, const Element &a, const Element &x) const
- {
- r += a * x;
- return init (r, r);
- }
-
- unsigned long AccBound(const Element&r) const
- {
- Element one, zero ; init(one,1UL) ; init(zero,0UL);
- double max_double = (double) (1ULL<<DBL_MANT_DIG) - modulus ;
- double p = std::max(up_mod,-lo_mod) ;
- if (areEqual(zero,r))
- return (unsigned long) (double(max_double)/p) ;
- else if (areEqual(one,r))
- {
- if (modulus>= getMaxModulus())
- return 0 ;
- else
- return (unsigned long) (double(max_double)/(p*p)) ;
- }
- else
- throw LinboxError("Bad input, expecting 0 or 1");
- return 0;
- }
-
-
- static inline double getMaxModulus()
- { return 67108864.0; } // 2^26
-
- };
-
-#define SQR(A) \
- ((A)*(A))
-
- template <>
- class FieldAXPY<ModularCrooked<double> > {
- public:
-
- typedef double Element;
- typedef ModularCrooked<double> Field;
-
- FieldAXPY (const Field &F) :
- _F (F), _y(0.) , _bound( (double) ((1ULL << 53) - (int) (SQR(std::max(_F.up_mod,-_F.lo_mod)))))
- {}
-
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F),
- _y(faxpy._y), _bound(faxpy._bound)
- {}
-
- FieldAXPY<ModularCrooked<double> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- _y= faxpy._y;
- _bound= faxpy._bound;
- return *this;
- }
-
- inline Element& mulacc (const Element &a, const Element &x) {
- // Element tmp= a*x;
- // return accumulate(tmp);
- return accumulate(a*x);
- }
-
- inline Element& accumulate (const Element &tmp) {
- _y += tmp;
- if (_y > _bound)
- return _y = drem (_y, _F.modulus);
- else
- return _y;
- }
- inline Element& subumulate (const Element &tmp) {
- _y -= tmp;
- if (_y < 0)
- return _y += _F.modulus;
- else
- return _y;
- }
-
- inline Element& get (Element &y) {
- _y = drem (_y, _F.modulus);
- return y=_y ;
- }
-
- inline FieldAXPY &assign (const Element y) {
- _y = y;
- return *this;
- }
-
- inline void reset() {
- _y = 0.;
- }
-
- inline Element& set (const Element &tmp) {
- _y = tmp;
- if (_y > _bound)
- return _y = drem (_y, _F.modulus);
- else
- return _y;
- }
-
- private:
-
- Field _F;
- double _y;
- double _bound;
- };
-
- template <>
- class DotProductDomain<ModularCrooked<double> > : private virtual VectorDomainBase<ModularCrooked<double> > {
- private:
- double _bound;
- size_t _nmax;
-
- public:
- typedef double Element;
- DotProductDomain (const ModularCrooked<double> &F) :
- VectorDomainBase<ModularCrooked<double> > (F), _bound( (double) ( (1ULL<<53) - (int) (SQR(std::max(_F.up_mod,-_F.lo_mod)))))
- {
- _nmax= (size_t)floor((double(1<<26)* double(1<<26)*2.)/ (SQR(std::max(_F.up_mod,-_F.lo_mod))));
- }
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- double y = 0.;
- double t = 0.;
- if (v1.size() < _nmax) {
- for (size_t i = 0; i< v1.size();++i)
- y += v1[i] * v2[i] ;
- y = drem(y, _F.modulus);
- }
- else{
- size_t i=0;
- for (;i< v1.size()- _nmax ;i=i+_nmax){
- for (size_t j=i;j<i+_nmax;++j)
- y += v1[j] * v2[j];
- t+=drem(y, _F.modulus);
- y=0.;
- }
- for (;i < v1.size();++i)
- y += v1[i] * v2[i];
- t+=drem(y, _F.modulus);
- y = drem(t, _F.modulus);
- }
- return res = y;
- }
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- double y = 0.;
- double t =0.;
-
-
- if (v1.first.size() < _nmax) {
- for (size_t i=0;i<v1.first.size();++i)
- y+= v1.second[i] * v2[v1.first[i]];
- y = drem(y, _F.modulus);
- }
- else {
- size_t i=0;
- for (;i< v1.first.size()- _nmax ;i=i+_nmax){
- for (size_t j=i;j<i+_nmax;++j)
- y += v1.second[j] * v2[v1.first[j]];
- t+=drem(y, _F.modulus);
- y=0.;
- }
- for (;i < v1.first.size();++i)
- y += v1.second[i] * v2[v1.first[i]];
- t+= drem(y, _F.modulus);
- y = drem(t, _F.modulus);
- }
- return res = y;
- }
- };
-
- template<class T>
- std::ostream& operator<< (std::ostream & o, const ModularCrooked<T> & F)
- {
- return F.write(o);
- }
-
-}
-#endif //__LINBOX_modular_crooked_double_H
-
diff --git a/linbox/field/modular-double.h b/linbox/field/modular-double.h
deleted file mode 100644
index a52f2bb..0000000
--- a/linbox/field/modular-double.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/modular-double.h
- * Copyright (C) 2003 Pascal Giorgi
- *
- * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
- *
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-/*! @file field/modular-double.h
- * @ingroup field
- * @brief Standard representation of <code>Z/mZ</code> over \c double .
- */
-
-#ifndef __LINBOX_modular_double_H
-#define __LINBOX_modular_double_H
-
-
-#include "linbox/linbox-config.h"
-#include "linbox/integer.h"
-#include "linbox/vector/vector-domain.h"
-#include "linbox/field/field-interface.h"
-#include "linbox/field/field-traits.h"
-#include "linbox/util/field-axpy.h"
-#include "linbox/util/debug.h"
-#include <math.h>
-#include <linbox/field/field-traits.h>
-#include "linbox/randiter/nonzero.h"
-#include "linbox/randiter/modular.h"
-
-#include "fflas-ffpack/field/modular-double.h"
-
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
- template< class Element >
- class Modular;
-
- template< class Element >
- class ModularRandIter;
-
- template< class Field, class RandIter >
- class NonzeroRandIter;
-
- template <class Ring>
- struct ClassifyRing;
-
- template <class Element>
- struct ClassifyRing<Modular<Element> >;
-
- template <>
- struct ClassifyRing<Modular<double> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
- class MultiModDouble;
-
- /*! \ingroup modular
- * Standard representation of \f$\mathbf{Z}/m\mathbf{Z}\f$.
- * If \c m is the modulus, then elements are represented in \f[ \left
- * \llbracket 0, m-1 \right \rrbracket.\f]
- */
- template <>
- class Modular<double> :
- public FFPACK::Modular<double>,public FieldInterface {
- public:
- typedef double Element;
-
- protected:
-
- public:
- friend class FieldAXPY<Modular<Element> >;
- friend class DotProductDomain<Modular<Element> >;
- friend class MultiModDouble;
-
- public:
-
- typedef ModularRandIter<Element> RandIter;
- typedef NonzeroRandIter<Modular<Element>, ModularRandIter<Element> > NonZeroRandIter;
-
- static ClassifyRing<Modular<Element> >::categoryTag getCategory() {return ClassifyRing<Modular<Element> >::categoryTag();}
-
- Modular (const integer& p, int e=1) :
- FFPACK::Modular<double>((unsigned long) p)
- {
- linbox_check(e==1);
-#ifdef DEBUG
- if(modulus <= 1)
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
- if(modulus > getMaxModulus())
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
-#endif
- }
-
- Modular () : FFPACK::Modular<double>() {};
-
- integer &cardinality (integer &c) const
- {
- return c = integer(modulus);
- }
-
- integer &characteristic (integer &c) const
- {
- return c = integer(modulus);
- }
-
- integer &convert (integer &x, const Element &y) const
- {
- return x = integer(y);
- }
-
- template<class T>T&convert(T&x,const Element&y)const{return x=T(y);}
- template<class T>T&characteristic(T&x)const{return x=T(lmodulus);}
- unsigned long characteristic()const{return FFPACK::Modular<double>::characteristic();}
- unsigned long cardinality()const{return FFPACK::Modular<double>::cardinality();}
- template<class T>T&init(T&x)const{return init(x,0);}
-
- Element &init (Element &x, const integer &y) const
- {
- x = (Element)(y%lmodulus);
- if (x<0) x+= lmodulus ;
- linbox_check(x < lmodulus);
- linbox_check(!(x < 0));
- return x ;
- }
-
- bool isMinusOne (const Element &x) const
- {
- return (x == modulus-1.);
- }
-
- /** Max number of operations before reducing
- * @param r if \c r=0, we consider how many \c += are performable.
- * if \c r=1, then we look for the maximum \c axpy operations doable.
- * @return \p 0 if the field is too big, a positive number otherwise, \p -1 if infinity
- * on general fields, it is \p 1.
- */
- unsigned long AccBound(const Element r) const
- {
- Element one, zero ; init(one,1UL) ; init(zero,0UL);
- Element max_Element = (Element) (1ULL<<DBL_MANT_DIG) - modulus ; /* other wise 2^52+(2^52-1) */
- Element p = modulus-1 ;
- if (areEqual(zero,r))
- return (unsigned long) (Element(max_Element)/p) ;
- else if (areEqual(one,r))
- {
- if (modulus>= getMaxModulus())
- return 0 ;
- else
- return (unsigned long) (Element(max_Element)/(modulus*modulus)) ;
- }
- else
- throw LinboxError("Bad input, expecting 0 or 1");
- return 0;
- }
-
- };
-
- template <>
- class FieldAXPY<Modular<double> > {
- public:
-
- typedef double Element;
- typedef Modular<double> Field;
-
- FieldAXPY (const Field &F) :
- _F (F) , //_invmod(1./_F.modulus),
- _y(0.) , _bound( (double) ((1ULL << 53) - (int) (_F.modulus*_F.modulus)))
- {}
-
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F),// _invmod(faxpy._invmod) ,
- _y(faxpy._y), _bound(faxpy._bound)
- {}
-
- FieldAXPY<Modular<double> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- //_invmod= faxpy._invmod;
- _y= faxpy._y;
- _bound= faxpy._bound;
- return *this;
- }
-
- Element& mulacc (const Element &a, const Element &x)
- {
- // Element tmp= a*x;
- // return accumulate(tmp);
- return accumulate(a*x);
- }
-
- Element& accumulate (const Element &tmp)
- {
- _y += tmp;
- if (_y > _bound)
- return _y = fmod (_y, _F.modulus);
- else
- return _y;
- }
-
- Element& subumulate (const Element &tmp)
- {
- _y -= tmp;
- if (_y < 0)
- return _y += _F.modulus;
- else
- return _y;
- }
-
- Element& get (Element &y)
- {
- _y = fmod (_y, _F.modulus);
- return y=_y ;
- }
-
- FieldAXPY &assign (const Element y)
- {
- _y = y;
- return *this;
- }
-
- void reset()
- {
- _y = 0.;
- }
-
- Element& set (const Element &tmp)
- {
- _y = tmp;
- if (_y > _bound)
- return _y = fmod (_y, _F.modulus);
- else
- return _y;
- }
-
- private:
-
- Field _F;
- //double _invmod;
- double _y;
- double _bound;
- };
-
- template <>
- class DotProductDomain<Modular<double> > : private virtual VectorDomainBase<Modular<double> > {
- private:
- double _bound;
- size_t _nmax;
- //double _invmod;
-
- public:
- typedef double Element;
- DotProductDomain (const Modular<double> &F) :
- VectorDomainBase<Modular<double> > (F), _bound( (double) ( (1ULL<<53) - (int) (F.modulus*F.modulus)))//, _invmod(1./_F.modulus)
- {
- _nmax= (size_t)floor((double(1<<26)* double(1<<26)*2.)/ (F.modulus * F.modulus));
- _nmax = (_nmax>0?_nmax:1);
- }
-
- protected:
- template <class Vector1, class Vector2>
- Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- double y = 0.;
- double t = 0.;
- if (v1.size() < _nmax) {
- for (size_t i = 0; i< v1.size();++i)
- y += v1[i] * v2[i] ;
- y = fmod(y, _F.modulus);
- }
- else{
- size_t i=0;
- for (;i< v1.size()- _nmax ;i=i+_nmax){
- for (size_t j=i;j<i+_nmax;++j)
- y += v1[j] * v2[j];
- t+=fmod(y, _F.modulus);
- y=0.;
- }
- for (;i < v1.size();++i)
- y += v1[i] * v2[i];
- t+=fmod(y, _F.modulus);
- y = fmod(t, _F.modulus);
- }
- return res = y;
- }
-
- template <class Vector1, class Vector2>
- Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- double y = 0.;
- double t =0.;
-
-
- if (v1.first.size() < _nmax) {
- for (size_t i=0;i<v1.first.size();++i)
- y+= v1.second[i] * v2[v1.first[i]];
- y = fmod(y, _F.modulus);
- }
- else {
- size_t i=0;
- for (;i< v1.first.size()- _nmax ;i=i+_nmax){
- for (size_t j=i;j<i+_nmax;++j)
- y += v1.second[j] * v2[v1.first[j]];
- t+=fmod(y, this->_F.modulus);
- y=0.;
- }
- for (;i < v1.first.size();++i)
- y += v1.second[i] * v2[v1.first[i]];
- t+= fmod(y, _F.modulus);
- y = fmod(t, _F.modulus);
- }
- return res = y;
- }
- };
-}
-
-
-#endif //__LINBOX_modular_double_H
-
diff --git a/linbox/field/modular-float.h b/linbox/field/modular-float.h
deleted file mode 100644
index dbda8ad..0000000
--- a/linbox/field/modular-float.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/modular-float.h
- * Copyright (C) 2003 Pascal Giorgi
- * 2007 Clement Pernet
- * Written by Clement Pernet <cpernet at uwaterloo.ca>
- *
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-/*! @file field/modular-float.h
- * @ingroup field
- * @brief representation of <code>Z/mZ</code> over \c float .
- */
-
-#ifndef __LINBOX_modular_float_H
-#define __LINBOX_modular_float_H
-
-#ifdef __INTEL_COMPILER
-#define FmodF fmodf
-#else
-#define FmodF fmod
-#endif
-
-
-
-#include "linbox/linbox-config.h"
-#include "linbox/integer.h"
-#include "linbox/vector/vector-domain.h"
-#include "linbox/field/field-interface.h"
-#include "linbox/field/field-traits.h"
-#include "linbox/util/field-axpy.h"
-#include "linbox/util/debug.h"
-#include <math.h>
-#include <linbox/field/field-traits.h>
-#include "linbox/randiter/nonzero.h"
-
-#include "fflas-ffpack/field/modular-float.h"
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
- template< class Element >
- class Modular;
- template< class Element >
- class ModularRandIter;
-
- template< class Field, class RandIter >
- class NonzeroRandIter;
-
- template <class Ring>
- struct ClassifyRing;
- template <class Element>
- struct ClassifyRing<Modular<Element> >;
- template <>
- struct ClassifyRing<Modular<float> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
- class MultiModFloat;
-
- /// \ingroup field
- template <>
- class Modular<float> : public FieldInterface,
- public FFPACK::Modular<float> {
-
- public :
- typedef float Element;
-
- public:
- friend class FieldAXPY<Modular<Element> >;
- friend class DotProductDomain<Modular<Element> >;
- friend class MultiModFloat;
-
- typedef ModularRandIter<Element> RandIter;
- typedef NonzeroRandIter<Modular<Element>, ModularRandIter<Element> > NonZeroRandIter;
-
- static ClassifyRing<Modular<Element> >::categoryTag getCategory()
- {
- return ClassifyRing<Modular<Element> >::categoryTag();
- }
-
- Modular (const integer& p) :
- FFPACK::Modular<float>((unsigned long)p)
- {
-#ifdef DEBUG
- if(modulus <= 1)
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
- integer max;
- if(modulus > (Element) FieldTraits<Modular<Element> >::maxModulus(max))
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
-#endif
-
- }
-
- integer &cardinality (integer &c) const
- {
- return c = integer(modulus);
- }
-
- integer &characteristic (integer &c) const
- {
- return c = integer(modulus);
- }
-
- integer &convert (integer &x, const Element &y) const
- {
- return x = integer(y);
- }
-
- template<class T>T&convert(T&x,const Element&y)const{return x=T(y);}
- template<class T>T&characteristic(T&x)const{return x=T(lmodulus);}
- unsigned long characteristic(void)const{return FFPACK::Modular<float>::characteristic();}
- unsigned long cardinality(void)const{return FFPACK::Modular<float>::cardinality();}
-
- Element &init (Element &x, const integer &y) const
- {
- x = (Element)(y%lmodulus);
-
- if (x<0) return x+=modulus ;
- return x;
- }
-
- unsigned long AccBound(const Element&r) const
- {
- Element one, zero ; init(one,1UL) ; init(zero,0UL);
- double max_double = (double) (1ULL<<FLT_MANT_DIG) - modulus ;
- double p = modulus-1 ;
- if (areEqual(zero,r))
- return (unsigned long) (double(max_double)/p) ;
- else if (areEqual(one,r))
- {
- if (modulus>= getMaxModulus())
- return 0 ;
- else
- return (unsigned long) (double(max_double)/(modulus*modulus)) ;
- }
- else
- throw LinboxError("Bad input, expecting 0 or 1");
- return 0;
- }
-
- };
-
- template <>
- class FieldAXPY<Modular<float> > {
- public:
-
- typedef float Element;
- typedef Modular<float> Field;
-
- FieldAXPY (const Field &F) :
- _F (F) , //_invmod(1./_F.modulus),
- _y(0.) , _bound( (float) ( (1UL << 23) - (int) (_F.modulus*_F.modulus)))
- {}
-
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F),// _invmod(faxpy._invmod) ,
- _y(faxpy._y), _bound(faxpy._bound)
- {}
-
- FieldAXPY<Modular<float> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- //_invmod= faxpy._invmod;
- _y= faxpy._y;
- _bound= faxpy._bound;
- return *this;
- }
-
- inline Element& mulacc (const Element &a, const Element &x)
- {
- Element tmp= a*x;
- return accumulate(tmp);
- }
-
- inline Element& accumulate (const Element &tmp)
- {
- _y += tmp;
- if (_y > _bound)
- return _y = fmodf (_y, _F.modulus);
- else
- return _y;
- }
-
- inline Element& get (Element &y)
- {
- _y = fmodf (_y, _F.modulus);
- return y=_y ;
- }
-
- inline FieldAXPY &assign (const Element y)
- {
- _y = y;
- return *this;
- }
-
- inline void reset()
- {
- _y = 0.;
- }
-
- private:
-
- Field _F;
- //float _invmod;
- float _y;
- float _bound;
- };
-
-
- template <>
- class DotProductDomain<Modular<float> > : private virtual VectorDomainBase<Modular<float> > {
- private:
- float _bound;
- size_t _nmax;
- //float _invmod;
-
- public:
- typedef float Element;
- DotProductDomain (const Modular<float> &F) :
- VectorDomainBase<Modular<float> > (F)
- , _bound( (float) ( (1<<23) - (int) (_F.modulus*_F.modulus)))
- //, _invmod(1./_F.modulus)
- {
- _nmax= (size_t)floor((float(1<<11)* float(1<<12))/ (_F.modulus * _F.modulus));
- }
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- float y = 0.;
- float t = 0.;
- if (v1.size() < _nmax)
- {
- for (size_t i = 0; i< v1.size();++i)
- y += v1[i] * v2[i] ;
- y = fmodf(y, _F.modulus);
- }
- else
- {
- size_t i=0;
- for (;i< v1.size()- _nmax ;i=i+_nmax)
- {
- for (size_t j=i;j<i+_nmax;++j)
- y += v1[j] * v2[j];
- t+=fmodf(y, _F.modulus);
- y=0.;
- }
- for (;i < v1.size();++i)
- y += v1[i] * v2[i];
- t+=fmodf(y, _F.modulus);
- y = fmodf(t, _F.modulus);
- }
- return res = y;
- }
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- float y = 0.;
- float t =0.;
-
-
- if (v1.first.size() < _nmax)
- {
- for (size_t i=0;i<v1.first.size();++i)
- y+= v1.second[i] * v2[v1.first[i]];
- y = fmodf(y, _F.modulus);
- }
- else
- {
- size_t i=0;
- for (;i< v1.first.size()- _nmax ;i=i+_nmax)
- {
- for (size_t j=i;j<i+_nmax;++j)
- y += v1.second[j] * v2[v1.first[j]];
- t+=fmodf(y, _F.modulus);
- y=0.;
- }
- for (;i < v1.first.size();++i)
- y += v1.second[i] * v2[v1.first[i]];
- t+= fmodf(y, _F.modulus);
- y = fmodf(t, _F.modulus);
- }
- return res = y;
- }
- };
-}
-
-#include "linbox/randiter/modular.h"
-
-#undef FmodF
-
-#endif //__LINBOX_modular_float_H
-
diff --git a/linbox/field/modular-int32.h b/linbox/field/modular-int32.h
deleted file mode 100644
index 86995a8..0000000
--- a/linbox/field/modular-int32.h
+++ /dev/null
@@ -1,506 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* Copyright (C) 2010 LinBox
- *
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*! @file field/modular-int32_t.h
- * @ingroup field
- * @brief representation of <code>Z/mZ</code> over \c int32_t .
- */
-#ifndef __LINBOX_modular_int32_H
-#define __LINBOX_modular_int32_H
-
-
-#include <math.h>
-#include "linbox/linbox-config.h"
-#include "linbox/integer.h"
-#include "linbox/vector/vector-domain.h"
-#include "linbox/field/field-interface.h"
-#include "linbox/field/field-traits.h"
-#include "linbox/util/debug.h"
-#include "linbox/field/field-traits.h"
-
-#include "fflas-ffpack/field/modular-int32.h"
-
-#ifndef LINBOX_MAX_INT /* 2147483647 */
-#define LINBOX_MAX_INT INT32_MAX
-#endif
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
- template< class Element >
- class Modular;
- template< class Element >
- class ModularRandIter;
- template< class Field, class RandIter >
- class NonzeroRandIter;
-
- template<class Field>
- class DotProductDomain;
- template<class Field>
- class FieldAXPY;
- template<class Field>
- class MVProductDomain;
-
- template <class Ring>
- struct ClassifyRing;
-
- template <class Element>
- struct ClassifyRing<Modular<Element> >;
-
- template <>
- struct ClassifyRing<Modular<int32_t> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
-
-
- /** \brief Specialization of Modular to int32_t element type with efficient dot product.
- *
- * Efficient element operations for dot product, mul, axpy, by using floating point
- * inverse of modulus (borrowed from NTL) and some use of non-normalized intermediate values.
- *
- * For some uses this is the most efficient field for primes in the range from half word
- * to 2^30.
- *
- * Requires: Modulus < 2^30.
- * Intended use: 2^15 < prime modulus < 2^30.
- \ingroup field
- */
- template <>
- class Modular<int32_t> : public FieldInterface ,
- public ::FFPACK::Modular<int32_t> {
-
- protected:
-
- public:
-
- friend class FieldAXPY<Modular<int32_t> >;
- friend class DotProductDomain<Modular<int32_t> >;
- friend class MVProductDomain<Modular<int32_t> >;
-
- typedef int32_t Element;
- typedef ModularRandIter<int32_t> RandIter;
- typedef NonzeroRandIter<Modular<int32_t>, ModularRandIter<int32_t> > NonZeroRandIter;
-
- Modular (integer &p) :
- FFPACK::Modular<int32_t>((unsigned long)p)
- {}
-
- Modular (int32_t value, int32_t exp=1) :
- FFPACK::Modular<int32_t>(value,exp)
- {}
-
- integer &cardinality (integer &c) const
- {
- return c = modulus;
- }
-
- integer &characteristic (integer &c) const
- {
- return c = modulus;
- }
-
-
- template<class T>T&convert(T&x,const Element&y)const{return x=T(y);}
- template<class T>T&characteristic(T&x)const{return x=T(lmodulus);}
- unsigned long characteristic()const{return FFPACK::Modular<int32_t>::characteristic();}
- unsigned long cardinality()const{return FFPACK::Modular<int32_t>::cardinality();}
-
- integer &convert (integer &x, const Element &y) const
- {
- return x = y;
- }
-
-
- Element &init (Element &x, const integer &y) const
- {
- x = Element (y % modulus);
- if (x < 0) x += modulus;
- return x;
- }
-
- Element init(Element&x) const { return FFPACK::Modular<int32_t>::init(x) ; }
-
- unsigned long AccBound(const Element&r) const
- {
- Element one, zero ; init(one,1UL) ; init(zero,0UL);
- double max_double = (double) (INT_MAX) - modulus ;
- double p = modulus-1 ;
- if (areEqual(zero,r))
- return (unsigned long) (max_double/p) ;
- else if (areEqual(one,r))
- {
- if (modulus>= getMaxModulus())
- return 0 ;
- else
- return (unsigned long) max_double/(modulus*modulus) ;
- }
- else
- throw LinboxError("Bad input, expecting 0 or 1");
- return 0;
- }
-
- private:
-
- };
-
- template <>
- class FieldAXPY<Modular<int32_t> > {
- public:
-
- typedef int32_t Element;
- typedef Modular<int32_t> Field;
-
- FieldAXPY (const Field &F) :
- _F (F),_y(0)
- { }
-
-
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F), _y (0)
- {}
-
- FieldAXPY<Modular<int32_t> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- _y = faxpy._y;
- return *this;
- }
-
- uint64_t& mulacc (const Element &a, const Element &x)
- {
- uint64_t t = (uint64_t) a * (uint64_t) x;
- _y += t;
- if (_y < t)
- return _y += _F._two64;
- else
- return _y;
- }
-
- uint64_t& accumulate (const Element &t)
- {
- _y += t;
- if (_y < (uint64_t)t)
- return _y += _F._two64;
- else
- return _y;
- }
-
- Element& get (Element &y)
- {
- y =_y % (uint64_t) _F.modulus;
- return y;
- }
-
- FieldAXPY &assign (const Element y)
- {
- _y = y;
- return *this;
- }
-
- void reset()
- {
- _y = 0;
- }
-
- protected:
- Field _F;
- uint64_t _y;
- };
-
-
- template <>
- class DotProductDomain<Modular<int32_t> > : private virtual VectorDomainBase<Modular<int32_t> > {
-
- public:
- typedef int32_t Element;
- DotProductDomain (const Modular<int32_t> &F) :
- VectorDomainBase<Modular<int32_t> > (F)
- {}
-
-
- protected:
- template <class Vector1, class Vector2>
- Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- typename Vector1::const_iterator i;
- typename Vector2::const_iterator j;
-
- uint64_t y = 0;
- uint64_t t;
-
- for (i = v1.begin (), j = v2.begin (); i < v1.end (); ++i, ++j)
- {
- t = ( (uint64_t) *i ) * ( (uint64_t) *j );
- y += t;
-
- if (y < t)
- y += _F._two64;
- }
-
- y %= (uint64_t) _F.modulus;
- return res = y;
-
- }
-
- template <class Vector1, class Vector2>
- Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
- typename Vector1::first_type::const_iterator i_idx;
- typename Vector1::second_type::const_iterator i_elt;
-
- uint64_t y = 0;
- uint64_t t;
-
- for (i_idx = v1.first.begin (), i_elt = v1.second.begin (); i_idx != v1.first.end (); ++i_idx, ++i_elt)
- {
- t = ( (uint64_t) *i_elt ) * ( (uint64_t) v2[*i_idx] );
- y += t;
-
- if (y < t)
- y += _F._two64;
- }
-
-
- y %= (uint64_t) _F.modulus;
-
- return res = y;
- }
- };
-
- // Specialization of MVProductDomain for int32_t modular field
-
- template <>
- class MVProductDomain<Modular<int32_t> > {
- public:
-
- typedef int32_t Element;
-
- protected:
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDense
- (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
- {
- return mulColDenseSpecialized
- (VD, w, A, v, typename VectorTraits<typename Matrix::Column>::VectorCategory ());
- }
-
- private:
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const;
-
- mutable std::vector<uint64_t> _tmp;
- };
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int32_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseVectorTag) const
- {
-
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i)
- {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
- {
- t = ((uint64_t) *k) * ((uint64_t) *j);
-
- *l += t;
-
- if (*l < t)
- *l += VD.field ()._two64;
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int32_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const
- {
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i)
- {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
- {
- t = ((uint64_t) k->second) * ((uint64_t) *j);
-
- _tmp[k->first] += t;
-
- if (_tmp[k->first] < t)
- _tmp[k->first] += VD.field ()._two64;
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int32_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const
- {
-
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i)
- {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
- {
- t = ((uint64_t) k->second) * ((uint64_t) *j);
-
- _tmp[k->first] += t;
-
- if (_tmp[k->first] < t)
- _tmp[k->first] += VD.field ()._two64;
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int32_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<int32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const
- {
-
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::first_type::const_iterator k_idx;
- typename Matrix::Column::second_type::const_iterator k_elt;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i)
- {
- for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
- k_idx != i->first.end ();
- ++k_idx, ++k_elt, ++l)
- {
- t = ((uint64_t) *k_elt) * ((uint64_t) *j);
-
- _tmp[*k_idx] += t;
-
- if (_tmp[*k_idx] < t)
- _tmp[*k_idx] += VD.field ()._two64;
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
-
-}
-
-#include "linbox/randiter/modular.h"
-
-#endif //__LINBOX_modular_int32_H
-
diff --git a/linbox/field/modular-int64.h b/linbox/field/modular-int64.h
deleted file mode 100644
index 9e0273c..0000000
--- a/linbox/field/modular-int64.h
+++ /dev/null
@@ -1,490 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* Copyright (C) 2010 LinBox
- * Adapted by B Boyer <brice.boyer at imag.fr>
- * (from other modular-balanced* files)
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*! @file field/modular-int64_t.h
- * @ingroup field
- * @brief representation of <code>Z/mZ</code> over \c int64_t .
- */
-#ifndef __LINBOX_modular_int64_H
-#define __LINBOX_modular_int64_H
-
-
-#include <math.h>
-#include "linbox/linbox-config.h"
-#include "linbox/integer.h"
-#include "linbox/vector/vector-domain.h"
-#include "linbox/field/field-interface.h"
-#include "linbox/field/field-traits.h"
-#include "linbox/util/debug.h"
-#include "linbox/field/field-traits.h"
-
-#include "fflas-ffpack/field/modular-int64.h"
-
-#ifndef LINBOX_MAX_INT64 /* 18446744073709551615L(L) is UINT64_MAX*/
-#ifdef __x86_64__
-#define LINBOX_MAX_INT64 INT64_MAX
-#else
-#define LINBOX_MAX_INT64 INT64_MAX
-#endif
-#endif
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
- template< class Element >
- class Modular;
- template< class Element >
- class ModularRandIter;
- template<class Field>
- class DotProductDomain;
- template<class Field>
- class FieldAXPY;
- template<class Field>
- class MVProductDomain;
-
- template <class Ring>
- struct ClassifyRing;
-
- template <class Element>
- struct ClassifyRing<Modular<Element> >;
-
- template <>
- struct ClassifyRing<Modular<int64_t> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
-
-
- /** \brief Specialization of Modular to int64_t element type with efficient dot product.
- *
- * Efficient element operations for dot product, mul, axpy, by using floating point
- * inverse of modulus (borrowed from NTL) and some use of non-normalized intermediate values.
- *
- * For some uses this is the most efficient field for primes in the range from half word
- * to 2^62.
- *
- * Requires: Modulus < 2^62.
- * Intended use: 2^30 < prime modulus < 2^62.
- \ingroup field
- */
- template <>
- class Modular<int64_t> : public FieldInterface,
- public FFPACK::Modular<int64_t> {
-
- public:
- typedef int64_t Element;
-
- friend class FieldAXPY<Modular<int64_t> >;
- friend class DotProductDomain<Modular<int64_t> >;
- friend class MVProductDomain<Modular<int64_t> >;
-
- typedef ModularRandIter<int64_t> RandIter;
-
- inline integer &cardinality (integer &c) const
- {
- return c = modulus;
- }
-
- inline integer &characteristic (integer &c) const
- {
- return c = modulus;
- }
-
- inline integer characteristic () const
- {
- return modulus;
- }
-
- inline integer &convert (integer &x, const Element &y) const
- {
- return x = y;
- }
-
- inline Element &init (Element &x, const integer &y) const
- {
- x = Element (y % modulus);
- if (x < 0) x += modulus;
- return x;
- }
-
-
- private:
-
-
- };
-
- template <>
- class FieldAXPY<Modular<int64_t> > {
- public:
-
- typedef int64_t Element;
- typedef Modular<int64_t> Field;
-
- FieldAXPY (const Field &F) :
- _F (F),_y(0)
- {}
-
-
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F), _y (0)
- {}
-
- FieldAXPY<Modular<int64_t> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- _y = faxpy._y;
- return *this;
- }
-
- inline uint64_t& mulacc (const Element &a, const Element &x)
- {
- uint64_t t = (uint64_t) a * (uint64_t) x;
- _y += t;
- if (_y < t)
- return _y += _F._two64;
- else
- return _y;
- }
-
- inline uint64_t& accumulate (const Element &t)
- {
- _y += t;
- if (_y < (uint64_t)t)
- return _y += _F._two64;
- else
- return _y;
- }
-
- inline Element& get (Element &y)
- {
- y =_y % (uint64_t) _F.modulus;
- return y;
- }
-
- inline FieldAXPY &assign (const Element y)
- {
- _y = y;
- return *this;
- }
-
- inline void reset()
- {
- _y = 0;
- }
-
- protected:
- Field _F;
- uint64_t _y;
- };
-
-
- template <>
- class DotProductDomain<Modular<int64_t> > : private virtual VectorDomainBase<Modular<int64_t> > {
-
- public:
- typedef int64_t Element;
- DotProductDomain (const Modular<int64_t> &F) :
- VectorDomainBase<Modular<int64_t> > (F)
- {}
-
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- typename Vector1::const_iterator i;
- typename Vector2::const_iterator j;
-
- uint64_t y = 0;
- uint64_t t;
-
- for (i = v1.begin (), j = v2.begin (); i < v1.end (); ++i, ++j)
- {
- t = ( (uint64_t) *i ) * ( (uint64_t) *j );
- y += t;
-
- if (y < t)
- y += _F._two64;
- }
-
- y %= (uint64_t) _F.modulus;
- return res = y;
-
- }
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
- typename Vector1::first_type::const_iterator i_idx;
- typename Vector1::second_type::const_iterator i_elt;
-
- uint64_t y = 0;
- uint64_t t;
-
- for (i_idx = v1.first.begin (), i_elt = v1.second.begin (); i_idx != v1.first.end (); ++i_idx, ++i_elt)
- {
- t = ( (uint64_t) *i_elt ) * ( (uint64_t) v2[*i_idx] );
- y += t;
-
- if (y < t)
- y += _F._two64;
- }
-
-
- y %= (uint64_t) _F.modulus;
-
- return res = y;
- }
- };
-
- // Specialization of MVProductDomain for int64_t modular field
-
- template <>
- class MVProductDomain<Modular<int64_t> > {
- public:
-
- typedef int64_t Element;
-
- protected:
- template <class Vector1, class Matrix, class Vector2>
- inline Vector1 &mulColDense
- (const VectorDomain<Modular<int64_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
- {
- return mulColDenseSpecialized
- (VD, w, A, v, typename VectorTraits<typename Matrix::Column>::VectorCategory ());
- }
-
- private:
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int64_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int64_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int64_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int64_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const;
-
- mutable std::vector<uint64_t> _tmp;
- };
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 & MVProductDomain<Modular<int64_t> >::
- mulColDenseSpecialized (const VectorDomain<Modular<int64_t> > &VD,
- Vector1 &w,
- const Matrix &A,
- const Vector2 &v,
- VectorCategories::DenseVectorTag) const
- {
-
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i)
- {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
- {
- t = ((uint64_t) *k) * ((uint64_t) *j);
-
- *l += t;
-
- if (*l < t)
- *l += VD.field ()._two64;
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int64_t> >::
- mulColDenseSpecialized (const VectorDomain<Modular<int64_t> > &VD,
- Vector1 &w,
- const Matrix &A,
- const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const
- {
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i)
- {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
- {
- t = ((uint64_t) k->second) * ((uint64_t) *j);
-
- _tmp[k->first] += t;
-
- if (_tmp[k->first] < t)
- _tmp[k->first] += VD.field ()._two64;
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int64_t> > ::
- mulColDenseSpecialized(const VectorDomain<Modular<int64_t> > &VD,
- Vector1 &w,
- const Matrix &A,
- const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const
- {
-
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i)
- {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
- {
- t = ((uint64_t) k->second) * ((uint64_t) *j);
-
- _tmp[k->first] += t;
-
- if (_tmp[k->first] < t)
- _tmp[k->first] += VD.field ()._two64;
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int64_t> > ::
- mulColDenseSpecialized (const VectorDomain<Modular<int64_t> > &VD,
- Vector1 &w,
- const Matrix &A,
- const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const
- {
-
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::first_type::const_iterator k_idx;
- typename Matrix::Column::second_type::const_iterator k_elt;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i)
- {
- for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
- k_idx != i->first.end ();
- ++k_idx, ++k_elt, ++l)
- {
- t = ((uint64_t) *k_elt) * ((uint64_t) *j);
-
- _tmp[*k_idx] += t;
-
- if (_tmp[*k_idx] < t)
- _tmp[*k_idx] += VD.field ()._two64;
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
-
-}
-
-#undef LINBOX_MAX_INT64
-
-#include "linbox/randiter/modular.h"
-
-#endif //__LINBOX_modular_int64_H
-
diff --git a/linbox/field/modular-short.h b/linbox/field/modular-short.h
deleted file mode 100644
index 653da49..0000000
--- a/linbox/field/modular-short.h
+++ /dev/null
@@ -1,770 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* Copyright (C) 2010 LinBox
- * Written by <?>
- *
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*! @file field/modular-short.h
- * @ingroup field
- * @brief representation of <code>Z/mZ</code> over \c short .
- */
-#ifndef __LINBOX_modular_short_H
-#define __LINBOX_modular_short_H
-
-
-#include "math.h"
-#include "linbox/linbox-config.h"
-#include "linbox/integer.h"
-#include "linbox/vector/vector-domain.h"
-#include "linbox/field/field-interface.h"
-#include "linbox/util/debug.h"
-#include "linbox/field/field-traits.h"
-
-#ifndef LINBOX_MAX_INT16 /* 32767 */
-#define LINBOX_MAX_INT16 INT16_MAX
-#endif
-
-#ifdef __ICC /* pas content avec x = -x par exemple */
-#pragma warning(disable:2259)
-#endif
-
-// Namespace in which all LinBox code resides
-namespace LinBox
-{
-
- template<class Element>
- class Modular;
-
- template<class Element>
- class ModularRandIter;
-
- template<class Field>
- class FieldAXPY;
-
- template<class Field>
- class DotProductDomain;
-
- template<class Field>
- class MVProductDomain;
-
- template <class Ring>
- struct ClassifyRing;
-
- template <class Element>
- struct ClassifyRing<Modular<Element> >;
-
- template <>
- struct ClassifyRing<Modular<short> >{
- typedef RingCategories::ModularTag categoryTag;
- };
-
- /** \brief Specialization of Modular to short element type with efficient dot product.
- *
- * Efficient element operations for dot product, mul, axpy, by using floating point
- * inverse of modulus (borrowed from NTL) and some use of non-normalized intermediate values.
- *
- * Requires: modulus < 2^15.
- * Intended use: 2^7 < prime modulus < 2^15.
- \ingroup field
- */
- template <>
- class Modular<int16_t> : public FieldInterface {
- public:
- typedef int16_t Element;
- protected:
- Element modulus;
- unsigned long lmodulus;
- double modulusinv;
-
- public:
- friend class FieldAXPY<Modular<Element> >;
- friend class DotProductDomain<Modular<Element> >;
- friend class MVProductDomain<Modular<Element> >;
-
- typedef ModularRandIter<Element> RandIter;
-
- //default modular field,taking 251 as default modulus
- Modular () :
- modulus(251),lmodulus(modulus)
- {
- modulusinv=1/(double)modulus;
- }
-
- Modular (int value, int exp = 1) :
- modulus((Element)value),lmodulus((unsigned long) value)
- {
- modulusinv = 1 / ((double) value);
-#ifdef DEBUG
- if(value<=1)
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
- integer max;
- if(value>FieldTraits< Modular<Element> >::maxModulus(max))
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
- if(exp != 1)
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
-#endif
- }
-
- Modular(const Modular<Element>& mf) :
- modulus(mf.modulus),lmodulus(mf. lmodulus),modulusinv(mf.modulusinv)
- {}
-
- const Modular &operator=(const Modular<Element> &F)
- {
- modulus = F. modulus;
- lmodulus = F. lmodulus ;
- modulusinv = F. modulusinv;
- return *this;
- }
-
- inline integer &cardinality (integer &c) const
- {
- return c = modulus;
- }
-
- inline integer &characteristic (integer &c) const
- {
- return c = modulus;
- }
-
- inline unsigned long cardinality () const
- {
- return lmodulus;
- }
-
- inline unsigned long characteristic () const
- {
- return lmodulus;
- }
-
-
- inline integer &convert (integer &x, const Element &y) const
- {
- return x = y;
- }
-
- inline std::ostream &write (std::ostream &os) const
- {
- return os << "Element mod " << modulus;
- }
-
- inline std::istream &read (std::istream &is)
- {
- int prime;
- is >> prime;
-#ifdef DEBUG
- if(prime <= 1) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be > 1");
- integer max;
- if(prime > FieldTraits< Modular<Element> >::maxModulus(max)) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus is too big");
-#endif
- modulus = (Element) prime;
- modulusinv = 1 /((double) modulus );
-
- return is;
- }
-
- inline std::ostream &write (std::ostream &os, const Element &x) const
- {
- return os << x;
- }
-
- inline std::istream &read (std::istream &is, Element &x) const
- {
- integer tmp;
- is >> tmp;
- init(x,tmp);
- return is;
- }
-
- template<class T>
- inline Element &init (Element &x, const T& y) const
- {
- return init( x, static_cast<integer>(y) );
- }
-
- inline Element &init (Element &x, const integer &y) const
- {
- x = Element(y % (unsigned long)modulus);
- if (x < 0)
- x += modulus;
- return x;
- }
-
- inline Element& init(Element& x, int y =0) const
- {
- x = (Element)(y % modulus);
- if ( x < 0 )
- x += modulus;
- return x;
- }
-
- inline Element& init(Element& x, long y) const
- {
- x = y % modulus;
- if ( x < 0 ) x += modulus;
- return x;
- }
-
- inline Element &init (Element & x, const double &y) const
- {
- double z = fmod(y, (double)modulus);
- if (z < 0) z += (double)modulus;
- //z += 0.5; // C Pernet Sounds nasty and not necessary
- return x = static_cast<long>(z); //rounds towards 0
- }
-
- inline Element &init (Element &x, const float &y) const
- {
- return init (x, (double) y);
- }
-
- inline Element& assign(Element& x, const Element& y) const
- {
- return x = y;
- }
-
-
- inline bool areEqual (const Element &x, const Element &y) const
- {
- return x == y;
- }
-
- inline bool isZero (const Element &x) const
- {
- return x == 0;
- }
-
- inline bool isOne (const Element &x) const
- {
- return x == 1;
- }
-
- inline Element &add (Element &x, const Element &y, const Element &z) const
- {
- x = y + z;
- if ( (uint16_t)x >= (uint16_t)modulus )
- x = (Element) (( (uint16_t)x )- modulus);
- return x;
- }
-
- inline Element &sub (Element &x, const Element &y, const Element &z) const
- {
- x = y - z;
- if (x < 0)
- x += modulus;
- return x;
- }
-
- inline Element &mul (Element &x, const Element &y, const Element &z) const
- {
- Element q;
-
- double ab=((double) y)* ((double) z);
- q = (Element)(ab*modulusinv); // q could be off by (+/-) 1
- x = (Element) (ab - ((double) q )* ((double) modulus));
-
-
- if (x >= modulus)
- x -= modulus;
- else if (x < 0)
- x += modulus;
-
- return x;
- }
-
- inline Element &div (Element &x, const Element &y, const Element &z) const
- {
- Element temp;
- inv (temp, z);
- return mul (x, y, temp);
- }
-
- inline Element &neg (Element &x, const Element &y) const
- {
- if(y==0)
- return x=0;
- else
- return x= modulus-y;
- }
-
- inline Element &inv (Element &x, const Element &y) const
- {
- Element d, t;
- XGCD(d, x, t, y, modulus);
-#ifdef DEBUG
- if (d != 1)
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"InvMod: inverse undefined");
-#endif
- if (x < 0)
- return x += modulus;
- else
- return x;
-
- }
-
- inline Element &axpy (Element &r,
- const Element &a,
- const Element &x,
- const Element &y) const
- {
- Element q;
-
- double ab=((double) a)* ((double) x) + ( double ) y;
- q = (Element)(ab*modulusinv); // q could be off by (+/-) 1
- r = (Element) (ab - ((double) q )* ((double) modulus));
-
-
- if (r >= modulus)
- r -= modulus;
- else if (r < 0)
- r += modulus;
-
- return r;
-
- }
-
- inline Element &addin (Element &x, const Element &y) const
- {
- x += y;
- if ( ((uint16_t) x) >= (uint16_t)modulus )
- x = Element( ((uint16_t) x)-modulus );
- return x;
- }
-
- inline Element &subin (Element &x, const Element &y) const
- {
- x -= y;
- if (x < 0) x += modulus;
- return x;
- }
-
- inline Element &mulin (Element &x, const Element &y) const
- {
- return mul(x,x,y);
- }
-
- inline Element &divin (Element &x, const Element &y) const
- {
- return div(x,x,y);
- }
-
- inline Element &negin (Element &x) const
- {
- if (x == 0) return x;
- else return x = modulus - x;
- }
-
- inline Element &invin (Element &x) const
- {
- return inv (x, x);
- }
-
- inline Element &axpyin (Element &r, const Element &a, const Element &x) const
- {
-
- Element q;
-
- double ab = ((double) a)* ((double) x) + ( double ) r;
- q = (Element)(ab*modulusinv); // q could be off by (+/-) 1
- r = (Element) (ab - ((double) q )* ((double) modulus));
-
-
- if (r >= modulus)
- r -= modulus;
- else if (r < 0)
- r += modulus;
-
- return r;
- }
-
- static inline Element getMaxModulus()
- {
- return 32767; // 2^15 - 1
- // linbox_check(180*181 < INT16_MAX);
- // return 181 ;
- }
-
- private:
-
- static void XGCD(int16_t& d, int16_t& s, int16_t& t, int16_t a, int16_t b)
- {
- Element u, v, u0, v0, u1, v1, u2, v2, q, r;
-
- Element aneg = 0, bneg = 0;
-
- if (a < 0) {
-#ifdef DEBUG
- if (a < -LINBOX_MAX_INT16) throw PreconditionFailed(__func__,__FILE__,__LINE__,"XGCD: integer overflow");
-#endif
- a = -a;
- aneg = 1;
- }
-
- if (b < 0) {
-#ifdef DEBUG
- if (b < -LINBOX_MAX_INT16) throw PreconditionFailed(__func__,__FILE__,__LINE__,"XGCD: integer overflow");
-#endif
- b = -b;
- bneg = 1;
- }
-
- u1 = 1; v1 = 0;
- u2 = 0; v2 = 1;
- u = a; v = b;
-
-
- while (v != 0) {
- q = u / v;
- r = u % v;
- u = v;
- v = r;
- u0 = u2;
- v0 = v2;
- u2 = u1 - q*u2;
- v2 = v1- q*v2;
- u1 = u0;
- v1 = v0;
- }
-
- if (aneg)
- u1 = -u1;
-
- if (bneg)
- v1 = -v1;
-
- d = u;
- s = u1;
- t = v1;
- }
-
- };
-
- template <>
- class FieldAXPY<Modular<int16_t> > {
- public:
-
- typedef int16_t Element;
- typedef Modular<int16_t> Field;
-
- FieldAXPY (const Field &F) :
- _F (F),_y(0)
- {
- }
-
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F), _y (0)
- {}
-
- FieldAXPY<Modular<int16_t> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- _y = faxpy._y;
- return *this;
- }
-
- inline uint64_t& mulacc (const Element &a, const Element &x)
- {
- uint64_t t = ( (uint32_t) a ) * ( (uint32_t) x );
- return _y+=t;
- }
-
- inline uint64_t& accumulate (const Element &t)
- {
- return _y += t;
- }
-
- inline Element& get (Element &y)
- {
- y = _y % (uint64_t) _F.modulus;
- return y;
- }
-
- inline FieldAXPY &assign (const Element y)
- {
- _y = y;
- return *this;
- }
-
- inline void reset()
- {
- _y = 0;
- }
-
- private:
-
- Field _F;
- uint64_t _y;
- uint16_t _two_64;
- };
-
-
- template <>
- class DotProductDomain<Modular<int16_t> > : private virtual VectorDomainBase<Modular<int16_t> > {
-
- public:
- typedef int16_t Element;
- DotProductDomain (const Modular<int16_t> &F) :
- VectorDomainBase<Modular<int16_t> > (F)
- { }
-
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
-
- typename Vector1::const_iterator i;
- typename Vector2::const_iterator j;
-
- uint64_t y = 0;
- // uint64_t t;
-
- for (i = v1.begin (), j = v2.begin (); i < v1.end (); ++i, ++j) {
- y += ( (uint32_t) *i ) * ( (uint32_t) *j );
- }
-
- y %= (uint64_t) _F.modulus;
-
- return res = y;
-
- }
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
- {
- typename Vector1::first_type::const_iterator i_idx;
- typename Vector1::second_type::const_iterator i_elt;
-
- uint64_t y = 0;
-
- for (i_idx = v1.first.begin (), i_elt = v1.second.begin (); i_idx != v1.first.end (); ++i_idx, ++i_elt) {
- y += ( (uint32_t) *i_elt ) * ( (uint32_t) v2[*i_idx] );
- }
-
- y %= (uint64_t) _F.modulus;
-
- return res = y;
- }
-
- };
- // Specialization of MVProductDomain for int16_t modular field
-
- template <>
- class MVProductDomain<Modular<int16_t> >
- {
- public:
-
- typedef int16_t Element;
-
- protected:
- template <class Vector1, class Matrix, class Vector2>
- inline Vector1 &mulColDense
- (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
- {
- return mulColDenseSpecialized
- (VD, w, A, v, typename VectorTraits<typename Matrix::Column>::VectorCategory ());
- }
-
- private:
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const;
-
- mutable std::vector<uint64_t> _tmp;
- };
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int16_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseVectorTag) const
- {
-
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i) {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
- t = ((uint32_t) *k) * ((uint32_t) *j);
-
- *l += t;
-
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int16_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const
- {
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i) {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
- t = ((uint32_t) k->second) * ((uint32_t) *j);
-
- _tmp[k->first] += t;
-
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int16_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const
- {
-
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i) {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
- t = ((uint32_t) k->second) * ((uint32_t) *j);
-
- _tmp[k->first] += t;
-
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &MVProductDomain<Modular<int16_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<int16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const
- {
-
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::first_type::const_iterator k_idx;
- typename Matrix::Column::second_type::const_iterator k_elt;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i) {
- for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
- k_idx != i->first.end ();
- ++k_idx, ++k_elt, ++l)
- {
- t = ((uint32_t) *k_elt) * ((uint32_t) *j);
-
- _tmp[*k_idx] += t;
-
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ().modulus;
-
- return w;
- }
-
-
-}
-
-#ifdef __ICC
-#pragma warning(enable:2259)
-#endif
-
-#include "linbox/randiter/modular.h"
-#endif //__LINBOX_modular_short_H
-
diff --git a/linbox/field/modular.doxy b/linbox/field/modular.doxy
index 063b601..19ec321 100644
--- a/linbox/field/modular.doxy
+++ b/linbox/field/modular.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 Brice Boyer, part of LinBox, GNU LGPL, see COPYING
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/*! @ingroup field
@defgroup modular Modular
diff --git a/linbox/field/modular.h b/linbox/field/modular.h
index 1745218..b98f955 100644
--- a/linbox/field/modular.h
+++ b/linbox/field/modular.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/modular.h
* Copyright (C) 1999-2001 William J Turner,
* 2001 Bradford Hovinen
@@ -17,7 +15,25 @@
* Renamed from large-modular.h to modular.h
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file field/modular.h
@@ -29,6 +45,7 @@
* - Random Iterators
* .
*
+ * @bug move Element& init(const Element&) to FFPACK. use using more..
*/
#ifndef __LINBOX_field_modular_H
@@ -45,7 +62,7 @@
#include "linbox/util/field-axpy.h"
#include "linbox/vector/vector-traits.h"
#include "linbox/linbox-config.h"
-#include <linbox/field/field-traits.h>
+#include "linbox/field/field-traits.h"
// Namespace in which all LinBox code resides
@@ -63,6 +80,13 @@ namespace LinBox
typedef RingCategories::ModularTag categoryTag;
};
+ template <class Element>
+ struct ClassifyRing<Modular<Element> const>
+ {
+ typedef RingCategories::ModularTag categoryTag;
+ };
+
+
/** * <!-- @name ModularBase-->
* \brief Base for prime fields where the elements are represented by various primitive types (and their operations).
* \ingroup field
@@ -105,7 +129,7 @@ namespace LinBox
* element type.
* @param modulus constant reference to integer prime modulus
*/
- ModularBase (unsigned long modulus) :
+ ModularBase (unsigned long modulus, int e = 1) :
_modulus ((Element)modulus)
{}
@@ -336,9 +360,10 @@ namespace LinBox
class Modular : public ModularBase<_Element> {
public:
typedef _Element Element;
+ typedef Modular<_Element> Self_t;
+ typedef ModularBase<_Element> Father_t;
typedef typename ModularBase<_Element>::RandIter RandIter;
- const Element zero,one;
- Element mone;
+ const Element zero,one, mOne;
/*- @name Object Management
* @brief see \ref FieldArchetype for member specs.
@@ -349,7 +374,7 @@ namespace LinBox
/*- Default constructor.
*/
Modular () :
- zero(0),one(1)
+ zero(0),one(1),mOne(0)
{}
/*- Constructor from an element type
@@ -357,17 +382,18 @@ namespace LinBox
* element type.
* @param modulus constant reference to integer prime modulus
*/
- Modular (unsigned long modulus) :
- ModularBase<_Element> (modulus),zero(0),one(1)
+ Modular (unsigned long modulus, unsigned long = 1) :
+ ModularBase<_Element> (modulus),zero(0),one(1),mOne(modulus-1)
{}
+
/*- Constructor from an integer
* Sets the modulus of the field throug the static member of the
* element type.
* @param modulus constant reference to integer prime modulus
*/
Modular (const integer &modulus) :
- ModularBase<_Element> (modulus),zero(0),one(1)
+ ModularBase<_Element> (modulus),zero(0),one(1),mOne(modulus-1)
{}
/* Assignment operator
@@ -379,6 +405,10 @@ namespace LinBox
const Modular &operator=(const Modular &F)
{
ModularBase<Element>::_modulus = F._modulus;
+ F.assign(const_cast<Element&>(one),F.one);
+ F.assign(const_cast<Element&>(zero),F.zero);
+ F.assign(const_cast<Element&>(mOne),F.mOne);
+
return *this;
}
public:
@@ -399,14 +429,14 @@ namespace LinBox
* @param x field base element to contain output (reference returned).
* @param y integer.
*/
- Element &init (Element &x, const integer &y = 0) const
+ Element &init (Element &x, const integer &y ) const
{
x = y % ModularBase<Element>::_modulus;
if (x < 0) x += ModularBase<Element>::_modulus;
return x;
}
- Element &init (Element &x, const size_t &y = 0) const
+ Element &init (Element &x, const size_t &y ) const
{
x = (Element) y % ModularBase<Element>::_modulus;
if (x < 0) x += ModularBase<Element>::_modulus;
@@ -420,7 +450,7 @@ namespace LinBox
return x;
}
- Element &init (Element &x, const long int y ) const
+ Element &init (Element &x, const long int y) const
{
x = y % ModularBase<Element>::_modulus;
if (x < 0) x += ModularBase<Element>::_modulus;
@@ -451,6 +481,11 @@ namespace LinBox
return x = (Element) (z+.5);
}
+ Element &init(Element &x) const
+ {
+ return x = 0 ;
+ }
+
//@}
/*- @name Arithmetic Operations
* @brief see \ref FieldArchetype for member specs.
@@ -712,1028 +747,96 @@ namespace LinBox
}; // class Modular
- /** @brief Allows compact storage when the modulus is less than 2^8.
- *
- * Requires <code>1 < modulus < 2^8</code>, normally prime. See \ref
- * FieldArchetype for member specifications.
- */
- template <>
- class Modular<uint8_t> : public FieldInterface, public ModularBase<uint8_t> {
- public:
- typedef uint8_t Element;
- const Element zero,one;
- Element mone;
-
- Modular () :
- zero(0),one(1),_k (0)
- {}
- Modular (uint32_t modulus) :
- ModularBase<Element> (modulus),
- zero(0),one(1),mone((Element)(modulus-1)),
- _k (((uint64_t) -1LL) / ((modulus - 1) * (modulus - 1))),
- _pinv (1.0 / (double) ((Element) modulus))
- {
- linbox_check(modulus < UINT8_MAX);
- }
- Modular (const integer &modulus) :
- ModularBase<Element> ((long) modulus),
- zero(0),one(1),mone(modulus-1),
- _k (((uint64_t) -1LL) / (((Element)modulus - 1) * ((Element)modulus - 1))),
- _pinv (1.0 / (double) ((Element) modulus))
- {
- linbox_check(modulus < UINT8_MAX);
- }
-
- const Modular &operator=(const Modular &F)
- {
- ModularBase<Element>::_modulus = F._modulus;
- _k = F._k;
- _pinv = F._pinv;
- mone = F.mone;
- return *this;
- }
-
- Element &init (Element &x, const integer &y = 0) const
- {
- x = (Element) (abs (y) % integer (ModularBase<Element>::_modulus));
- if (y < 0)
- x = Element(ModularBase<Element>::_modulus - x);
- return x;
- }
-
- Element &init (Element &x, const double &y) const
- {
- double z = fmod(y, (double)_modulus);
- if (z < 0) z += (double) _modulus;
- return x = (Element) (z);
- }
-
- /*! add elements
- * @todo is it faster to use uint32 and multiple casts ?
- */
- Element &add (Element &x, const Element &y, const Element &z) const
- {
- uint32_t t = (uint32_t) y + (uint32_t) z;
- if (t >= (uint32_t) ModularBase<Element>::_modulus)
- t -= ModularBase<Element>::_modulus;
- return x = (Element)t;
- }
-
- Element &sub (Element &x, const Element &y, const Element &z) const
- {
- int32_t t = (int32_t) y - (int32_t) z;
- if (t < 0)
- t += ModularBase<Element>::_modulus;
- return x = (Element)t;
- }
-
- Element &mul (Element &x, const Element &y, const Element &z) const
- {
- return x = Element( ((uint32_t) y * (uint32_t) z) % (uint32_t) ModularBase<Element>::_modulus );
- }
-
- Element &div (Element &x, const Element &y, const Element &z) const
- {
- Element temp;
- inv (temp, z);
- return mul (x, y, temp);
- }
-
- Element &neg (Element &x, const Element &y) const
- {
- if (y == 0)
- return x = y;
- else
- return x = (Element) (ModularBase<Element>::_modulus - y);
- }
-
- Element &inv (Element &x, const Element &y) const
- {
- // The extended Euclidean algoritm
- int32_t x_int, y_int, q, tx, ty, temp;
- x_int = ModularBase<Element>::_modulus;
- y_int = y;
- tx = 0;
- ty = 1;
-
- while (y_int != 0) {
- // always: gcd (modulus,residue) = gcd (x_int,y_int)
- // sx*modulus + tx*residue = x_int
- // sy*modulus + ty*residue = y_int
- q = x_int / y_int; // integer quotient
- temp = y_int; y_int = x_int - q * y_int;
- x_int = temp;
- temp = ty; ty = tx - q * ty;
- tx = temp;
- }
-
- if (tx < 0) tx += ModularBase<Element>::_modulus;
-
- // now x_int = gcd (modulus,residue)
- return x = (Element) tx;
- }
-
- Element &axpy (Element &r,
- const Element &a,
- const Element &x,
- const Element &y) const
- {
- r = Element(((uint32_t) a * (uint32_t) x + (uint32_t) y) % (uint32_t) ModularBase<Element>::_modulus) ;
- return r;
- }
-
- Element &addin (Element &x, const Element &y) const
- {
- uint32_t t = (long) x + (long) y;
- if (t >= (uint32_t) ModularBase<Element>::_modulus) t -= ModularBase<Element>::_modulus;
- return x = (Element) t;
- }
-
- /*! subin.
- * @todo why \c long here ?
- */
- Element &subin (Element &x, const Element &y) const
- {
- long t = x - y;
- if (t < 0) t += ModularBase<Element>::_modulus;
- return x = (Element) t;
- }
-
- Element &mulin (Element &x, const Element &y) const
- {
- x = (Element)( ((uint32_t) x * (uint32_t) y) % (uint32_t) ModularBase<Element>::_modulus );
- return x;
- }
-
- Element &divin (Element &x, const Element &y) const
- {
- Element temp;
- inv (temp, y);
- return mulin (x, temp);
- }
-
- Element &negin (Element &x) const
- {
- if (x == 0)
- return x;
- else
- return x = Element(ModularBase<Element>::_modulus - x);
- }
-
- Element &invin (Element &x) const
- {
- return inv (x, x);
- }
-
- Element &axpyin (Element &r, const Element &a, const Element &x) const
- {
- r = (Element)( ((uint32_t) r + (uint32_t) a * (uint32_t) x) % (uint32_t) ModularBase<Element>::_modulus);
- return r;
- }
-
- private:
-
- friend class FieldAXPY<Modular<Element> >;
- friend class DotProductDomain<Modular<Element> >;
- friend class MVProductDomain<Modular<Element> >;
-
- // Number of times one can perform an axpy into a long long
- // before modding out is mandatory.
- uint64_t _k;
- // Inverse of modulus in floating point
- double _pinv;
-
- }; // class Modular<uint8_t>
+ /*! Specialization of FieldAXPY for parameterized modular field */
- /** @brief Specialization of class Modular for uint16_t element type */
- template <>
- class Modular<uint16_t> : public FieldInterface, public ModularBase<uint16_t> {
+ template <class _Element>
+ class FieldAXPY<Modular<_Element> > {
public:
- typedef uint16_t Element;
-
- const Element zero,one;
- Element mone;
+ typedef _Element Element;
+ typedef Modular<_Element> Field;
- Modular () :
- zero(0),one(1),_k (0)
+ FieldAXPY (const Field &F) :
+ _field (F)
+ { _y = 0; }
+ FieldAXPY (const FieldAXPY<Modular<Element> > &faxpy) :
+ _field (faxpy._field), _y (faxpy._y)
{}
- Modular (uint32_t modulus) :
- ModularBase<Element> (modulus),
- zero(0),one(1),mone((Element)(modulus-1)),
- _k (((uint64_t) -1LL) / ((ModularBase<Element>::_modulus - 1) * (ModularBase<Element>::_modulus - 1))),
- _pinv (1.0 / (double) ((Element) ModularBase<Element>::_modulus))
- {
- linbox_check(modulus<UINT16_MAX);
- }
- Modular (const integer &modulus) :
- ModularBase<Element> ((long) modulus),
- zero(0),one(1),mone(Element(modulus-1)),
- _k (((uint64_t) -1LL) / ((ModularBase<Element>::_modulus - 1) * (ModularBase<Element>::_modulus - 1))),
- _pinv (1.0 / (double) ((Element) ModularBase<Element>::_modulus))
- {
- linbox_check(modulus<UINT16_MAX);
- }
- const Modular &operator=(const Modular &F)
+ FieldAXPY<Modular <Element> > &operator = (const FieldAXPY &faxpy)
{
- ModularBase<Element>::_modulus = F._modulus;
- _k = F._k;
- _pinv = F._pinv;
+ _field = faxpy._field;
+ _y = faxpy._y;
return *this;
}
- Element &init (Element &x, const integer &y = 0) const
- {
- x = abs (y) % integer (ModularBase<Element>::_modulus);
- if (y < 0)
- x = Element(ModularBase<Element>::_modulus - x);
- return x;
- }
-
- Element &init (Element &x, const double &y) const
- {
- double z = fmod(y, (double)_modulus);
- if (z < 0)
- z += (double) _modulus;
- return x = (Element) (z);
- }
-
- Element &add (Element &x, const Element &y, const Element &z) const
+ inline Element& mulacc (const Element &a, const Element &x)
{
- uint32_t t = (uint32_t) y + (uint32_t) z;
- if (t >= (uint32_t) ModularBase<Element>::_modulus)
- t -= ModularBase<Element>::_modulus;
- return x = (Element) t;
+ return accumulate(a * x);
}
- Element &sub (Element &x, const Element &y, const Element &z) const
+ inline Element& accumulate (const Element &t)
{
- int32_t t = (int32_t) y - (int32_t) z;
- if (t < 0) t += ModularBase<Element>::_modulus;
- return x = (Element) t;
+ return _y+=t;
}
- Element &mul (Element &x, const Element &y, const Element &z) const
- {
- return x = (Element) ( ((uint32_t) y * (uint32_t) z) % (uint32_t) ModularBase<Element>::_modulus);
+ inline Element &get (Element &y) { _y %= _field._modulus; y = _y; return y;
}
- Element &div (Element &x, const Element &y, const Element &z) const
+ inline FieldAXPY &assign (const Element y)
{
- Element temp;
- inv (temp, z);
- return mul (x, y, temp);
+ _y = y;
+ return *this;
}
- Element &neg (Element &x, const Element &y) const
- {
- if (y == 0)
- return x = y;
- else
- return x = (Element)( ModularBase<Element>::_modulus - y);
+ inline void reset() {
+ _field.init(_y, 0);
}
- Element &inv (Element &x, const Element &y) const
- {
- // The extended Euclidean algoritm
- int32_t x_int, y_int, q, tx, ty, temp;
- x_int = ModularBase<Element>::_modulus;
- y_int = y;
- tx = 0;
- ty = 1;
+ private:
- while (y_int != 0) {
- // always: gcd (modulus,residue) = gcd (x_int,y_int)
- // sx*modulus + tx*residue = x_int
- // sy*modulus + ty*residue = y_int
- q = x_int / y_int; // integer quotient
- temp = y_int; y_int = x_int - q * y_int;
- x_int = temp;
- temp = ty; ty = tx - q * ty;
- tx = temp;
- }
+ Field _field;
+ Element _y;
+ };
- if (tx < 0) tx += ModularBase<Element>::_modulus;
- // now x_int = gcd (modulus,residue)
- return x = (Element) tx;
- }
+ template <>
+ inline std::ostream& ModularBase<Integer>::write (std::ostream &os) const
+ {
+ return os << "GMP integers mod " << _modulus;
+ }
- Element &axpy (Element &r,
- const Element &a,
- const Element &x,
- const Element &y) const
- {
- r = (Element)( ((uint32_t) a * (uint32_t) x + (uint32_t) y) % (uint32_t) ModularBase<Element>::_modulus );
- return r;
- }
+ template <>
+ inline integer& Modular<integer>::init (integer& x, const double& y) const
+ {
+ integer tmp = (integer)y % _modulus;
+ if (tmp<0) tmp += _modulus;
+ return x = tmp;
+ }
- Element &addin (Element &x, const Element &y) const
- {
- uint32_t t = (long) x + (long) y;
- if (t >= (uint32_t) ModularBase<Element>::_modulus) t -= ModularBase<Element>::_modulus;
- return x = (Element) t;
- }
- Element &subin (Element &x, const Element &y) const
- {
- long t = x - y;
- if (t < 0) t += ModularBase<Element>::_modulus;
- return x = (Element) t;
- }
+} // namespace LinBox
- Element &mulin (Element &x, const Element &y) const
- {
- x = (Element)( ((uint32_t) x * (uint32_t) y) % (uint32_t) ModularBase<Element>::_modulus);
- return x;
- }
+#include "linbox/field/Modular/modular-unsigned.h"
+#include "linbox/randiter/modular.h"
+#include "linbox/field/Modular/modular-int32.h"
+#ifdef __LINBOX_HAVE_INT64
+#include "linbox/field/Modular/modular-int64.h"
+#endif
+#include "linbox/field/Modular/modular-short.h"
+#include "linbox/field/Modular/modular-byte.h"
+#include "linbox/field/Modular/modular-double.h"
+#include "linbox/field/Modular/modular-float.h"
- Element &divin (Element &x, const Element &y) const
- {
- Element temp;
- inv (temp, y);
- return mulin (x, temp);
- }
+#endif // __LINBOX_field_modular_H
- Element &negin (Element &x) const
- {
- if (x == 0)
- return x;
- else
- return x = (Element) ( ModularBase<Element>::_modulus - x);
- }
- Element &invin (Element &x) const
- {
- return inv (x, x);
- }
-
- Element &axpyin (Element &r, const Element &a, const Element &x) const
- {
- r = (Element) ( ((uint32_t) r + (uint32_t) a * (uint32_t) x) % (uint32_t) ModularBase<Element>::_modulus);
- return r;
- }
-
- private:
-
- friend class FieldAXPY<Modular<Element> >;
- friend class DotProductDomain<Modular<Element> >;
- friend class MVProductDomain<Modular<Element> >;
-
- // Number of times one can perform an axpy into a long long
- // before modding out is mandatory.
- uint64_t _k;
-
- // Inverse of modulus in floating point
- double _pinv;
-
- }; // class Modular<uint16_t>
-
- /** @brief Specialization of class Modular for uint32_t element type */
- template <>
- class Modular<uint32_t> : public FieldInterface, public ModularBase<uint32_t> {
- public:
-
- typedef uint32_t Element;
-
- const Element zero,one;
- Element mone;
-
- Modular () :
- zero(0),one(1)
- {}
- Modular (uint32_t modulus) :
- ModularBase<uint32_t> (modulus),zero(0),one(1),mone(modulus-1)
- { init_two_64 (); }
- Modular (const integer &modulus) :
- ModularBase<uint32_t> (modulus),zero(0),one(1),mone(modulus-1)
- { init_two_64 (); }
-
- const Modular &operator=(const Modular &F)
- {
- ModularBase<Element>::_modulus = F._modulus;
- _two_64 = F._two_64;
- mone = F.mone;
- return *this;
- }
-
- Element &init (Element &x, const integer &y = 0) const
- {
- x = abs (y) % integer (ModularBase<Element>::_modulus);
- if (y < 0) x = ModularBase<Element>::_modulus - x;
- return x;
- }
-
- Element &init (Element &x, const double &y) const
- {
- double z = fmod(y, (double)_modulus);
- if (z < 0) z += (double) _modulus;
- return x = (Element) (z);
- }
-
- Element &add (Element &x, const Element &y, const Element &z) const
- {
- x = y + z;
- if ((uint32_t) x >= (uint32_t) ModularBase<Element>::_modulus) x -= ModularBase<Element>::_modulus;
- return x;
- }
-
- Element &sub (Element &x, const Element &y, const Element &z) const
- {
- x = y - z;
- if ((int32_t) x < 0) x += ModularBase<Element>::_modulus;
- return x;
- }
-
- Element &mul (Element &x, const Element &y, const Element &z) const
- {
- return x = ((uint64_t) y * (uint64_t) z) % (uint64_t) ModularBase<Element>::_modulus;
- }
-
- Element &div (Element &x, const Element &y, const Element &z) const
- {
- Element temp;
- inv (temp, z);
- return mul (x, y, temp);
- }
-
- Element &neg (Element &x, const Element &y) const
- {
- if (y == 0)
- return x = y;
- else
- return x = ModularBase<Element>::_modulus - y;
- }
-
- Element &inv (Element &x, const Element &y) const
- {
- // The extended Euclidean algoritm
- int64_t x_int, y_int, q, tx, ty, temp;
- x_int = ModularBase<Element>::_modulus;
- y_int = y;
- tx = 0;
- ty = 1;
-
- while (y_int != 0) {
- // always: gcd (modulus,residue) = gcd (x_int,y_int)
- // sx*modulus + tx*residue = x_int
- // sy*modulus + ty*residue = y_int
- q = x_int / y_int; // integer quotient
- temp = y_int; y_int = x_int - q * y_int;
- x_int = temp;
- temp = ty; ty = tx - q * ty;
- tx = temp;
- }
-
- if (tx < 0) tx += ModularBase<Element>::_modulus;
-
- // now x_int = gcd (modulus,residue)
- return x = tx;
- }
-
- Element &axpy (Element &r,
- const Element &a,
- const Element &x,
- const Element &y) const
- {
- r = ((uint64_t) a * (uint64_t) x + (uint64_t) y) % (uint64_t) ModularBase<Element>::_modulus;
- if ((int32_t) r < 0) r += ModularBase<Element>::_modulus;
- return r;
- }
-
- Element &addin (Element &x, const Element &y) const
- {
- x += y;
- if ((uint32_t) x >= (uint32_t) ModularBase<Element>::_modulus) x -= ModularBase<Element>::_modulus;
- return x;
- }
-
- Element &subin (Element &x, const Element &y) const
- {
- x -= y;
- if ((int32_t) x < 0) x += ModularBase<Element>::_modulus;
- return x;
- }
-
- Element &mulin (Element &x, const Element &y) const
- {
- x = ((uint64_t) x * (uint64_t) y) % (uint64_t) ModularBase<Element>::_modulus;
- return x;
- }
-
- Element &divin (Element &x, const Element &y) const
- {
- Element temp;
- inv (temp, y);
- return mulin (x, temp);
- }
-
- Element &negin (Element &x) const
- {
- if (x == 0)
- return x;
- else
- return x = ModularBase<Element>::_modulus - x;
- }
-
- Element &invin (Element &x) const
- {
- return inv (x, x);
- }
-
- Element &axpyin (Element &r, const Element &a, const Element &x) const
- {
- r = ((uint64_t) r + (uint64_t) a * (uint64_t) x) % (uint64_t) ModularBase<Element>::_modulus;
- if ((int32_t) r < 0) r += ModularBase<Element>::_modulus;
- return r;
- }
-
- private:
-
- void init_two_64 ()
- {
- uint64_t two_64 = 2;
-
- for (int i = 0; i < 6; ++i)
- two_64 = (two_64 * two_64) % ModularBase<Element>::_modulus;
-
- _two_64 = two_64;
- }
-
- friend class FieldAXPY<Modular<uint32_t> >;
- friend class DotProductDomain<Modular<uint32_t> >;
- friend class MVProductDomain<Modular<uint32_t> >;
-
- Element _two_64;
-
- }; // class Modular<uint32_t>
-
- /*! Specialization of FieldAXPY for parameterized modular field */
-
- template <class _Element>
- class FieldAXPY<Modular<_Element> > {
- public:
-
- typedef _Element Element;
- typedef Modular<_Element> Field;
-
- FieldAXPY (const Field &F) :
- _F (F)
- { _y = 0; }
- FieldAXPY (const FieldAXPY<Modular<Element> > &faxpy) :
- _F (faxpy._F), _y (faxpy._y)
- {}
-
- FieldAXPY<Modular <Element> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- _y = faxpy._y;
- return *this;
- }
-
- inline Element& mulacc (const Element &a, const Element &x)
- {
- return accumulate(a * x);
- }
-
- inline Element& accumulate (const Element &t)
- {
- return _y+=t;
- }
-
- inline Element &get (Element &y) { _y %= _F._modulus; y = _y; return y;
- }
-
- inline FieldAXPY &assign (const Element y)
- {
- _y = y;
- return *this;
- }
-
- inline void reset() {
- _F.init(_y, 0);
- }
-
- private:
-
- Field _F;
- Element _y;
- };
-
- /*! Specialization of FieldAXPY for uint8_t modular field */
-
- template <>
- class FieldAXPY<Modular<uint8_t> > {
- public:
-
- typedef uint8_t Element;
- typedef Modular<uint8_t> Field;
-
- FieldAXPY (const Field &F) :
- _F (F), i (F._k)
- { _y = 0; }
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F), _y (0), i (faxpy._F._k)
- {}
-
- FieldAXPY<Modular<uint8_t> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- _y = faxpy._y;
- return *this;
- }
-
- inline uint64_t& mulacc (const Element &a, const Element &x)
- {
- uint32_t t = (uint32_t) a * (uint32_t) x;
-
- if (!i--) {
- i = _F._k;
- return _y = _y % (uint32_t) _F._modulus + t;
- }
- else
- return _y += t;
- }
-
- inline uint64_t& accumulate (const Element &t)
- {
-
- if (!i--) {
- i = _F._k;
- return _y = _y % (uint32_t) _F._modulus + t;
- }
- else
- return _y += t;
- }
-
- inline Element &get (Element &y) {
- _y %= (uint32_t) _F._modulus;
- if ((int32_t) _y < 0) _y += _F._modulus;
- y = (uint8_t) _y;
- i = _F._k;
- return y;
- }
-
- inline FieldAXPY &assign (const Element y)
- {
- _y = y;
- i = _F._k;
- return *this;
- }
-
- inline void reset() {
- _y = 0;
- }
-
- private:
-
- Field _F;
- uint64_t _y;
- int i;
- };
-
- /*! Specialization of FieldAXPY for uint16_t modular field */
- template <>
- class FieldAXPY<Modular<uint16_t> > {
- public:
-
- typedef uint16_t Element;
- typedef Modular<uint16_t> Field;
-
- FieldAXPY (const Field &F) :
- _F (F), i (F._k)
- { _y = 0; }
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F), _y (0), i (faxpy._F._k)
- {}
-
- FieldAXPY<Modular<uint16_t> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- _y = faxpy._y;
- return *this;
- }
-
- inline uint64_t& mulacc (const Element &a, const Element &x)
- {
- uint64_t t = (long long) a * (long long) x;
-
- if (!i--) {
- i = _F._k;
- return _y = _y % (uint64_t) _F._modulus + t;
- }
- else
- return _y += t;
- }
-
- inline uint64_t& accumulate (const Element &t)
- {
- if (!i--) {
- i = _F._k;
- return _y = _y % (uint64_t) _F._modulus + t;
- }
- else
- return _y += t;
- }
-
- inline Element &get (Element &y) {
- _y %= (uint64_t) _F._modulus;
- if ((int64_t) _y < 0) _y += _F._modulus;
- y = (uint16_t) _y;
- i = _F._k;
- return y;
- }
-
- inline FieldAXPY &assign (const Element y)
- {
- _y = y;
- i = _F._k;
- return *this;
- }
-
- inline void reset() {
- _y = 0;
- }
-
- private:
-
- Field _F;
- uint64_t _y;
- int i;
- };
-
- /*! Specialization of FieldAXPY for unsigned short modular field */
-
- template <>
- class FieldAXPY<Modular<uint32_t> > {
- public:
-
- typedef uint32_t Element;
- typedef Modular<uint32_t> Field;
-
- FieldAXPY (const Field &F) :
- _F (F), _y(0)
- { }
-
- FieldAXPY (const FieldAXPY &faxpy) :
- _F (faxpy._F), _y (0)
- {}
-
- FieldAXPY<Modular<uint32_t> > &operator = (const FieldAXPY &faxpy)
- {
- _F = faxpy._F;
- _y = faxpy._y;
- return *this;
- }
-
- inline uint64_t& mulacc (const Element &a, const Element &x)
- {
- uint64_t t = (uint64_t) a * (uint64_t) x;
- _y += t;
-
- if (_y < t)
- return _y += _F._two_64;
- else
- return _y;
- }
-
- inline uint64_t& accumulate (const Element &t)
- {
- _y += t;
-
- if (_y < t)
- return _y += _F._two_64;
- else
- return _y;
- }
-
- inline uint64_t& accumulate_special (const Element &t)
- {
- return _y += t;
- }
-
- inline Element &get (Element &y) {
- _y %= (uint64_t) _F._modulus;
- //if ((int64_t) _y < 0) _y += _F._modulus;
- return y = (uint32_t) _y;
- }
-
- inline FieldAXPY &assign (const Element y)
- {
- _y = y;
- return *this;
- }
-
- inline void reset() {
- _y = 0;
- }
-
- private:
-
- Field _F;
- uint64_t _y;
- };
-
- //! Specialization of DotProductDomain for unsigned short modular field
-
- template <>
- class DotProductDomain<Modular<uint8_t> > : private virtual VectorDomainBase<Modular<uint8_t> > {
- public:
-
- typedef uint8_t Element;
-
- DotProductDomain (const Modular<uint8_t> &F) :
- VectorDomainBase<Modular<uint8_t> > (F)
- {}
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const;
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const;
- };
-
- //! Specialization of DotProductDomain for unsigned short modular field
-
- template <>
- class DotProductDomain<Modular<uint16_t> > : private virtual VectorDomainBase<Modular<uint16_t> > {
- public:
-
- typedef uint16_t Element;
-
- DotProductDomain (const Modular<uint16_t> &F) :
- VectorDomainBase<Modular<uint16_t> > (F)
- {}
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const;
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const;
- };
-
- //! Specialization of DotProductDomain for uint32_t modular field
-
- template <>
- class DotProductDomain<Modular<uint32_t> > : private virtual VectorDomainBase<Modular<uint32_t> > {
- public:
-
- typedef uint32_t Element;
-
- DotProductDomain (const Modular<uint32_t> &F) :
- VectorDomainBase<Modular<uint32_t> > (F)
- {}
-
- protected:
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const;
-
- template <class Vector1, class Vector2>
- inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const;
- };
-
- //! Specialization of MVProductDomain for uint8_t modular field
-
- template <>
- class MVProductDomain<Modular<uint8_t> > {
- public:
-
- typedef uint8_t Element;
-
- protected:
- template <class Vector1, class Matrix, class Vector2>
- inline Vector1 &mulColDense
- (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
- {
- return mulColDenseSpecialized (VD, w, A, v, typename VectorTraits<typename Matrix::Column>::VectorCategory ());
- }
-
- private:
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const;
-
- mutable std::vector<uint32_t> _tmp;
- };
-
- //! Specialization of MVProductDomain for uint16_t modular field
-
- template <>
- class MVProductDomain<Modular<uint16_t> > {
- public:
-
- typedef uint16_t Element;
-
- protected:
- template <class Vector1, class Matrix, class Vector2>
- inline Vector1 &mulColDense
- (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
- {
- return mulColDenseSpecialized (VD, w, A, v, VectorTraits<typename Matrix::Column>::VectorCategory ());
- }
-
- private:
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const;
-
- mutable std::vector<uint64_t> _tmp;
- };
-
- //! Specialization of MVProductDomain for uint32_t modular field
-
- template <>
- class MVProductDomain<Modular<uint32_t> > {
- public:
-
- typedef uint32_t Element;
-
- protected:
- template <class Vector1, class Matrix, class Vector2>
- inline Vector1 &mulColDense
- (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v) const
- {
- return mulColDenseSpecialized (VD, w, A, v, typename VectorTraits<typename Matrix::Column>::VectorCategory ());
- }
-
- private:
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const;
- template <class Vector1, class Matrix, class Vector2>
- Vector1 &mulColDenseSpecialized
- (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const;
-
- mutable std::vector<uint64_t> _tmp;
- };
-
- template <>
- inline std::ostream& ModularBase<Integer>::write (std::ostream &os) const
- {
- return os << "GMP integers mod " << _modulus;
- }
-
- template <>
- inline integer& Modular<integer>::init (integer& x, const double& y) const
- {
- integer tmp = (integer)y % _modulus;
- if (tmp<0) tmp += _modulus;
- return x = tmp;
- }
-
-
-} // namespace LinBox
-
-#include "linbox/field/modular.inl"
-#include "linbox/randiter/modular.h"
-#include "linbox/field/modular-int32.h"
-#ifdef __LINBOX_HAVE_INT64
-#include "linbox/field/modular-int64.h"
-#endif
-#include "linbox/field/modular-short.h"
-#include "linbox/field/modular-byte.h"
-#include "linbox/field/modular-double.h"
-#include "linbox/field/modular-float.h"
-
-#endif // __LINBOX_field_modular_H
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
diff --git a/linbox/field/modular.inl b/linbox/field/modular.inl
deleted file mode 100644
index c2e923e..0000000
--- a/linbox/field/modular.inl
+++ /dev/null
@@ -1,741 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/modular.inl
- * Copyright (C) 2002 Bradford Hovinen
- * Copyright (C) 2002 Ahmet Duran
- * Copyright (C) 2002 B. David Saunders
- *
- * Written by Bradford Hovinen <hovinen at cis.udel.edu>,
- * Ahmet Duran <duran at cis.udel.edu>,
- * Dave Saunders <saunders at cis.udel.edu>
- *
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-#ifndef __LINBOX_field_modular_INL
-#define __LINBOX_field_modular_INL
-
-//Dan Roche 7-2-04
-#ifndef __LINBOX_MIN
-#define __LINBOX_MIN(a,b) ( (a) < (b) ? (a) : (b) )
-#endif
-
-#include <iostream>
-
-namespace LinBox {
-
-template <class Vector1, class Vector2>
-inline uint8_t &DotProductDomain<Modular<uint8_t> >::dotSpecializedDD
- (uint8_t &res, const Vector1 &v1, const Vector2 &v2) const
-{
- typename Vector1::const_iterator i = v1.begin ();
- typename Vector2::const_iterator j = v2.begin ();
-
- typename Vector1::const_iterator iterend = v1.begin () + v1.size() % _F._k;
-
- uint64_t y = 0;
-
- for (; i != iterend; ++i, ++j)
- y += (uint64_t) *i * (uint64_t) *j;
-
- y %= (uint64_t) _F._modulus;
-
- for (; iterend != v1.end (); j += _F._k) {
- typename Vector1::const_iterator iter_i = iterend;
- typename Vector2::const_iterator iter_j;
-
- iterend += _F._k;
-
- for (iter_j = j; iter_i != iterend; ++iter_i, ++iter_j)
- y += (uint64_t) *iter_i * (uint64_t) *j;
-
- y %= (uint64_t) _F._modulus;
- }
-
- return res = y;
-}
-
-template <class Vector1, class Vector2>
-inline uint8_t &DotProductDomain<Modular<uint8_t> >::dotSpecializedDSP
- (uint8_t &res, const Vector1 &v1, const Vector2 &v2) const
-{
- typename Vector1::first_type::const_iterator i_idx = v1.first.begin ();
- typename Vector1::second_type::const_iterator i_elt = v1.second.begin ();
-
- uint64_t y = 0;
-
- if (v1.first.size () < _F._k) {
- for (; i_idx != v1.first.end (); ++i_idx, ++i_elt)
- y += (uint64_t) *i_elt * (uint64_t) v2[*i_idx];
-
- return res = y % (uint64_t) _F._modulus;
- }
- else {
- typename Vector1::first_type::const_iterator iterend = v1.first.begin () + v1.first.size() % _F._k;
-
- for (; i_idx != iterend; ++i_idx, ++i_elt)
- y += (uint64_t) *i_elt * (uint64_t) v2[*i_idx];
-
- y %= (uint64_t) _F._modulus;
-
- while (iterend != v1.first.end ()) {
- typename Vector1::first_type::const_iterator iter_i_idx = iterend;
- typename Vector1::second_type::const_iterator iter_i_elt = i_elt;
-
- iterend += _F._k;
- i_elt += _F._k;
-
- for (; iter_i_idx != iterend; ++iter_i_idx, ++iter_i_elt)
- y += (uint64_t) *iter_i_elt * (uint64_t) v2[*iter_i_idx];
-
- y %= (uint64_t) _F._modulus;
- }
-
- return res = y;
- }
-}
-
-template <class Vector1, class Vector2>
-inline uint16_t &DotProductDomain<Modular<uint16_t> >::dotSpecializedDD
- (uint16_t &res, const Vector1 &v1, const Vector2 &v2) const
-{
- typename Vector1::const_iterator i = v1.begin ();
- typename Vector2::const_iterator j = v2.begin ();
-
- typename Vector1::const_iterator iterend = v1.begin () + v1.size() % _F._k;
-
- uint64_t y = 0;
-
- for (; i != iterend; ++i, ++j)
- y += (uint64_t) *i * (uint64_t) *j;
-
- y %= (uint64_t) _F._modulus;
-
- for (; iterend != v1.end (); j += _F._k) {
- typename Vector1::const_iterator iter_i = iterend;
- typename Vector2::const_iterator iter_j;
-
- iterend += _F._k;
-
- for (iter_j = j; iter_i != iterend; ++iter_i, ++iter_j)
- y += (uint64_t) *iter_i * (uint64_t) *j;
-
- y %= (uint64_t) _F._modulus;
- }
-
- return res = y;
-}
-
-template <class Vector1, class Vector2>
-inline uint16_t &DotProductDomain<Modular<uint16_t> >::dotSpecializedDSP
- (uint16_t &res, const Vector1 &v1, const Vector2 &v2) const
-{
- typename Vector1::first_type::const_iterator i_idx = v1.first.begin ();
- typename Vector1::second_type::const_iterator i_elt = v1.second.begin ();
-
- uint64_t y = 0;
-
- if (v1.first.size () < _F._k) {
- for (; i_idx != v1.first.end (); ++i_idx, ++i_elt)
- y += (uint64_t) *i_elt * (uint64_t) v2[*i_idx];
-
- return res = y % (uint64_t) _F._modulus;
- }
- else {
- typename Vector1::first_type::const_iterator iterend = v1.first.begin () + v1.first.size() % _F._k;
-
- for (; i_idx != iterend; ++i_idx, ++i_elt)
- y += (uint64_t) *i_elt * (uint64_t) v2[*i_idx];
-
- y %= (uint64_t) _F._modulus;
-
- while (iterend != v1.first.end ()) {
- typename Vector1::first_type::const_iterator iter_i_idx = iterend;
- typename Vector1::second_type::const_iterator iter_i_elt = i_elt;
-
- iterend += _F._k;
- i_elt += _F._k;
-
- for (; iter_i_idx != iterend; ++iter_i_idx, ++iter_i_elt)
- y += (uint64_t) *iter_i_elt * (uint64_t) v2[*iter_i_idx];
-
- y %= (uint64_t) _F._modulus;
- }
-
- return res = y;
- }
-}
-
-template <class Vector1, class Vector2>
-inline uint32_t &DotProductDomain<Modular<uint32_t> >::dotSpecializedDD
- (uint32_t &res, const Vector1 &v1, const Vector2 &v2) const
-{
- typename Vector1::const_iterator i;
- typename Vector2::const_iterator j;
-
- uint64_t y = 0;
- uint64_t t;
-
- for (i = v1.begin (), j = v2.begin (); i < v1.end (); ++i, ++j) {
- t = (uint64_t) *i * (uint64_t) *j;
- y += t;
-
- if (y < t)
- y += _F._two_64;
- }
-
- y %= (uint64_t) _F._modulus;
-
- return res = y;
-}
-
-template <class Vector1, class Vector2>
-inline uint32_t &DotProductDomain<Modular<uint32_t> >::dotSpecializedDSP
- (uint32_t &res, const Vector1 &v1, const Vector2 &v2) const
-{
- typename Vector1::first_type::const_iterator i_idx;
- typename Vector1::second_type::const_iterator i_elt;
-
- uint64_t y = 0;
- uint64_t t;
-
- for (i_idx = v1.first.begin (), i_elt = v1.second.begin (); i_idx != v1.first.end (); ++i_idx, ++i_elt) {
- t = (uint64_t) *i_elt * (uint64_t) v2[*i_idx];
- y += t;
-
- if (y < t)
- y += _F._two_64;
- }
-
- y %= (uint64_t) _F._modulus;
-
- return res = y;
-}
-
-template <class Vector1, class Matrix, class Vector2>
-Vector1 &MVProductDomain<Modular<uint8_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseVectorTag) const
-{
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j, j_end;
- typename Matrix::Column::const_iterator k;
- std::vector<uint32_t>::iterator l, l_end;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- l_end = _tmp.begin () + w.size ();
-
- do {
- j = v.begin ();
- j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
-
- for (; j != j_end; ++j, ++i)
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
- *l += *k * *j;
-
- j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
-
- for (l =_tmp.begin (); l != l_end; ++l)
- *l %= VD.field ()._modulus;
-
- } while (j_end != v.end ());
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l;
-
- return w;
-}
-
-template <class Vector1, class Matrix, class Vector2>
-Vector1 &MVProductDomain<Modular<uint8_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const
-{
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j, j_end;
- typename Matrix::Column::const_iterator k;
- std::vector<uint32_t>::iterator l, l_end;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- l_end = _tmp.begin () + w.size ();
-
- do {
- j = v.begin ();
- j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
-
- for (; j != j_end; ++j, ++i)
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
- _tmp[k->first] += k->second * *j;
-
- j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
-
- for (l =_tmp.begin (); l != l_end; ++l)
- *l %= VD.field ()._modulus;
-
- } while (j_end != v.end ());
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l;
-
- return w;
-}
-
-template <class Vector1, class Matrix, class Vector2>
-Vector1 &MVProductDomain<Modular<uint8_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const
-{
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j, j_end;
- typename Matrix::Column::const_iterator k;
- std::vector<uint32_t>::iterator l, l_end;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- l_end = _tmp.begin () + w.size ();
-
- do {
- j = v.begin ();
- j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
-
- for (; j != j_end; ++j, ++i)
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
- _tmp[k->first] += k->second * *j;
-
- j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
-
- for (l =_tmp.begin (); l != l_end; ++l)
- *l %= VD.field ()._modulus;
-
- } while (j_end != v.end ());
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l;
-
- return w;
-}
-
-template <class Vector1, class Matrix, class Vector2>
-Vector1 &MVProductDomain<Modular<uint8_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<uint8_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const
-{
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j, j_end;
- typename Matrix::Column::first_type::const_iterator k_idx;
- typename Matrix::Column::second_type::const_iterator k_elt;
- std::vector<uint32_t>::iterator l, l_end;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- l_end = _tmp.begin () + w.size ();
-
- do {
- j = v.begin ();
- j_end = j + __LINBOX_MIN (uint64_t (A.coldim ()), VD.field ()._k);
-
- for (; j != j_end; ++j, ++i)
- for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
- k_idx != i->first.end ();
- ++k_idx, ++k_elt, ++l)
- _tmp[*k_idx] += *k_elt * *j;
-
- j_end += __LINBOX_MIN (uint64_t (A.coldim () - (j_end - v.begin ())), VD.field ()._k);
-
- for (l =_tmp.begin (); l != l_end; ++l)
- *l %= VD.field ()._modulus;
-
- } while (j_end != v.end ());
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l;
-
- return w;
-}
-
-template <class Vector1, class Matrix, class Vector2>
-Vector1 &MVProductDomain<Modular<uint16_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseVectorTag) const
-{
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j = v.begin (), j_end;
- typename Matrix::Column::const_iterator k;
- // Dan Roche, 7-1-04
- // std::vector<uint32_t>::iterator l, l_end;
- std::vector<uint64_t>::iterator l, l_end;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- l_end = _tmp.begin () + w.size ();
-
- do {
- j = v.begin ();
- j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
-
- for (; j != j_end; ++j, ++i)
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
- *l += *k * *j;
-
- j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
-
- for (l =_tmp.begin (); l != l_end; ++l)
- *l %= VD.field ()._modulus;
-
- } while (j_end != v.end ());
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l;
-
- return w;
-}
-
-template <class Vector1, class Matrix, class Vector2>
-Vector1 &MVProductDomain<Modular<uint16_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const
-{
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j, j_end;
- typename Matrix::Column::const_iterator k;
- // Dan Roche, 7-1-04
- // std::vector<uint32_t>::iterator l, l_end;
- std::vector<uint64_t>::iterator l, l_end;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- l_end = _tmp.begin () + w.size ();
-
- do {
- j = v.begin ();
- j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
-
- for (; j != j_end; ++j, ++i)
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
- _tmp[k->first] += k->second * *j;
-
- j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
-
- for (l =_tmp.begin (); l != l_end; ++l)
- *l %= VD.field ()._modulus;
-
- } while (j_end != v.end ());
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l;
-
- return w;
-}
-
-template <class Vector1, class Matrix, class Vector2>
-Vector1 &MVProductDomain<Modular<uint16_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const
-{
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j, j_end;
- typename Matrix::Column::const_iterator k;
- // Dan Roche, 7-1-04
- // std::vector<uint32_t>::iterator l, l_end;
- std::vector<uint64_t>::iterator l, l_end;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- l_end = _tmp.begin () + w.size ();
-
- do {
- j = v.begin ();
- j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
-
- for (; j != j_end; ++j, ++i)
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l)
- _tmp[k->first] += k->second * *j;
-
- j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
-
- for (l =_tmp.begin (); l != l_end; ++l)
- *l %= VD.field ()._modulus;
-
- } while (j_end != v.end ());
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l;
-
- return w;
-}
-
-template <class Vector1, class Matrix, class Vector2>
-Vector1 &MVProductDomain<Modular<uint16_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<uint16_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const
-{
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j, j_end;
- typename Matrix::Column::first_type::const_iterator k_idx;
- typename Matrix::Column::second_type::const_iterator k_elt;
- // Dan Roche, 7-1-04
- // std::vector<uint32_t>::iterator l, l_end;
- std::vector<uint64_t>::iterator l, l_end;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- l_end = _tmp.begin () + w.size ();
-
- do {
- j = v.begin ();
- //Dan Roche, 7-2-04
- //j_end = j + __LINBOX_MIN (A->coldim (), VD.field ()._k);
- j_end = j + __LINBOX_MIN (A.coldim (), VD.field ()._k);
-
- for (; j != j_end; ++j, ++i)
- for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
- k_idx != i->first.end ();
- ++k_idx, ++k_elt, ++l)
- _tmp[*k_idx] += *k_elt * *j;
-
- //j_end += __LINBOX_MIN (A->coldim () - (j_end - v.begin ()), VD.field ()._k);
- j_end += __LINBOX_MIN (A.coldim () - (j_end - v.begin ()), VD.field ()._k);
-
- for (l =_tmp.begin (); l != l_end; ++l)
- *l %= VD.field ()._modulus;
-
- } while (j_end != v.end ());
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l;
-
- return w;
-}
-
-template <class Vector1, class Matrix, class Vector2>
-Vector1 &MVProductDomain<Modular<uint32_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::DenseVectorTag) const
-{
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i) {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
- t = ((uint64_t) *k) * ((uint64_t) *j);
-
- *l += t;
-
- if (*l < t)
- *l += VD.field ()._two_64;
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ()._modulus;
-
- return w;
-}
-
-template <class Vector1, class Matrix, class Vector2>
-Vector1 &MVProductDomain<Modular<uint32_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseSequenceVectorTag) const
-{
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i) {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
- t = ((uint64_t) k->second) * ((uint64_t) *j);
-
- _tmp[k->first] += t;
-
- if (_tmp[k->first] < t)
- _tmp[k->first] += VD.field ()._two_64;
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ()._modulus;
-
- return w;
-}
-
-template <class Vector1, class Matrix, class Vector2>
-Vector1 &MVProductDomain<Modular<uint32_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseAssociativeVectorTag) const
-{
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::const_iterator k;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i) {
- for (k = i->begin (), l = _tmp.begin (); k != i->end (); ++k, ++l) {
- t = ((uint64_t) k->second) * ((uint64_t) *j);
-
- _tmp[k->first] += t;
-
- if (_tmp[k->first] < t)
- _tmp[k->first] += VD.field ()._two_64;
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ()._modulus;
-
- return w;
-}
-
-template <class Vector1, class Matrix, class Vector2>
-Vector1 &MVProductDomain<Modular<uint32_t> >::mulColDenseSpecialized
- (const VectorDomain<Modular<uint32_t> > &VD, Vector1 &w, const Matrix &A, const Vector2 &v,
- VectorCategories::SparseParallelVectorTag) const
-{
- linbox_check (A.coldim () == v.size ());
- linbox_check (A.rowdim () == w.size ());
-
- typename Matrix::ConstColIterator i = A.colBegin ();
- typename Vector2::const_iterator j;
- typename Matrix::Column::first_type::const_iterator k_idx;
- typename Matrix::Column::second_type::const_iterator k_elt;
- std::vector<uint64_t>::iterator l;
-
- uint64_t t;
-
- if (_tmp.size () < w.size ())
- _tmp.resize (w.size ());
-
- std::fill (_tmp.begin (), _tmp.begin () + w.size (), 0);
-
- for (j = v.begin (); j != v.end (); ++j, ++i) {
- for (k_idx = i->first.begin (), k_elt = i->second.begin (), l = _tmp.begin ();
- k_idx != i->first.end ();
- ++k_idx, ++k_elt, ++l)
- {
- t = ((uint64_t) *k_elt) * ((uint64_t) *j);
-
- _tmp[*k_idx] += t;
-
- if (_tmp[*k_idx] < t)
- _tmp[*k_idx] += VD.field ()._two_64;
- }
- }
-
- typename Vector1::iterator w_j;
-
- for (w_j = w.begin (), l = _tmp.begin (); w_j != w.end (); ++w_j, ++l)
- *w_j = *l % VD.field ()._modulus;
-
- return w;
-}
-
-}
-
-#endif // __LINBOX_field_modular_INL
-
diff --git a/linbox/field/multimod-field.h b/linbox/field/multimod-field.h
index 601543c..7c0ff36 100644
--- a/linbox/field/multimod-field.h
+++ b/linbox/field/multimod-field.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/multimod-field.h
* Copyright (C) 2005 Pascal Giorgi
*
@@ -7,23 +5,43 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
-#ifndef __LINBOX_multimod_field_H
-#define __LINBOX_multimod_field_H
+#ifndef __LINBOX_field_multimod_field_H
+#define __LINBOX_field_multimod_field_H
#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
#include "linbox/integer.h"
+#include "linbox/field/modular.h"
+
#include "linbox/vector/vector-domain.h"
#include "linbox/field/field-interface.h"
#include "linbox/field/field-traits.h"
#include "linbox/util/field-axpy.h"
-#include "linbox/util/debug.h"
#include <cmath>
#include <vector>
@@ -75,7 +93,7 @@ namespace LinBox
{
_crt_modulo=1;
for (size_t i=0; i<_size; ++i){
- _fields[i] = Modular<double> (primes[i]);
+ _fields[i] .assign( Modular<double> (primes[i]) );
_crt_modulo *= primes[i];
}
double tmp;
@@ -94,7 +112,7 @@ namespace LinBox
{
_crt_modulo=1;
for (size_t i=0; i<_size; ++i){
- _fields[i] = Modular<double> (primes[i]);
+ _fields[i] .assign( Modular<double> (primes[i]) );
_crt_modulo *= primes[i];
}
double tmp;
@@ -419,11 +437,11 @@ namespace LinBox
typedef std::vector<double> Element;
DotProductDomain (const MultiModDouble &F) :
- VectorDomainBase<MultiModDouble > (F) //, _invmod(1./_F.modulus)
+ VectorDomainBase<MultiModDouble > (F) //, _invmod(1./_field.modulus)
{
for (size_t i=0; i<F.size();++i){
- //_bound[i]= (double) (1<<53 - (int) (_F.getModulo(i)*_F.getModulo(i))))
- _nmax[i] = (size_t)floor((double(1<<26)* double(1<<26)*2.)/ (_F.getModulo(i) * _F.getModulo(i)));
+ //_bound[i]= (double) (1<<53 - (int) (_field.getModulo(i)*_field.getModulo(i))))
+ _nmax[i] = (size_t)floor((double(1<<26)* double(1<<26)*2.)/ (_field.getModulo(i) * _field.getModulo(i)));
}
}
@@ -432,26 +450,26 @@ namespace LinBox
inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const
{
- for (size_t k=0;k<_F.size();++k){
+ for (size_t k=0;k<_field.size();++k){
double y = 0.;
double t = 0.;
if (v1.size() < _nmax[k]) {
for (size_t i = 0; i< v1.size();++i)
y += v1[i][k] * v2[i][k] ;
- y = fmod(y, _F.getModulo(k));
+ y = fmod(y, _field.getModulo(k));
}
else{
size_t i=0;
for (;i< v1.size()- _nmax[k] ;i=i+_nmax[k]){
for (size_t j=i;j<i+_nmax[k];++j)
y += v1[j][k] * v2[j][k];
- t+=fmod(y, _F.getModulo(k));
+ t+=fmod(y, _field.getModulo(k));
y=0.;
}
for (;i < v1.size();++i)
y += v1[i][k] * v2[i][k];
- t+=fmod(y, _F.getModulo(k));
- y = fmod(t, _F.getModulo(k));
+ t+=fmod(y, _field.getModulo(k));
+ y = fmod(t, _field.getModulo(k));
}
res[k]=y;
}
@@ -462,27 +480,27 @@ namespace LinBox
inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const
{
- for (size_t k=0;k<_F.size();++k){
+ for (size_t k=0;k<_field.size();++k){
double y = 0.;
double t =0.;
if (v1.first.size() < _nmax[k]) {
for (size_t i=0;i<v1.first.size();++i)
y+= v1.second[i] * v2[v1.first[i]];
- y = fmod(y, _F.getModulo(k));
+ y = fmod(y, _field.getModulo(k));
}
else {
size_t i=0;
for (;i< v1.first.size()- _nmax[k] ;i=i+_nmax[k]){
for (size_t j=i;j<i+_nmax[k];++j)
y += v1.second[j] * v2[v1.first[j]];
- t+=fmod(y, _F.getModulo(k));
+ t+=fmod(y, _field.getModulo(k));
y=0.;
}
for (;i < v1.first.size();++i)
y += v1.second[i] * v2[v1.first[i]];
- t+= fmod(y, _F.getModulo(k));
- y = fmod(t, _F.getModulo(k));
+ t+= fmod(y, _field.getModulo(k));
+ y = fmod(t, _field.getModulo(k));
}
}
return res;
@@ -495,3 +513,12 @@ namespace LinBox
#endif // __LINBOX_multimod_field_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/ntl-GF2E.h b/linbox/field/ntl-GF2E.h
deleted file mode 100644
index b77f873..0000000
--- a/linbox/field/ntl-GF2E.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/ntl-z_pE.h
- * Copyright (C) 2004 Pascal Giorgi
- *
- * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
- *
- * Modified by W. J. Turner <wjturner at acm.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __LINBOX_ntl_gf2e_H
-#define __LINBOX_ntl_gf2e_H
-
-
-#include <linbox/util/debug.h>
-#include <linbox/field/unparametric.h>
-#include <linbox/randiter/unparametric.h>
-#include <linbox/util/debug.h>
-#include <NTL/GF2XFactoring.h>
-#include <NTL/GF2E.h>
-#include <time.h>
-#include "linbox/linbox-config.h"
-#include <linbox/field/field-traits.h>
-
-namespace LinBox
-{
-
- template <class Ring>
- struct ClassifyRing;
-
- template <class Element>
- struct ClassifyRing<UnparametricRandIter<Element> >;
-
- template <>
- struct ClassifyRing<UnparametricRandIter<NTL::GF2E> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
-
- /// \ingroup field
- template<>
- class UnparametricRandIter<NTL::GF2E>
- {
- public:
- typedef NTL::GF2E Element;
- UnparametricRandIter<NTL::GF2E>(const UnparametricField<NTL::GF2E>& F =UnparametricField<NTL::GF2E>(),
- const size_t& size = 0,
- const size_t& seed = 0
- ) :
- _size(size), _seed(seed)
- {
- if(_seed == 0)
- NTL::SetSeed(NTL::to_ZZ(time(0)));
- else
- NTL::SetSeed(NTL::to_ZZ(_seed));
- }
-
- UnparametricRandIter<NTL::GF2E>(const UnparametricRandIter<NTL::GF2E>& R) :
- _size(R._size), _seed(R._seed)
-
- {
- if(_seed == 0)
- NTL::SetSeed(NTL::to_ZZ(time(0)));
- else
- NTL::SetSeed(NTL::to_ZZ(_seed));
- }
-
- Element& random (Element& x) const
- {
- NTL::random(x);
- return x;
- }
-
- protected:
- size_t _size;
- size_t _seed;
- };
-
-
-
- /*
- * Define a parameterized class to easily handle UnparametricField<NTL::GF2E> field
- */
-
- class NTL_GF2E : public UnparametricField<NTL::GF2E>
- {
- public:
- NTL_GF2E (const integer &p, const integer &k)
- {
- if(p != 2) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be 2");
- NTL::GF2X irredPoly = NTL::BuildSparseIrred_GF2X((long) k);
- NTL::GF2E::init(irredPoly);
- }
-
- }; // end o class NTL_GF2E
-
-
- /*
- * Specialization of UnparametricField<> for NTL::GF2E type
- */
- template<>
- // NTL::GF2E& UnparametricField<NTL::GF2E>::init (NTL::GF2E &x, const integer &y) const
- NTL::GF2E& Caster(NTL::GF2E &x, const integer &y)
- {
- x=NTL::to_GF2E(static_cast<long>(y));
- return x;
- }
- template<>
- // NTL::GF2E& UnparametricField<NTL::GF2E>::init (NTL::GF2E &x, const double &y) const
- NTL::GF2E& Caster(NTL::GF2E &x, const double &y)
- {
- x=NTL::to_GF2E(static_cast<long>(y));
- return x;
- }
-
-
- template<>
- // integer& UnparametricField<NTL::GF2E>::convert (integer& x, const NTL::GF2E &y) const {
- integer& Caster(integer& x, const NTL::GF2E &y)
- {
- NTL::GF2X poly = rep(y);
-
- long i;
- x = 0;
- for(i = deg(poly); i >= 0; --i) {
- x <<= 1;
- x += rep(coeff(poly, i));
- }
- return x;
- }
-
-
-
- template<>
- bool UnparametricField<NTL::GF2E>::isZero (const NTL::GF2E& a) const
- {
- return NTL::IsZero(a);
- }
-
- template<>
- bool UnparametricField<NTL::GF2E>::isOne (const NTL::GF2E& a) const
- {
- return NTL::IsOne(a);
- }
-
-
- template<>
- integer& UnparametricField<NTL::GF2E>::characteristic (integer &c) const
- {
- return c = 2;
- }
-
- template<>
- integer& UnparametricField<NTL::GF2E>::cardinality(integer& c) const
- {
- c=1;
- c<<= NTL::GF2E::degree();
- return c;
- }
-
-
- template<>
- NTL::GF2E& UnparametricField<NTL::GF2E>::inv(NTL::GF2E& x, const NTL::GF2E& y) const
- {
- x=NTL::to_GF2E(1)/y;
- return x;
- }
- template<>
- NTL::GF2E& UnparametricField<NTL::GF2E>::invin(NTL::GF2E& x) const
- {
- x=NTL::to_GF2E(1)/x;
- return x;
- }
-
-
- template<>
- std::istream& UnparametricField<NTL::GF2E>::read(std::istream& is, NTL::GF2E& x) const
- {
- long tmp;
- is>>tmp;
- x=NTL::to_GF2E(tmp);
- return is;
- }
-
-
-}
-
-#endif //__LINBOX_ntl_gf2e_H
-
diff --git a/linbox/field/ntl-RR.h b/linbox/field/ntl-RR.h
deleted file mode 100644
index 10df2a7..0000000
--- a/linbox/field/ntl-RR.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/ntl-RR.h
- * Copyright (C) 1999-2005 William J Turner,
- * 2001 Bradford Hovinen
- *
- * Written by W. J. Turner <wjturner at acm.org>,
- * Bradford Hovinen <hovinen at cis.udel.edu>
- *
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-#ifndef __LINBOX_field_ntl_rr_H
-#define __LINBOX_field_ntl_rr_H
-#include <NTL/tools.h>
-
-#include <NTL/RR.h>
-
-#include "linbox/field/unparametric.h"
-#include "linbox/linbox-config.h"
-#include <linbox/field/field-traits.h>
-
-// Namespace in which all LinBox library code resides
-namespace LinBox
-{
-
- template <class Ring>
- struct ClassifyRing;
-
- template<class Element>
- struct ClassifyRing<UnparametricField<Element> >;
-
- template<>
- struct ClassifyRing<UnparametricField<NTL::RR> >{
- typedef RingCategories::ModularTag categoryTag;
- };
-
- //class NTL_RR: public UnparametricField<NTL::RR>, public FieldInterface{};
- //typedef UnparametricField<NTL::RR> NTL_RR;
-
- /** @name class RR.
- \brief
- * Rational number field.
- * This field is provided as a convenience in a few places.
- * Use with caution because expression swell.
- *
- * This specialization allows the \ref UnparametricField template class to be
- * used to wrap NTL's RR class as a LinBox field.
- \ingroup field
- */
- //@{
-
-
- /** Initialization of field element from an integer.
- * Behaves like C++ allocator construct.
- * This function assumes the output field element x has already been
- * constructed, but that it is not already initialized.
- * For now, this is done by converting the integer type to a C++
- * long and then to the element type through the use of static cast and
- * NTL's to_RR function.
- * This, of course, assumes such static casts are possible.
- * This function should be changed in the future to avoid using long.
- * @return reference to field element.
- * @param x field element to contain output (reference returned).
- * @param y integer.
- */
- /*
- template <>
- NTL::RR& UnparametricField<NTL::RR>::init(NTL::RR& x, const integer& y) const
- { return x = NTL::to_RR(static_cast<const long&>(y)); }
- template <>
- NTL::RR& UnparametricField<NTL::RR>::init(NTL::RR& x, const double& y) const
- { return x = NTL::to_RR((long)(y)); }
- */
- template <>
- NTL::RR& Caster(NTL::RR& x, const integer& y)
- { return x = NTL::to_RR(static_cast<const long&>(y)); }
- template <>
- NTL::RR& Caster(NTL::RR& x, const double& y)
- { return x = NTL::to_RR((long)(y)); }
- template <>
- NTL::RR& Caster(NTL::RR& x, const int& y)
- { return x = NTL::to_RR((long)(y)); }
-
- /** Conversion of field element to an integer.
- * This function assumes the output field element x has already been
- * constructed, but that it is not already initialized.
- * For now, this is done by converting the element type to a C++
- * long and then to the integer type through the use of static cast and
- * NTL's to_long function.
- * This, of course, assumes such static casts are possible.
- * This function should be changed in the future to avoid using long.
- * @return reference to integer.
- * @param x reference to integer to contain output (reference returned).
- * @param y constant reference to field element.
- */
- /*
- template <>
- integer& UnparametricField<NTL::RR>::convert(integer& x, const NTL::RR& y) const
- { return x = static_cast<integer>(to_long(y)); }
- */
- template <>
- integer& Caster(integer& x, const NTL::RR& y)
- { return x = static_cast<integer>(to_long(y)); }
-
-
- /** Multiplicative Inverse.
- * x = 1 / y
- * This function assumes both field elements have already been
- * constructed and initialized.
- * @return reference to x.
- * @param x field element (reference returned).
- * @param y field element.
- */
- template <>
- NTL::RR& UnparametricField<NTL::RR>::inv(NTL::RR& x, const NTL::RR& y) const
- { return x = NTL::inv(y); }
-
- /** Zero equality.
- * Test if field element is equal to zero.
- * This function assumes the field element has already been
- * constructed and initialized.
- * In this specialization, NTL's IsZero function is called.
- * @return boolean true if equals zero, false if not.
- * @param x field element.
- */
- template <> bool UnparametricField<NTL::RR>::isZero(const NTL::RR& x) const
- { return static_cast<bool>(IsZero(x)); }
-
- /** One equality.
- * Test if field element is equal to one.
- * This function assumes the field element has already been
- * constructed and initialized.
- * In this specialization, NTL's IsOne function is called.
- * @return boolean true if equals one, false if not.
- * @param x field element.
- */
- template <> bool UnparametricField<NTL::RR>::isOne(const NTL::RR& x) const
- { return static_cast<bool>(IsOne(x)); }
-
- /** Inplace Multiplicative Inverse.
- * x = 1 / x
- * This function assumes both field elements have already been
- * constructed and initialized.
- * @return reference to x.
- * @param x field element (reference returned).
- */
- template <> NTL::RR& UnparametricField<NTL::RR>::invin(NTL::RR& x) const
- { return x = NTL::inv(x); }
-
- /** Print field.
- * @return output stream to which field is written.
- * @param os output stream to which field is written.
- */
- template <> std::ostream& UnparametricField<NTL::RR>::write(std::ostream& os) const
- { return os << "unparameterized field NTL::RR"; }
-
-
- /** Random field element creator.
- * This returns a random field element from the information supplied
- * at the creation of the generator.
- * This generator uses the built-in C++ random number generator instead of
- * NTL's random function because the NTL function does not allow as much
- * control over the sampling size as the generic LinBox template. This
- * specialization is included only to allow conversion to an NTL
- * object.
- * @return random field element
- */
- template <> NTL::RR& UnparametricRandIter<NTL::RR>::random(NTL::RR &elt) const
- {
- // Create new random elements
- if (_size == 0)
- elt = rand();
- else
- elt = static_cast<long>((double(rand())/RAND_MAX)*double(_size));
-
-#ifdef TRACE
- double temp = elt;
- cout << "random double = " << temp
- << " random NTL::RR = " << elt << endl;
-#endif // TRACE
-
- return elt;
-
- } // element& operator() (void)
-
-
-
- //@}
-} // namespace LinBox
-
-#endif // __LINBOX_field_ntl_rr_H
-
diff --git a/linbox/field/ntl-ZZ.h b/linbox/field/ntl-ZZ.h
deleted file mode 100644
index 1836e2b..0000000
--- a/linbox/field/ntl-ZZ.h
+++ /dev/null
@@ -1,753 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* Copyright (C) LinBox
- * Author: Zhendong Wan
- *
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/** @file field/ntl-ZZ.h
- * @ingroup field
- * @brief NO DOC
- */
-
-#ifndef __LINBOX_ntl_zz_H
-#define __LINBOX_ntl_zz_H
-
-#include <NTL/ZZ.h>
-#include <linbox/integer.h>
-#include <iostream>
-#include <linbox/util/debug.h>
-#include <linbox/randiter/ntl-ZZ.h>
-#include <linbox/field/field-traits.h>
-
-namespace LinBox
-{
-
- template <class Ring>
- struct ClassifyRing ;
-
- class NTL_ZZ;
-
- template <>
- struct ClassifyRing<NTL_ZZ>
- {
- typedef RingCategories::IntegerTag categoryTag;
- };
-
- template<class Field>
- class FieldAXPY;
-
- /// \brief the integer ring. \ingroup ring
- class NTL_ZZ {
-
- public:
- typedef NTL_ZZRandIter RandIter;
-
- typedef NTL::ZZ Element;
-
- NTL_ZZ(int p = 0, int exp = 1)
- {
- if( p != 0 ) throw PreconditionFailed(__func__,__FILE__,__LINE__,"modulus must be 0 (no modulus)");
- if( exp != 1 ) throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
- }
-
- inline integer& cardinality (integer& c) const
- {
- return c = -1;
- }
-
- inline integer& characteristic (integer& c)const
- {
- return c = 0;
- }
-
- std::ostream& write (std::ostream& out) const
- {
- return out << "NTL ZZ Ring";
- }
-
- std::istream& read (std::istream& in) const
- {
- return in;
- }
-
- /** @brief
- * Init x from y.
- */
- template<class Element2>
- inline Element& init (Element& x, const Element2& y) const
- {
-
- NTL::conv (x, y);
-
- return x;
- }
-
- /** @brief
- * Init from a NTL::ZZ
- */
- inline Element& init (Element& x, const Element& y) const
- {
-
- x = y;
-
- return x;
- }
-
- /** @brief
- * Init from an int64_t
- */
- inline Element& init (Element& x, const int64_t& y) const
- {
- bool isNeg = false;
- uint64_t t;
- if( y < 0 ) {
- isNeg = true;
- t = y * -1;
- }
- else t = y;
- init(x,t);
- if( isNeg ) x *= -1;
- return x;
- }
-
- /** @brief
- * Init from a uint64_t
- */
- inline Element& init (Element& x, const uint64_t& y) const
- {
- uint64_t shift = (uint64_t)1 << 32;
- uint32_t temp = y % shift;
- NTL::conv (x,temp);
- x <<= 32;
- temp = y / shift;
- x += temp;
- return x;
- }
-
- /** @brief
- * I don't know how to init from integer efficiently.
- */
- // c_str is safer than data, Z. W and BDS
- inline Element& init (Element& x, const integer& y) const
- {
-
- return x=NTL::to_ZZ((std::string(y)).c_str());
- }
-
- /** @brief
- * Convert y to an Element.
- */
- inline integer& convert (integer& x, const Element& y) const
- {
- bool neg=false;
- if (sign(y) <0)
- neg=true;
- long b = NumBytes(y);
- unsigned char* byteArray;
- byteArray = new unsigned char[(size_t)b ];
- BytesFromZZ(byteArray, y, b);
-
- integer base(256);
- x= integer(0);
-
- for(long i = b - 1; i >= 0; --i) {
- x *= base;
- x += integer(byteArray[i]);
- }
- delete [] byteArray;
- if (neg)
- x=-x;
- return x;
- }
-
- inline double& convert (double& x, const Element& y) const
- {
- return x=NTL::to_double(y);
- }
-
-
-
- /** @brief
- * x = y.
- */
- inline Element& assign (Element& x, const Element& y) const
- {
- return x = y;
- }
-
- /** @brief
- * Test if x == y
- */
- inline bool areEqual (const Element& x ,const Element& y) const
- {
- return x == y;
- }
-
- /** @brief
- * Test if x == 0
- */
- inline bool isZero (const Element& x) const
- {
- return NTL::IsZero (x);
- }
-
- /** @brief
- * Test if x == 1
- */
- inline bool isOne (const Element& x) const
- {
- return NTL::IsOne (x);
- }
-
- // arithmetic
-
- /** @brief
- * return x = y + z
- */
- inline Element& add (Element& x, const Element& y, const Element& z) const
- {
-
- NTL::add (x, y, z);
-
- return x;
- }
-
- /** @brief
- * return x = y - z
- */
- inline Element& sub (Element& x, const Element& y, const Element& z) const
- {
-
- NTL::sub (x, y, z);
-
- return x;
- }
-
- /** @brief
- * return x = y * z
- */
- template <class Int>
- inline Element& mul (Element& x, const Element& y, const Int& z) const
- {
-
- NTL::mul (x, y, z);
-
- return x;
- }
-
- /** @brief
- * If z divides y, return x = y / z,
- * otherwise, throw an exception
- */
- inline Element& div (Element& x, const Element& y, const Element& z) const
- {
-
- Element q, r;
-
- NTL::DivRem (q, r, y, z);
-
- if (NTL::IsZero (r))
- return x = q;
-
- else
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"Div: not dividable");
- }
-
- /** @brief
- * If y is a unit, return x = 1 / y,
- * otherwsie, throw an exception
- */
- inline Element& inv (Element& x, const Element& y) const
- {
-
- if ( NTL::IsOne (y)) return x = y;
-
- else if ( NTL::IsOne (-y)) return x = y;
-
- else
- throw PreconditionFailed(__func__,__FILE__,__LINE__,"Inv: Not invertible");
- }
-
- /** @brief
- * return x = -y;
- */
- inline Element& neg (Element& x, const Element& y) const
- {
-
- NTL::negate (x, y);
-
- return x;
- }
-
-
- /** @brief
- * return r = a x + y
- */
- template <class Int>
- inline Element& axpy (Element& r, const Element& a, const Int& x, const Element& y) const
- {
-
- NTL::mul (r, a, x);
-
- return r += y;
- }
-
-
- // inplace operator
-
- /** @brief
- * return x += y;
- */
- inline Element& addin (Element& x, const Element& y) const
- {
-
- return x += y;
- }
-
- /** @brief
- * return x -= y;
- */
- inline Element& subin (Element& x, const Element& y) const
- {
-
- return x -= y;
- }
-
- /** @brief
- * return x *= y;
- */
- template<class Int>
- inline Element& mulin (Element& x, const Int& y) const
- {
-
- return x *= y;
- }
-
- /** @brief
- * If y divides x, return x /= y,
- * otherwise throw an exception
- */
- inline Element& divin (Element& x, const Element& y) const
- {
-
- div (x, x, y);
-
- return x;
- }
-
- /** @brief
- * If x is a unit, x = 1 / x,
- * otherwise, throw an exception.
- */
- inline Element& invin (Element& x) {
-
- if (NTL::IsOne (x)) return x;
-
- else if (NTL::IsOne (-x)) return x;
-
- else throw PreconditionFailed(__func__,__FILE__,__LINE__,"Div: not dividable");
- }
-
- /** @brief
- * return x = -x;
- */
- inline Element& negin (Element& x) const
- {
-
- NTL::negate (x, x);
-
- return x;
- }
-
- /** @brief
- * return r += a x
- */
- template <class Int>
- inline Element& axpyin (Element& r, const Element& a, const Int& x) const
- {
-
- return r += a * x;
- }
-
-
- // IO
-
- /** @brief
- * out << y;
- */
- std::ostream& write(std::ostream& out,const Element& y) const
- {
-
- out << y;
-
- return out;
- }
-
-
- /** @brief
- * read x from istream in
- */
- std::istream& read(std::istream& in, Element& x) const
- {
-
- return in >> x;
- }
-
-
- /** some PIR function
- */
-
- /** @brief
- * Test if x is a unit.
- */
- inline bool isUnit (const Element& x) const
- {
-
- return (NTL::IsOne (x) || NTL::IsOne (-x));
- }
-
- /** @brief
- * return g = gcd (a, b)
- */
- inline Element& gcd (Element& g, const Element& a, const Element& b) const
- {
-
- NTL::GCD (g, a, b);
-
- return g;
- }
-
- /** @brief
- * return g = gcd (g, b)
- */
- inline Element& gcdin (Element& g, const Element& b) const
- {
-
- NTL::GCD (g, g, b);
-
- return g;
- }
-
- /** @brief
- * g = gcd(a, b) = a*s + b*t.
- * The coefficients s and t are defined according to the standard
- * Euclidean algorithm applied to |a| and |b|, with the signs then
- * adjusted according to the signs of a and b.
- */
- inline Element& xgcd (Element& g, Element& s, Element& t, const Element& a, const Element& b)const
- {
-
- NTL::XGCD (g,s,t,a,b);
-
- return g;
- }
-
- /** @brief
- * c = lcm (a, b)
- */
- inline Element& lcm (Element& c, const Element& a, const Element& b) const
- {
-
-
- if (NTL::IsZero (a) || NTL::IsZero (b)) return c = NTL::ZZ::zero();
-
- else {
- Element g;
-
- NTL::GCD (g, a, b);
-
- NTL::mul (c, a, b);
-
- c /= g;
-
- NTL::abs (c, c);
-
- return c;
- }
- }
-
- /** @brief
- * l = lcm (l, b)
- */
- inline Element& lcmin (Element& l, const Element& b) const
- {
-
- if (NTL::IsZero (l) || NTL::IsZero (b))
-
- return l = NTL::ZZ::zero();
-
- else {
-
- Element g;
-
- NTL::GCD (g, l, b);
-
- l *= b;
-
- l /= g;
-
- NTL::abs (l, l);
-
- return l;
- }
- }
-
-
-
-
-
- // some specail function
-
- /** @brief
- * x = floor ( sqrt(y)).
- */
-
- inline Element& sqrt (Element& x, const Element& y) const
- {
-
- NTL::SqrRoot(x,y);
-
- return x;
- }
-
- /** @brief
- * Requires 0 <= x < m, m > 2 * a_bound * b_bound,
- * a_bound >= 0, b_bound > 0
- * This routine either returns 0, leaving a and b unchanged,
- * or returns 1 and sets a and b so that
- * (1) a = b x (mod m),
- * (2) |a| <= a_bound, 0 < b <= b_bound, and
- * (3) gcd(m, b) = gcd(a, b).
- */
-
- inline long reconstructRational (Element& a, Element& b, const Element& x, const Element& m,
- const Element& a_bound, const Element& b_bound) const
- {
-
- return NTL::ReconstructRational(a,b,x,m,a_bound,b_bound);
- }
-
-
- /** @brief
- * q = floor (x/y);
- */
- inline Element& quo (Element& q, const Element& a, const Element& b) const
- {
-
- NTL::div (q, a, b);
-
- return q;
- }
-
- /** @brief
- * r = remindar of a / b
- */
- inline Element& rem (Element& r, const Element& a, const Element& b) const
- {
-
- NTL::rem (r, a, b);
-
- return r;
- }
-
- /** @brief
- * a = quotient (a, b)
- */
- inline Element& quoin (Element& a, const Element& b) const
- {
-
- return a /= b;
-
- }
-
- /** @brief
- * a = quotient (a, b)
- */
- inline Element& remin (Element& x, const Element& y) const
- {
- return x %= y;
- }
-
-
- /** @brief
- * q = [a/b], r = a - b*q
- * |r| < |b|, and if r != 0, sign(r) = sign(b)
- */
- inline void quoRem (Element& q, Element& r, const Element& a, const Element& b) const
- {
-
- NTL::DivRem(q,r,a,b);
- }
-
- /** @brief
- * Test if b | a.
- */
- inline bool isDivisor (const Element& a, const Element& b) const
- {
-
- if ( NTL::IsZero (a) ) return true;
-
- else if (NTL::IsZero (b)) return false;
-
- else {
- Element r;
-
- NTL::rem (r, a, b); //weird order changed, dpritcha 2004-07-19
-
- return NTL::IsZero (r);
- }
- }
-
- /** compare two elements, a and b
- * return 1, if a > b
- * return 0, if a = b;
- * return -1. if a < b
- */
- inline long compare (const Element& a, const Element& b) const
- {
-
- return NTL::compare (a, b);
- }
-
- /** return the absolute value
- * x = abs (a);
- */
- inline Element& abs (Element& x, const Element& a) const
- {
-
- NTL::abs (x, a);
-
- return x;
- }
-
-
- static inline int getMaxModulus()
- {
- return 0;
- } // no modulus
-
- };
-
-
- template<>
- class FieldAXPY<NTL_ZZ> {
- public:
- typedef NTL_ZZ Field;
- typedef Field::Element Element;
-
- /** Constructor.
- * A faxpy object if constructed from a Field and a field element.
- * Copies of this objects are stored in the faxpy object.
- * @param F field F in which arithmetic is done
- */
- FieldAXPY (const Field &F) :
- _F (F)
- {
- _y = 0;
- }
-
- /** Copy constructor.
- * @param faxpy
- */
- FieldAXPY (const FieldAXPY<Field> &faxpy) :
- _F (faxpy._F), _y (faxpy._y)
- {}
-
- /** Assignment operator
- * @param faxpy
- */
- FieldAXPY<Field> &operator = (const FieldAXPY &faxpy)
- {
- _y = faxpy._y;
- return *this;
- }
-
- /** Add a*x to y
- * y += a*x.
- * @param a constant reference to element a
- * @param x constant reference to element x
- * allow optimal multiplication, such as integer * int
- */
- template<class Element1>
- inline Element& mulacc (const Element &a, const Element1 &x)
- {
- return _y += a * x;
- }
-
- inline Element& accumulate (const Element &t)
- {
- return _y += t;
- }
-
- /** Add a*x to y
- * y += a*x.
- * @param a constant reference to element a
- * @param x constant reference to element x
- * allow optimal multiplication, such as integer * int
- */
- template<class Element1>
- inline Element& mulacc (const Element1 &a, const Element &x)
- {
- return _y += a * x;
- }
-
- inline Element& mulacc (const Element& a, const Element& b)
- {
-
- return _y += a * b;
- }
-
-
- /** Retrieve y
- *
- * Performs the delayed modding out if necessary
- */
- inline Element &get (Element &y) { y = _y; return y; }
-
- /** Assign method.
- * Stores new field element for arithmetic.
- * @return reference to self
- * @param y constant reference to element a
- */
- inline FieldAXPY &assign (const Element& y)
- {
- _y = y;
- return *this;
- }
-
- inline void reset()
- {
- _y = 0;
- }
-
- private:
-
- /// Field in which arithmetic is done
- /// Not sure why it must be mutable, but the compiler complains otherwise
- Field _F;
-
- /// Field element for arithmetic
- Element _y;
-
- };
-}
-
-#endif //__LINBOX_ntl_zz_H
-
diff --git a/linbox/field/ntl-ZZ_p.h b/linbox/field/ntl-ZZ_p.h
deleted file mode 100644
index 7cc2f11..0000000
--- a/linbox/field/ntl-ZZ_p.h
+++ /dev/null
@@ -1,386 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/ntl.h
- * Copyright (C) 1999-2005 William J Turner,
- * 2001 Bradford Hovinen
- *
- * Written by W. J. Turner <wjturner at acm.org>,
- * Bradford Hovinen <hovinen at cis.udel.edu>
- *
- * ------------------------------------
- *
- * See COPYING for license information.
- */
-
-/*! @file field/ntl-ZZ_p.h
- * @ingroup field
- * @ingroup NTL
- * @brief NO DOC
- */
-
-#ifndef __LINBOX_field_ntl_z_p_H
-#define __LINBOX_field_ntl_z_p_H
-
-#ifndef __LINBOX_HAVE_NTL
-#error "you need NTL here"
-#endif
-
-#include <sys/time.h>
-#include "linbox/linbox-config.h"
-
-#include "linbox/field/unparametric.h"
-#include "linbox/randiter/unparametric.h"
-#include "linbox/field/field-traits.h"
-
-#include <NTL/ZZ_p.h>
-
-
-// Namespace in which all LinBox library code resides
-namespace LinBox
-{
-
- template <class Ring>
- struct ClassifyRing;
-
-
- template <>
- struct ClassifyRing<UnparametricField<NTL::ZZ_p> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
- //@{
- /** @name NTL_ZZ_p
- * @brief Arbitrary precision integers modulus a positive integer.
-
- * While NTL allows any integer to serve as the modulus, only prime
- * moduli yield fields. Therefore, while arthmetic operations may be
- * valid for any modulus, only prime moduli are supported in this
- * implementation. The primality of the modulus will not be checked, so
- * it is the programmer's responsibility to supply a prime modulus.
- * These specializations allow the \ref UnparametricField template class to be
- * used to wrap NTL's <code>ZZ_p</code> class as a LinBox field.
- */
-
- template<>
- UnparametricField<NTL::ZZ_p>::UnparametricField(integer q, size_t e)
- {
- // no default - allow initialization of ZZ_p directly by user.
- //if(q==0) q=65521; //set default value to 65521
- if ( q > 0 )
- NTL::ZZ_p::init(NTL::to_ZZ((std::string(q)).data())); // it's an error if q not prime, e not 1
- //
- }
-
-
- /**\brief Initialization of field element from an integer.
- * Behaves like C++ allocator construct.
- * This function assumes the output field element x has already been
- * constructed, but that it is not already initialized.
- * This done by converting to a std::string : inefficient but correct.
- * @return reference to field element.
- * @param x field element to contain output (reference returned).
- * @param y integer.
- \ingroup field
- */
- template <>
- // NTL::ZZ_p& UnparametricField<NTL::ZZ_p>::init(NTL::ZZ_p& x, const integer& y) const
- NTL::ZZ_p& Caster(NTL::ZZ_p& x, const integer& y)
- {
- return x = NTL::to_ZZ_p( NTL::to_ZZ( (static_cast<const std::string>(y)).c_str() ) );
- }
- template <>
- // NTL::ZZ_p& UnparametricField<NTL::ZZ_p>::init(NTL::ZZ_p& x, const double& y) const
- NTL::ZZ_p& Caster(NTL::ZZ_p& x, const double& y)
- {
- return x = NTL::to_ZZ_p( NTL::to_ZZ((long)(y) ) );
- }
- template <>
- NTL::ZZ_p& Caster(NTL::ZZ_p& x, const int& y)
- {
- return x = NTL::to_ZZ_p( NTL::to_ZZ((long)(y) ) );
- }
- template <>
- NTL::ZZ_p& Caster(NTL::ZZ_p& x, const unsigned long& y)
- {
- return x = NTL::to_ZZ_p( NTL::to_ZZ((long)(y) ) );
- }
- template <>
- NTL::ZZ_p& Caster(NTL::ZZ_p& x, const unsigned int& y)
- {
- return x = NTL::to_ZZ_p( NTL::to_ZZ((long)(y) ) );
- }
-
-
-
-
- //@} doc of NTL_ZZ_p
-
- //@{
-
- /** Conversion of field element to an integer.
- * This function assumes the output field element x has already been
- * constructed, but that it is not already initialized.
- * This done by converting to a std::string : inefficient but correct.
- * @return reference to integer.
- * @param x reference to integer to contain output (reference returned).
- * @param y constant reference to field element.
- */
-
- template <>
- // integer& UnparametricField<NTL::ZZ_p>::convert(integer& x, const NTL::ZZ_p& y) const
- integer& Caster(integer& x, const NTL::ZZ_p& y)
- {
- NTL::ZZ iy = y._ZZ_p__rep;
-
- long nb = NTL::NumBytes(iy);
- unsigned char *txt;
- typedef unsigned char u_char;
- txt = new u_char[nb + 68];
- // if (!txt) Error("out of memory");
- BytesFromZZ(txt, iy, nb);
-
- x = 0;
- for (long i = 0; i < nb; i++) {
- x += LinBox::integer( (unsigned long)txt[i] )<<(8*i) ;
- }
- delete [] txt;
- return x;
- }
-
- //dpritcha
- template<>
- // double& UnparametricField<NTL::ZZ_p>::convert(double& x, const NTL::ZZ_p& y) const
- double& Caster(double& x, const NTL::ZZ_p& y)
- {
- x = NTL::to_double(NTL::rep(y));
- return x;
- }
-
- /** Cardinality.
- * Return integer representing cardinality of the field.
- * Returns the modulus of the field, which should be prime.
- * @return integer representing cardinality of the field
- */
- template <>
- integer& UnparametricField<NTL::ZZ_p>::cardinality(integer& c) const
- { return c = static_cast<integer>(to_long(NTL::ZZ_p::modulus())); }
-
- /** Characteristic.
- * Return integer representing characteristic of the field.
- * Returns the modulus of the field, which should be prime.
- * @return integer representing characteristic of the field.
- */
- template <>
- integer& UnparametricField<NTL::ZZ_p>::characteristic(integer& c) const
- //FIXME we shouldn't go thru long here as p may be larger than that.
- // check if NTL has cast ZZp to gmp integers.
- { return c = static_cast<integer>(to_long(NTL::ZZ_p::modulus())); }
-
- /** Multiplicative Inverse.
- * x = 1 / y
- * This function assumes both field elements have already been
- * constructed and initialized.
- * @return reference to x.
- * @param x field element (reference returned).
- * @param y field element.
- */
- template <> NTL::ZZ_p&
- UnparametricField<NTL::ZZ_p>::inv(NTL::ZZ_p& x, const NTL::ZZ_p& y) const
- { return x = NTL::inv(y); }
-
- /** Zero equality.
- * Test if field element is equal to zero.
- * This function assumes the field element has already been
- * constructed and initialized.
- * In this specialization, NTL's IsZero function is called.
- * @return boolean true if equals zero, false if not.
- * @param x field element.
- */
- template <> bool UnparametricField<NTL::ZZ_p>::isZero(const NTL::ZZ_p& x) const
- { return static_cast<bool>(IsZero(x)); }
-
- /** One equality.
- * Test if field element is equal to one.
- * This function assumes the field element has already been
- * constructed and initialized.
- * In this specialization, NTL's IsOne function is called.
- * @return boolean true if equals one, false if not.
- * @param x field element.
- */
- template <> bool UnparametricField<NTL::ZZ_p>::isOne(const NTL::ZZ_p& x) const
- { return static_cast<bool>(IsOne(x)); }
-
- /** Inplace Multiplicative Inverse.
- * x = 1 / x
- * This function assumes both field elements have already been
- * constructed and initialized.
- * @return reference to x.
- * @param x field element (reference returned).
- */
- template <> NTL::ZZ_p& UnparametricField<NTL::ZZ_p>::invin(NTL::ZZ_p& x) const
- { return x = NTL::inv(x); }
-
-
- /** Print field.
- * @return output stream to which field is written.
- * @param os output stream to which field is written.
- */
- template <> std::ostream& UnparametricField<NTL::ZZ_p>::write(std::ostream& os) const
- {
- return os << "unparameterized field NTL::ZZ_p with p = "
- << NTL::ZZ_p::modulus();
- }
-
- /// Constructor for random field element generator
- template <>
- UnparametricRandIter<NTL::ZZ_p>::UnparametricRandIter (const UnparametricField<NTL::ZZ_p>& F,
- const integer& size,
- const integer& seed) :
- _size(size), _seed(seed)
- {
- if (_seed == integer(0)) _seed = integer(time(NULL));
-
- integer cardinality;
- F.cardinality(cardinality);
- if (_size > cardinality)
- _size = 0;
-
-#ifdef TRACE
- std::cout << "created random generator with size " << _size
- << " and seed " << _seed << std::endl;
-#endif // TRACE
-
- // Seed random number generator
- NTL::SetSeed(NTL::to_ZZ(static_cast<long>(_seed)));
- }
-
-
- /// Random field element creator.
- template <> NTL::ZZ_p& UnparametricRandIter<NTL::ZZ_p>::random(NTL::ZZ_p& x) const
- // { return x = static_cast<long>((double(rand())/RAND_MAX)*double(_size)); }
- {
- if (_size == 0) {
- return x = NTL::random_ZZ_p();
- }
- else {
- return x = NTL::to_ZZ_p(NTL::RandomBnd(static_cast<long>(_size)));
- }
- }
-
-
- /**
- *
- * @brief Wrapper of zz_p from NTL.
- * Uses nice mod p via floating pt trick.
- *
- */
- struct NTL_ZZ_p: public UnparametricField<NTL::ZZ_p> {
-
- NTL_ZZ_p(integer p, size_t e = 1) :
- UnparametricField<NTL::ZZ_p>(p, e)
- {}
-
- NTL::ZZ_p& init(NTL::ZZ_p& x, const integer& y) const
- {
- return UnparametricField<NTL::ZZ_p>::init(x,y);
- }
-
- NTL::ZZ_p& init(NTL::ZZ_p& x, const double& y) const
- {
- double z = fmod(y,NTL::to_double(NTL::ZZ_p::modulus()));
- if (z > 0) z += 0.5;
- else z -= 0.5;
- return x = NTL::to_ZZ_p(static_cast<long>(z)); //rounds towards 0
- }
-
- /** Specialization for NTL::ZZ
- *
- * @return reference to field element.
- * @param x field element to contain output (reference returned)
- * @param y NTL::ZZ.
- */
- NTL::ZZ_p& init(NTL::ZZ_p& x, const NTL::ZZ& y) const
- {
- return x = NTL::to_ZZ_p( y );
- }
-
- /** Specialization for NTL::ZZ
- *
- * @return reference to NTL::ZZ
- * @param x NTL::ZZ to contain output (reference returned).
- * @param y constant reference to field element.
- */
- NTL::ZZ& convert(NTL::ZZ& x, const NTL::ZZ_p& y) const
- {
- return x = y._ZZ_p__rep;
- }
-
- /** Conversion of field element to an integer.
- * This function assumes the output field element x has already been
- * constructed, but that it is not already initialized.
- * This done by converting to a std::string : inefficient but correct.
- * @return reference to integer.
- * @param x reference to integer to contain output (reference returned).
- * @param y constant reference to field element.
- */
- integer& convert(integer& x, const NTL::ZZ_p& y) const
- {
- NTL::ZZ iy = y._ZZ_p__rep;
-
- long nb = NTL::NumBytes(iy);
- unsigned char *txt;
- typedef unsigned char u_char;
- txt = new u_char[nb + 68];
- // if (!txt) Error("out of memory");
- BytesFromZZ(txt, iy, nb);
-
- x = 0;
- for (long i = 0; i < nb; i++) {
- x += LinBox::integer( (unsigned long)txt[i] )<<(8*i) ;
- }
- delete [] txt;
- return x;
- };
-
- double& convert(double& x, const NTL::ZZ_p& y) const
- {
- x = NTL::to_double(NTL::rep(y));
- return x;
- }
-
- template <class ANY> //dpritcha--FIX
- NTL::ZZ_p& init(NTL::ZZ_p& x, const ANY& y) const
- { return x = NTL::to_ZZ_p((long)(y)); }
-
- template <class ANY>
- ANY& convert(ANY& x, const NTL::ZZ_p& y) const
- { return x = (ANY)(rep(y)); }
-
- static inline integer getMaxModulus()
- { return integer( -1 ); }
-
- NTL::ZZ_p& pow( NTL::ZZ_p& res, const NTL::ZZ_p& x, long exp ) const
- {
- NTL::power( res, x, exp );
- return res;
- }
-
- NTL::ZZ_p& powin( NTL::ZZ_p& x, long exp ) const
- {
- return x = NTL::power(x,exp);
- }
-
- };
-
- template <>
- struct ClassifyRing<NTL_ZZ_p> {
- typedef RingCategories::ModularTag categoryTag;
- };
-
-
-
-
-} // namespace LinBox
-
-#endif // __LINBOX_field_ntl_zz_p_H
-
diff --git a/linbox/field/ntl-ZZ_pE.h b/linbox/field/ntl-ZZ_pE.h
deleted file mode 100644
index 5317d8b..0000000
--- a/linbox/field/ntl-ZZ_pE.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* Copyright (C) LinBox
- *
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __LINBOX_field_ntl_zz_pe_H
-#define __LINBOX_field_ntl_zz_pe_H
-
-#include <linbox/field/unparametric.h>
-#include <linbox/randiter/unparametric.h>
-#include <NTL/ZZ_pXFactoring.h>
-#include <NTL/ZZ_pE.h>
-#include <NTL/ZZ.h>
-#include <time.h>
-#include "linbox/linbox-config.h"
-#include <linbox/field/field-traits.h>
-
-#ifdef __LINBOX_XMLENABLED
-
-#include "linbox/util/xml/linbox-reader.h"
-#include "linbox/util/xml/linbox-writer.h"
-
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#endif //__LINBOX_XMLENABLED
-
-namespace LinBox
-{
-
- template <class Ring>
- struct ClassifyRing;
-
- template<>
- struct ClassifyRing<UnparametricRandIter<NTL::ZZ_pE> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
- template<>
- class UnparametricRandIter<NTL::ZZ_pE>
- {
- public:
- typedef NTL::ZZ_pE Element;
- UnparametricRandIter<NTL::ZZ_pE>(const UnparametricField<NTL::ZZ_pE>& F =UnparametricField<NTL::ZZ_pE>(),
- const size_t& size = 0,
- const size_t& seed = 0
- ) :
- _size(size), _seed(seed)
- {
- if(_seed == 0)
- NTL::SetSeed(NTL::to_ZZ(time(0)));
- else
- NTL::SetSeed(NTL::to_ZZ(_seed));
- }
-
-#ifdef __LINBOX_XMLENABLED
- UnparametricRandIter(LinBox::Reader &R)
- {
- if(!R.expectTagName("randiter")) return;
- if(!R.expectAttributeNum("seed", _seed) || !R.expectAttributeNum("size", _size)) return;
-
- if(_seed == 0) _seed = time(NULL);
-
- NTL::SetSeed(NTL::to_ZZ(_seed));
- }
-#endif
-
-
- UnparametricRandIter<NTL::ZZ_pE>(const UnparametricRandIter<NTL::ZZ_pE>& R) :
- _size(R._size), _seed(R._seed)
-
- {
- if(_seed == 0)
- NTL::SetSeed(NTL::to_ZZ(time(0)));
- else
- NTL::SetSeed(NTL::to_ZZ(_seed));
- }
- Element& random (Element& x) const
- {
- NTL::random(x);
- return x;
- }
-
- protected:
- size_t _size;
- size_t _seed;
- };
-}
-
-namespace LinBox
-{
-
- /*
- * Define a parameterized class to handle easily UnparametricField<NTL::ZZ_pE> field
- */
- class NTL_ZZ_pE : public UnparametricField<NTL::ZZ_pE> {
- public:
- NTL_ZZ_pE (const integer &p, const integer &k)
- {
-
- NTL::ZZ_p::init(NTL::to_ZZ(std::string(p).data()));
- NTL::ZZ_pX irredPoly = NTL::BuildIrred_ZZ_pX ((long) k);
- NTL::ZZ_pE::init(irredPoly);
- }
-
- }; // end o class NTL_ZZ_pE
-
-
-
-
-
- template<>
- // NTL::ZZ_pE& UnparametricField<NTL::ZZ_pE>::init (NTL::ZZ_pE &x, const integer &y) const
- NTL::ZZ_pE& Caster(NTL::ZZ_pE &x, const integer &y)
- {
- x=NTL::to_ZZ_pE(static_cast<long>(y));
- return x;
- }
- template<>
- // NTL::ZZ_pE& UnparametricField<NTL::ZZ_pE>::init (NTL::ZZ_pE &x, const double &y) const
- NTL::ZZ_pE& Caster(NTL::ZZ_pE &x, const double &y)
- {
- x=NTL::to_ZZ_pE(static_cast<long>(y));
- return x;
- }
-
- template<>
- bool UnparametricField<NTL::ZZ_pE>::isZero (const NTL::ZZ_pE& a) const
- {
- return NTL::IsZero(a);
- }
-
- template<>
- bool UnparametricField<NTL::ZZ_pE>::isOne (const NTL::ZZ_pE& a) const
- {
- return NTL::IsOne(a);
- }
-
- // Rich Seagraves, 7-15-03
- // On the orders of Dr Saunders, I'm re-writing init & convert so that
- // they convert a ZZpE into a padic number, ie a0 + a1x + a2x^2 +... ->
- // a0 + a1*p + a2*p^2 + ...
- //
- template<>
- // integer& UnparametricField<NTL::ZZ_pE>::convert(integer& c, const NTL::ZZ_pE& e) const
- integer& Caster(integer& c, const NTL::ZZ_pE& e)
- {
- NTL::ZZ_pX poly = rep(e);
- //Integer base = _p;
- Integer base = static_cast<integer>(to_long(NTL::ZZ_p::modulus()));
- long i;
-
- c = 0;
- for(i = deg(poly); i >= 0; --i) {
- c *= base;
- c += NTL::to_long(rep(coeff(poly, i)));
- }
-
- return c;
- }
-
- template<>
- integer& UnparametricField<NTL::ZZ_pE>::characteristic (integer &c) const
- {
- return c=static_cast<integer>(to_long(NTL::ZZ_p::modulus()));
- //NTL::ZZ_p::modulus();
- }
-
- template<>
- integer& UnparametricField<NTL::ZZ_pE>::cardinality(integer& c) const
- {
- c=static_cast<integer>(to_long(NTL::ZZ_p::modulus()));
- c=pow(c,NTL::ZZ_pE::degree());
- return c;
- }
- template<>
- NTL::ZZ_pE& UnparametricField<NTL::ZZ_pE>::inv(NTL::ZZ_pE& x, const NTL::ZZ_pE& y) const
- {
- x=NTL::to_ZZ_pE(1)/y;
- return x;
- }
- template<>
- NTL::ZZ_pE& UnparametricField<NTL::ZZ_pE>::invin(NTL::ZZ_pE& x) const
- {
- x=NTL::to_ZZ_pE(1)/x;
- return x;
- }
-
- template<>
- std::istream& UnparametricField<NTL::ZZ_pE>::read(std::istream& is, NTL::ZZ_pE& x) const
- {
- long tmp;
- is>>tmp;
- x=NTL::to_ZZ_pE(tmp);
- return is;
- }
-
-
-
-#ifdef __LINBOX_XMLENABLED
-
- template <>
- bool UnparametricField<NTL::ZZ_pE>::toTag(LinBox::Writer &W) const
- {
- std::string s;
- NTL::ZZ_pX poly = NTL::ZZ_pE::modulus();
- long i;
-
- W.setTagName("field");
- W.setAttribute("implDetail", "ntl-ZZpE");
- W.setAttribute("cardinality", LinBox::Writer::numToString(s, _card));
-
- W.addTagChild();
- W.setTagName("finite");
-
- W.addTagChild();
- W.setTagName("characteristic");
- W.addNum(_p);
- W.upToParent();
-
- W.addTagChild();
- W.setTagName("extension");
- W.addNum(deg(poly) + 1);
- W.upToParent();
-
- W.addTagChild();
- W.setTagName("polynomial");
-
- for(i = 0; i <= deg(poly); ++i) {
- W.addNum(coeff(poly, i));
- }
- W.upToParent();
- W.upToParent();
- W.upToParent();
-
- return true;
- }
-
- template <>
- std::ostream &UnparametricField<NTL::ZZ_pE>::write(std::ostream &os) const
- {
- LinBox::Writer W;
- if( toTag(W) )
- W.write(os);
-
- return os;
- }
-
-
- // Elemnt Reading & writing functions
- // BIG NOTE: It was decided that for extension fields, the elements
- // would be represented using a single number that has the following
- // property: for an element e in ZZp[x], with e = a0 + a1x + a2x^2 + ...,
- // represent e as "<cn>n</cn>" where n = a0 + a1 * p + a2 * p^2 + ...
- //
-
- template <>
- bool UnparametricField<NTL::ZZ_pE>::toTag(LinBox::Writer &W, const Element &e) const
- {
- NTL::ZZ_pX poly = rep(e);
- NTL::ZZ accum, base = NTL::ZZ_p::modulus();
- long i;
- std::string s;
-
- accum = 0;
- for(i = deg(poly); i >= 0; --i) {
- accum *= base;
- accum += rep(coeff(poly, i));
- }
-
-
- W.setTagName("cn");
- W.addDataChild(LinBox::Writer::numToString(s, accum));
-
- return true;
- }
-
- template <>
- std::ostream &UnparametricField<NTL::ZZ_pE>::write(std::ostream &os, const Element &e) const
- {
-
- LinBox::Writer W;
- if( toTag(W, e))
- W.write(os);
-
- return os;
- }
-
-
-
- template <>
- bool UnparametricField<NTL::ZZ_pE>::fromTag(LinBox::Reader &R, Element &e) const
- {
- NTL::ZZ total, base = NTL::ZZ_p::modulus(), rem;
- std::stringstream ss;
-
- if(!R.expectTagName("cn") || !R.expectChildTextNum(total))
- return false;
-
- ss << "[";
- while(total > 0) {
- rem = total % base;
- total /= base;
- ss << rem;
- if(total > 0) ss << " ";
- }
-
- ss << "]";
-
- ss >> e; // use the extraction stream operator
-
- return true;
- }
-
- template <>
- std::istream &UnparametricField<NTL::ZZ_pE>::read(std::istream &is, Element &e) const
- {
- LinBox::Reader R(is);
- if( !fromTag(R, e)) {
- is.setstate(std::istream::failbit);
- if(!R.initalized()) {
- is.setstate(std::istream::badbit);
- }
- }
-
- return is;
- }
-
-
-#endif
-
-
-
-
-
-}
-
-#endif //__LINBOX_field_ntl_zz_pe_H
diff --git a/linbox/field/ntl-ZZ_pX.h b/linbox/field/ntl-ZZ_pX.h
deleted file mode 100644
index ccb30df..0000000
--- a/linbox/field/ntl-ZZ_pX.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* Copyright (C) 2005 LinBox
- * written by Daniel Roche, August 2005
- *
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __LINBOX_field_ntl_zz_px_H
-#define __LINBOX_field_ntl_zz_px_H
-
-#include <linbox/field/unparametric.h>
-#include <linbox/field/ntl-ZZ_p.h>
-#include <linbox/integer.h>
-#include <vector>
-#include <NTL/ZZ_pX.h>
-
-namespace LinBox
-{ // namespace in which all LinBox code resides
-
- /** Ring (in fact, a unique factorization domain) of polynomial with
- * coefficients in class NTL_ZZ_p (integers mod a wordsize prime).
- * All the same functions as any other ring, with the addition of:
- * Coeff (type), CoeffField (type), getCoeffField, setCoeff, getCoeff,
- * leadCoeff, deg
- */
- class NTL_ZZ_pX :public UnparametricField<NTL::ZZ_pX> {
- public:
- typedef NTL_ZZ_p CoeffField;
- typedef NTL::ZZ_p Coeff;
- typedef NTL::ZZ_pX Element;
-
- /** Standard LinBox field constructor. The paramters here
- * (prime, exponent) are only used to initialize the coefficient field.
- */
- NTL_ZZ_pX( const integer& p, size_t e = 1 ) :
- UnparametricField<NTL::ZZ_pX>(p, e), _CField(p,e)
- {}
-
- /** Constructor from a coefficient field */
- NTL_ZZ_pX( CoeffField cf ) :
- _CField(cf)
- {}
-
- /** Initialize p to the constant y (p = y*x^0) */
- template <class ANY>
- Element& init( Element& p, const ANY& y ) const
- {
- Coeff temp;
- _CField.init( temp, y );
- return p = temp;
- }
-
- /** Initialize p to the constant y (p = y*x^0) */
- Element& init( Element& p, const Coeff& y ) const
- {
- return p = y;
- }
-
- /** Initialize p from a vector of coefficients.
- * The vector should be ordered the same way NTL does it: the front
- * of the vector corresponds to the trailing coefficients, and the back
- * of the vector corresponds to the leading coefficients. That is,
- * v[i] = coefficient of x^i.
- */
- template <class ANY>
- Element& init( Element& p, const std::vector<ANY>& v ) const
- {
- p = 0;
- Coeff temp;
- for( long i = 0; i < (long)v.size(); ++i ) {
- _CField.init( temp, v[ (size_t) i ] );
- if( !_CField.isZero(temp) )
- NTL::SetCoeff( p, i, temp );
- }
- return p;
- }
-
- /** Initialize p from a vector of coefficients.
- * The vector should be ordered the same way NTL does it: the front
- * of the vector corresponds to the trailing coefficients, and the back
- * of the vector corresponds to the leading coefficients. That is,
- * v[i] = coefficient of x^i.
- */
- Element& init( Element& p, const std::vector<Coeff>& v ) const
- {
- p = 0;
- for( long i = 0; i < (long)v.size(); ++i )
- NTL::SetCoeff( p, i, v[ (size_t) i ] );
- return p;
- }
-
- /** Convert p to a vector of coefficients.
- * The vector will be ordered the same way NTL does it: the front
- * of the vector corresponds to the trailing coefficients, and the back
- * of the vector corresponds to the leading coefficients. That is,
- * v[i] = coefficient of x^i.
- */
- template< class ANY >
- std::vector<ANY>& convert( std::vector<ANY>& v, const Element& p ) const
- {
- v.clear();
- ANY temp;
- for( long i = 0; i <= this->deg(p); ++i ) {
- _CField.convert( temp, NTL::coeff( p, i ) );
- v.push_back( temp );
- }
- return v;
- }
-
- /** Convert p to a vector of coefficients.
- * The vector will be ordered the same way NTL does it: the front
- * of the vector corresponds to the trailing coefficients, and the back
- * of the vector corresponds to the leading coefficients. That is,
- * v[i] = coefficient of x^i.
- */
- std::vector<Coeff>& convert( std::vector<Coeff>& v, const Element& p )
- const
- {
- v.clear();
- for( long i = 0; i <= (long)this->deg(p); ++i )
- v.push_back( NTL::coeff(p,i) );
- return v;
- }
-
- /** Test if an element equals zero */
- bool isZero( const Element& x ) const
- {
- return ( (this->deg(x) == 0) &&
- ( _CField.isZero( NTL::ConstTerm(x) ) ) );
- }
-
- /** Test if an element equals one */
- bool isOne( const Element& x ) const
- {
- return ( (this->deg(x) == 0) &&
- ( _CField.isOne( NTL::ConstTerm(x) ) ) );
- }
-
- /** The LinBox field for coefficients */
- const CoeffField& getCoeffField() const
- { return _CField; }
-
- /** Get the degree of a polynomial
- * Unlike NTL, deg(0)=0.
- */
- size_t deg( const Element& p ) const
- {
- long temp = NTL::deg(p);
- if( temp == -1 ) return 0;
- else return static_cast<size_t>(temp);
- }
-
- /** r will be set to the reverse of p. */
- Element& rev( Element& r, const Element& p ) {
- NTL::reverse(r,p);
- return r;
- }
-
- /** r is itself reversed. */
- Element& revin( Element& r ) {
- return r = NTL::reverse(r);
- }
-
- /** Get the leading coefficient of this polynomial. */
- Coeff& leadCoeff( Coeff& c, const Element& p ) const
- {
- c = NTL::LeadCoeff(p);
- return c;
- }
-
- /** Get the coefficient of x^i in a given polynomial */
- Coeff& getCoeff( Coeff& c, const Element& p, size_t i ) const
- {
- c = NTL::coeff( p, (long)i );
- return c;
- }
-
- /** Set the coefficient of x^i in a given polynomial */
- Element& setCoeff( Element& p, size_t i, const Coeff& c ) const
- {
- NTL::SetCoeff(p,(long)i,c);
- return p;
- }
-
- /** Get the quotient of two polynomials */
- Element& quo( Element& res, const Element& a, const Element& b ) const
- {
- NTL::div(res,a,b);
- return res;
- }
-
- /** a = quotient of a, b */
- Element& quoin( Element& a, const Element& b ) const
- {
- return a /= b;
- }
-
- /** Get the remainder under polynomial division */
- Element& rem( Element& res, const Element& a, const Element& b ) const
- {
- NTL::rem(res,a,b);
- return res;
- }
-
- /** a = remainder of a,b */
- Element& remin( Element& a, const Element& b ) const
- {
- return a %= b;
- }
-
- /** Get the quotient and remainder under polynomial division */
- void quorem( Element& q, Element& r,
- const Element& a, const Element& b ) const
- {
- NTL::DivRem(q,r,a,b);
- }
-
- /** Get characteristic of the field - same as characteristic of
- * coefficient field. */
- integer& characteristic( integer& c ) const
- { return _CField.characteristic(c); }
-
- /** Get the cardinality of the field. Since the cardinality is
- * infinite, by convention we return -1.
- */
- integer& cardinality( integer& c ) const
- { return c = static_cast<integer>(-1); }
-
- static inline integer getMaxModulus()
- { return CoeffField::getMaxModulus(); }
-
- private:
- /** Conversion to scalar types doesn't make sense and should not be
- * used. Use getCoeff or leadCoeff to get the scalar values of
- * specific coefficients, and then convert them using coeffField()
- * if needed.
- */
- template< class ANY >
- ANY& convert( ANY& x, const Element& y ) const
- { return x; }
-
- CoeffField _CField;
- }; // end of class NTL_ZZ_pX
-
- /** Write a description of the field */
- // Oustide of class definition so write(ostream&,const Element&) from
- // UnparametricField still works.
- template<>
- std::ostream& UnparametricField<NTL::ZZ_pX>::write( std::ostream& os ) const
- {
- return os << "Polynomial ring using NTL::ZZ_pX";
- }
-
-
-} // end of namespace LinBox
-
-#endif // __LINBOX_field_ntl_zz_px_H
-
diff --git a/linbox/field/ntl-lzz_p.h b/linbox/field/ntl-lzz_p.h
deleted file mode 100644
index 3a385fc..0000000
--- a/linbox/field/ntl-lzz_p.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/ntl-lzz_p.h
- * Copyright (C) 1999-2005 W. J. Turner,
- * 2001 Bradford Hovinen
- * Copyright (C) LinBox
- *
- * Written by W. J. Turner <wjturner at acm.org>,
- * Bradford Hovinen <hovinen at cis.udel.edu>
- *
- * see COPYING for license information
- *
- */
-
-#ifndef __LINBOX_field_ntl_lzz_p_H
-#define __LINBOX_field_ntl_lzz_p_H
-
-#include <NTL/lzz_p.h>
-#include <NTL/ZZ.h>
-
-#include <time.h>
-#include "linbox/field/unparametric.h"
-#include "linbox/randiter/unparametric.h"
-#include "linbox/linbox-config.h"
-#include <linbox/field/field-traits.h>
-#include <linbox/integer.h>
-
-// Namespace in which all LinBox library code resides
-namespace LinBox
-{
-
- template <class Ring>
- struct ClassifyRing;
-
- class NTL_zz_p;
-
- template<>
- struct ClassifyRing<NTL_zz_p> {
- typedef RingCategories::ModularTag categoryTag;
- };
-
- /*
- integer& FieldTraits<NTL_zz_p>::maxExponent( integer& i )
- { return i = integer( "4294967295" ); } // 2^32 - 1
- */
-
- template<>
- UnparametricField<NTL::zz_p>::UnparametricField(integer q, size_t e)
- {
- if(q==0) q=65521;//set default value to 65521
- NTL::zz_p::init(q); // it's an error if q not prime, e not 1
- }
-
- /** Initialization of field element from an integer.
- * This Uses NTL's <code>to_zz_p</code> function.
- *
- * @return reference to field element.
- * @param x field element to contain output (reference returned).
- * @param y integer.
- */
-#if 0
- template <>
- NTL::zz_p& UnparametricField<NTL::zz_p>::init(NTL::zz_p& x, const integer& y) const
- { return x = NTL::to_zz_p(y%NTL::zz_p::modulus()); }
- template <>
- NTL::zz_p& UnparametricField<NTL::zz_p>::init(NTL::zz_p& x, const double& y) const
- { return x = NTL::to_zz_p((long)(y)%NTL::zz_p::modulus()); }
-#endif
- template<>
- NTL::zz_p& Caster(NTL::zz_p& x, const integer& y)
- { return x = NTL::to_zz_p(y%NTL::zz_p::modulus()); }
- template <>
- NTL::zz_p& Caster(NTL::zz_p& x, const double& y)
- { return x = NTL::to_zz_p((long)(y)%NTL::zz_p::modulus()); }
-
- /** Conversion of field element to an integer.
- * This function assumes the output field element x has already been
- * constructed, but that it is not already initialized.
- * For now, this is done by converting the element type to a C++
- * long and then to the integer type through the use of static cast and
- * NTL's to_long function.
- * This, of course, assumes such static casts are possible.
- * This function should be changed in the future to avoid using long.
- * @return reference to integer.
- * @param x reference to integer to contain output (reference returned).
- * @param y constant reference to field element.
- */
- /*
- template <>
- integer& UnparametricField<NTL::zz_p>::convert(integer& x, const NTL::zz_p& y) const
- { return x = static_cast<integer>(rep(y)); }
- */
- template <>
- integer& Caster(integer& x, const NTL::zz_p& y)
- { return x = static_cast<integer>(rep(y)); }
-
- /** Cardinality.
- * Return integer representing cardinality of the field.
- * Returns the modulus of the field, which should be prime.
- * @return integer representing cardinality of the field
- */
- template <>
- integer& UnparametricField<NTL::zz_p>::cardinality(integer& c) const
- { return c = static_cast<integer>(NTL::zz_p::modulus()); }
-
- /** Characteristic.
- * Return integer representing characteristic of the field.
- * Returns the modulus of the field, which should be prime.
- * @return integer representing characteristic of the field.
- */
- template <>
- integer& UnparametricField<NTL::zz_p>::characteristic(integer& c) const
- { return c = static_cast<integer>(NTL::zz_p::modulus()); }
-
- /** Multiplicative Inverse.
- * x = 1 / y
- * This function assumes both field elements have already been
- * constructed and initialized.
- * @return reference to x.
- * @param x field element (reference returned).
- * @param y field element.
- */
- template <> NTL::zz_p&
- UnparametricField<NTL::zz_p>::inv(NTL::zz_p& x, const NTL::zz_p& y) const
- { return x = NTL::inv(y); }
-
- /** Zero equality.
- * Test if field element is equal to zero.
- * This function assumes the field element has already been
- * constructed and initialized.
- * In this specialization, NTL's IsZero function is called.
- * @return boolean true if equals zero, false if not.
- * @param x field element.
- */
- template <> bool UnparametricField<NTL::zz_p>::isZero(const NTL::zz_p& x) const
- { return static_cast<bool>(NTL::IsZero(x)); }
-
- /** One equality.
- * Test if field element is equal to one.
- * This function assumes the field element has already been
- * constructed and initialized.
- * In this specialization, NTL's IsOne function is called.
- * @return boolean true if equals one, false if not.
- * @param x field element.
- */
- template <> bool UnparametricField<NTL::zz_p>::isOne(const NTL::zz_p& x) const
- { return static_cast<bool>(NTL::IsOne(x)); }
-
- /** Inplace Multiplicative Inverse.
- * x = 1 / x
- * This function assumes both field elements have already been
- * constructed and initialized.
- * @return reference to x.
- * @param x field element (reference returned).
- */
- template <> NTL::zz_p& UnparametricField<NTL::zz_p>::invin(NTL::zz_p& x) const
- { return x = NTL::inv(x); }
-
- /** Print field.
- * @return output stream to which field is written.
- * @param os output stream to which field is written.
- */
- template <> std::ostream& UnparametricField<NTL::zz_p>::write(std::ostream& os) const
- {
- return os << "unparameterized field NTL::zz_p with p = "
- << NTL::zz_p::modulus();
- }
-
- /// Constructor for random field element generator
- template <>
- UnparametricRandIter<NTL::zz_p>::UnparametricRandIter (const UnparametricField<NTL::zz_p>& F,
- const integer& size,
- const integer& seed) :
- _size(size), _seed(seed)
- {
- if (_seed == integer(0)) _seed = integer(time(NULL));
-
- integer cardinality;
- F.cardinality(cardinality);
- if (_size > cardinality)
- _size = 0;
-
-#ifdef TRACE
- cout << "created random generator with size " << _size
- << " and seed " << _seed << endl;
-#endif // TRACE
-
- // Seed random number generator
- NTL::SetSeed(NTL::to_ZZ(static_cast<long>(_seed)));
- }
-
- /// Random field element creator.
- template <> NTL::zz_p& UnparametricRandIter<NTL::zz_p>::random(NTL::zz_p& x) const
- // { return x = static_cast<long>((double(rand())/RAND_MAX)*double(_size)); }
- {
- if (_size == 0)
- return x = NTL::random_zz_p();
- else
- return x = NTL::to_zz_p(NTL::RandomBnd(static_cast<long>(_size)));
- }
-
-
-
- /**
- * \brief long ints modulo a positive integer.
- *
- * While NTL allows any int to serve as the modulus, only prime
- * moduli yield fields. The primality of the modulus will not be checked, so
- * it is the programmer's responsibility to supply a prime modulus if a field is
- * wanted.
- * These specializations allow the \ref UnparametricField template class to be
- * used to wrap NTL's <code>zz_p</code> class as a LinBox field.
- * Uses nice trick for mod p via floating point.
- \ingroup field
- */
-
- struct NTL_zz_p: public UnparametricField<NTL::zz_p>
- {
- NTL_zz_p(integer p, size_t e = 1) :
- UnparametricField<NTL::zz_p>(p, e)
- {}
-
- NTL::zz_p& init(NTL::zz_p& x, const double& y) const
- {
- double z = fmod(y,NTL::zz_p::modulus());
- if (z > 0) z += 0.5;
- else z -= 0.5;
- return x = NTL::to_zz_p(static_cast<long>(z)); //rounds towards 0
- }
-
- NTL::zz_p &init (NTL::zz_p &x, const integer &y=0) const
- {
- NTL::ZZ tmp= NTL::to_ZZ(std::string(y).data());
- return x = NTL::to_zz_p(tmp);
- }
-
- template <class ANY>
- NTL::zz_p& init(NTL::zz_p& x, const ANY& y) const
- {
- return x = NTL::to_zz_p((long)(y));
- }
-
- template <class ANY>
- ANY& convert(ANY& x, const NTL::zz_p& y) const
- {
- return x = (ANY)(rep(y));
- }
-
- static inline integer getMaxModulus()
- { return integer( NTL_SP_BOUND ); }
-
- NTL::zz_p& pow( NTL::zz_p& res, const NTL::zz_p& x, long exp ) const
- {
- NTL::power( res, x, exp );
- return res;
- }
-
- NTL::zz_p& powin( NTL::zz_p& x, long exp ) const
- {
- return x = NTL::power(x,exp);
- }
- };
-
-
-
-
-
-} // namespace LinBox
-
-#endif // __LINBOX_field_ntl_lzz_p_H
-
diff --git a/linbox/field/ntl-lzz_pE.h b/linbox/field/ntl-lzz_pE.h
deleted file mode 100644
index 3a17db2..0000000
--- a/linbox/field/ntl-lzz_pE.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/field/ntl-z_pE.h
- * Copyright (C) 2004 Pascal Giorgi
- *
- * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
- *
- * Modified by W. J. Turner <wjturner at acm.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __LINBOX_ntl_lzz_pe_H
-#define __LINBOX_ntl_lzz_pe_H
-
-
-#include <linbox/field/unparametric.h>
-#include <linbox/randiter/unparametric.h>
-#include <NTL/lzz_pXFactoring.h>
-#include <NTL/lzz_pE.h>
-#include <time.h>
-#include "linbox/linbox-config.h"
-#include <linbox/field/field-traits.h>
-
-
-namespace LinBox
-{
-
-
- template <class Ring>
- struct ClassifyRing;
-
- template<>
- struct ClassifyRing<UnparametricRandIter<NTL::zz_pE> > {
- typedef RingCategories::ModularTag categoryTag;
- };
-
- template<>
- class UnparametricRandIter<NTL::zz_pE>
- {
- public:
- typedef NTL::zz_pE Element;
- UnparametricRandIter<NTL::zz_pE>(const UnparametricField<NTL::zz_pE>& F =UnparametricField<NTL::zz_pE>(),
- const size_t& size = 0,
- const size_t& seed = 0
- ) :
- _size(size), _seed(seed)
- {
- if(_seed == 0)
- NTL::SetSeed(NTL::to_ZZ(time(0)));
- else
- NTL::SetSeed(NTL::to_ZZ(_seed));
- }
-
- UnparametricRandIter<NTL::zz_pE>(const UnparametricRandIter<NTL::zz_pE>& R) :
- _size(R._size), _seed(R._seed)
-
- {
- if(_seed == 0)
- NTL::SetSeed(NTL::to_ZZ(time(0)));
- else
- NTL::SetSeed(NTL::to_ZZ(_seed));
- }
-
- Element& random (Element& x) const
- {
- NTL::random(x);
- return x;
- }
-
- protected:
- size_t _size;
- size_t _seed;
- };
-
-
-
- /*
- * Define a parameterized class to easily handle UnparametricField<NTL::zz_pE> field
- */
-
- /// \brief for large cardinality, small prime. \ingroup field
- class NTL_zz_pE : public UnparametricField<NTL::zz_pE>
- {
- public:
- NTL_zz_pE (const integer &p, const integer &k)
- {
-
- NTL::zz_p::init( (long) p);
- NTL::zz_pX irredPoly = NTL::BuildIrred_zz_pX ((long) k);
- NTL::zz_pE::init(irredPoly);
- }
-
- Element& random (Element& x) const
- {
- NTL::random(x);
- return x;
- }
-
- }; // end o class NTL_zz_pE
-
-
- /*
- * Specialization of UnparametricField<> for NTL::zz_pE type
- */
- template<>
- // NTL::zz_pE& UnparametricField<NTL::zz_pE>::init (NTL::zz_pE &x, const integer &y) const
- NTL::zz_pE& Caster(NTL::zz_pE &x, const integer &y)
- {
- x=NTL::to_zz_pE(static_cast<long>(y));
- return x;
- }
- template<>
- // NTL::zz_pE& UnparametricField<NTL::zz_pE>::init (NTL::zz_pE &x, const double &y) const
- NTL::zz_pE& Caster(NTL::zz_pE &x, const double &y)
- {
- x=NTL::to_zz_pE(static_cast<long>(y));
- return x;
- }
-
- template<>
- // integer& UnparametricField<NTL::zz_pE>::convert (integer& x, const NTL::zz_pE &y) const {
- integer& Caster (integer& x, const NTL::zz_pE &y) {
- NTL::zz_pX poly = rep(y);
- integer base = static_cast<integer>(NTL::zz_p::modulus());
- long i = deg(poly)+1;
- x = 0;
- for( ; i-- ; ) {
- x *= base;
- x += NTL::to_long(rep(coeff(poly, i)));
- }
- return x;
- }
-
-
-
- template<>
- bool UnparametricField<NTL::zz_pE>::isZero (const NTL::zz_pE& a) const
- {
- return NTL::IsZero(a);
- }
-
- template<>
- bool UnparametricField<NTL::zz_pE>::isOne (const NTL::zz_pE& a) const
- {
- return NTL::IsOne(a);
- }
-
-
- template<>
- integer& UnparametricField<NTL::zz_pE>::characteristic (integer &c) const
- {
- return c = static_cast<integer>(NTL::zz_p::modulus());
- }
-
- template<>
- integer& UnparametricField<NTL::zz_pE>::cardinality(integer& c) const
- {
- NTL::ZZ card = NTL::zz_pE::cardinality();
- long b = NumBytes(card);
- unsigned char* byteArray;
- byteArray = new unsigned char[(size_t)b ];
- BytesFromZZ(byteArray, card, b);
-
- integer base(256);
- c= integer(0);
-
- for(long i = b - 1; i >= 0; --i) {
- c *= base;
- c += integer(byteArray[i]);
- }
- delete [] byteArray;
-
- return c;
- }
-
-
- template<>
- NTL::zz_pE& UnparametricField<NTL::zz_pE>::inv(NTL::zz_pE& x, const NTL::zz_pE& y) const
- {
- x=NTL::to_zz_pE(1)/y;
- return x;
- }
- template<>
- NTL::zz_pE& UnparametricField<NTL::zz_pE>::invin(NTL::zz_pE& x) const
- {
- x=NTL::to_zz_pE(1)/x;
- return x;
- }
-
-
- template<>
- std::istream& UnparametricField<NTL::zz_pE>::read(std::istream& is, NTL::zz_pE& x) const
- {
- long tmp;
- is>>tmp;
- x=NTL::to_zz_pE(tmp);
- return is;
- }
-
-
-}
-
-#endif //__LINBOX_ntl_lzz_pe_H
-
diff --git a/linbox/field/ntl-lzz_pX.h b/linbox/field/ntl-lzz_pX.h
deleted file mode 100644
index 64d0d38..0000000
--- a/linbox/field/ntl-lzz_pX.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* Copyright (C) 2005 LinBox
- *
- *
- * Written by Daniel Roche, August 2005
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-
-#ifndef __LINBOX_field_ntl_lzz_px_H
-#define __LINBOX_field_ntl_lzz_px_H
-
-#include <linbox/field/unparametric.h>
-#include <linbox/field/ntl-lzz_p.h>
-#include <linbox/integer.h>
-#include <vector>
-#include <NTL/lzz_pX.h>
-
-namespace LinBox
-{ // namespace in which all LinBox code resides
-
- /** Ring (in fact, a unique factorization domain) of polynomial with
- * coefficients in class NTL_zz_p (integers mod a wordsize prime).
- * All the same functions as any other ring, with the addition of:
- * Coeff (type), CoeffField (type), getCoeffField, setCoeff, getCoeff,
- * leadCoeff, deg
- */
- class NTL_zz_pX :public UnparametricField<NTL::zz_pX> {
- public:
- typedef NTL_zz_p CoeffField;
- typedef NTL::zz_p Coeff;
- typedef NTL::zz_pX Element;
-
- /** Standard LinBox field constructor. The paramters here
- * (prime, exponent) are only used to initialize the coefficient field.
- */
- NTL_zz_pX( const integer& p, size_t e = 1 ) :
- UnparametricField<NTL::zz_pX>(p, e), _CField(p,e)
- {}
-
- /** Constructor from a coefficient field */
- NTL_zz_pX( CoeffField cf ) :
- _CField(cf)
- {}
-
- /** Initialize p to the constant y (p = y*x^0) */
- template <class ANY>
- Element& init( Element& p, const ANY& y ) const
- {
- Coeff temp;
- _CField.init( temp, y );
- return p = temp;
- }
-
- /** Initialize p to the constant y (p = y*x^0) */
- Element& init( Element& p, const Coeff& y ) const
- {
- return p = y;
- }
-
- /** Initialize p from a vector of coefficients.
- * The vector should be ordered the same way NTL does it: the front
- * of the vector corresponds to the trailing coefficients, and the back
- * of the vector corresponds to the leading coefficients. That is,
- * v[i] = coefficient of x^i.
- */
- template <class ANY>
- Element& init( Element& p, const std::vector<ANY>& v ) const
- {
- p = 0;
- Coeff temp;
- for( long i = 0; i < (long)v.size(); ++i ) {
- _CField.init( temp, v[ (size_t) i ] );
- if( !_CField.isZero(temp) )
- NTL::SetCoeff( p, i, temp );
- }
- return p;
- }
-
- /** Initialize p from a vector of coefficients.
- * The vector should be ordered the same way NTL does it: the front
- * of the vector corresponds to the trailing coefficients, and the back
- * of the vector corresponds to the leading coefficients. That is,
- * v[i] = coefficient of x^i.
- */
- Element& init( Element& p, const std::vector<Coeff>& v ) const
- {
- p = 0;
- for( long i = 0; i < (long)v.size(); ++i )
- NTL::SetCoeff( p, i, v[ (size_t) i ] );
- return p;
- }
-
- /** Convert p to a vector of coefficients.
- * The vector will be ordered the same way NTL does it: the front
- * of the vector corresponds to the trailing coefficients, and the back
- * of the vector corresponds to the leading coefficients. That is,
- * v[i] = coefficient of x^i.
- */
- template< class ANY >
- std::vector<ANY>& convert( std::vector<ANY>& v, const Element& p ) const
- {
- v.clear();
- ANY temp;
- for( long i = 0; i <= this->deg(p); ++i ) {
- _CField.convert( temp, NTL::coeff( p, i ) );
- v.push_back( temp );
- }
- return v;
- }
-
- /** Convert p to a vector of coefficients.
- * The vector will be ordered the same way NTL does it: the front
- * of the vector corresponds to the trailing coefficients, and the back
- * of the vector corresponds to the leading coefficients. That is,
- * v[i] = coefficient of x^i.
- */
- std::vector<Coeff>& convert( std::vector<Coeff>& v, const Element& p ) const
- {
- v.clear();
- for( long i = 0; i <= (long)this->deg(p); ++i )
- v.push_back( NTL::coeff(p,i) );
- return v;
- }
-
- /** Test if an element equals zero */
- bool isZero( const Element& x ) const
- {
- return ( (this->deg(x) == 0) &&
- ( _CField.isZero( NTL::ConstTerm(x) ) ) );
- }
-
- /** Test if an element equals one */
- bool isOne( const Element& x ) const
- {
- return ( (this->deg(x) == 0) &&
- ( _CField.isOne( NTL::ConstTerm(x) ) ) );
- }
-
- /** The LinBox field for coefficients */
- const CoeffField& getCoeffField() const
- { return _CField; }
-
- /** Get the degree of a polynomial
- * Unlike NTL, deg(0)=0.
- */
- size_t deg( const Element& p ) const
- {
- long temp = NTL::deg(p);
- if( temp == -1 ) return 0;
- else return static_cast<size_t>(temp);
- }
-
- /** r will be set to the reverse of p. */
- Element& rev( Element& r, const Element& p ) {
- NTL::reverse(r,p);
- return r;
- }
-
- /** r is itself reversed. */
- Element& revin( Element& r ) {
- return r = NTL::reverse(r);
- }
-
- /** Get the leading coefficient of this polynomial. */
- Coeff& leadCoeff( Coeff& c, const Element& p ) const
- {
- c = NTL::LeadCoeff(p);
- return c;
- }
-
- /** Get the coefficient of x^i in a given polynomial */
- Coeff& getCoeff( Coeff& c, const Element& p, size_t i ) const
- {
- c = NTL::coeff( p, (long)i );
- return c;
- }
-
- /** Set the coefficient of x^i in a given polynomial */
- Element& setCoeff( Element& p, size_t i, const Coeff& c ) const
- {
- NTL::SetCoeff(p,(long)i,c);
- return p;
- }
-
- /** Get the quotient of two polynomials */
- Element& quo( Element& res, const Element& a, const Element& b ) const
- {
- NTL::div(res,a,b);
- return res;
- }
-
- /** a = quotient of a, b */
- Element& quoin( Element& a, const Element& b ) const
- {
- return a /= b;
- }
-
- /** Get the remainder under polynomial division */
- Element& rem( Element& res, const Element& a, const Element& b ) const
- {
- NTL::rem(res,a,b);
- return res;
- }
-
- /** a = remainder of a,b */
- Element& remin( Element& a, const Element& b ) const
- {
- return a %= b;
- }
-
- /** Get the quotient and remainder under polynomial division */
- void quorem( Element& q, Element& r,
- const Element& a, const Element& b ) const
- {
- NTL::DivRem(q,r,a,b);
- }
-
- /** Get characteristic of the field - same as characteristic of
- * coefficient field. */
- integer& characteristic( integer& c ) const
- { return _CField.characteristic(c); }
-
- /** Get the cardinality of the field. Since the cardinality is
- * infinite, by convention we return -1.
- */
- integer& cardinality( integer& c ) const
- { return c = static_cast<integer>(-1); }
-
- static inline integer getMaxModulus()
- { return CoeffField::getMaxModulus(); }
-
- private:
- /** Conversion to scalar types doesn't make sense and should not be
- * used. Use getCoeff or leadCoeff to get the scalar values of
- * specific coefficients, and then convert them using coeffField()
- * if needed.
- */
- template< class ANY >
- ANY& convert( ANY& x, const Element& y ) const
- { return x; }
-
- CoeffField _CField;
- }; // end of class NTL_zz_pX
-
- /** Write a description of the field */
- // Oustide of class definition so write(ostream&,const Element&) from
- // UnparametricField still works.
- template<>
- std::ostream& UnparametricField<NTL::zz_pX>::write( std::ostream& os ) const
- {
- return os << "Polynomial ring using NTL::zz_pX";
- }
-
-
-} // end of namespace LinBox
-
-#endif // __LINBOX_field_ntl_lzz_px_H
-
diff --git a/linbox/field/ntl-pid-lzz_p.h b/linbox/field/ntl-pid-lzz_p.h
deleted file mode 100644
index 025d414..0000000
--- a/linbox/field/ntl-pid-lzz_p.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* Copyright (C) 2010 LinBox
- * written by bds
- *
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __LINBOX_ntl_pid_zz_p_H
-#define __LINBOX_ntl_pid_zz_p_H
-
-#include "linbox/field/ntl-lzz_p.h"
-#include "linbox/util/debug.h"
-#include "linbox/linbox-config.h"
-#include <NTL/ZZ.h>
-#include <linbox/field/field-traits.h>
-
-// Namespace in which all LinBox library code resides
-namespace LinBox
-{
- template <class Ring>
- struct ClassifyRing;
-
- class NTL_PID_zz_p;
-
- template<>
- struct ClassifyRing<NTL_PID_zz_p> {
- typedef RingCategories::ModularTag categoryTag;
- };
-
- /** \brief extend Wrapper of zz_p from NTL. Add PID functions
- \ingroup field
- */
- struct NTL_PID_zz_p: public NTL_zz_p
- {
- protected: long _modulus;
- public:
- NTL_PID_zz_p(long pp, int exp = 1) :
- NTL_zz_p(pp), _modulus(pp)
- {
- if( exp != 1 ) throw PreconditionFailed(__func__,__FILE__,__LINE__,"exponent must be 1");
- }
-
- Element& gcd(Element& g, const Element& a, const Element& b) const
- { g = NTL::GCD(NTL::rep(a), NTL::rep(b));
- g = NTL::GCD(NTL::rep(g), _modulus);
- return g;
- }
-
- Element& gcdin(Element& a, const Element& b) const
- { return gcd(a,a, b); }
-
- bool isUnit(const Element& a) const
- { return 1 == NTL::GCD(NTL::rep(a), _modulus); }
-
- Element& div(Element& c, const Element& a, const Element& b) const
- { return c = NTL::rep(a)/NTL::GCD(NTL::rep(a),NTL::rep(b)); }
- Element& divin(Element& a, const Element& b) const
- { return div(a, a, b); }
-
- static inline double getMaxModulus() { return (double)NTL_SP_BOUND; }
- };
-
-} // namespace LinBox
-
-#endif // __LINBOX_ntl_pid_zz_p_H
-
diff --git a/linbox/field/ntl.doxy b/linbox/field/ntl.doxy
index 70d5550..bc64a83 100644
--- a/linbox/field/ntl.doxy
+++ b/linbox/field/ntl.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 Brice Boyer, part of LinBox, GNU LGPL, see COPYING
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/*! @ingroup field
@defgroup NTL NTL
diff --git a/linbox/field/ntl.h b/linbox/field/ntl.h
index e053824..627cc17 100644
--- a/linbox/field/ntl.h
+++ b/linbox/field/ntl.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/ntl.h
* Copyright (C) 1999-2002 William J Turner,
* 2001 Bradford Hovinen
@@ -13,18 +11,49 @@
* Broke NTL field wrappers into separate files.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_field_ntl_H
#define __LINBOX_field_ntl_H
-#include "linbox/field/ntl-RR.h"
-#include "linbox/field/ntl-ZZ_p.h"
-#include "linbox/field/ntl-lzz_p.h"
-#include "linbox/field/ntl-ZZ_pE.h"
-#include "linbox/field/ntl-lzz_pE.h"
-#include "linbox/field/ntl-GF2E.h"
+#include "linbox/field/NTL/ntl-RR.h"
+#include "linbox/field/NTL/ntl-ZZ_p.h"
+#include "linbox/field/NTL/ntl-ZZ.h"
+#include "linbox/field/NTL/ntl-ZZ_pX.h"
+#include "linbox/field/NTL/ntl-lzz_p.h"
+#include "linbox/field/NTL/ntl-lzz_pX.h"
+#include "linbox/field/NTL/ntl-ZZ_pE.h"
+#include "linbox/field/NTL/ntl-lzz_pE.h"
+#include "linbox/field/NTL/ntl-GF2E.h"
+
#endif // __LINBOX_field_ntl_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/param-fuzzy.h b/linbox/field/param-fuzzy.h
index 01a14c3..52e1c66 100644
--- a/linbox/field/param-fuzzy.h
+++ b/linbox/field/param-fuzzy.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/param-fuzzy.h
* Copyright (C) 1999-2001 William J Turner,
* 2001 Bradford Hovinen
@@ -9,10 +7,13 @@
*
* Updated by bds 8/02
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +21,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_param_fuzzy_H
@@ -31,8 +32,8 @@
#include <iostream>
#include "linbox/integer.h"
-#include <linbox/field/field-interface.h>
-#include <linbox/field/field-traits.h>
+#include "linbox/field/field-interface.h"
+#include "linbox/field/field-traits.h"
// Namespace in which all LinBox code resides
namespace LinBox
@@ -75,6 +76,7 @@ namespace LinBox
*/
ParamFuzzy (const double &value = .000000001) :
_fuzz (value)
+ ,one(1),zero(0),mOne(-one)
{}
/** Copy constructor.
@@ -85,6 +87,7 @@ namespace LinBox
*/
ParamFuzzy (const ParamFuzzy &F) :
_fuzz (F._fuzz)
+ ,one(F.one),zero(F.zero),mOne(F.mOne)
{}
/** Assignment operator.
@@ -407,6 +410,8 @@ namespace LinBox
/// Private static double for fuzz value
double _fuzz;
+ public:
+ const Element one,zero,mOne;
}; // class ParamFuzzy
@@ -418,3 +423,12 @@ namespace LinBox
#endif // __LINBOX_param_fuzzy_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/rebind.h b/linbox/field/rebind.h
index abae65a..5c3ada5 100644
--- a/linbox/field/rebind.h
+++ b/linbox/field/rebind.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2005 LinBox
* Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_rebind_H
@@ -40,3 +41,12 @@ namespace LinBox
}
#endif //__LINBOX_rebind_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/field/unparametric.h b/linbox/field/unparametric.h
index 6b963d2..9aec440 100644
--- a/linbox/field/unparametric.h
+++ b/linbox/field/unparametric.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/unparametric.h
* Copyright (C) 1999-2005 William J Turner,
@@ -9,10 +7,13 @@
* Written by W. J. Turner <wjturner at acm.org>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +21,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_field_unparametric_H
@@ -32,25 +33,23 @@
#include <string>
#include <algorithm>
+
+#include "linbox/linbox-config.h"
#include "linbox/integer.h"
-#include <linbox/field/field-interface.h>
+#include "linbox/field/field-interface.h"
#include "linbox/randiter/unparametric.h"
-#include "linbox/linbox-config.h"
-#include <linbox/field/field-traits.h>
+#include "linbox/field/field-traits.h"
#include <fflas-ffpack/field/unparametric.h>
+#include "linbox/randiter/nonzero.h"
//#if __LINBOX_HAVE_NTL
-//#include <linbox/field/ntl-RR.h>
+//#include "linbox/field/ntl-RR.h"
//#endif // __LINBOX_HAVE_NTL
namespace LinBox
{
- template <typename Target, typename Source>
- Target& Caster (Target& t, const Source& s)
- {
- return t = static_cast<Target>(s);
- }
+ using Givaro::Caster;
#if 0
#if __LINBOX_HAVE_NTL
@@ -69,11 +68,19 @@ namespace LinBox
template <class K>
class UnparametricField;
+ // using FFPACK::UnparametricField ;
+ using FFPACK::UnparametricOperations;
+
template <class K>
struct ClassifyRing<UnparametricField<K> > {
typedef RingCategories::GenericTag categoryTag;
};
+ template <>
+ struct ClassifyRing<UnparametricField<integer> > {
+ typedef RingCategories::IntegerTag categoryTag;
+ };
+
/** \brief Unparameterized field adapter.
* \ingroup field
@@ -99,6 +106,7 @@ namespace LinBox
protected:
integer _p; integer _card;
public:
+ typedef typename FFPACK::UnparametricField<K> Father_t ;
/** @name Common Object Interface for a LinBox Field.
* These methods and member types are required of all LinBox fields.
@@ -124,41 +132,64 @@ namespace LinBox
* This constructor must be defined in a specialization.
*/
UnparametricField(integer q = 0, size_t e = 1) :
- FFPACK::UnparametricField<K>((unsigned long)q,(unsigned long)e),
- _p(q), _card(q == 0 ? integer(-1) : pow(q, e) )
+ Father_t(q, e),
+ //Father_t((unsigned long)q,(unsigned long)e)
+ _p(q),
+ _card(q == 0 ?
+ integer(-1) :
+ pow(q, e) )
{} // assuming q is a prime or zero.
/// construct this field as copy of F.
UnparametricField (const UnparametricField &F) :
- FFPACK::UnparametricField<K>(F),_p(F._p), _card(F._card)
+ Father_t(F),_p(F._p), _card(F._card)
{}
// field/ntl-ZZ_p.h me les demande... //
- Element&inv (Element&x, const Element&y)const{return FFPACK::UnparametricField<K>::inv(x,y);}
- Element&invin (Element&x)const{return FFPACK::UnparametricField<K>::invin(x);}
- std::ostream&write (std::ostream&os)const{return FFPACK::UnparametricField<K>::write(os);}
- std::ostream&write (std::ostream&os, const Element&p)const{return FFPACK::UnparametricField<K>::write(os,p);}
- bool isZero(const Element&x)const{return FFPACK::UnparametricField<K>::isZero(x);}
- bool isOne(const Element&x)const{return FFPACK::UnparametricField<K>::isOne(x);}
- long unsigned int characteristic(long unsigned int&p)const{return FFPACK::UnparametricField<K>::characteristic(p);}
- long unsigned int characteristic()const{return FFPACK::UnparametricField<K>::characteristic();};
- long unsigned int cardinality()const{return FFPACK::UnparametricField<K>::cardinality();};
- template<typename Src>Element&init(Element&x, const Src&s)const{return Caster (x, s);}
- std::istream&read(std::istream&is, Element&x)const{return FFPACK::UnparametricField<K>::read(is,x);}
- std::istream&read(std::istream&is)const{return FFPACK::UnparametricField<K>::read(is);}
- template<typename T>T&convert(T&x,const Element&y)const{return Caster(x,y);}
+ using Father_t::inv ;
+ //using Father_t::read ;
+ std::istream &read(std::istream & is) { return Father_t::read(is); }
+
+ std::istream &read(std::istream & s, Element &a) const
+ {
+ Integer tmp;
+ s >> tmp;
+ init(a, tmp);
+ return s;
+ }
+ using Father_t::invin;
+ using Father_t::write;
+ using Father_t::isZero;
+ using Father_t::isOne;
+
+ template<typename Src>
+ Element&init(Element&x, const Src&s) const
+ {
+ return Caster (x, s);
+ }
+ Element&init(Element&x)const
+ {
+ return Caster (x, 0);
+ }
+ template<typename T>
+ T&convert(T&x, const Element&y) const
+ {
+ return Caster(x,y);
+ }
// fin des trucs zarbs //
/// c := cardinality of this field (-1 if infinite).
+ using Father_t::cardinality ;
integer &cardinality (integer &c) const
{
return c = _card;
}
/// c := characteristic of this field (zero or prime).
+ using Father_t::characteristic;
integer &characteristic (integer &c) const
{
return c = _p;
@@ -224,14 +255,14 @@ namespace LinBox
* @param F field F in which arithmetic is done
*/
FieldAXPY (const Field &F) :
- _F (F)
+ _field (F)
{ _y = 0; }
/** Copy constructor.
* @param faxpy
*/
FieldAXPY (const FieldAXPY<Field> &faxpy) :
- _F (faxpy._F), _y (faxpy._y)
+ _field (faxpy._field), _y (faxpy._y)
{}
/** Assignment operator
@@ -282,7 +313,7 @@ namespace LinBox
private:
/// Field in which arithmetic is done
- Field _F;
+ Field _field;
/// Field element for arithmetic
Element _y;
@@ -295,3 +326,12 @@ namespace LinBox
#endif // __LINBOX_field_unparametric_H
+
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+
diff --git a/linbox/integer.h b/linbox/integer.h
index e35c1ef..9f9f990 100644
--- a/linbox/integer.h
+++ b/linbox/integer.h
@@ -1,8 +1,22 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright(c)'94-97 by Givaro Team
* Copyright(c)'2000-2002 by LinBox Team
- * see the COPYING file for license information.
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
* Created by M. Samama, T. Gautier
*
* Modified Jean-Guillaume.Dumas <Jean-Guillaume.Dumas at imag.fr>
@@ -28,24 +42,37 @@
#define __LINBOX_integer_H
//#include <cstdint>
-#include "linbox/linbox-config.h"
-#include "gmp++/gmp++.h"
-
-#include <cfloat> // BB : needed on some rare platforms...
#ifdef __LINBOX_HAVE_STDINT_H
+#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
+// else ??
+#endif
#include <stdint.h>
+#ifndef INT32_MAX
+#error "INT32_MAX is not defined. It should at least be defined in Givaro..."
+#endif
#endif
+#include "linbox/linbox-config.h"
+#include "givaro/givconfig.h"
+#include "gmp++/gmp++.h"
+#include <cfloat> // BB : needed on some rare platforms...
+
+
+#ifndef FFLAFLAS_VERSION
+#define FFLAFLAS_VERSION __LINBOX_FFLAFFLAS_VERSION
+#endif
+
+
namespace LinBox
{
/*! Integers in LinBox.
* Integer representation from <a href=http://ljk.imag.fr/CASYS/LOGICIELS/givaro/>Givaro</a>.
* @ingroup integers
*/
- typedef ::Givaro::Integer integer;
- typedef ::Givaro::Integer Integer;
+ typedef Givaro::Integer integer;
+ typedef Givaro::Integer Integer;
#if 0
// These integer types are defined by Givaro
@@ -89,7 +116,7 @@ namespace LinBox
/*! @internal
- * Spy structure to have access to protected members of ::Givaro::Integer.
+ * Spy structure to have access to protected members of Givaro::Integer.
*/
struct SpyInteger
{
@@ -109,6 +136,9 @@ namespace LinBox
static mpz_ptr get_mpz(const integer& i) {
return const_cast<InHeritsInteger&>(static_cast<const InHeritsInteger&>(i)).get_mpz();
}
+ static mpz_srcptr get_mpz_const(const integer& i) {
+ return static_cast<const InHeritsInteger&>(i).get_mpz_const();
+ }
};
@@ -121,16 +151,90 @@ namespace LinBox
*/
#include <givaro/givconfig.h>
#include <math.h>
+
+#ifndef GIVARO_VERSION
+#error "Givaro didn't tell us about his version !"
+#endif
+
+
namespace LinBox
{
-// Natural logarithm of a
-// log(2) being close to 0.69314718055994531
-inline double naturallog(const ::Givaro::Integer& a) {
- signed long int exp;
- double d = mpz_get_d_2exp( &exp, (mpz_ptr)(LinBox::SpyInteger::get_rep(a) ) );
- return (double)exp*0.69314718055994531+log(d);
+
+ /** Natural logarithm (ln).
+ * log(2) being close to 0.69314718055994531
+ * @param a integer.
+ * @return ln(a).
+ */
+#if (GIVARO_VERSION < 30305)
+ inline double naturallog(const Givaro::Integer& a) {
+ signed long int exp;
+ double d = (double)mpz_get_d_2exp( &exp, (mpz_srcptr)(LinBox::SpyInteger::get_rep(a) ) );
+ return (double)exp*0.69314718055994531+log(d);
+ }
+#else
+ inline double naturallog(const Givaro::Integer& a) {
+ return Givaro::naturallog(a);
+ }
+#endif
}
+
+namespace LinBox { /* signedness of integers */
+ /*! Positiveness of an integer.
+ * Essentially usefull in debug mode to avoid compiler warnings
+ * about comparison always true for some unsigned type.
+ * @param x integer
+ * @return \c true iff \c x>=0.
+ */
+ //@{
+ template<class T>
+ inline bool isPositive( const T & x) {
+ return x>=0 ;
+ }
+ template<>
+ inline bool isPositive(const uint8_t &) {
+ return true ;
+ }
+ template<>
+ inline bool isPositive(const uint16_t &) {
+ return true ;
+ }
+ template<>
+ inline bool isPositive(const uint32_t &) {
+ return true ;
+ }
+#ifdef __APPLE__
+ template<>
+ inline bool isPositive(const unsigned long&) {
+ return true ;
+ }
+#endif
+ template<>
+ inline bool isPositive(const uint64_t &) {
+ return true ;
+ }
+ //@}
+}
+
+#if (GIVARO_VERSION < 30601)
+namespace Givaro {
+ template <typename Target, typename Source>
+ Target& Caster (Target& t, const Source& s) {
+ return t = static_cast<Target>(s);
+ }
}
+#else
+#include <givaro/givcaster.h>
+#endif
+
#endif // __LINBOX_integer_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/linbox-config.h b/linbox/linbox-config.h
index e3cc965..7791d8a 100644
--- a/linbox/linbox-config.h
+++ b/linbox/linbox-config.h
@@ -8,6 +8,11 @@
/* Define if building universal (internal helper macro) */
/* #undef __LINBOX_AC_APPLE_UNIVERSAL_BUILD */
+/* what version of FFLAS-FFPACK is installed */
+#ifndef __LINBOX_FFLAS_FFPACK_VERSION
+#define __LINBOX_FFLAS_FFPACK_VERSION 10600
+#endif
+
/* Define if GMP is version 3.xxx */
/* #undef __LINBOX_GMP_VERSION_3 */
@@ -19,9 +24,9 @@
#define __LINBOX_HAVE_DLFCN_H 1
#endif
-/* Define if FFLAFLAS is installed */
-#ifndef __LINBOX_HAVE_FFLAFLAS
-#define __LINBOX_HAVE_FFLAFLAS 1
+/* Define if FFLAS-FFPACK is installed */
+#ifndef __LINBOX_HAVE_FFLAS_FFPACK
+#define __LINBOX_HAVE_FFLAS_FFPACK 1
#endif
/* Define to 1 if you have the <float.h> header file. */
@@ -29,8 +34,15 @@
#define __LINBOX_HAVE_FLOAT_H 1
#endif
+/* Define if FPLLL is installed */
+#ifndef __LINBOX_HAVE_FPLLL
+#define __LINBOX_HAVE_FPLLL 1
+#endif
+
/* ps2pdf available as external program */
-/* #undef __LINBOX_HAVE_GHOSTSCRIPT */
+#ifndef __LINBOX_HAVE_GHOSTSCRIPT
+#define __LINBOX_HAVE_GHOSTSCRIPT 1
+#endif
/* Define if GIVARO is installed */
#ifndef __LINBOX_HAVE_GIVARO
@@ -43,16 +55,23 @@
#endif
/* gnuplot available as external program */
-/* #undef __LINBOX_HAVE_GNUPLOT */
+#ifndef __LINBOX_HAVE_GNUPLOT
+#define __LINBOX_HAVE_GNUPLOT 1
+#endif
/* Define if IML is installed */
-/* #undef __LINBOX_HAVE_IML */
+#ifndef __LINBOX_HAVE_IML
+#define __LINBOX_HAVE_IML 1
+#endif
/* Define to 1 if you have the <inttypes.h> header file. */
#ifndef __LINBOX_HAVE_INTTYPES_H
#define __LINBOX_HAVE_INTTYPES_H 1
#endif
+/* Define if LAPACK is available */
+/* #undef __LINBOX_HAVE_LAPACK */
+
/* Define if LIDIA is installed */
/* #undef __LINBOX_HAVE_LIDIA */
@@ -66,6 +85,16 @@
#define __LINBOX_HAVE_LITTLE_ENDIAN 1
#endif
+/* Define if M4RI is installed */
+#ifndef __LINBOX_HAVE_M4RI
+#define __LINBOX_HAVE_M4RI 1
+#endif
+
+/* Define if M4RIE is installed */
+#ifndef __LINBOX_HAVE_M4RIE
+#define __LINBOX_HAVE_M4RIE 1
+#endif
+
/* Define if MAPLE is installed */
/* #undef __LINBOX_HAVE_MAPLE */
@@ -74,8 +103,15 @@
#define __LINBOX_HAVE_MEMORY_H 1
#endif
+/* Define if MPFR is installed */
+#ifndef __LINBOX_HAVE_MPFR
+#define __LINBOX_HAVE_MPFR 1
+#endif
+
/* Define if NTL is installed */
-/* #undef __LINBOX_HAVE_NTL */
+#ifndef __LINBOX_HAVE_NTL
+#define __LINBOX_HAVE_NTL 1
+#endif
/* Define if SACLIB is installed */
/* #undef __LINBOX_HAVE_SACLIB */
@@ -125,26 +161,6 @@
#define __LINBOX_HAVE_UNISTD_H 1
#endif
-/* Canonical 16-bit data type */
-#ifndef __LINBOX_INT16
-#define __LINBOX_INT16 short
-#endif
-
-/* Canonical 32-bit data type */
-#ifndef __LINBOX_INT32
-#define __LINBOX_INT32 int
-#endif
-
-/* Canonical 64-bit data type */
-#ifndef __LINBOX_INT64
-#define __LINBOX_INT64 long
-#endif
-
-/* Canonical 8-bit data type */
-#ifndef __LINBOX_INT8
-#define __LINBOX_INT8 char
-#endif
-
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#ifndef __LINBOX_LT_OBJDIR
@@ -171,7 +187,7 @@
/* Define to the full name and version of this package. */
#ifndef __LINBOX_PACKAGE_STRING
-#define __LINBOX_PACKAGE_STRING "LinBox 1.2.0"
+#define __LINBOX_PACKAGE_STRING "LinBox 1.3.1"
#endif
/* Define to the one symbol short name of this package. */
@@ -186,7 +202,7 @@
/* Define to the version of this package. */
#ifndef __LINBOX_PACKAGE_VERSION
-#define __LINBOX_PACKAGE_VERSION "1.2.0"
+#define __LINBOX_PACKAGE_VERSION "1.3.1"
#endif
/* The size of `char', as computed by sizeof. */
@@ -224,17 +240,15 @@
#define __LINBOX_STDC_HEADERS 1
#endif
-/* Define if optimized threshold for Strassen-Winograd matrix multiplication
- is available */
-/* #undef __LINBOX_STRASSEN_OPTIMIZATION */
-
/* Version number of package */
#ifndef __LINBOX_VERSION
-#define __LINBOX_VERSION "1.2.0"
+#define __LINBOX_VERSION "1.3.1"
#endif
/* optimized threshold for switching to strassen matrix multiplication */
-/* #undef __LINBOX_WINOTHRESHOLD */
+#ifndef __LINBOX_WINOTHRESHOLD
+#define __LINBOX_WINOTHRESHOLD 1896
+#endif
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
diff --git a/linbox/linbox.doxy b/linbox/linbox.doxy
index dba1c8e..e4808fd 100644
--- a/linbox/linbox.doxy
+++ b/linbox/linbox.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/*+ \defgroup linbox LinBox
*
diff --git a/linbox/matrix/Makefile.am b/linbox/matrix/Makefile.am
index dc72fff..7cd215d 100644
--- a/linbox/matrix/Makefile.am
+++ b/linbox/matrix/Makefile.am
@@ -1,6 +1,24 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
pkgincludesubdir=$(pkgincludedir)/matrix
BASIC_HDRS = \
@@ -8,14 +26,16 @@ BASIC_HDRS = \
matrix-category.h \
sparse.h sparse.inl \
transpose-matrix.h \
- dense.h dense.inl \
- dense-submatrix.h dense-submatrix.inl \
dense-rows-matrix.h \
matrix-domain.h matrix-domain.inl \
+ matrix-domain-gf2.h \
blas-matrix.h \
+ blas-matrix.inl blas-submatrix.inl \
+ blas-matrix-multimod.h \
factorized-matrix.h factorized-matrix.inl \
- matrix-permutation.h matrix-permutation.inl \
- random-matrix.h
+ blas-triangularmatrix.inl \
+ permutation-matrix.h permutation-matrix.inl \
+ random-matrix.h random-matrix.inl
NTL_HDRS =
GIVARO_HDRS =
diff --git a/linbox/matrix/Makefile.in b/linbox/matrix/Makefile.in
index b0f3a4b..7c54307 100644
--- a/linbox/matrix/Makefile.in
+++ b/linbox/matrix/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,10 +15,47 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -41,12 +78,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -54,7 +94,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -63,18 +106,44 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
-pkgincludesubHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkgincludesub_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -86,6 +155,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -109,10 +179,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -133,10 +205,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -145,6 +222,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -161,6 +240,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -223,24 +303,22 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
pkgincludesubdir = $(pkgincludedir)/matrix
BASIC_HDRS = \
archetype.h \
matrix-category.h \
sparse.h sparse.inl \
transpose-matrix.h \
- dense.h dense.inl \
- dense-submatrix.h dense-submatrix.inl \
dense-rows-matrix.h \
matrix-domain.h matrix-domain.inl \
+ matrix-domain-gf2.h \
blas-matrix.h \
+ blas-matrix.inl blas-submatrix.inl \
+ blas-matrix-multimod.h \
factorized-matrix.h factorized-matrix.inl \
- matrix-permutation.h matrix-permutation.inl \
- random-matrix.h
+ blas-triangularmatrix.inl \
+ permutation-matrix.h permutation-matrix.inl \
+ random-matrix.h random-matrix.inl
NTL_HDRS =
GIVARO_HDRS =
@@ -272,9 +350,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/matrix/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps linbox/matrix/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/matrix/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/matrix/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -292,6 +370,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -300,21 +379,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludesubdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)"
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludesubHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- $(pkgincludesubHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
done
uninstall-pkgincludesubHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
- done
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -328,7 +411,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -336,29 +419,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -379,13 +467,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -406,16 +498,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -501,6 +599,7 @@ uninstall-am: uninstall-pkgincludesubHEADERS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/linbox/matrix/archetype.h b/linbox/matrix/archetype.h
index 9211cdc..5d9b866 100644
--- a/linbox/matrix/archetype.h
+++ b/linbox/matrix/archetype.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/matrix/archetype.h
* Copyright (C) 2001 B. David Saunders,
* 2001-2002 Bradford Hovinen,
@@ -18,7 +16,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
/*!@file matrix/archetype.h
@@ -204,20 +220,20 @@ namespace LinBox
ConstColIterator colEnd () const;
//@}
- /** RawIterator.
+ /** Iterator.
* The raw iterator is a method for accessing all entries in the matrix
* in some unspecified order. This can be used, e.g. to reduce all
* matrix entries modulo a prime before passing the matrix into an
* algorithm.
*/
//@{
- class RawIterator;
- class ConstRawIterator;
+ class Iterator;
+ class ConstIterator;
- RawIterator rawBegin ();
- RawIterator rawEnd ();
- ConstRawIterator rawBegin () const;
- ConstRawIterator rawEnd () const;
+ Iterator Begin ();
+ Iterator End ();
+ ConstIterator Begin () const;
+ ConstIterator End () const;
//@}
/** Like the raw iterator, the indexed iterator is a method for
@@ -228,13 +244,13 @@ namespace LinBox
* This is provided through it's \c rowIndex() and \c colIndex() functions.
*/
//@{
- class RawIndexedIterator;
- typedef const RawIndexedIterator ConstRawIndexedIterator;
+ class IndexedIterator;
+ typedef const IndexedIterator ConstIndexedIterator;
- RawIndexedIterator rawIndexedBegin();
- RawIndexedIterator rawIndexedEnd();
- ConstRawIndexedIterator rawIndexedBegin() const;
- ConstRawIndexedIterator rawIndexedEnd() const;
+ IndexedIterator IndexedBegin();
+ IndexedIterator IndexedEnd();
+ ConstIndexedIterator IndexedBegin() const;
+ ConstIndexedIterator IndexedEnd() const;
//@}
/** Retrieve a reference to a row.
@@ -284,3 +300,12 @@ namespace LinBox
#endif // __LINBOX_matrix_archetype_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/blas-matrix-multimod.h b/linbox/matrix/blas-matrix-multimod.h
new file mode 100644
index 0000000..db588a4
--- /dev/null
+++ b/linbox/matrix/blas-matrix-multimod.h
@@ -0,0 +1,218 @@
+/* linbox/matrix/blas-matrix-multimod.h
+ * Copyright (C) 2004 Pascal Giorgi, Clément Pernet
+ *
+ * Written by :
+ * Pascal Giorgi pascal.giorgi at ens-lyon.fr
+ * Clément Pernet clement.pernet at imag.fr
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*! @file matrix/blas-matrix-multimod.h
+ * @ingroup matrix
+ * A \c BlasMatrix<\c _Field > represents a matrix as an array of
+ * <code>_Field::Element</code>s. It also has the BlasBlackbox interface.
+ *
+ */
+
+/*! @file matrix/blas-matrix-multimod.h
+ * @brief specialisation for mutlimod field.
+ */
+
+#ifndef __LINBOX_blas_matrix_multimod_H
+#define __LINBOX_blas_matrix_multimod_H
+
+#include "linbox/util/debug.h"
+
+#include "linbox/vector/subiterator.h"
+#include "linbox/vector/subvector.h"
+
+#include "linbox/matrix/matrix-category.h"
+#include "linbox/algorithms/linbox-tags.h"
+#include "linbox/matrix/blas-matrix.h"
+
+THIS_CODE_MAY_NOT_COMPILE_AND_IS_NOT_TESTED
+
+namespace LinBox
+{ /* Specialisation of BlasMatrix for MultiModDouble field */
+
+ /*! No Doc.
+ */
+ template<>
+ class BlasMatrix<MultiModDouble> {
+
+ public:
+
+ typedef MultiModDouble Field;
+ typedef std::vector<double> Element;
+ typedef BlasMatrix<MultiModDouble> Self_t;
+
+ protected:
+
+ MultiModDouble _field;
+ const std::vector<MatrixDomain<Modular<double> > > _MD;
+ size_t _row,_col;
+ Element _One,_Zero;
+ std::vector<BlasMatrix<Modular<double> >* > _rep;
+ std::vector<double> _entry;
+ public:
+
+
+ //BlasMatrix () {}
+
+ BlasMatrix (const MultiModDouble& F) :
+ _field(F) , _rep(F.size()), _entry(F.size())
+ {}
+
+ BlasMatrix (const Field& F, size_t m, size_t n, bool alloc=true) :
+ _field(F), _row(m) , _col(n) , _rep(F.size()), _entry(F.size())
+ {
+ for (size_t i=0;i<_rep.size();++i)
+ _rep[i] = new BlasMatrix<Modular<double> > (F.getBase(i), m, n);
+ }
+
+ BlasMatrix (const BlasMatrix<MultiModDouble> & A):
+ _field(A._field),_row(A._row), _col(A._col),
+ _rep(A._rep.size()), _entry(A._entry)
+ {
+
+ for (size_t i=0;i<_rep.size();++i)
+ _rep[i]= new BlasMatrix<Modular<double> > (const_cast<BlasMatrix<Modular<double> >& >( *A._rep[i]));
+ }
+
+
+ const BlasMatrix<MultiModDouble>& operator=(const BlasMatrix<MultiModDouble> & A)
+ {
+ _field = A._field;
+ _row = A._row;
+ _col = A._col;
+ _rep = std::vector<BlasMatrix<Modular<double> >* >(A._rep.size());
+ _entry = A._entry;
+ for (size_t i=0;i<_rep.size();++i)
+ _rep[i]= new BlasMatrix<Modular<double> > (const_cast<BlasMatrix<Modular<double> >& >( *A._rep[i]));
+ return *this;
+ }
+
+
+ ~BlasMatrix() {for (size_t i=0; i< _rep.size();++i) {delete _rep[i];} }
+
+ template <class Vector1, class Vector2>
+ Vector1& apply (Vector1& y, const Vector2& x) const
+ {
+ for (size_t i=0;i<_rep.size();++i) {
+ std::vector<double> x_tmp(x.size()), y_tmp(y.size());
+ for (size_t j=0;j<x.size();++j)
+ x_tmp[j]= x[j][i];
+
+ _rep[i]->apply(y_tmp, x_tmp);
+
+ for (size_t j=0;j<y.size();++j){
+ y[j][i]=y_tmp[j];
+
+ }
+ }
+
+ return y;
+ }
+
+ template <class Vector1, class Vector2>
+ Vector1& applyTranspose (Vector1& y, const Vector2& x) const
+ {
+ for (size_t i=0;i<_rep.size();++i) {
+ std::vector<double> x_tmp(x.size()), y_tmp(y.size());
+ for (size_t j=0;j<x.size();++j)
+ x_tmp[i]= x[j][i];
+
+ _rep[i]->applyTranspose(y_tmp, x_tmp);
+
+ for (size_t j=0;j<y.size();++j)
+ y[j][i]=y_tmp[i];
+ }
+
+ return y;
+ }
+
+#if 0
+ template<typename _Tp1>
+ struct rebind
+ {
+ typedef BlasMatrix<_Tp1> other;
+
+ void operator() (other *& Ap, const Self_t& A, const _Tp1& F) {
+ Ap = new other(F, A.rowdim(), A.coldim());
+ Hom<Field, _Tp1> hom(A. field(), F);
+
+ hom.image (*Ap_p, *A_p);
+ }
+ };
+#endif
+
+ size_t rowdim() const {return _row;}
+
+ size_t coldim() const {return _col;}
+
+
+ const Field &field() const {return _field;}
+
+
+ std::ostream& write(std::ostream& os) const
+ {
+ for (size_t i=0;i<_rep.size();++i)
+ _rep[i]->write(os);
+ return os;
+ }
+
+
+ void setEntry (size_t , size_t j, const Element &a_ij)
+ {
+ for (size_t i=0; i< _rep.size();++i)
+ _rep[i]->setEntry(i,j,a_ij[i]);
+ }
+
+
+ const Element& getEntry (size_t , size_t j)
+ {
+ for (size_t i=0; i< _rep.size();++i)
+ _entry[i]=_rep[i]->getEntry(i,j);
+ return _entry;
+ }
+
+ BlasMatrix<Modular<double> >*& getMatrix(size_t i) {return _rep[i];}
+
+ };
+
+
+ template <>
+ class MatrixContainerTrait<BlasMatrix<MultiModDouble> > {
+ public:
+ typedef MatrixContainerCategory::Blackbox Type;
+ };
+} // LinBox
+
+#endif // __LINBOX_blas_matrix_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/blas-matrix.h b/linbox/matrix/blas-matrix.h
index dfa81cf..c7f8b59 100644
--- a/linbox/matrix/blas-matrix.h
+++ b/linbox/matrix/blas-matrix.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/matrix/blas-matrix.h
* Copyright (C) 2004 Pascal Giorgi, Clément Pernet
*
@@ -7,10 +5,13 @@
* Pascal Giorgi pascal.giorgi at ens-lyon.fr
* Clément Pernet clement.pernet at imag.fr
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,71 +19,104 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file matrix/blas-matrix.h
* @ingroup matrix
- * A \c BlasMatrix<\c _element > represents a matrix as an array of
- * <code>_element</code>s.
+ * A \c BlasMatrix<\c _Field > represents a matrix as an array of
+ * <code>_Field::Element</code>s. It also has the BlasBlackbox interface.
*
- * @todo explain the differences with \c DenseMatrixBase<\c _element >
- * and \c DenseSubmatrix<\c _element > or
- * \c DenseMatrix<\c _field >...
*/
#ifndef __LINBOX_blas_matrix_H
#define __LINBOX_blas_matrix_H
+#include "linbox/vector/subiterator.h"
+#include "linbox/vector/subvector.h"
-#include <linbox/solutions/getentry.h>
-#include <linbox/matrix/dense.h>
-#include <linbox/matrix/dense-submatrix.h>
-#include <linbox/util/debug.h>
-#include <linbox/matrix/matrix-category.h>
+#include "linbox/util/debug.h"
+#include "linbox/matrix/matrix-category.h"
+#include "linbox/algorithms/linbox-tags.h"
-#include "linbox/algorithms/cra-full-multip.h"
namespace LinBox
-{
+{ /* not generic wrt Field (eg NTL_ZZ_p) */
+ namespace Protected
+ {
- // forward declaration
- template<class Element>
- class BlasMatrix;
+ template <class Field>
+ bool checkBlasApply(const Field &F, size_t n)
+ {
- template <class Element>
- class MatrixContainerTrait<BlasMatrix<Element> > {
- public:
- typedef MatrixContainerCategory::BlasContainer Type;
- };
+ integer chara, card;
+ F.characteristic(chara);
+ F.cardinality(card);
+
+ if ((chara != card) || chara == 0)
+ return false;
+ else
+ if (n*chara*chara < integer("9007199254740992"))
+ return true;
+ else
+ return false;
+ }
+ }
+}
- template <class Element>
- class MatrixContainerTrait<const BlasMatrix<Element> > {
- public:
- typedef MatrixContainerCategory::BlasContainer Type;
- };
+namespace LinBox
+{ /* Blas Matrix */
+ template<class _Field>
+ class BlasSubmatrix ;
- /*! BlasMatrix.
+ /*! Dense matrix representation.
* @ingroup matrix
- * Limited docs so far.
+ * A BlasMatrix is a matrix of \p _Field::Element, with the structure of BLAS matrices.
+ * It is basically a vector of \p _Field::Element.
+ * In the Mother model, a BlasMatrix is allocated by the user.
*/
- template <class _Element>
- class BlasMatrix : public DenseSubmatrix<_Element> {
+ template <class _Field>
+ class BlasMatrix {
+ // private :
public:
- typedef _Element Element;
- // typedef _Element* pointer ?
- typedef typename DenseSubmatrix<_Element>::Element * pointer;
- typedef BlasMatrix<Element> Self_t;
+ typedef _Field Field;
+ typedef typename Field::Element Element; //!< Element type
+ typedef typename RawVector<Element>::Dense Rep; //!< Actually a <code>std::vector<Element></code> (or alike.)
+ typedef typename Rep::pointer pointer; //!< pointer type to elements
+ typedef const pointer const_pointer; //!< const pointer type
+ typedef BlasMatrix<_Field> Self_t; //!< Self type
protected:
- size_t _stride;
- bool _alloc;
- pointer _ptr;
+ size_t _row;
+ size_t _col;
+ Rep _rep;
+ pointer _ptr;
+ const Field & _field;
+ const MatrixDomain<Field> _MD;
+ const VectorDomain<Field> _VD;
+ bool _use_fflas ;
+
private:
+#if 0
+ void makePointer()
+ {
+#if 0
+ if (_row && _col) {
+ _ptr = malloc( _row*_col*sizeof(_Element) ) ;
+ linbox_check(_ptr);
+ }
+ else
+ _ptr = NULL ;
+#endif
+ _rep = Rep(_row*_col);
+ _ptr = &_rep[0];
+ }
+#endif
+
/*! @internal
* @name create BlasMatrix
* @{ */
@@ -91,69 +125,28 @@ namespace LinBox
* Copy data according to blas container structure.
* Specialisation for BlasContainer.
*/
+ void createBlasMatrix (const BlasMatrix<_Field> & A) ;
+
+ /*! @internal
+ * Copy data according to blas container structure.
+ * Specialisation for BlasContainer.
+ */
template <class _Matrix>
- void createBlasMatrix (const _Matrix& A, MatrixContainerCategory::BlasContainer)
- {
- typename _Matrix::ConstRawIterator iter_value = A.rawBegin();
- RawIterator iter_addr = this->rawBegin();
- for (;iter_value != A.rawEnd(); ++iter_value,++iter_addr)
- *iter_addr = *iter_value;
- }
+ void createBlasMatrix (const _Matrix& A, MatrixContainerCategory::BlasContainer) ;
/*! @internal
* Copy data according to Matrix container structure.
* Specialisation for Container
*/
template <class Matrix>
- void createBlasMatrix (const Matrix& A, MatrixContainerCategory::Container)
- {
- // With both iterators, it is Segfaulting !!!!
- typename Matrix::ConstRawIndexedIterator iter_index = A.rawIndexedBegin();
- for (;iter_index != A.rawIndexedEnd(); ++iter_index)
- this->_M->setEntry( iter_index.rowIndex(),
- iter_index.colIndex(),
- A.getEntry(iter_index.rowIndex(),iter_index.colIndex())
- );
- }
+ void createBlasMatrix (const Matrix& A, MatrixContainerCategory::Container) ;
/*! @internal
* Copy data according to blackbox structure.
* Specialisation for Blackbox.
*/
template <class Matrix>
- void createBlasMatrix (const Matrix& A, MatrixContainerCategory::Blackbox)
- {
- typedef typename Matrix::Field Field;
- typename Field::Element one, zero;
- Field F = A.field();
- F. init(one, 1);
- F. init(zero, 0);
-
- std::vector<typename Field::Element> e(A.coldim(), zero), tmp(A.rowdim());
- typedef typename DenseSubmatrix<_Element>::ColIterator ColIterator ;
- ColIterator col_p;
-
- typename BlasMatrix<Element>::Col::iterator elt_p;
-
- typename std::vector<typename Field::Element>::iterator e_p, tmp_p;
-
-
- for (col_p = DenseSubmatrix<_Element>:: colBegin(), e_p = e.begin();
- e_p != e.end(); ++ col_p, ++ e_p)
- {
-
- F.assign(*e_p, one);
-
- A.apply (tmp, e);
-
- for (tmp_p = tmp.begin(), elt_p = col_p -> begin();
- tmp_p != tmp.end(); ++ tmp_p, ++ elt_p)
-
- F.assign(*elt_p, *tmp_p);
-
- F.assign(*e_p, zero);
- }
- }
+ void createBlasMatrix (const Matrix& A, MatrixContainerCategory::Blackbox) ;
/*! @internal
* Copy data according to Matrix container structure (allow submatrix).
@@ -163,20 +156,7 @@ namespace LinBox
void createBlasMatrix (const _Matrix& A,
const size_t i0,const size_t j0,
const size_t m, const size_t n,
- MatrixContainerCategory::Container)
- {
-
- typename _Matrix::ConstRawIterator iter_value = A.rawBegin();
- typename _Matrix::ConstRawIndexedIterator iter_index = A.rawIndexedBegin();
-
- for (;iter_value != A.rawEnd(); ++iter_value,++iter_index){
- size_t i,j;
- i=iter_index.rowIndex();
- j=iter_index.colIndex();
- if (( i >= i0) && (i< i0+m) && (j >= j0) && (j < j0+n))
- this->_M->setEntry(i-i0, j-j0, *iter_value);
- }
- }
+ MatrixContainerCategory::Container) ;
/*! @internal
* Copy data according to Matrix container structure (allow submatrix).
@@ -186,20 +166,7 @@ namespace LinBox
void createBlasMatrix (const Matrix& A,
const size_t i0,const size_t j0,
const size_t m, const size_t n,
- MatrixContainerCategory::BlasContainer)
- {
-
- typename Matrix::ConstRawIterator iter_value = A.rawBegin();
- typename Matrix::ConstRawIndexedIterator iter_index = A.rawIndexedBegin();
-
- for (;iter_value != A.rawEnd(); ++iter_value,++iter_index){
- size_t i,j;
- i=iter_index.rowIndex();
- j=iter_index.colIndex();
- if (( i >= i0) && (i< i0+m) && (j >= j0) && (j < j0+n))
- this->_M->setEntry(i-i0, j-j0, *iter_value);
- }
- }
+ MatrixContainerCategory::BlasContainer) ;
/*! @internal
* Copy data according to blackbox structure (allow submatrix).
@@ -210,74 +177,88 @@ namespace LinBox
void createBlasMatrix (const Matrix& A,
const size_t i0,const size_t j0,
const size_t m, const size_t n,
- MatrixContainerCategory::Blackbox)
- {
- throw(NotImplementedYet(__func__,__FILE__,__LINE__,
- "need to be implemented by succesive apply"));
- }
+ MatrixContainerCategory::Blackbox) ;
+
+ /*!@internal constructor from vector of elements.
+ * @param v pointer to \c Element s
+ */
+ void createBlasMatrix ( const Element * v) ;
+ /*!@internal constructor from vector of elements.
+ * @param v std::vector of \c Element s
+ */
+ void createBlasMatrix ( const std::vector<Element> & v) ;
/*! @internal
* @}
*/
public:
- typedef typename DenseSubmatrix<_Element>::RawIterator RawIterator ; // for nvcc
- /* Constructors. */
+ //////////////////
+ // CONSTRUCTORS //
+ //////////////////
+
/*! Allocates a new \f$ 0 \times 0\f$ matrix.
- */
- BlasMatrix () :
- DenseSubmatrix<Element>(*(new DenseMatrixBase<Element> (0,0)),0,0,0,0),
- _stride(0), _alloc(true)
- {
- _ptr = this->_M->FullIterator();
- }
+ */
+ BlasMatrix (const _Field &F) ;
- /*! Allocates a new \f$ m \times n\f$ matrix.
- * @param m rows
- * @param n cols
- */
- BlasMatrix (int m, int n) :
- DenseSubmatrix<Element>(*(new DenseMatrixBase<Element> (m,n)),0,0,m,n),
- _stride(n), _alloc(true)
- {
- _ptr = this->_M->FullIterator();
- }
+ /*! Allocates a new \f$ 0 \times 0\f$ matrix.
+ */
+ BlasMatrix () ;
/*! Allocates a new \f$ m \times n\f$ matrix.
+ * @param F
* @param m rows
* @param n cols
*/
- BlasMatrix (size_t m, size_t n) :
- DenseSubmatrix<Element>(*(new DenseMatrixBase<Element> (m,n)),0,0,m,n),
- _stride(n), _alloc(true)
- {
- _ptr = this->_M->FullIterator();
- }
+ //@{
+#ifdef __GNUC__
+#ifndef __x86_64__
+#if (__GNUC__ == 4 && __GNUC_MINOR__ ==4 && __GNUC_PATCHLEVEL__==5)
+ template<class T>
+ BlasMatrix (const _Field &F, const long &m, const T &n) ;
+#endif
+#endif
+#endif
+
+ // Pascal Giorgi: fix a bug with MAC OSX
+ // MAC OSX defines in stdint.h the int64_t to be a long long which causes trouble here
+ // might be useful to add signed type either but need to resolve conflict with pathch version above for GCC-4.4.5
+#ifdef __APPLE__
+
+ template<class T>
+ BlasMatrix (const _Field &F, const unsigned long &m, const T &n) ;
+#endif
+
+ template<class T>
+ BlasMatrix (const _Field &F, const uint64_t &m, const T &n) ;
+
+ template<class T>
+ BlasMatrix (const _Field &F, const int64_t &m, const T &n) ;
+
+ template<class T>
+ BlasMatrix (const _Field &F, const uint32_t &m, const T &n) ;
+
+ template<class T>
+ BlasMatrix (const _Field &F, const int32_t &m, const T &n) ;
+
+ template<class T>
+ BlasMatrix (const _Field &F, const Integer & m, const T &n) ;
+
+ //@}
+
/*! Constructor from a matrix stream.
* @param ms matrix stream.
*/
- template< class Field >
- BlasMatrix(MatrixStream<Field>& ms) :
- DenseSubmatrix<Element>(*(new DenseMatrixBase<Element> (ms))), _alloc(true)
- {
- _ptr = this->_M->FullIterator();
- _stride= this->coldim();
- }
+ BlasMatrix(MatrixStream<_Field>& ms) ;
/*! Generic copy constructor from either a blackbox or a matrix container.
* @param A matrix to be copied
*/
template <class Matrix>
- BlasMatrix (const Matrix &A) :
- DenseSubmatrix<Element>(*(new DenseMatrixBase<Element> (A.rowdim(),A.coldim())),0,0,A.rowdim(),A.coldim()),
- _stride(A.coldim()) , _alloc(true)
- {
- _ptr = this->_M->FullIterator();
- createBlasMatrix(A, typename MatrixContainerTrait<Matrix>::Type());
- }
+ BlasMatrix (const Matrix &A) ;
/*! Generic copy constructor from either a blackbox or a matrix container (allow submatrix).
* @param A matrix to be copied
@@ -289,284 +270,823 @@ namespace LinBox
template <class Matrix>
BlasMatrix (const Matrix& A,
const size_t i0, const size_t j0,
- const size_t m, const size_t n) :
- DenseSubmatrix<Element>( *(new DenseMatrixBase<Element> (m,n)),0,0,m,n),
- _stride(A.coldim()) , _alloc(true)
- {
- _ptr = this->_M->FullIterator();
- createBlasMatrix(A, i0, j0, m, n, typename MatrixContainerTrait<Matrix>::Type());
- }
+ const size_t m, const size_t n) ;
/*! Constructor.
* @param A matrix to be copied
- * @param F ?
- */
- template<class _Matrix, class _Field>
- BlasMatrix (const _Matrix &A, const _Field &F) :
- DenseSubmatrix<Element>( *(new DenseMatrixBase<Element> (A.rowdim(),A.coldim())),0,0,A.rowdim(),A.coldim() ),
- _stride(A.coldim()) ,
- _alloc(true)
- {
- _ptr = this->_M->FullIterator() ;
- typename _Matrix::template rebind<_Field>()(*this,A,F);
+ * @param F Field
+ */
+ template<class _Matrix>
+ BlasMatrix (const _Matrix &A, const _Field &F) ;
- }
+ /*! Copy Constructor of a matrix (copying data).
+ * @param A matrix to be copied.
+ */
+ BlasMatrix (const BlasMatrix<_Field>& A) ;
-#if 1
- /*! Constructor from matrix (no copy).
- * @param A DenseMatrixBase
+ /*- Copy Constructor of a matrix (copying data).
+ * @param A matrix to be copied.
*/
- BlasMatrix ( DenseMatrixBase<Element>& A ) :
- DenseSubmatrix<Element>(A,0,0,A.rowdim(),A.coldim()),
- _stride(A.coldim()) , _alloc(false)
- {
- _ptr = this->_M->FullIterator();
- }
+ // BlasMatrix (const BlasSubmatrix<_Field>& A) ;
- /*! Constructor from matrix (no copy).
- * @param A DenseMatrixBase
- * @param i0
- * @param j0
- * @param m rows
- * @param n columns
+ /*! Create a BlasMatrix from a vector of elements
+ * @param F
+ * @param v
+ * @param m
+ * @param n
*/
- BlasMatrix ( DenseMatrixBase<Element>& A,
- const size_t i0, const size_t j0,
- const size_t m, const size_t n) :
- DenseSubmatrix<Element>(A,i0,j0,m,n),
- _stride(A.coldim()) , _alloc(false)
- {
- _ptr = this->_M->FullIterator();
- }
-#endif
+ BlasMatrix (const _Field &F, const std::vector<Element>& v,
+ size_t m, size_t n) ;
+
+ /*! Create a BlasMatrix from an array of elements
+ * @param F
+ * @param v
+ * @param m
+ * @param n
+ */
+ BlasMatrix (const _Field &F, const Element * v,
+ size_t m, size_t n) ;
- /*! Copy Constructor of a matrix (copying data).
- * @param A matrix to be copied.
+ /** Constructor using a finite vector stream (stream of the rows).
+ * @param F The field of entries; passed so that arithmetic may be done
+ * on elements
+ * @param stream A vector stream to use as a source of vectors for this
+ * matrix
+ */
+ template <class StreamVector>
+ BlasMatrix (const Field &F, VectorStream<StreamVector> &stream) ;
+
+ /// Destructor.
+ ~BlasMatrix () ;
+
+ //! operator = (copying data)
+ BlasMatrix<_Field>& operator= (const BlasMatrix<_Field>& A) ;
+
+ //! Rebind operator
+ template<typename _Tp1>
+ struct rebind ;
+
+ //////////////////
+ // DIMENSIONS //
+ //////////////////
+
+ /** Get the number of rows in the matrix.
+ * @returns Number of rows in matrix
+ */
+ size_t rowdim() const ;
+
+ /** Get the number of columns in the matrix.
+ * @returns Number of columns in matrix
+ */
+ size_t coldim() const ;
+
+ /*! Get the stride of the matrix.
+ */
+ size_t getStride() const;
+
+ /*!Get a reference to the stride of the matrix.
+ * Modify stride this way.
+ */
+ size_t& getWriteStride();
+
+
+ /** Resize the matrix to the given dimensions.
+ * The state of the matrix's entries after a call to this method is
+ * undefined
+ * @param m Number of rows
+ * @param n Number of columns
+ * @param val
+ */
+ void resize (size_t m, size_t n, const Element& val = Element()) ;
+
+ //////////////////
+ // ELEMENTS //
+ //////////////////
+
+ /*! @internal
+ * Get read-only pointer to the matrix data.
+ */
+ pointer getPointer() const ;
+
+ const_pointer &getConstPointer() const ;
+
+
+ /*! @internal
+ * Get write pointer to the matrix data.
+ * Data may be changed this way.
+ */
+ pointer& getWritePointer() ;
+
+ /** Set the entry at the (i, j) position to a_ij.
+ * @param i Row number, 0...rowdim () - 1
+ * @param j Column number 0...coldim () - 1
+ * @param a_ij Element to set
*/
- BlasMatrix (const BlasMatrix<Element>& A) :
- DenseSubmatrix<Element>(*(new DenseMatrixBase<Element> (*A._M)),0,0,A.rowdim(),A.coldim()),
- _stride(A._stride), _alloc(true)
+ void setEntry (size_t i, size_t j, const Element &a_ij) ;
+
+ /** Get a writeable reference to the entry in the (i, j) position.
+ * @param i Row index of entry
+ * @param j Column index of entry
+ * @returns Reference to matrix entry
+ */
+ Element &refEntry (size_t i, size_t j) ;
+
+ /** Get a read-only reference to the entry in the (i, j) position.
+ * @param i Row index
+ * @param j Column index
+ * @returns Const reference to matrix entry
+ */
+ const Element &getEntry (size_t i, size_t j) const ;
+
+ /** Copy the (i, j) entry into x, and return a reference to x.
+ * This form is more in the Linbox style and is provided for interface
+ * compatibility with other parts of the library
+ * @param x Element in which to store result
+ * @param i Row index
+ * @param j Column index
+ * @returns Reference to x
+ */
+ Element &getEntry (Element &x, size_t i, size_t j) const ;
+
+ ///////////////////
+ // TRANSPOSE &AL //
+ ///////////////////
+
+ /*! Creates a transposed matrix of \c *this.
+ * @param[in] tM
+ * @return the transposed matrix of this.
+ */
+ BlasMatrix<_Field> transpose(BlasMatrix<_Field> & tM) const ;
+
+
+ /*! Transpose (inplace).
+ * If rows and columns agree, we can transpose inplace.
+ */
+ template<bool _IP>
+ void transpose() ;
+
+ void transpose() ;
+
+ /*! Reverse the rows of a matrix.
+ * This is done inplace.
+ * Let J=antiDiag(1) (or the matrix of the reverse
+ * permutation or the matrix (i,j) = (i+j+1==m)). Then,
+ * we compute A <- J.A;
+ */
+ void reverseRows() ;
+
+ /*! Reverse the columns of a matrix.
+ * This is done inplace.
+ * This is A <- J.A
+ */
+ void reverseCols() ;
+
+ /*! Reverse the rows/columns of a matrix.
+ * This is done inplace.
+ * This is A <- J.A.J
+ */
+ void reverse() ;
+
+ ///////////////////
+ // I/O //
+ ///////////////////
+
+ /** Read the matrix from an input stream.
+ * The stream is in SMS or DENSE format and is autodetected.
+ * @param file Input stream from which to read
+ */
+ std::istream &read (std::istream &file);
+
+ /** Write the matrix to an output stream.
+ * @param os Output stream to which to write
+ * @param f write in some format (@ref LinBoxTag::Format). Default is Maple's.
+ */
+ std::ostream &write (std::ostream &os,
+ enum LinBoxTag::Format f = LinBoxTag::FormatMaple) const;
+
+ /*! @deprecated Only for compatiblity.
+ */
+ std::ostream &write (std::ostream &os,
+ bool mapleFormat) const
{
- _ptr = this->_M->FullIterator();
+ if (mapleFormat)
+ return write(os,LinBoxTag::FormatMaple);
+ else
+ return write(os);
}
-#if 1
- /// Copy Contructor of a matrix (no copy is done, just through pointer)
- /*! @param A BlasMatrix to be copied
+
+
+ ///////////////////
+ // ITERATORS //
+ ///////////////////
+
+ /** @name Column of rows iterator
+ * \brief
+ * The column of rows iterator traverses the rows of the
+ * matrix in ascending order. Dereferencing the iterator yields
+ * a row vector in dense format
*/
- BlasMatrix(BlasMatrix<Element>& A) :
- DenseSubmatrix<Element>(A),
- _stride(A._stride), _alloc(false), _ptr(A._ptr)
- {}
+ //@{
+ typedef Subvector<typename Rep::iterator, typename Rep::const_iterator> Row;
+ typedef Subvector<typename Rep::const_iterator> ConstRow;
+ /*! Row Iterator.
+ * @ingroup iterators
+ * @brief NO DOC
+ */
+ class RowIterator;
+ /*! Const Row Iterator.
+ * @ingroup iterators
+ * @brief NO DOC
+ */
+ class ConstRowIterator;
+
+ RowIterator rowBegin ();
+ RowIterator rowEnd ();
+ ConstRowIterator rowBegin () const;
+ ConstRowIterator rowEnd () const;
+ //@}
+
+ /** @name Row of columns iterator
+ * \brief
+ * The row of columns iterator traverses the columns of the
+ * matrix in ascending order. Dereferencing the iterator yields
+ * a column vector in dense format
+ */
+ //@{
+ typedef Subvector<Subiterator<typename Rep::iterator> > Col;
+ typedef Subvector<Subiterator<typename Rep::const_iterator> > ConstCol;
+ typedef Col Column;
+ typedef ConstCol ConstColumn;
+
+ /*! Col Iterator.
+ * @ingroup iterators
+ * @brief NO DOC
+ */
+ class ColIterator;
+ /*! Const Col Iterator.
+ * @ingroup iterators
+ * @brief NO DOC
+ */
+ class ConstColIterator;
+
+ ColIterator colBegin ();
+ ColIterator colEnd ();
+ ConstColIterator colBegin () const;
+ ConstColIterator colEnd () const;
+ //@}
+
+ /** @name Iterator
+ * \brief
+ *
+ * The iterator is a method for accessing all entries in the matrix
+ * in some unspecified order. This can be used, e.g. to reduce all
+ * matrix entries modulo a prime before passing the matrix into an
+ * algorithm.
+ */
+ //@{
+ typedef typename Rep::iterator Iterator;
+ typedef typename Rep::const_iterator ConstIterator;
+
+ Iterator Begin ();
+ Iterator End ();
+ ConstIterator Begin () const;
+ ConstIterator End () const;
+ //@}
+
+ /** @name Raw Indexed iterator
+ * \brief
+ *
+ * Like the raw iterator, the indexed iterator is a method for
+ * accessing all entries in the matrix in some unspecified order.
+ * At each position of the the indexed iterator, it also provides
+ * the row and column indices of the currently referenced entry.
+ * This is provided through it's \c rowIndex() and \c colIndex() functions.
+ */
+ //@{
+ class IndexedIterator;
+ /*! Const Indexed Iterator.
+ * @ingroup iterators
+ * @brief NO DOC
+ */
+ class ConstIndexedIterator;
+
+ IndexedIterator IndexedBegin ();
+ IndexedIterator IndexedEnd ();
+ ConstIndexedIterator IndexedBegin () const;
+ ConstIndexedIterator IndexedEnd () const;
+ //@}
+
+ /** Retrieve a reference to a row.
+ * Since rows may also be indexed, this allows A[i][j] notation
+ * to be used.
+ * @param i Row index
+ */
+ //@{
+ Row operator[] (size_t i) ;
+ ConstRow operator[] (size_t i) const ;
+ //@}
- /// Copy Contructor of a submatrix (no copy is done, just through pointer)
- /*! @param A BlasMatrix to be copied
- * @param i0
- * @param j0
- * @param m rows
- * @param n columns
+ ///////////////////
+ // MISC //
+ ///////////////////
+
+
+ /** Compute column density.
+ * @param v
*/
- BlasMatrix(BlasMatrix<Element>& A, const size_t i, const size_t j, const size_t m, const size_t n) :
- DenseSubmatrix<Element>(A,i,j,m,n),
- _stride(A._stride), _alloc(false),
- _ptr(A._ptr+ i*A._stride+j)
- {}
-#endif
+ template <class Vector>
+ Vector &columnDensity (Vector &v) const ;
+
+ ///////////////////
+ // BLACK BOX //
+ ///////////////////
+ template <class Vector1, class Vector2>
+ Vector1& apply (Vector1& y, const Vector2& x) const ;
-#if 0 /* Create a blas matrix from a pointer of elements
- * (without allocating a vector in DenseMatrixBase...)
- * is it possible ? */
- BlasMatrix(size_t m, size_t n, size_t stride,
- Element * A, size_t lda)
+ template <class Vector1, class Vector2>
+ Vector1& applyTranspose (Vector1& y, const Vector2& x) const ;
+
+ const _Field& field() const;
+ _Field& field() ;
+ // void setField(const _Field & F) { _field = F ; };
+
+ template<class uselessTag>
+ void changeFieldSpecialised( _Field & G,
+ MatrixDomain<_Field> & MD,
+ VectorDomain<_Field> & VD,
+ const _Field & F,
+ const uselessTag & m)
{
+ return;
+ }
+ void changeFieldSpecialised( _Field & G,
+ MatrixDomain<_Field> & MD,
+ VectorDomain<_Field> & VD,
+ const _Field & F,
+ const RingCategories::ModularTag & m)
+ {
+ G=F ;
+ MD = MatrixDomain<_Field>(F);
+ VD = VectorDomain<_Field>(F);
+ return;
}
-#endif
- /// Destructor.
- ~BlasMatrix ()
+ void changeField(const _Field &F)
{
- if (_alloc)
- delete this->_M;
+ changeFieldSpecialised(const_cast<_Field&>(_field),
+ const_cast<MatrixDomain<_Field>&>(_MD),
+ const_cast<VectorDomain<_Field>&>(_VD),
+ F,
+ typename FieldTraits<_Field>::categoryTag());
}
- //! Rebind operator
+
+
+ }; // end of class BlasMatrix
+
+ template <class _Field>
+ struct MatrixTraits< BlasMatrix<_Field> > {
+ typedef BlasMatrix<_Field> MatrixType;
+ typedef typename MatrixCategories::RowColMatrixTag MatrixCategory;
+ };
+
+ template <class _Field>
+ struct MatrixTraits< const BlasMatrix<_Field> > {
+ typedef const BlasMatrix<_Field> MatrixType;
+ typedef typename MatrixCategories::RowColMatrixTag MatrixCategory;
+ };
+
+ /*! Write a matrix to a stream.
+ * The \c C++ way using <code>operator<<</code>
+ * @param o output stream
+ * @param Mat matrix to write.
+ */
+ template<class T>
+ std::ostream& operator<< (std::ostream & o, const BlasMatrix<T> & Mat)
+ {
+ return Mat.write(o);
+ }
+
+} // end of namespace LinBox
+
+namespace LinBox
+{ /* Blas Submatrix */
+ /*! Dense Submatrix representation.
+ * @ingroup matrix
+ * A @ref BlasSubmatrix is a matrix of \p _Field::Element, with the structure of BLAS matrices.
+ * It is basically a read/write view on a vector of \p _Field::Element.
+ * In the Mother model, a @ref BlasSubmatrix is not allocated.
+ * <p>
+ * This matrix type conforms to the same interface as @ref BlasMatrix,
+ * except that you cannot resize it. It represents a submatrix of a dense
+ * matrix. Upon construction, one can freely manipulate the entries in the
+ * DenseSubmatrix, and the corresponding entries in the underlying
+ * @ref BlasMatrix will be modified.
+
+
+ */
+ template <class _Field>
+ class BlasSubmatrix {
+ public :
+ typedef _Field Field;
+ typedef typename Field::Element Element; //!< Element type
+ typedef BlasSubmatrix<_Field> Self_t; //!< Self type
+ typedef typename RawVector<Element>::Dense Rep; //!< Actually a <code>std::vector<Element></code> (or alike.)
+ typedef typename Rep::pointer pointer; //!< pointer type to elements
+ typedef const pointer const_pointer; //!< const pointer type
+
+
+ protected:
+ BlasMatrix<_Field> *_Mat; //!< Parent BlasMatrix (ie raw vector)
+ size_t _row; //!< row dimension of Submatrix
+ size_t _col; //!< col dimension of Submatrix
+ size_t _r0; //!< upper left corner row of Submatrix in \p _Mat
+ size_t _c0; //!< upper left corner row of Submatrix in \p _Mat
+ size_t _stride ; //!< number of columns in \p _Mat (or stride of \p _Mat)
+ size_t _off;
+
+ public:
+
+ //////////////////
+ // CONSTRUCTORS //
+ //////////////////
+
+
+ /* constructors */
+
+ /** NULL constructor. */
+ BlasSubmatrix () ;
+
+ /** Constructor from an existing @ref BlasMatrix and dimensions.
+ * \param M Pointer to @ref BlasMatrix of which to construct submatrix
+ * \param rowbeg Starting row
+ * \param colbeg Starting column
+ * \param Rowdim Row dimension
+ * \param Coldim Column dimension
+ */
+ BlasSubmatrix (const BlasMatrix<_Field> &M,
+ size_t rowbeg,
+ size_t colbeg,
+ size_t Rowdim,
+ size_t Coldim);
+
+ /** Constructor from an existing @ref BlasMatrix
+ * \param M Pointer to @ref BlasMatrix of which to construct submatrix
+ */
+ BlasSubmatrix (const BlasMatrix<_Field> &M);
+
+
+ /** Constructor from an existing submatrix and dimensions
+ * @param SM Constant reference to BlasSubmatrix from which to
+ * construct submatrix
+ * @param rowbeg Starting row
+ * @param colbeg Starting column
+ * @param Rowdim Row dimension
+ * @param Coldim Column dimension
+ */
+ BlasSubmatrix (const BlasSubmatrix<_Field> &SM,
+ size_t rowbeg,
+ size_t colbeg,
+ size_t Rowdim,
+ size_t Coldim);
+
+ /** Copy constructor.
+ * @param SM Submatrix to copy
+ */
+ BlasSubmatrix (const BlasSubmatrix<_Field> &SM);
+
+
+ /* Members */
+
+ /** Assignment operator.
+ * Assign the given submatrix to this one
+ * This is <i>only</i> renaming !
+ * There is no copy because BlasSubmatrix owns nothing.
+ * @param SM Submatrix to assign
+ * @return Reference to this submatrix
+ */
+ BlasSubmatrix &operator = (const BlasSubmatrix<_Field> &SM);
+
template<typename _Tp1>
- struct rebind {
- typedef BlasMatrix<typename _Tp1::Element> other;
-
- void operator() (other & Ap, const Self_t& A, const _Tp1& F)
- {
- typedef typename DenseSubmatrix<_Element>::ConstRawIndexedIterator ConstRawIndexedIterator ;
- typedef typename DenseSubmatrix<_Element>::ConstRawIterator ConstRawIterator ;
- ConstRawIterator iter_value = A.rawBegin();
- ConstRawIndexedIterator iter_index = A.rawIndexedBegin();
- typename _Tp1::Element tmp;
- for (;iter_value != A.rawEnd(); ++iter_value,++iter_index){
- F.init( tmp, *iter_value );
- Ap.setEntry(iter_index.rowIndex(), iter_index.colIndex(),tmp);
- }
-#if 0
- linbox_check( Ap.rowdim() == A.rowdim() );
- linbox_check( Ap.coldim() == A.coldim() ) ;
- for (size_t i = 0 ; i < A.rowdim() ; ++i)
- for (size_t j = 0 ; j < A.coldim() ; ++j) {
- F.init(Ap.refEntry(i,j),(Element)A.getEntry(i,j));
- }
-#endif
- return ;
- }
- };
+ struct rebind ;
+ //////////////////
+ // DIMENSIONS //
+ //////////////////
- //! operator = (copying data)
- BlasMatrix<Element>& operator= (const BlasMatrix<Element>& A)
- {
+ /** Get the number of rows in the matrix
+ * @return Number of rows in matrix
+ */
+ size_t rowdim () const;
- DenseMatrixBase<Element> *tmp= this->_M;
- this->_M = new DenseMatrixBase<Element>(*A._M);
- if (_alloc) {
- delete tmp;
- }
- this->_beg_row = A._beg_row;
- this->_end_row = A._end_row;
- this->_beg_col = A._beg_col;
- this->_end_col = A._end_col;
- _ptr = this->_M->FullIterator();
- _alloc = true;
- _stride = A._stride;
-
- return *this;
+ /** Get the number of columns in the matrix
+ * @return Number of columns in matrix
+ */
+ size_t coldim () const ;
+
+ /*! Get the stride of the matrix.
+ * @return stride of submatrix (number of cols of dense base matrix)
+ */
+ size_t getStride() const;
+
+
+ ///////////////////
+ // I/O //
+ ///////////////////
+
+ /** Read the matrix from an input stream.
+ * @param file Input stream from which to read
+ * @bug reading a submatrix should not be allowed !!
+ */
+ // template<class Field>
+ std::istream& read (std::istream &file/*, const Field& field*/);
+
+
+ /** Write the matrix to an output stream.
+ * @param os Output stream to which to write
+ * @param f write in some format (@ref LinBoxTag::Format). Default is Maple's.
+ */
+ std::ostream &write (std::ostream &os,
+ enum LinBoxTag::Format f = LinBoxTag::FormatMaple) const;
+
+ /*! @deprecated Only for compatiblity.
+ */
+ std::ostream &write (std::ostream &os,
+ bool mapleFormat) const
+ {
+ if (mapleFormat)
+ return write(os,LinBoxTag::FormatMaple);
+ else
+ return write(os);
}
+ //////////////////
+ // ELEMENTS //
+ //////////////////
+
/*! @internal
* Get read-only pointer to the matrix data.
*/
- pointer getPointer() const
- {
- return _ptr;
- }
+ pointer getPointer() const ;
+
+ const_pointer &getConstPointer() const ;
+
/*! @internal
* Get write pointer to the matrix data.
* Data may be changed this way.
*/
- pointer& getWritePointer()
- {
- return _ptr;
- }
+ pointer& getWritePointer() ;
- /*! @internal
- * Get the stride of the matrix
+
+ /** Set the entry at (i, j).
+ * @param i Row number, 0...rowdim () - 1
+ * @param j Column number 0...coldim () - 1
+ * @param a_ij Element to set
*/
- size_t getStride() const
- {
- return _stride;
- }
+ void setEntry (size_t i, size_t j, const Element &a_ij) ;
- /*! @internal
- * Get a reference to the stride of the matrix.
- * Modify stride this way.
+ /** Get a writeable reference to an entry in the matrix.
+ * @param i Row index of entry
+ * @param j Column index of entry
+ * @return Reference to matrix entry
+ */
+ Element &refEntry (size_t i, size_t j) ;
+
+ /** Get a read-only individual entry from the matrix.
+ * @param i Row index
+ * @param j Column index
+ * @return Const reference to matrix entry
+ */
+ const Element &getEntry (size_t i, size_t j) const ;
+
+ /** Get an entry and store it in the given value.
+ * This form is more in the Linbox style and is provided for interface
+ * compatibility with other parts of the library
+ * @param x Element in which to store result
+ * @param i Row index
+ * @param j Column index
+ * @return Reference to x
*/
- size_t& getWriteStride()
+ Element &getEntry (Element &x, size_t i, size_t j) const ;
+
+
+ ///////////////////
+ // ITERATORS //
+ ///////////////////
+
+ //! @name Forward declaration of Raw Iterators.
+ //@{
+ class Iterator ;
+ class ConstIterator ;
+
+ class IndexedIterator ;
+ class ConstIndexedIterator ;
+ //@}
+
+
+ /** @name typedef'd Row Iterators.
+ *\brief
+ * The row iterator gives the rows of the
+ * matrix in ascending order. Dereferencing the iterator yields
+ * a row vector in dense format
+ * @{
+ */
+ typedef typename BlasMatrix<_Field>::RowIterator RowIterator;
+ typedef typename BlasMatrix<_Field>::ConstRowIterator ConstRowIterator;
+ typedef typename BlasMatrix<_Field>::Row Row;
+ typedef typename BlasMatrix<_Field>::ConstRow ConstRow;
+ //@} Row Iterators
+
+ /** @name typedef'd Column Iterators.
+ *\brief
+ * The columns iterator gives the columns of the
+ * matrix in ascending order. Dereferencing the iterator yields
+ * a column vector in dense format
+ * @{
+ */
+ typedef typename BlasMatrix<_Field>::ColIterator ColIterator;
+ typedef typename BlasMatrix<_Field>::ConstColIterator ConstColIterator;
+ typedef typename BlasMatrix<_Field>::Col Col;
+ typedef typename BlasMatrix<_Field>::Column Column;
+ typedef typename BlasMatrix<_Field>::ConstCol ConstCol;
+ //@} // Column Iterators
+
+
+
+ RowIterator rowBegin (); //!< iterator to the begining of a row
+ RowIterator rowEnd (); //!< iterator to the end of a row
+ ConstRowIterator rowBegin () const; //!< const iterator to the begining of a row
+ ConstRowIterator rowEnd () const; //!< const iterator to the end of a row
+
+ ColIterator colBegin ();
+ ColIterator colEnd ();
+ ConstColIterator colBegin () const;
+ ConstColIterator colEnd () const;
+
+ Iterator Begin ();
+ Iterator End ();
+ ConstIterator Begin () const;
+ ConstIterator End () const;
+
+
+ IndexedIterator IndexedBegin();
+ IndexedIterator IndexedEnd();
+ ConstIndexedIterator IndexedBegin() const;
+ ConstIndexedIterator IndexedEnd() const;
+
+ /*! operator[].
+ * Retrieve a reference to a row
+ * @param i Row index
+ */
+ Row operator[] (size_t i) ;
+ ConstRow operator[] (size_t i) const ;
+
+ ///////////////////
+ // BLACK BOX //
+ ///////////////////
+
+
+ template <class Vector1, class Vector2>
+ Vector1& apply (Vector1& y, const Vector2& x) const
{
- return _stride;
+ //_stride ?
+ if (_Mat->_use_fflas){
+ //!@bug this supposes &x[0]++ == &x[1]
+ FFLAS::fgemv((typename Field::Father_t) _Mat->_field, FFLAS::FflasNoTrans,
+ _row, _col,
+ _Mat->_field.one,
+ _Mat->_ptr, getStride(),
+ &x[0],1,
+ _Mat->_field.zero,
+ &y[0],1);
+ }
+ else {
+ _Mat->_MD. vectorMul (y, *this, x);
+#if 0
+ typename BlasMatrix<_Field>::ConstRowIterator i = this->rowBegin ();
+ typename Vector1::iterator j = y.begin ();
+
+ for (; j != y.end (); ++j, ++i)
+ _VD.dot (*j, *i, x);
+#endif
+ }
+ return y;
}
- /*! @internal Is the matrix allocated ?
- */
- bool isAllocated()
+ template <class Vector1, class Vector2>
+ Vector1& applyTranspose (Vector1& y, const Vector2& x) const
{
- return _alloc ;
+
+ //_stride ?
+ if (_Mat->_use_fflas) {
+ FFLAS::fgemv((typename Field::Father_t) _Mat->_field, FFLAS::FflasTrans,
+ _row, _col,
+ _Mat->_field.one,
+ _Mat->_ptr, getStride(),
+ &x[0],1,
+ _Mat->_field.zero,
+ &y[0],1);
+ }
+ else {
+ typename BlasMatrix<_Field>::ConstColIterator i = this->colBegin ();
+ typename Vector1::iterator j = y.begin ();
+ for (; j != y.end (); ++j, ++i)
+ _Mat->_VD.dot (*j, x, *i);
+ }
+
+ return y;
}
- }; // end of class BlasMatrix
+ const _Field& field() const { return _Mat->field() ;}
+ _Field & field() { return _Mat->field(); }
+ };
+ template <class _Field>
+ struct MatrixTraits< BlasSubmatrix<_Field> > {
+ typedef BlasSubmatrix<_Field> MatrixType;
+ typedef typename MatrixCategories::RowColMatrixTag MatrixCategory;
+ };
- /*! TAG for triangular blas matrix.
- * @see \ref FFLAS::FFLAS_DIAG and \ref FFLAS::FFLAS_UPLO enums in \c fflas/fflas.h.
- */
- class BlasTag {
- public:
- typedef enum{low,up} uplo; //!< upper or lower triangular
- typedef enum{unit,nonunit} diag; //!< unit or non unit diagonal
+ template <class _Field>
+ struct MatrixTraits< const BlasSubmatrix<_Field> > {
+ typedef const BlasSubmatrix<_Field> MatrixType;
+ typedef typename MatrixCategories::RowColMatrixTag MatrixCategory;
};
+ /*! Write a matrix to a stream.
+ * The C++ way using <code>operator<<</code>
+ * @param o output stream
+ * @param Mat matrix to write.
+ */
+ template<class T>
+ std::ostream& operator<< (std::ostream & o, const BlasSubmatrix<T> & Mat)
+ {
+ return Mat.write(o);
+ }
+
+}
+namespace LinBox
+{ /* Triangular, Transposed Matrix */
//! Triangular BLAS matrix.
- template <class Element>
- class TriangularBlasMatrix: public BlasMatrix<Element> {
+ template <class _Field>
+ class TriangularBlasMatrix: public BlasMatrix<_Field> {
protected:
- BlasTag::uplo _uplo; //!< upper or lower triangular
- BlasTag::diag _diag; //!< unit or non unit diagonal
+ LinBoxTag::Shape _uplo; //!< upper or lower triangular
+ LinBoxTag::Diag _diag; //!< unit or non unit diagonal
public:
+ typedef _Field Field;
+ typedef typename Field::Element Element; //!< Element type
+ typedef BlasMatrix<_Field> Father_t;
+ typedef TriangularBlasMatrix<_Field> Self_t;
+
/*! Constructor for a new \c TriangularBlasMatrix.
+ * @param F
* @param m rows
* @param n cols
* @param y (non)unit diagonal
* @param x (upp/low)er matrix
*/
- TriangularBlasMatrix (const size_t m, const size_t n,
- BlasTag::uplo x=BlasTag::up, BlasTag::diag y= BlasTag::nonunit) :
- BlasMatrix<Element>(m, n ) , _uplo(x), _diag(y)
- {}
+ TriangularBlasMatrix (const Field & F,
+ const size_t m, const size_t n,
+ LinBoxTag::Shape x=LinBoxTag::Upper,
+ LinBoxTag::Diag y= LinBoxTag::NonUnit) ;
/*! Constructor from a \c BlasMatrix (copy).
* @param A matrix
* @param y (non)unit diagonal
* @param x (upp/low)er matrix
*/
- TriangularBlasMatrix (const BlasMatrix<Element>& A,
- BlasTag::uplo x=BlasTag::up, BlasTag::diag y= BlasTag::nonunit) :
- BlasMatrix<Element>(A) , _uplo(x), _diag(y)
- {}
+ TriangularBlasMatrix (const BlasMatrix<_Field>& A,
+ LinBoxTag::Shape x=LinBoxTag::Upper,
+ LinBoxTag::Diag y= LinBoxTag::NonUnit) ;
/*! Constructor from a \c BlasMatrix (no copy).
* @param A matrix
* @param y (non)unit diagonal
* @param x (upp/low)er matrix
*/
- TriangularBlasMatrix (BlasMatrix<Element>& A, BlasTag::uplo x=BlasTag::up, BlasTag::diag y= BlasTag::nonunit) :
- BlasMatrix<Element>(A), _uplo(x), _diag(y)
- {}
+ TriangularBlasMatrix (BlasMatrix<_Field>& A,
+ LinBoxTag::Shape x=LinBoxTag::Upper,
+ LinBoxTag::Diag y= LinBoxTag::NonUnit) ;
/*! Constructor from a \c TriangularBlasMatrix (copy).
* @param A matrix
*/
- TriangularBlasMatrix (const TriangularBlasMatrix<Element>& A) :
- BlasMatrix<Element>(A.rowdim(),A.coldim()), _uplo(A._uplo), _diag(A._diag)
- {
- switch (A._uplo) {
- case BlasTag::up:
- {
- for (size_t i=0;i<A.rowdim();++i)
- for (size_t j=i;j<A.coldim();++j)
- this->setEntry(i,j,A.getEntry(i,j));
- break;
- }
- case BlasTag::low:
- {
- for (size_t i=0;i<A.rowdim();++i) {
- for (size_t j=0;j<=i;++j)
- this->setEntry(i,j,A.getEntry(i,j));
- }
-
- break;
- }
- default:
- throw LinboxError ("Error in copy constructor of TriangularBlasMatrix (incorrect argument)");
- }
- }
+ TriangularBlasMatrix (const TriangularBlasMatrix<_Field>& A) ;
/*! Generic constructor from a \c Matrix (no copy).
* @param A matrix
@@ -574,55 +1094,22 @@ namespace LinBox
* @param x (upp/low)er matrix
*/
template<class Matrix>
- TriangularBlasMatrix (const Matrix& A, BlasTag::uplo x=BlasTag::up, BlasTag::diag y= BlasTag::nonunit) :
- BlasMatrix<Element>(A.rowdim(),A.coldim()), _uplo(x), _diag(y)
- {
- switch (x) {
- case BlasTag::up:
- {
- for (size_t i=0;i<A.rowdim();++i){
- for (size_t j=i;j<A.coldim();++j) {
- Element tmp;
- this->setEntry(i,j,getEntry(tmp, A,i,j));
- }
- }
- break;
- }
- case BlasTag::low:
- {
- for (size_t i=0;i<A.rowdim();++i) {
- for (size_t j=0;j<=i;++j) {
- Element tmp;
- this->setEntry(i,j,getEntry(tmp, A,i,j));
- }
- }
-
- break;
- }
- default:
- throw LinboxError ("Error in copy constructor of TriangularBlasMatrix (incorrect argument)");
- }
- }
+ TriangularBlasMatrix (const Matrix& A,
+ LinBoxTag::Shape x=LinBoxTag::Upper,
+ LinBoxTag::Diag y= LinBoxTag::NonUnit) ;
/// get the shape of the matrix (upper or lower)
- BlasTag::uplo getUpLo() const { return _uplo;}
+ LinBoxTag::Shape getUpLo() const ;
/// Is the diagonal implicitly unit ?
- BlasTag::diag getDiag() const { return _diag;}
+ LinBoxTag::Diag getDiag() const ;
}; // end of class TriangularBlasMatrix
- template <class Element>
- struct MatrixTraits< BlasMatrix<Element> > {
- typedef BlasMatrix<Element> MatrixType;
- typedef typename MatrixCategories::RowColMatrixTag MatrixCategory;
- };
+} // LinBox
- template <class Element>
- struct MatrixTraits< const BlasMatrix<Element> > {
- typedef const BlasMatrix<Element> MatrixType;
- typedef typename MatrixCategories::RowColMatrixTag MatrixCategory;
- };
+namespace LinBox
+{ /* indexDomain : used only once in linbox/algorithms/rational-solver.inl */
/** Class used for permuting indices.
@@ -634,6 +1121,7 @@ namespace LinBox
public:
typedef size_t Element;
public:
+ typedef indexDomain Father_t;
indexDomain() {};
template <class ANY>
size_t init(size_t& dst, const ANY& src) const {
@@ -643,126 +1131,12 @@ namespace LinBox
size_t assign(ANY& dst, const size_t& src) const {
return dst = static_cast<ANY>(src);
}
+ int characteristic() const { return 0 ; }
};
+}
-#if 0 /* original BlasPermutation */
- // Dan Roche 7-8-04 Changed _P to _PP to avoid confict with a macro defined in
- // <iostream> somewhere.
- /*! BlasPermutation.
- * Lapack ipiv style compressed permutation.
- * @todo to be deprecated
- */
- class BlasPermutation {
-
-
- public:
-
- /// null constructor
- BlasPermutation() {};
-
- BlasPermutation( const size_t n ) :
- _PP(n), _order( n ), _size( -1 )
- {};
-
- BlasPermutation( const std::vector<size_t> P ) :
- _PP( P ), _order( P.size() ) , _size( -1 )
- {};
-
- BlasPermutation( const std::vector<size_t> P, size_t order ) :
- _PP( P ), _order( order ) , _size( -1 )
- {};
-
- BlasPermutation( const std::vector<size_t> P,
- size_t order, size_t size ) :
- _PP( P ), _order( order ) , _size( size )
- {};
-
- BlasPermutation( const BlasPermutation& P) :
- _PP( P._PP ), _order( P._order ) , _size( size )
- {};
-
- BlasPermutation& operator=( const BlasPermutation& P )
- {
- _PP = P._PP;
- _order = P._order;
- _size = P._size ;
- return *this;
- }
-
- const size_t* getPointer() const
- {
- return &_PP[0];
- }
-
- size_t* getWritePointer()
- {
- return &_PP[0];
- }
-
- size_t getOrder() const
- {
- return _order;
- }
-
- size_t getSize() const
- {
- if (_size == -1)
- _size = (*(std::max_element(_PP.begin(),_PP.end())))+1 ;
- return _size;
- }
-
- BlasPermutation& extendTrivially(const size_t newSize)
- {
- if (newSize < _order)
- std::cerr << "WARNING: attempting to reduce size of permutation.";
- _PP.resize(newSize);
- for (size_t i=_order; i<newSize; i++)
- _PP[i] = i;
- _order = newSize;
- return *this;
- };
-
- protected:
-
- std::vector<size_t> _PP ; //!< Lapack representation of the permutation
- size_t _order; //!< size of the representation (number of permutations)
- mutable size_t _size ; //!< size of the permutation (computed if necessary)
-
- private :
-
- /// compresses PackedPermutation to a smaller \c r_.
- void Compress_()
- {
- if (_order==0) {
- _PP.resize(0) ;
- // Id_ = true ;
- return ;
- }
- linbox_check(_order);
- size_t rr = _order-1 ;
- while ( rr && (_PP[rr] == 0 )) --rr ; // removing trailing zeros
- while ( rr && (_PP[rr] == rr )) --rr ; // useless information
- if ((rr == 0) && (_PP[0] == 0)) {
- _order = 0 ;
- _size = 0 ;
- Id_ = true ;
- _PP.resize(0) ;
- return ;
- }
- _order = rr+1 ;
- _PP.resize(_order,0); // done cleaning.
- // recomputing n_ if lost.
- if (_size != -1) {
- _size = getSize();
- }
- cleaned_ = true ;
- return ;
- }
-
-
- }; // end of class BlasPermutation
-#endif
-
+namespace LinBox
+{ /* Transposed Matrix */
/*! TransposedBlasMatrix.
* NO DOC
*/
@@ -772,24 +1146,27 @@ namespace LinBox
public:
/*! NO DOC
- * @param M
+ * @param Mat
*/
- TransposedBlasMatrix ( Matrix& M ) :
- _M(M)
+ TransposedBlasMatrix ( Matrix& Mat ) :
+ _Mat(Mat)
{}
/*! NO DOC
- */
- Matrix& getMatrix() const { return _M; }
+ */
+ Matrix& getMatrix() const
+ {
+ return _Mat;
+ }
protected:
- Matrix& _M; //!< NO DOC
+ Matrix& _Mat; //!< NO DOC
};
/*! TransposedBlasMatrix.
* NO DOC
*/
-#if !defined(__INTEL_COMPILER) && !defined(__CUDACC__)
+#if !defined(__INTEL_COMPILER) && !defined(__CUDACC__) & !defined(__clang__)
template <>
#endif
template< class Matrix >
@@ -799,21 +1176,35 @@ namespace LinBox
/*! TransposedBlasMatrix.
* NO DOC
*/
- TransposedBlasMatrix ( Matrix& M ) :
- Matrix(M)
+ TransposedBlasMatrix ( Matrix& Mat ) :
+ Matrix(Mat)
{}
/*! TransposedBlasMatrix.
* NO DOC
*/
- TransposedBlasMatrix ( const Matrix& M ) :
- Matrix(M)
+ TransposedBlasMatrix ( const Matrix& Mat ) :
+ Matrix(Mat)
{}
};
-} // end of namespace LinBox
+}
+
+
+#include "blas-matrix.inl"
+#include "blas-submatrix.inl"
+#include "blas-triangularmatrix.inl"
#endif // __LINBOX_blas_matrix_H
+
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+
diff --git a/linbox/matrix/blas-matrix.inl b/linbox/matrix/blas-matrix.inl
new file mode 100644
index 0000000..6400e00
--- /dev/null
+++ b/linbox/matrix/blas-matrix.inl
@@ -0,0 +1,1742 @@
+/* linbox/matrix/blas-matrix.h
+ * Copyright (C) 2004 Pascal Giorgi, Clément Pernet
+ *
+ * Written by :
+ * Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
+ * Clément Pernet <clement.pernet at imag.fr>
+ * Brice Boyer <bboyer at imag.fr>
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*!@internal
+ * @file matrix/blas-matrix.inl
+ * @ingroup matrix
+ * A \c BlasMatrix<\c _Field > represents a matrix as an array of
+ * <code>_Field</code>s.
+ */
+
+#ifndef __LINBOX_blas_matrix_INL
+#define __LINBOX_blas_matrix_INL
+
+/////////////////
+// PRIVATE //
+/////////////////
+
+namespace LinBox
+{
+ template<class _Field>
+ void BlasMatrix<_Field>::createBlasMatrix (const BlasMatrix<_Field>& A)
+ {
+#ifndef NDEBUG
+ if (!areFieldEqual(A.field(),_field)) {
+ A.field().write(std::cout) << "!=" ;
+ _field.write(std::cout) << std::endl;
+ }
+#endif
+ linbox_check( areFieldEqual(A.field(),_field));
+ createBlasMatrix(A,MatrixContainerCategory::BlasContainer());
+ }
+
+ template<class _Field>
+ void BlasMatrix<_Field>::createBlasMatrix (const Element * v)
+ {
+ const_pointer iter_v = v ;
+ const_pointer v_end = v+(_col*_row) ;
+ Iterator iter_addr = this->Begin();
+ for (; v != v_end ; ++v, ++iter_addr)
+ _field.init(*iter_addr,*v);
+ }
+
+ template<class _Field>
+ void BlasMatrix<_Field>::createBlasMatrix (const std::vector<Element> & v)
+ {
+ typename std::vector< Element>::const_iterator iter_value = v.begin();
+ Iterator iter_addr = this->Begin();
+ for (;iter_value != v.end(); ++iter_value,++iter_addr)
+ _field.init(*iter_addr,*iter_value);
+ }
+
+
+ template<class _Field>
+ template <class _Matrix>
+ void BlasMatrix<_Field>::createBlasMatrix (const _Matrix& A,
+ MatrixContainerCategory::BlasContainer)
+ {
+ linbox_check( areFieldEqual(A.field(),_field));
+ typename _Matrix::ConstIterator iter_value = A.Begin();
+ Iterator iter_addr = this->Begin();
+ for (;iter_value != A.End(); ++iter_value,++iter_addr)
+ _field.init(*iter_addr, *iter_value);
+ }
+
+ template<class _Field>
+ template <class Matrix>
+ void BlasMatrix<_Field>::createBlasMatrix (const Matrix& A,
+ MatrixContainerCategory::Container)
+ {
+ linbox_check( areFieldEqual(A.field(),_field));
+ // const Field & F = A.field();
+ //!@bug With both iterators, it is Segfaulting !!!!
+ typename Matrix::ConstIndexedIterator iter_index = A.IndexedBegin();
+ for (;iter_index != A.IndexedEnd(); ++iter_index)
+ setEntry( iter_index.rowIndex(),
+ iter_index.colIndex(),
+ A.getEntry(iter_index.rowIndex(),iter_index.colIndex())
+ );
+ }
+
+ template<class _Field>
+ template <class Matrix>
+ void BlasMatrix<_Field>::createBlasMatrix (const Matrix& A,
+ MatrixContainerCategory::Blackbox)
+ {
+ linbox_check( areFieldEqual(A.field(),_field) );
+
+ std::vector<Element> e(A.coldim(), _field.zero), tmp(A.rowdim());
+ ColIterator col_p;
+
+ typename BlasMatrix< _Field>::Col::iterator elt_p;
+ typename std::vector<Element>::iterator e_p, tmp_p;
+
+
+ for (col_p = colBegin(), e_p = e.begin();
+ e_p != e.end(); ++ col_p, ++ e_p)
+ {
+
+ _field.assign(*e_p, _field.one);
+
+ A.apply (tmp, e);
+
+ for (tmp_p = tmp.begin(), elt_p = col_p -> begin();
+ tmp_p != tmp.end(); ++ tmp_p, ++ elt_p)
+
+ _field.assign(*elt_p, *tmp_p);
+
+ _field.assign(*e_p, _field.zero);
+ }
+ }
+
+ template<class _Field>
+ template <class _Matrix>
+ void BlasMatrix<_Field>::createBlasMatrix (const _Matrix& A,
+ const size_t i0,const size_t j0,
+ const size_t m, const size_t n,
+ MatrixContainerCategory::Container)
+ {
+ linbox_check( areFieldEqual(A.field(),_field ) );
+
+ typename _Matrix::ConstIterator iter_value = A.Begin();
+ typename _Matrix::ConstIndexedIterator iter_index = A.IndexedBegin();
+
+ for (;iter_value != A.End(); ++iter_value,++iter_index){
+ int i,j;
+ i=(int)iter_index.rowIndex()-(int)i0;
+ j=(int)iter_index.colIndex()-(int)j0;
+ if (( i >= 0) && (j >= 0) && (i< (int)m) && (j < (int)n))
+ setEntry(i, j, *iter_value);
+ }
+ }
+
+ template<class _Field>
+ template <class Matrix>
+ void BlasMatrix<_Field>::createBlasMatrix (const Matrix& A,
+ const size_t i0,const size_t j0,
+ const size_t m, const size_t n,
+ MatrixContainerCategory::BlasContainer)
+ {
+ linbox_check( areFieldEqual(A.field(),_field ) );
+
+ typename Matrix::ConstIterator iter_value = A.Begin();
+ typename Matrix::ConstIndexedIterator iter_index = A.IndexedBegin();
+
+ for (;iter_value != A.End(); ++iter_value,++iter_index){
+ int i,j;
+ i=(int)iter_index.rowIndex()-(int)i0;
+ j=(int)iter_index.colIndex()-(int)j0;
+ if ( (i>=0) && (j>=0) && (i< (int)m) && (j < (int)n))
+ setEntry(i, j, *iter_value);
+ }
+ }
+
+ template<class _Field>
+ template <class Matrix>
+ void BlasMatrix<_Field>::createBlasMatrix (const Matrix& A,
+ const size_t i0,const size_t j0,
+ const size_t m, const size_t n,
+ MatrixContainerCategory::Blackbox)
+ {
+ linbox_check( areFieldEqual(A.field(),_field ) );
+
+
+ std::vector<Element> e(A.coldim(), _field.zero), tmp(A.rowdim());
+ ColIterator col_p;
+
+ typename BlasMatrix< _Field>::Col::iterator elt_p;
+ typename std::vector<Element>::iterator e_p, tmp_p;
+
+
+ for (col_p = colBegin(), e_p = e.begin()+j0;
+ e_p != e.begin()+j0+n; ++ col_p, ++ e_p) {
+
+ _field.assign(*e_p, _field.one);
+
+ A.apply (tmp, e);
+
+ for (tmp_p = tmp.begin()+i0, elt_p = col_p -> begin();
+ elt_p != col_p.end(); ++ tmp_p, ++ elt_p) {
+ _field.assign(*elt_p, *tmp_p);
+ }
+
+ _field.assign(*e_p, _field.zero);
+ }
+ }
+
+} // LinBox
+
+//////////////////
+// CONSTRUCTORS //
+//////////////////
+
+namespace LinBox
+{
+
+
+ template <class _Field>
+ BlasMatrix< _Field>::BlasMatrix (const _Field &F) :
+ _row(0),_col(0),_rep(0),_ptr(NULL),
+ _field(F),_MD(F),_VD(F),_use_fflas(false)
+ { }
+
+ template <class _Field>
+ BlasMatrix< _Field>::BlasMatrix () :
+ _row(0),_col(0),_rep(0),_ptr(NULL),
+ _field(Field()),_MD(_field ),_VD(_field )
+ {}
+
+
+ template <class _Field>
+ template<class T>
+ BlasMatrix< _Field>::BlasMatrix ( const _Field &F, const uint32_t& m, const T& n) :
+ _row(m),_col(n),_rep(_row*_col),_ptr(&_rep[0]),
+ _field(F),_MD(F),_VD(F)
+ {
+ _use_fflas = Protected::checkBlasApply(_field,_col);
+ }
+
+ template <class _Field>
+ template<class T>
+ BlasMatrix< _Field>::BlasMatrix (const _Field &F, const int64_t& m, const T& n) :
+ _row((size_t)m),_col((size_t)n),_rep(_row*_col),_ptr(&_rep[0]),
+ _field(F),_MD(F),_VD(F)
+ {
+ linbox_check(n>=0);
+ linbox_check(m>=0);
+ _use_fflas = Protected::checkBlasApply(_field,_col);
+ }
+
+#ifdef __GNUC__
+#ifndef __x86_64__
+#if (__GNUC__ == 4 && __GNUC_MINOR__ ==4 && __GNUC_PATCHLEVEL__==5)
+ template <class _Field>
+ template<class T>
+ BlasMatrix< _Field>::BlasMatrix (const _Field &F, const long & m, const T& n) :
+ _row(m),_col(n),_rep(_row*_col),_ptr(&_rep[0]),
+ _field(F),_MD(F),_VD(F)
+ {
+ linbox_check(n>=0);
+ linbox_check(m>=0);
+ _use_fflas = Protected::checkBlasApply(_field,_col);
+ }
+#endif
+#endif
+#endif
+
+#ifdef __APPLE__
+ template <class _Field>
+ template<class T>
+ BlasMatrix< _Field>::BlasMatrix (const _Field &F, const unsigned long & m, const T& n) :
+ _row(m),_col(n),_rep(_row*_col),_ptr(&_rep[0]),
+ _field(F),_MD(F),_VD(F)
+ {
+ linbox_check(n>=0);
+ linbox_check(m>=0);
+ _use_fflas = Protected::checkBlasApply(_field,_col);
+ }
+#endif
+
+
+ template <class _Field>
+ template<class T>
+ BlasMatrix< _Field>::BlasMatrix (const _Field &F, const uint64_t &m, const T & n) :
+ _row(m),_col(n),_rep(_row*_col),_ptr(&_rep[0]),
+ _field(F),_MD(F),_VD(F)
+ {
+ //!@todo
+ // linbox_check_non_neg(n);
+ // linbox_check(n>=0);
+ // makePointer();
+ _use_fflas = Protected::checkBlasApply(_field, _col);
+ }
+
+ template <class _Field>
+ template<class T>
+ BlasMatrix< _Field>::BlasMatrix (const _Field &F, const int32_t & m, const T &n) :
+ _row((size_t) m),_col((size_t)n),_rep(_row*_col),_ptr(&_rep[0]),
+ _field(F),_MD(F),_VD(F)
+ {
+ linbox_check(isPositive<T>(n));
+ linbox_check(m>=0);
+ // makePointer();
+ _use_fflas = Protected::checkBlasApply(_field, _col);
+ }
+
+ template <class _Field>
+ template<class T>
+ BlasMatrix< _Field>::BlasMatrix ( const _Field &F, const Integer & m, const T &n) :
+ _row(m),_col(n),_rep(_row*_col),_ptr(&_rep[0]),
+ _field(F),_MD(F),_VD(F)
+ {
+ //!@todo check m,n not too big ?
+ linbox_check(n>=0);
+ linbox_check(m>=0);
+ // makePointer();
+ _use_fflas = Protected::checkBlasApply(_field, _col);
+ }
+
+
+
+ template <class _Field>
+ BlasMatrix< _Field>::BlasMatrix(MatrixStream<_Field>& ms) :
+ _row(0),_col(0),_rep(0),
+ _field(ms.getField()),_MD(_field ),_VD(_field )
+ {
+ if( !ms.getArray(_rep) || !ms.getRows(_row) || !ms.getColumns(_col) )
+ throw ms.reportError(__FUNCTION__,__LINE__);
+ _ptr = &_rep[0];
+ _use_fflas = Protected::checkBlasApply(_field, _col);
+ }
+
+ template <class _Field>
+ template <class StreamVector>
+ BlasMatrix< _Field>::BlasMatrix (const Field &F, VectorStream<StreamVector> &stream) :
+ _row(stream.size ()), _col(stream.dim ()), _rep(_row*_col), _ptr(&_rep[0]),
+ _field (F), _MD (F), _VD(F)
+ {
+ StreamVector tmp;
+ typename BlasMatrix<Field>::RowIterator p;
+
+ VectorWrapper::ensureDim (tmp, stream.dim ());
+
+ for (p = BlasMatrix<Field>::rowBegin (); p != BlasMatrix<Field>::rowEnd (); ++p) {
+ stream >> tmp;
+ _VD.copy (*p, tmp);
+ }
+ _use_fflas = Protected::checkBlasApply(_field, _col);
+ }
+
+
+ template <class _Field>
+ template <class Matrix>
+ BlasMatrix< _Field>::BlasMatrix (const Matrix &A) :
+ _row(A.rowdim()),_col(A.coldim()),_rep(_row*_col),_ptr(&_rep[0]),
+ _field(A.field()),_MD(_field ),_VD(_field )
+ {
+ // makePointer();
+ _use_fflas = Protected::checkBlasApply(_field, _col);
+ createBlasMatrix(A, typename MatrixContainerTrait<Matrix>::Type());
+ }
+
+ template <class _Field>
+ template <class Matrix>
+ BlasMatrix< _Field>::BlasMatrix (const Matrix& A,
+ const size_t i0, const size_t j0,
+ const size_t m, const size_t n) :
+ _row(m),_col(n),_rep(_row*_col),_ptr(&_rep[0]),
+ _field(A.field()),_MD(_field ),_VD(_field )
+ {
+ _use_fflas = Protected::checkBlasApply(_field, _col);
+ // makePointer();
+ createBlasMatrix(A, i0, j0, m, n,
+ typename MatrixContainerTrait<Matrix>::Type());
+ }
+
+ template <class _Field>
+ template<class _Matrix>
+ BlasMatrix< _Field>::BlasMatrix (const _Matrix &A, const _Field &F) :
+ _row(A.rowdim()), _col(A.coldim()),_rep(_row*_col),_ptr(&_rep[0]),
+ _field(F),_MD(_field ),_VD(_field )
+ {
+ _use_fflas = Protected::checkBlasApply(_field, _col);
+ typename _Matrix::template rebind<_Field>()(*this,A);
+ }
+
+ template <class _Field>
+ BlasMatrix< _Field>::BlasMatrix (const BlasMatrix< _Field>& A) :
+ _row(A.rowdim()), _col(A.coldim()),_rep(_row*_col),_ptr(&_rep[0]),
+ _field(A.field()),_MD(_field ),_VD(_field )
+ {
+ _use_fflas = Protected::checkBlasApply(_field, _col);
+ // makePointer();
+ createBlasMatrix(A);
+ }
+
+ template <class _Field>
+ BlasMatrix< _Field>::BlasMatrix (const _Field &F,
+ const std::vector<typename _Field::Element>& v,
+ size_t m, size_t n) :
+ _row(m), _col(n),_rep(_row*_col),_ptr(&_rep[0]),
+ _field(F),_MD(_field ),_VD(_field )
+ {
+ linbox_check(v.size() == m*n);
+ // makePointer();
+ _use_fflas = Protected::checkBlasApply(_field, _col);
+ createBlasMatrix(v);
+ }
+
+ template <class _Field>
+ BlasMatrix< _Field>::BlasMatrix (const _Field &F,
+ const typename _Field::Element * v,
+ size_t m, size_t n) :
+ _row(m), _col(n),_rep(_row*_col),_ptr(&_rep[0]),
+ _field(F), _MD(_field ),_VD(_field )
+ {
+ // makePointer();
+ _use_fflas = Protected::checkBlasApply(_field, _col);
+ createBlasMatrix(_field,v);
+ }
+
+ template <class _Field>
+ BlasMatrix< _Field>::~BlasMatrix ()
+ {
+ // if (_ptr)
+ // free(_ptr);
+ }
+
+} // LinBox
+
+///////////////////
+// I/O //
+///////////////////
+
+namespace LinBox
+{
+
+ template <class _Field>
+ // template <class Field>
+ std::istream &BlasMatrix< _Field>::read (std::istream &file)
+ {
+#if 0
+ Iterator p;
+ int m,n;
+ char c;
+ file>>m>>n>>c;
+
+ if (m*n < _row*_col)
+ cerr<<"NOT ENOUGH ELEMENT TO READ\n";
+ else {
+ for (p = Begin (); p != End (); ++p) {
+ integer tmp;
+ file>>tmp;cout<<tmp<<endl;
+ //file.ignore(1);
+ F.read (file, *p);
+ }
+ }
+#endif
+
+
+ Iterator p;
+ int m,n;
+ char c;
+ file>>m>>n>>c;
+ // std::cout << m << 'x' << n << ':' << c << std::endl;
+ _row = m; _col = n;
+
+ // _ptr.resize(_row * _col, zero);
+ resize(_row,_col);
+
+ if ((c != 'M') && (c != 'm')) {
+ for (p = Begin (); p != End (); ++p) {
+ //file.ignore(1);
+ _field.read (file, *p);
+ }
+ }
+ else { // sparse file format - needs fixing
+ int i, j;
+ while (true) {
+ file >> i >> j;
+ //file.ignore(1);
+ //if (! file) break;
+ if (i+j <= 0) break;
+ // std::cout << i << ',' << j << ':' ;
+ _field.read (file, _ptr[_col*(i-1) + j-1]);
+ // std::cout << _ptr[_col*(i-1) + j-1] << std::endl;
+ }
+ }
+
+ return file;
+ }
+
+ template <class _Field>
+ std::ostream& BlasMatrix< _Field>::write (std::ostream &os,
+ enum LinBoxTag::Format f) const
+ {
+
+ ConstRowIterator p;
+
+ switch(f) {
+ case (LinBoxTag::FormatPlain) : /* raw output */
+ {
+ integer c;
+ int wid;
+
+ _field.cardinality (c);
+
+ if (c >0) {
+ wid = (int) ceil (log ((double) c) / M_LN10);
+ }
+ else {
+ integer tmp;
+ size_t max=0;
+ ConstIterator it = Begin();
+ for (; it != End(); ++it){
+ _field.convert(tmp,*it);
+ if (tmp.bitsize() > max)
+ max= tmp.bitsize();
+ }
+ wid= (int) ceil ((double)max / M_LN10)+1;
+ }
+
+ for (p = rowBegin (); p != rowEnd ();++p) {
+ typename ConstRow::const_iterator pe;
+
+ os << " [ ";
+
+ for (pe = p->begin (); pe != p->end (); ++pe) {
+ os.width (wid);
+ /*! @warning
+ * matrix base does not provide this field(), maybe should?
+ * _Mat.field ().write (os, *pe);
+ * os << *pe;
+ * fixed by using extra field
+ */
+
+ _field.write (os, *pe);
+ os << " ";
+ }
+
+ os << "]" << std::endl;
+ }
+ }
+ break;
+ case (LinBoxTag::FormatMaple) : /* maple format */
+ {
+ os << "Matrix( " << rowdim() << ',' << coldim() << ",[" ;
+ for (p = rowBegin (); p != rowEnd (); ) {
+ typename ConstRow::const_iterator pe;
+
+ os << " [ ";
+
+ for (pe = p->begin (); pe != p->end (); ) {
+ _field.write (os, *pe);
+ ++pe ;
+ if (pe != p->end())
+ os << ", ";
+ }
+
+ os << "]" ;
+ ++p ;
+ if (p != rowEnd() )
+ os << ',' << std::endl;;
+
+ }
+ os << "])" ;
+ }
+ break;
+ case (LinBoxTag::FormatHTML) : /* html format */
+ {
+ os << "<table border=\"1\">" ;
+ for (p = rowBegin (); p != rowEnd (); ) {
+ typename ConstRow::const_iterator pe;
+
+ os << "<tr>";
+
+ for (pe = p->begin (); pe != p->end (); ) {
+ _field.write (os << "<td>", *pe)<<"</td>";
+ ++pe ;
+ }
+
+ os << "</tr>" << std::endl;
+ ++p ;
+ }
+ os << "</table>" ;
+ }
+ break;
+ case (LinBoxTag::FormatLaTeX) : /* latex format (pmatrix) */
+ {
+
+ os << "\\begin{pmatrix} " << std::endl;
+ for (p = rowBegin (); p != rowEnd (); ) {
+ typename ConstRow::const_iterator pe;
+
+
+ for (pe = p->begin (); pe != p->end (); ) {
+ _field.write (os, *pe);
+ ++pe ;
+ if (pe != p->end())
+ os << "& ";
+ }
+
+ os << "\\\\" << std::endl;
+ ++p ;
+
+ }
+ os << "\\end{pmatrix}" ;
+ }
+ break;
+ default : /* this is an error */
+ {
+ throw LinBoxError("unknown format to write matrix in");
+ }
+ }
+ return os;
+ }
+
+ template <class _Field>
+ BlasMatrix< _Field>& BlasMatrix< _Field>::operator= (const BlasMatrix< _Field>& A)
+ {
+ if ( &A == this)
+ return *this;
+
+ _col = A.coldim();
+ _row = A.rowdim();
+ _rep = Rep(_row*_col);
+ _ptr = &_rep[0] ;
+ // const_cast<_Field&>(_field ) = A.field();
+ // changeField( A.field() );
+ createBlasMatrix(A);
+
+ return *this;
+ }
+
+#if 0 /* loop rebind */
+ template <class _Field>
+ template<typename _Tp1>
+ struct BlasMatrix< _Field>::rebind {
+ typedef BlasMatrix<_Tp1> other;
+
+ void operator() (other & Ap, const Self_t& A, const _Tp1& F) {
+ // typedef typename BlasMatrix< _Field>::ConstIndexedIterator ConstIndexedIterator ;
+ // typedef typename BlasMatrix< _Field>::ConstIterator ConstIterator ;
+ ConstIterator iter_value = A.Begin();
+ ConstIndexedIterator iter_index = A.IndexedBegin();
+ typename _Tp1::Element tmp;
+ for (;iter_value != A.End(); ++iter_value,++iter_index){
+ Ap.field().init( tmp, *iter_value );
+ Ap.setEntry(iter_index.rowIndex(), iter_index.colIndex(),tmp);
+ }
+ }
+ };
+#endif
+
+#if 1 /* HOM */
+ template <class _Field>
+ template<typename _Tp1>
+ struct BlasMatrix< _Field>::rebind {
+ typedef BlasMatrix<_Tp1> other;
+
+ void operator() (other & Ap, const Self_t& A) {
+ typedef typename BlasMatrix<_Field>::ConstIterator ConstSelfIterator ;
+ typedef typename other::Iterator OtherIterator ;
+ OtherIterator Ap_i = Ap.Begin();
+ ConstSelfIterator A_i = A.Begin();
+ Hom<Field, _Tp1> hom(A. field(), Ap. field()) ;
+ for ( ; A_i != A. End(); ++ A_i, ++ Ap_i)
+ hom.image (*Ap_i, *A_i);
+ }
+ };
+#endif
+
+
+ } // LinBox
+
+//////////////////
+// DIMENSIONS //
+//////////////////
+
+namespace LinBox
+{
+
+ template <class _Field>
+ size_t BlasMatrix< _Field>::rowdim() const
+ {
+ return _row ;
+ }
+
+ template <class _Field>
+ size_t BlasMatrix< _Field>::coldim() const
+ {
+ return _col ;
+ }
+
+ template <class _Field>
+ size_t BlasMatrix< _Field>::getStride() const
+ {
+ return _col;
+ }
+
+ template <class _Field>
+ size_t& BlasMatrix< _Field>::getWriteStride()
+ {
+ return _col;
+ }
+
+ template <class _Field>
+ void BlasMatrix< _Field>::resize (size_t m, size_t n, const Element& val )
+ {
+#ifndef NDEBUG
+ if (_col != n)
+ std::cerr << " ***Warning*** you are resizing a matrix, possibly loosing data. " << std::endl;
+#endif
+ _row = m;
+ _col = n;
+ _rep.resize (m * n, val);
+#if 0
+ if (_ptr) {
+ if (m && n)
+ realloc(_ptr,m*n*sizeof(Element));
+ else {
+ free(_ptr);
+ _ptr=NULL ;
+ }
+ }
+ else
+ makePointer();
+#endif
+ }
+
+} // LinBox
+
+//////////////////
+// ELEMENTS //
+//////////////////
+
+namespace LinBox
+{
+
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::pointer
+ BlasMatrix< _Field>::getPointer() const
+ {
+ return _ptr;
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::const_pointer &
+ BlasMatrix< _Field>::getConstPointer() const
+ {
+ return (const_pointer)_ptr;
+ }
+
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::pointer&
+ BlasMatrix< _Field>::getWritePointer()
+ {
+ return _ptr;
+ }
+
+ template <class _Field>
+ void BlasMatrix< _Field>::setEntry (size_t i, size_t j, const Element &a_ij)
+ {
+ _ptr[i * _col + j] = a_ij;
+ }
+
+ template <class _Field>
+ typename _Field::Element & BlasMatrix< _Field>::refEntry (size_t i, size_t j)
+ {
+ return _ptr[i * _col + j];
+ }
+
+ template <class _Field>
+ const typename _Field::Element & BlasMatrix< _Field>::getEntry (size_t i, size_t j) const
+ {
+ return _ptr[i * _col + j];
+ }
+
+ template <class _Field>
+ typename _Field::Element & BlasMatrix< _Field>::getEntry (Element &x, size_t i, size_t j) const
+ {
+ x = _ptr[i * _col + j];
+ return x;
+ }
+
+} // LinBox
+
+///////////////////
+// TRANSPOSE &AL //
+///////////////////
+
+namespace LinBox
+{
+ template <class _Field>
+ BlasMatrix< _Field> BlasMatrix< _Field>::transpose(BlasMatrix< _Field> & tM) const
+ {
+ size_t r = this->rowdim() ;
+ size_t c = this->coldim() ;
+ linbox_check(tM.coldim() == r );
+ linbox_check(tM.rowdim() == c);
+ for (size_t i = 0 ; i < r ; ++i)
+ for (size_t j = 0 ; j < c ; ++j)
+ tM.setEntry(j,i,this->getEntry(i,j));
+ return tM;
+ }
+
+ namespace Protected
+ {
+ /*! @internal
+ * @brief In-Place Tranpose.
+ * Adapted from the Wikipedia article.
+ * @todo make it for strides and Submatrices
+ * @todo use specialized versions when available (eg dgetmi)
+ * @todo make transpose have an inplace=true default parameter
+ * (execpt maybe when below a threshold).
+ * @param m pointer to the beginning of a row-major matrix vector
+ * @param w rows in the matrix
+ * @param h cols in the matrix
+ */
+ template<class T>
+ void transposeIP(T *m, size_t h, size_t w)
+ {
+ size_t start, next, i;
+ T tmp;
+
+ for (start = 0; start <= w * h - 1; ++start) {
+ next = start;
+ i = 0;
+ do {
+ ++i;
+ next = (next % h) * w + next / h;
+ } while (next > start);
+ if (next < start || i == 1)
+ continue;
+
+ tmp = m[next = start];
+ do {
+ i = (next % h) * w + next / h;
+ m[next] = (i == start) ? tmp : m[i];
+ next = i;
+ } while (next > start);
+ }
+ }
+ } // Protected
+
+ template <class _Field>
+ template<bool _IP>
+ void BlasMatrix< _Field>::transpose()
+ {
+ size_t r = this->rowdim() ;
+ size_t c = this->coldim() ;
+
+ if ( r == c) {
+ for (size_t i = 0 ; i < r ; ++i)
+ for (size_t j = i+1 ; j < c ; ++j)
+ std::swap(this->refEntry(i,j),this->refEntry(j,i));
+ }
+ else {
+ if (!_IP) {
+ BlasMatrix<_Field> MM(*this);
+ std::swap(_row,_col);
+ // iterating row first seems faster.
+#ifdef _BLOCKIT
+ size_t B ;
+ B = 1024;
+
+ for (size_t bi = 0 ; bi < r/B ; ++bi) {
+ for (size_t bj = 0 ; bj < c/B ; ++bj){
+ for (size_t i = 0 ; i < B ; ++i)
+ for (size_t j = 0 ; j < B ; ++j)
+ this->setEntry(bj*B+j,bi*B+i,
+ MM.getEntry(bi*B+i,bj*B+j));
+ }
+ }
+ for (size_t i = r/B*B ; i < r ; ++i)
+ for (size_t j = c/B*B ; j < c ; ++j)
+ this->setEntry(j,i,
+ MM.getEntry(i,j));
+#else
+ for (size_t i = 0 ; i < r ; ++i)
+ for (size_t j = 0 ; j < c ; ++j)
+ this->setEntry(j,i,
+ MM.getEntry(i,j));
+#endif
+
+ }
+ else {
+ Protected::transposeIP<Element>(_ptr,_row,_col);
+ std::swap(_row,_col);
+ }
+ }
+ }
+
+ template <class _Field>
+ void BlasMatrix< _Field>::transpose()
+ {
+ this->transpose<false>();
+ }
+
+ template <class _Field>
+ void BlasMatrix< _Field>::reverseRows()
+ {
+ size_t r = this->rowdim()/2 ;
+ for (size_t i = 0 ; i < r ; ++i) {
+ _VD.swap( this->rowBegin()+i,
+ this->rowBegin()+(r-1-i) );
+ }
+
+ }
+
+ template <class _Field>
+ void BlasMatrix< _Field>::reverseCols()
+ {
+ size_t r = this->rowdim() ;
+ size_t c = this->coldim()/2 ;
+ for (size_t j = 0 ; j < c ; ++j) {
+ for (size_t i = 0 ; i < r ; ++i) {
+ std::swap(this->refEntry(i,j),
+ this->refEntry(i,c-j-1));
+
+ }
+ }
+ }
+
+ template <class _Field>
+ void BlasMatrix< _Field>::reverse()
+ {
+ size_t r = this->rowdim() ;
+ size_t c = this->coldim() ;
+ for (size_t j = 0 ; j < c ; ++j) {
+ for (size_t i = 0 ; i < r ; ++i) {
+ std::swap(this->refEntry(i,j),
+ this->refEntry(r-i-1,c-j-1));
+
+ }
+ }
+ }
+} // LinBox
+
+///////////////////
+// ITERATORS //
+///////////////////
+
+namespace LinBox
+{
+
+ template <class _Field>
+ class BlasMatrix< _Field>::ConstRowIterator {
+ public:
+ ConstRowIterator (const typename Rep::const_iterator& p, size_t len, size_t d) :
+ _row (p, p + len), _dis (d)
+ {}
+
+ ConstRowIterator () {}
+
+ ConstRowIterator (const ConstRowIterator& colp) :
+ _row (colp._row), _dis (colp._dis)
+ {}
+
+ ConstRowIterator& operator = (const ConstRowIterator& colp)
+ {
+ _row = colp._row;
+ _dis = colp._dis;
+ return *this;
+ }
+
+ ConstRowIterator& operator --()
+ {
+ _row = ConstRow (_row.begin () - _dis, _row.end () - _dis);
+ return *this;
+ }
+
+ ConstRowIterator operator-- (int)
+ {
+ ConstRowIterator tmp (*this);
+ --*this;
+ return tmp;
+ }
+
+
+ ConstRowIterator& operator++ ()
+ {
+ _row = ConstRow (_row.begin () + _dis, _row.end () + _dis);
+ return *this;
+ }
+
+ ConstRowIterator operator++ (int)
+ {
+ ConstRowIterator tmp (*this);
+ ++*this;
+ return tmp;
+ }
+
+ ConstRowIterator operator+ (int i)
+ {
+ return ConstRowIterator (_row.begin () + _dis * i, _row.size (), _dis);
+ }
+
+ ConstRowIterator& operator += (int i)
+ {
+ _row = ConstRow (_row.begin () + _dis * i, _row.end () + _dis * i);
+ return *this;
+ }
+
+ ConstRow operator[] (int i) const
+ {
+ return ConstRow (_row.begin () + _dis * i, _row.end () + _dis * i);
+ }
+
+ ConstRow* operator-> ()
+ {
+ return &_row;
+ }
+
+ ConstRow& operator* ()
+ {
+ return _row;
+ }
+
+ bool operator!= (const ConstRowIterator& c) const
+ {
+ return (_row.begin () != c._row.begin ()) || (_row.end () != c._row.end ()) || (_dis != c._dis);
+ }
+
+ private:
+ ConstRow _row;
+ size_t _dis;
+ };
+
+ template <class _Field>
+ class BlasMatrix< _Field>::RowIterator {
+ public:
+ RowIterator (const typename Rep::iterator& p, size_t len, size_t d) :
+ _row (p, p + len), _dis (d)
+ {}
+
+ RowIterator () {}
+
+ RowIterator (const RowIterator& colp) :
+ _row (colp._row), _dis (colp._dis)
+ {}
+
+ RowIterator& operator = (const RowIterator& colp)
+ {
+ _row = colp._row;
+ _dis = colp._dis;
+ return *this;
+ }
+
+ RowIterator& operator ++ ()
+ {
+ _row = Row (_row.begin () + _dis, _row.end () + _dis);
+ return *this;
+ }
+
+ RowIterator operator ++ (int)
+ {
+ RowIterator tmp (*this);
+ ++*this;
+ return tmp;
+ }
+
+ RowIterator& operator -- ()
+ {
+ _row = Row (_row.begin () - _dis, _row.end () - _dis);
+ return *this;
+ }
+
+ RowIterator operator -- (int)
+ {
+ RowIterator tmp (*this);
+ --*this;
+ return tmp;
+ }
+
+ RowIterator operator + (int i)
+ {
+ return RowIterator (_row.begin () + _dis * i, _row.size (), _dis);
+ }
+
+ RowIterator& operator += (int i)
+ {
+ _row = Row (_row.begin () + _dis * i, _row.end () + _dis * i);
+ return *this;
+ }
+
+ Row operator[] (int i) const
+ {
+ return Row (const_cast<Row&> (_row).begin () + _dis * i,
+ const_cast<Row&> (_row).end () + _dis * i);
+ }
+
+ Row* operator-> ()
+ {
+ return &_row;
+ }
+
+ Row& operator* ()
+ {
+ return _row;
+ }
+
+ bool operator!= (const RowIterator& c) const
+ {
+ return (_row.begin () != c._row.begin ()) || (_row.end () != c._row.end ()) || (_dis != c._dis);
+ }
+
+ operator ConstRowIterator ()
+ {
+ return ConstRowIterator (_row.begin (), _row.size (), _dis);
+ }
+
+ private:
+ Row _row;
+ size_t _dis;
+ };
+
+ template <class _Field>
+ class BlasMatrix< _Field>::ConstColIterator {
+ public:
+ ConstColIterator (typename Rep::const_iterator p, size_t stride, size_t len) :
+ _col (Subiterator<typename Rep::const_iterator> (p, stride),
+ Subiterator<typename Rep::const_iterator> (p + len * stride, stride)),
+ _stride (stride)
+ {}
+
+ ConstColIterator (const ConstCol& col, size_t stride) :
+ _col (col),
+ _stride (stride)
+ {}
+
+ ConstColIterator () {}
+
+ ConstColIterator (const ConstColIterator& rowp) :
+ _col (rowp._col)
+ {}
+
+ ConstColIterator& operator= (const ConstColIterator& rowp)
+ {
+ _col = rowp._col;
+ _stride = rowp._stride;
+ return *this;
+ }
+
+ ConstColIterator& operator++ ()
+ {
+ _col = ConstCol (Subiterator<typename Rep::const_iterator> (_col.begin ().operator-> () + 1, _stride),
+ Subiterator<typename Rep::const_iterator> (_col.end ().operator-> () + 1, _stride));
+ return *this;
+ }
+
+ ConstColIterator operator++ (int)
+ {
+ ConstColIterator old(*this);
+ this->operator++ ();
+ return old;
+ }
+
+ ConstColIterator operator + (int i)
+ {
+ return ConstColIterator (_col.begin ().operator-> () + i, _stride, _col.size ());
+ }
+
+ ConstColIterator& operator += (int i)
+ {
+ _col = ConstCol (Subiterator<typename Rep::const_iterator> (_col.begin ().operator-> () + i, _stride),
+ Subiterator<typename Rep::const_iterator> (_col.end ().operator-> () + i, _stride));
+ return *this;
+ }
+
+ ConstCol operator[] (int i) const
+ {
+ return ConstCol (Subiterator<typename Rep::const_iterator> (_col.begin ().operator-> () + i, _stride),
+ Subiterator<typename Rep::const_iterator> (_col.end ().operator-> () + i, _stride));
+ }
+
+ ConstCol* operator-> ()
+ {
+ return &_col;
+ }
+
+ ConstCol& operator* ()
+ {
+ return _col;
+ }
+
+ bool operator!= (const ConstColIterator& c) const
+ {
+ return (_col.begin () != c._col.begin ()) || (_col.end () != c._col.end ());
+ }
+
+ private:
+ ConstCol _col;
+ size_t _stride;
+ };
+
+ template <class _Field>
+ class BlasMatrix< _Field>::ColIterator {
+ public:
+ ColIterator (typename Rep::iterator p, size_t stride, size_t len) :
+ _col (Subiterator<typename Rep::iterator> (p, stride),
+ Subiterator<typename Rep::iterator> (p + len * stride, stride)), _stride (stride)
+ {}
+
+ ColIterator () {}
+
+ ColIterator (const ColIterator& rowp) :
+ _col (rowp._col)
+ {}
+
+ ColIterator& operator= (const ColIterator& rowp)
+ {
+ _col = rowp._col;
+ _stride = rowp._stride;
+ return *this;
+ }
+
+ const ColIterator& operator= (const ColIterator& rowp) const
+ {
+ const_cast<ColIterator*> (this)->_col = rowp._col;
+ return *this;
+ }
+
+ ColIterator& operator++ ()
+ {
+ _col = Col (Subiterator<typename Rep::iterator> (_col.begin ().operator-> () + 1, _stride),
+ Subiterator<typename Rep::iterator> (_col.end ().operator-> () + 1, _stride));
+ return *this;
+ }
+
+ ColIterator operator++ (int)
+ {
+ Col tmp (_col);
+ this->operator++ ();
+ return tmp;
+ }
+
+ ColIterator operator + (int i)
+ {
+ return ColIterator (_col.begin ().operator-> () + i, _stride, _col.size ());
+ }
+
+ ColIterator& operator += (int i)
+ {
+ _col = Col (Subiterator<typename Rep::iterator> (_col.begin ().operator-> () + i, _stride),
+ Subiterator<typename Rep::iterator> (_col.end ().operator-> () + i, _stride));
+ return *this;
+ }
+
+ Col operator[] (int i) const
+ {
+ return Col (Subiterator<typename Rep::iterator> (const_cast<Col&> (_col).begin ().operator-> () + i, _stride),
+ Subiterator<typename Rep::iterator> (const_cast<Col&> (_col).end ().operator-> () + i, _stride));
+ }
+
+ Col* operator-> ()
+ {
+ return &_col;
+ }
+
+ Col& operator* ()
+ {
+ return _col;
+ }
+
+ bool operator!= (const ColIterator& c) const
+ {
+ return (_col.begin () != c._col.begin ()) || (_col.end () != c._col.end ());
+ }
+
+ operator ConstColIterator ()
+ {
+ return ConstColIterator (reinterpret_cast<ConstCol&> (_col) , _stride);
+ }
+
+ private:
+
+ Col _col;
+ size_t _stride;
+ };
+
+ /*! Indexed Iterator.
+ * @ingroup iterators
+ * @brief NO DOC
+ */
+ template <class _Field>
+ class BlasMatrix< _Field>::IndexedIterator {
+ size_t _r_index;
+ size_t _c_index;
+ size_t _dim;
+ typename Rep::iterator _begin;
+ typedef typename _Field::Element value_type;
+
+ public:
+ IndexedIterator (const size_t &dim,
+ const size_t &r_index,
+ const size_t &c_index,
+ const typename Rep::iterator &begin) :
+ _r_index (r_index), _c_index (c_index), _dim (dim), _begin (begin)
+ {}
+
+ IndexedIterator () :
+ _r_index (0), _c_index (0), _dim (1), _begin (0)
+ {}
+
+ IndexedIterator (const IndexedIterator& r) :
+ _r_index (r._r_index), _c_index (r._c_index), _dim (r._dim), _begin (r._begin)
+ {}
+
+ IndexedIterator& operator = (const IndexedIterator &iter)
+ {
+ _r_index = iter._r_index;
+ _c_index = iter._c_index;
+ _dim = iter._dim;
+ _begin = iter._begin;
+ return *this;
+ }
+
+ bool operator == (const IndexedIterator &iter) const
+ {
+ return (_r_index == iter._r_index) &&
+ (_c_index == iter._c_index) &&
+ (_dim == iter._dim) &&
+ (_begin==iter._begin);
+ }
+
+ bool operator != (const IndexedIterator& iter) const
+ {
+ return (_r_index != iter._r_index) ||
+ (_c_index != iter._c_index) ||
+ (_dim != iter._dim) ||
+ (_begin!=iter._begin);
+ }
+
+ IndexedIterator &operator ++ ()
+ {
+ ++_c_index;
+
+ if (_c_index == _dim) {
+ _c_index = 0;
+ ++_r_index;
+ }
+
+ return *this;
+ }
+
+
+ IndexedIterator operator ++ (int)
+ {
+ IndexedIterator tmp = *this;
+ ++(*this);
+ return tmp;
+ }
+
+ IndexedIterator &operator -- ()
+ {
+ if (_c_index)
+ --_c_index;
+ else {
+ --_r_index;
+ _c_index = _dim - 1;
+ }
+
+ return *this;
+ }
+
+
+ IndexedIterator operator -- (int)
+ {
+ IndexedIterator tmp = *this;
+ --(*this);
+ return tmp;
+ }
+
+ value_type &operator * () const
+ {
+ return *(_begin + (_r_index * _dim + _c_index));
+ }
+
+
+ value_type * operator -> () const
+ {
+ return _begin + (_r_index * _dim + _c_index);
+ }
+
+
+ size_t rowIndex () const
+ {
+ return _r_index;
+ }
+
+ size_t colIndex () const
+ {
+ return _c_index;
+ }
+
+ const value_type &value () const
+ {
+ return *(_begin + (_r_index * _dim + _c_index));
+ }
+
+
+ };
+
+ template <class _Field>
+ class BlasMatrix< _Field>::ConstIndexedIterator {
+ size_t _r_index;
+ size_t _c_index;
+ size_t _dim;
+ typedef typename _Field::Element value_type;
+ typename Rep::const_iterator _begin;
+
+ public:
+ ConstIndexedIterator (const size_t &my_dim,
+ const size_t &r_index,
+ const size_t &c_index,
+ const typename Rep::const_iterator &begin) :
+ _r_index (r_index), _c_index (c_index), _dim (my_dim), _begin (begin)
+ {}
+
+ ConstIndexedIterator () :
+ _r_index (0), _c_index (0), _dim (1), _begin (0)
+ {}
+
+ ConstIndexedIterator (const ConstIndexedIterator& r) :
+ _r_index (r._r_index), _c_index (r._c_index), _dim (r._dim), _begin (r._begin)
+ {}
+
+ ConstIndexedIterator& operator = (const ConstIndexedIterator &iter)
+ {
+ _r_index = iter._r_index;
+ _c_index = iter._c_index;
+ _dim = iter._dim;
+ _begin = iter._begin;
+ return *this;
+ }
+
+ bool operator == (const ConstIndexedIterator &iter) const
+ {
+ return (_r_index == iter._r_index) &&
+ (_c_index == iter._c_index) &&
+ (_dim == iter._dim) &&
+ (_begin==iter._begin);
+ }
+
+ bool operator != (const ConstIndexedIterator& iter) const
+ {
+ return (_r_index != iter._r_index) ||
+ (_c_index != iter._c_index) ||
+ (_dim != iter._dim) ||
+ (_begin!=iter._begin);
+ }
+
+ ConstIndexedIterator &operator ++ ()
+ {
+ ++_c_index;
+
+ if (_c_index == _dim) {
+ _c_index = 0;
+ ++_r_index;
+ }
+
+ return *this;
+ }
+
+
+ ConstIndexedIterator operator ++ (int)
+ {
+ ConstIndexedIterator tmp = *this;
+ ++(*this);
+ return tmp;
+ }
+
+ ConstIndexedIterator &operator -- ()
+ {
+ if (_c_index)
+ --_c_index;
+ else {
+ --_r_index;
+ _c_index = _dim - 1;
+ }
+
+ return *this;
+ }
+
+ ConstIndexedIterator operator -- (int)
+ {
+ ConstIndexedIterator tmp = *this;
+ --(*this);
+ return tmp;
+ }
+
+ const value_type &operator * () const
+ {
+ return *(_begin + (_r_index * _dim + _c_index));
+ }
+
+ const value_type *operator -> () const
+ {
+ return _begin + (_r_index * _dim + _c_index);
+ }
+
+ size_t rowIndex () const
+ {
+ return _r_index;
+ }
+
+ size_t colIndex () const
+ {
+ return _c_index;
+ }
+
+ const value_type &value() const
+ {
+ return *(_begin + (_r_index * _dim + _c_index));
+ }
+ };
+
+ /* */
+
+ // Entry access view. Size m*n vector in C (row major) order.
+ template <class _Field>
+ typename BlasMatrix< _Field>::Iterator BlasMatrix< _Field>::Begin ()
+ {
+ return _rep.begin ();
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::Iterator BlasMatrix< _Field>::End ()
+ {
+ return _rep.end ();
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::ConstIterator BlasMatrix< _Field>::Begin () const
+ {
+ return _rep.begin ();
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::ConstIterator BlasMatrix< _Field>::End () const
+ {
+ return _rep.end ();
+ }
+
+ /* Indexed */
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::IndexedIterator BlasMatrix< _Field>::IndexedBegin ()
+ {
+ return IndexedIterator (coldim (), 0, 0, _rep.begin ());
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::IndexedIterator BlasMatrix< _Field>::IndexedEnd ()
+ {
+ return IndexedIterator (coldim (), rowdim (), 0, _rep.begin ());
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::ConstIndexedIterator BlasMatrix< _Field>::IndexedBegin () const
+ {
+ return ConstIndexedIterator (coldim (), 0, 0, _rep.begin ());
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::ConstIndexedIterator BlasMatrix< _Field>::IndexedEnd () const
+ {
+ return ConstIndexedIterator (coldim (), rowdim (), 0, _rep.begin ());
+ }
+
+ /* Row */
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::RowIterator BlasMatrix< _Field>::rowBegin ()
+ {
+ return RowIterator (_rep.begin (), _col, _col);
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::RowIterator BlasMatrix< _Field>::rowEnd ()
+ {
+ return RowIterator (_rep.end (), _col, _col);
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::ConstRowIterator BlasMatrix< _Field>::rowBegin () const
+ {
+ return ConstRowIterator (_rep.begin (), _col, _col);
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::ConstRowIterator BlasMatrix< _Field>::rowEnd () const
+ {
+ return ConstRowIterator (_rep.end (), _col, _col);
+ }
+
+ /* Col */
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::ColIterator BlasMatrix< _Field>::colBegin ()
+ {
+ return typename BlasMatrix< _Field>::ColIterator (_rep.begin (), _col, _row);
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::ColIterator BlasMatrix< _Field>::colEnd ()
+ {
+ return typename BlasMatrix< _Field>::ColIterator (_rep.begin ()+_col, _col, _row);
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::ConstColIterator BlasMatrix< _Field>::colBegin () const
+ {
+ return typename BlasMatrix< _Field>::ConstColIterator (_rep.begin (), _col, _row);
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::ConstColIterator BlasMatrix< _Field>::colEnd () const
+ {
+ return typename BlasMatrix< _Field>::ConstColIterator (_rep.begin ()+_col, _col, _row);
+ }
+
+ /* operators */
+ template <class _Field>
+ typename BlasMatrix< _Field>::Row BlasMatrix< _Field>::operator[] (size_t i)
+ {
+ return Row (_rep.begin () + i * _col, _rep.begin () + (i * _col +_col));
+ }
+
+ template <class _Field>
+ typename BlasMatrix< _Field>::ConstRow BlasMatrix< _Field>::operator[] (size_t i) const
+ {
+ return Row (_rep.begin () + i * _col, _rep.begin () + ( i * _col + _col));
+ }
+
+} // LinBox
+
+//////////////////
+// MISC //
+//////////////////
+
+namespace LinBox
+{
+ template <class _Field>
+ template <class Vector>
+ Vector& BlasMatrix< _Field>::columnDensity (Vector &v) const
+ {
+ std::fill (v.begin (), v.end (), _row);
+ return v;
+ }
+
+} // LinBox
+
+///////////////////
+// BLACK BOX //
+///////////////////
+
+namespace LinBox
+{
+ template <class _Field>
+ template <class Vector1, class Vector2>
+ Vector1& BlasMatrix< _Field>::apply (Vector1& y, const Vector2& x) const
+ {
+ //_stride ?
+ if (_use_fflas){
+ //!@bug this supposes &x[0]++ == &x[1]
+ FFLAS::fgemv((typename Field::Father_t) _field, FFLAS::FflasNoTrans,
+ _row, _col,
+ _field.one,
+ _ptr, getStride(),
+ &x[0],1,
+ _field.zero,
+ &y[0],1);
+ }
+ else {
+ _MD. vectorMul (y, *this, x);
+#if 0
+ typename BlasMatrix<_Field>::ConstRowIterator i = this->rowBegin ();
+ typename Vector1::iterator j = y.begin ();
+
+ for (; j != y.end (); ++j, ++i)
+ _VD.dot (*j, *i, x);
+#endif
+ }
+ return y;
+ }
+
+ template <class _Field>
+ template <class Vector1, class Vector2>
+ Vector1& BlasMatrix< _Field>::applyTranspose (Vector1& y, const Vector2& x) const
+ {
+
+ //_stride ?
+ if (_use_fflas) {
+ FFLAS::fgemv((typename Field::Father_t) _field, FFLAS::FflasTrans,
+ _row, _col,
+ _field.one,
+ _ptr, getStride(),
+ &x[0],1,
+ _field.zero,
+ &y[0],1);
+ }
+ else {
+ typename BlasMatrix<_Field>::ConstColIterator i = this->colBegin ();
+ typename Vector1::iterator j = y.begin ();
+ for (; j != y.end (); ++j, ++i)
+ _VD.dot (*j, x, *i);
+ }
+
+ return y;
+ }
+
+ template <class _Field>
+ const _Field& BlasMatrix< _Field>::field() const
+ {
+ return _field;
+ }
+
+ template <class _Field>
+ _Field& BlasMatrix< _Field>::field()
+ {
+ return const_cast<_Field&>(_field );
+ }
+}
+
+
+#endif // __LINBOX_blas_matrix_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/blas-submatrix.inl b/linbox/matrix/blas-submatrix.inl
new file mode 100644
index 0000000..abe6f8b
--- /dev/null
+++ b/linbox/matrix/blas-submatrix.inl
@@ -0,0 +1,1085 @@
+/* linbox/matrix/blas-matrix.h
+ * Copyright (C) 2004 Pascal Giorgi, Clément Pernet
+ *
+ * Written by :
+ * Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
+ * Clément Pernet <clement.pernet at imag.fr>
+ * Brice Boyer <bboyer at imag.fr>
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*!@internal
+ * @file matrix/blas-matrix.inl
+ * @ingroup matrix
+ * A \c BlasMatrix<\c _Field > represents a matrix as an array of
+ * <code>_Field</code>s.
+ */
+
+#ifndef __LINBOX_blas_submatrix_INL
+#define __LINBOX_blas_submatrix_INL
+
+/////////////////
+// PRIVATE //
+/////////////////
+
+namespace LinBox
+{
+}
+
+//////////////////
+// CONSTRUCTORS //
+//////////////////
+
+namespace LinBox
+{
+ template <class _Field>
+ BlasSubmatrix<_Field>::BlasSubmatrix () :
+ _Mat(NULL),_row(0),_col(0),_r0(0),_c0(0),_stride(0),_off(0)
+ {
+#ifndef NDEBUG
+ std::cerr << "***Warning*** you are creating a NULL BlasSubmatrix. You are stuck with it now." << std::endl;
+#endif
+ }
+
+ template <class _Field>
+ BlasSubmatrix<_Field>::BlasSubmatrix (const BlasMatrix<_Field> &Mat,
+ size_t row,
+ size_t col,
+ size_t Rowdim,
+ size_t Coldim) :
+ _Mat (&(const_cast<BlasMatrix<Field>& >(Mat))),
+ _row (Rowdim), _col(Coldim),
+ _r0(row),_c0(col),
+ _stride(Mat.coldim()),_off(row*_stride+col)
+ {
+ linbox_check ( _r0 <= Mat.rowdim() ); // allow for NULL matrix
+ linbox_check ( _c0 <= Mat.coldim() );
+ // linbox_check ( _row <= Mat.rowdim() );
+ linbox_check ( _off <= Mat.rowdim()*Mat.coldim() );
+ linbox_check ( _col <= Mat.coldim() );
+ }
+
+
+ template <class _Field>
+ BlasSubmatrix<_Field>::BlasSubmatrix (const BlasMatrix<_Field> &Mat) :
+ _Mat(&(const_cast<BlasMatrix<Field>& >(Mat))),
+ _row(Mat.rowdim()), _col(Mat.coldim()),
+ _r0(0), _c0(0),
+ _stride(Mat.coldim()),_off(0)
+ {}
+
+
+
+ template <class _Field>
+ BlasSubmatrix<_Field>::BlasSubmatrix (const BlasSubmatrix<_Field> &SM,
+ size_t row,
+ size_t col,
+ size_t Rowdim,
+ size_t Coldim) :
+ _Mat (SM._Mat),
+ _row ( Rowdim ), _col ( Coldim ) ,
+ _r0 ( SM._r0 + row ), _c0 ( SM._c0 + col ),
+ _stride(SM._stride),_off(SM._off+(row*_stride+col))
+ {
+ linbox_check ( _r0 <= SM._Mat->rowdim() ); // allow for NULL matrix
+ linbox_check ( _c0 <= SM._stride );
+ linbox_check ( _row <= SM._Mat->rowdim() );
+ linbox_check ( _col <= SM._stride );
+ linbox_check ( _off <= SM._Mat->rowdim()*(SM._Mat->coldim()+1) );
+ }
+
+ template <class _Field>
+ BlasSubmatrix<_Field>::BlasSubmatrix (const BlasSubmatrix<_Field> &SM) :
+ _Mat (SM._Mat),
+ _row ( SM._row ), _col ( SM._col ) ,
+ _r0 ( SM._r0 ), _c0 (SM._c0 ),
+ _stride(SM._stride),_off(SM._off)
+ {
+ linbox_check ( _r0 <= SM._Mat->rowdim() ); // allow for NULL matrix
+ linbox_check ( _c0 <= SM._stride );
+ linbox_check ( _row <= SM._Mat->rowdim() );
+ linbox_check ( _col <= SM._stride );
+ linbox_check ( _off <= SM._Mat->rowdim()*(SM._Mat->coldim()+1) );
+ }
+
+ template <class _Field>
+ BlasSubmatrix<_Field>& BlasSubmatrix<_Field>::operator=(const BlasSubmatrix<_Field> &SM)
+ {
+ if ( &SM == this)
+ return *this ;
+
+ _Mat = SM._Mat ;
+ _r0 = SM._r0 ;
+ _row = SM._row;
+ _c0 = SM._c0 ;
+ _col = SM._col;
+ _stride = SM._stride;
+ _off = SM._off ;
+
+ return *this;
+ }
+
+} // LinBox
+
+
+//////////////////
+// DIMENSIONS //
+//////////////////
+
+namespace LinBox
+{
+
+ template <class _Field>
+ size_t BlasSubmatrix< _Field>::rowdim() const
+ {
+ return _row ;
+ }
+
+ template <class _Field>
+ size_t BlasSubmatrix< _Field>::coldim() const
+ {
+ return _col ;
+ }
+
+ template <class _Field>
+ size_t BlasSubmatrix< _Field>::getStride() const
+ {
+ return _stride;
+ }
+
+
+} // LinBox
+
+//////////////////
+// ELEMENTS //
+//////////////////
+
+namespace LinBox
+{
+
+
+ template <class _Field>
+ typename BlasSubmatrix< _Field>::pointer
+ BlasSubmatrix< _Field>::getPointer() const
+ {
+ return _Mat->getPointer();
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix< _Field>::const_pointer &
+ BlasSubmatrix< _Field>::getConstPointer() const
+ {
+ return _Mat->getConstPointer();
+ }
+
+
+ template <class _Field>
+ typename BlasSubmatrix< _Field>::pointer&
+ BlasSubmatrix< _Field>::getWritePointer()
+ {
+ return _Mat->getWritePointer();
+ }
+
+ template <class _Field>
+ void BlasSubmatrix< _Field>::setEntry (size_t i, size_t j, const Element &a_ij)
+ {
+ _Mat->setEntry (_r0 + i, _c0 + j, a_ij);
+ }
+
+ template <class _Field>
+ typename _Field:: Element &BlasSubmatrix< _Field>::refEntry (size_t i, size_t j)
+ {
+ return _Mat->refEntry ( _r0+i, _c0+j );
+ }
+
+ template <class _Field>
+ const typename _Field:: Element &BlasSubmatrix< _Field>::getEntry (size_t i, size_t j) const
+ {
+ return _Mat->getEntry ( _r0+i , _c0+j );
+ }
+
+ template <class _Field>
+typename _Field:: Element &BlasSubmatrix< _Field>::getEntry (Element &x, size_t i, size_t j) const
+ {
+ return _Mat->getEntry (x, _r0+i , _c0+j );
+ }
+
+}
+
+///////////////////
+// TRANSPOSE &AL //
+///////////////////
+
+namespace LinBox
+{
+}
+
+///////////////////
+// ITERATORS //
+///////////////////
+
+namespace LinBox
+{
+
+
+ /*! Raw Iterators.
+ * @ingroup iterators
+ *
+ * The raw iterator is a method for accessing all entries in the matrix
+ * in some unspecified order. This can be used, e.g. to reduce all
+ * matrix entries modulo a prime before passing the matrix into an
+ * algorithm.
+ */
+ template <class _Field>
+ class BlasSubmatrix<_Field>::Iterator {
+ public:
+ Iterator (){}
+
+ /*! @internal
+ * @brief NO DOC
+ */
+ Iterator (const typename BlasMatrix<_Field>::Iterator& cur,
+ const size_t c_dim,
+ const size_t stride,
+ const size_t c_idx) :
+ _cur (cur), _c_dim (c_dim), _stride(stride), _c_idx (c_idx)
+ {}
+
+ /*! @internal
+ * @brief copy operator.
+ * @param r Iterator to copy.
+ */
+ Iterator& operator = (const Iterator& r)
+ {
+ _cur = r._cur;
+ _c_dim = r._c_dim;
+ _stride = r._stride;
+ _c_idx = r._c_idx;
+ return *this;
+ }
+
+ /*! @internal
+ * increment.
+ * ??
+ */
+ Iterator& operator ++()
+ {
+ if (_c_idx < _c_dim - 1){
+ ++_cur; ++_c_idx;
+ }
+ else {
+ _cur = _cur + _stride - _c_dim + 1;
+ _c_idx = 0;
+ }
+
+ return *this;
+ }
+
+ /*! @internal
+ * increment.
+ * ??
+ */
+ Iterator& operator++ (int)
+ {
+ return this->operator++ ();
+ }
+
+
+ /*! @internal
+ * @brief operator !=.
+ * @param r Iterator to test inequaltity from.
+ */
+ bool operator != (const Iterator& r) const
+ {
+ return (_cur != r._cur || _c_dim != r._c_dim) || (_stride != r._stride) || (_c_idx != r._c_idx);
+ }
+
+ //! @internal operator *.
+ _Field& operator * ()
+ {
+ return *_cur;
+ }
+
+ //! @internal operator *.
+ const _Field& operator * () const
+ {
+ return *_cur;
+ }
+
+ protected:
+ typename BlasMatrix<_Field>::Iterator _cur;
+ size_t _c_dim;
+ size_t _stride;
+ size_t _c_idx;
+ };
+
+ /*! Raw Iterators (const version).
+ * @ingroup iterators
+ * The raw iterator is a method for accessing all entries in the matrix
+ * in some unspecified order. This can be used, e.g. to reduce all
+ * matrix entries modulo a prime before passing the matrix into an
+ * algorithm.
+ */
+ template <class _Field>
+ class BlasSubmatrix<_Field>::ConstIterator {
+ public:
+ //! @internal Null constructor
+ ConstIterator (){}
+
+
+ /*! @internal
+ * @brief NO DOC
+ */
+ ConstIterator (const typename BlasMatrix<_Field>::ConstIterator& cur,
+ const size_t c_dim,
+ const size_t stride,
+ const size_t c_idx) :
+ _cur (cur), _c_dim (c_dim), _stride(stride), _c_idx (c_idx)
+ {}
+
+ /*! @internal
+ * @brief copy operator.
+ * @param r Iterator to copy.
+ */
+ ConstIterator& operator = (const ConstIterator& r)
+ {
+ _cur = r._cur;
+ _c_dim = r._c_dim;
+ _stride = r._stride;
+ _c_idx = r._c_idx;
+ return *this;
+ }
+
+ /*! @internal
+ * increment.
+ * ??
+ */
+ ConstIterator& operator ++()
+ {
+ if (_c_idx < _c_dim - 1){
+ ++_cur; ++_c_idx;
+ }
+ else {
+ _cur = _cur + _stride - _c_dim + 1;
+ _c_idx = 0;
+ }
+
+ return *this;
+ }
+
+ /*! @internal
+ * increment.
+ * ??
+ */
+ ConstIterator& operator++ (int)
+ {
+ return this->operator++ ();
+ }
+
+ /*! @internal
+ * @brief operator !=.
+ * @param r Iterator to test inequaltity from.
+ */
+ bool operator != (const ConstIterator& r) const
+ {
+ return (_cur != r._cur) || (_c_dim != r._c_dim) || (_stride != r._stride) || (_c_idx != r._c_idx);
+ }
+
+ //! @internal operator *.
+ const _Field& operator * () const
+ {
+ return *_cur;
+ }
+
+ protected:
+ typename BlasMatrix<_Field>::ConstIterator _cur;
+ size_t _c_dim;
+ size_t _stride;
+ size_t _c_idx;
+ };
+
+#if 0
+ template <class _Field>
+ class BlasSubmatrix< _Field>::ConstIterator {
+ public:
+ ConstIterator (){}
+
+ ConstIterator ( const typename BlasMatrix< _Field>::ConstIterator& cur,
+ size_t cont_len,
+ size_t gap_len) :
+ _beg (beg), _cur (cur), _cont_len (cont_len), _gap_len (gap_len)
+ {}
+
+ ConstIterator& operator = (const Iterator& r)
+ {
+ _cur = r._cur;
+ _beg = r._beg;
+ _cont_len = r._cont_len;
+ _gap_len = r._gap_len;
+ return *this;
+ }
+
+ ConstIterator& operator = (const ConstIterator& r)
+ {
+ _cur = r._cur;
+ _beg = r._beg;
+ _cont_len = r._cont_len;
+ _gap_len = r._gap_len;
+ return *this;
+ }
+
+ ConstIterator& operator++()
+ {
+ if (((_cur - _beg + 1) % _cont_len) != 0)
+ ++_cur;
+ else {
+ _cur = _cur + _gap_len + 1;
+ _beg = _beg + _gap_len + _cont_len;
+ }
+ return *this;
+ }
+
+ ConstIterator operator++(int)
+ {
+ ConstIterator tmp = *this;
+ this->operator++();
+ return tmp;
+ }
+
+ bool operator != (const ConstIterator& r) const
+ {
+ return (_cur != r._cur) || (_beg != r._beg) || (_cont_len != r._cont_len) || (_gap_len != r._gap_len);
+ }
+
+ const _Field& operator*()
+ { return *_cur; }
+
+ _Field& operator*()
+ { return *_cur; }
+
+ const _Field& operator*() const
+ { return *_cur; }
+
+ protected:
+ typename BlasMatrix< _Field>::ConstIterator _beg;
+ typename BlasMatrix< _Field>::ConstIterator _cur;
+ size_t _cont_len;
+ size_t _gap_len;
+ };
+#endif
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::Iterator BlasSubmatrix<_Field>::Begin ()
+ {
+ return Iterator (_Mat->Begin () + ( _off ),
+ _col, _stride, 0);
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::Iterator BlasSubmatrix<_Field>::End ()
+ {
+ return Iterator (_Mat->Begin () + ( (_row) * _stride + _off ),
+ _col, _stride, 0);
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::ConstIterator BlasSubmatrix<_Field>::Begin () const
+ {
+ return ConstIterator (_Mat->Begin () + ( _off ),
+ _col, _stride, 0);
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::ConstIterator BlasSubmatrix<_Field>::End () const
+ {
+ return ConstIterator (_Mat->Begin () + ( (_row) * _stride + _off ),
+ _col, _stride, 0);
+ }
+
+#if 0
+ template <class _Field>
+ typename BlasSubmatrix< _Field>::ConstIterator BlasSubmatrix< _Field>::Begin () const
+ {
+ return ConstIterator (_Mat->Begin () + ( _off ),
+ _Mat->Begin () + ( _off ),
+ _col, _stride - _col);
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix< _Field>::ConstIterator BlasSubmatrix< _Field>::End () const
+ {
+ return ConstIterator (_Mat->Begin () + ( (_row) * _stride + _off ),
+ _Mat->Begin () + ( (_row) * _stride + _off ),
+ _col, _stride - _col);
+ }
+#endif
+
+ /*! Raw Indexed Iterator.
+ * @ingroup iterators
+ *
+ * Like the raw iterator, the indexed iterator is a method for
+ * accessing all entries in the matrix in some unspecified order.
+ * At each position of the the indexed iterator, it also provides
+ * the row and column indices of the currently referenced entry.
+ * This is provided through it's \c rowIndex() and \c colIndex() functions.
+ */
+ template <class _Field>
+ class BlasSubmatrix<_Field>::IndexedIterator {
+ public:
+ IndexedIterator (){}
+
+ IndexedIterator (const typename BlasMatrix<_Field>::Iterator& cur,
+ size_t c_dim,
+ size_t stride,
+ size_t r_idx,
+ size_t c_idx) :
+ _cur (cur), _c_dim (c_dim), _stride (stride), _r_idx(r_idx), _c_idx (c_idx)
+ {}
+
+ IndexedIterator& operator = (const IndexedIterator& r)
+ {
+ _cur = r._cur;
+ _stride = r._stride;
+ _c_dim = r._c_dim;
+ _r_idx = r._r_idx;
+ _c_idx = r._c_idx;
+ return *this;
+ }
+
+ IndexedIterator& operator++()
+ {
+ if (_c_idx < _c_dim - 1){
+ ++_c_idx;
+ ++_cur;
+ }
+ else {
+ _cur = _cur + _stride - _c_dim + 1;
+ _c_idx = 0;
+ ++_r_idx;
+ }
+ return *this;
+ }
+
+ IndexedIterator& operator--()
+ {
+ if (_c_idx > 0){
+ --_c_idx;
+ --_cur;
+ }
+ else {
+ _cur = _cur - _stride + _c_dim -1;
+ _c_idx = 0;
+ --_r_idx;
+ }
+ return *this;
+ }
+
+ IndexedIterator operator++(int)
+ {
+ IndexedIterator tmp = *this;
+ this->operator++();
+ return tmp;
+ }
+
+ IndexedIterator operator--(int)
+ {
+ IndexedIterator tmp = *this;
+ this->operator--();
+ return tmp;
+ }
+
+ bool operator != (const IndexedIterator& r) const
+ {
+ return ((_c_idx != r._c_idx) || (_r_idx != r._r_idx) ||(_stride != r._stride) || (_c_dim != r._c_dim) );
+ }
+
+ const _Field& operator*() const {return *_cur;}
+
+ _Field& operator*() {return *_cur;}
+
+ size_t rowIndex () const { return _r_idx; }
+
+ size_t colIndex () const { return _c_idx; }
+
+ const _Field& value () const {return *_cur;}
+
+ protected:
+ typename BlasMatrix<_Field>::Iterator _cur;
+ size_t _stride;
+ size_t _c_dim;
+ size_t _r_idx;
+ size_t _c_idx;
+ };
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::IndexedIterator BlasSubmatrix<_Field>::IndexedBegin ()
+ {
+ return IndexedIterator (_Mat->Begin () + ( (_off) ),
+ _col , _stride, 0, 0);
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::IndexedIterator BlasSubmatrix<_Field>::IndexedEnd ()
+ {
+ return IndexedIterator (_Mat->Begin () + ( (_row) * _stride + (_col+_off) ),
+ _col, _stride, _row-1, _col-1);
+ }
+
+ /*! Raw Indexed Iterator (const version).
+ * @ingroup iterators
+ *
+ * Like the raw iterator, the indexed iterator is a method for
+ * accessing all entries in the matrix in some unspecified order.
+ * At each position of the the indexed iterator, it also provides
+ * the row and column indices of the currently referenced entry.
+ * This is provided through it's \c rowIndex() and \c colIndex() functions.
+ */
+ template <class _Field>
+ class BlasSubmatrix<_Field>::ConstIndexedIterator {
+ public:
+ ConstIndexedIterator (){}
+
+ ConstIndexedIterator (const typename BlasMatrix<_Field>::ConstIterator& cur,
+ size_t c_dim,
+ size_t stride,
+ size_t r_idx,
+ size_t c_idx) :
+ _cur (cur), _stride (stride), _c_dim (c_dim), _r_idx(r_idx), _c_idx (c_idx)
+ {}
+
+ ConstIndexedIterator& operator = (const IndexedIterator& r)
+ {
+ _cur = r._cur;
+ _stride = r._stride;
+ _c_dim = r._c_dim;
+ _r_idx = r._r_idx;
+ _c_idx = r._c_idx;
+ return *this;
+ }
+
+ ConstIndexedIterator& operator = (const ConstIndexedIterator& r)
+ {
+ _cur = r._cur;
+ _stride = r._stride;
+ _c_dim = r._c_dim;
+ _r_idx = r._r_idx;
+ _c_idx = r._c_idx;
+ return *this;
+ }
+
+ ConstIndexedIterator& operator++()
+ {
+ if (_c_idx < _c_dim - 1){
+ ++_c_idx;
+ ++_cur;
+ }
+ else {
+ _cur = _cur + _stride - _c_dim +1;
+ _c_idx = 0;
+ ++_r_idx;
+ }
+ return *this;
+ }
+
+ IndexedIterator& operator--()
+ {
+ if (_c_idx > 0){
+ --_c_idx;
+ --_cur;
+ }
+ else {
+ _cur = _cur - _stride + _c_dim -1;
+ _c_idx = 0;
+ --_r_idx;
+ }
+ return *this;
+ }
+
+ ConstIndexedIterator operator++(int)
+ {
+ ConstIndexedIterator tmp = *this;
+ this->operator++();
+ return tmp;
+ }
+
+ ConstIndexedIterator operator--(int)
+ {
+ ConstIndexedIterator tmp = *this;
+ this->operator--();
+ return tmp;
+ }
+
+ size_t rowIndex () const
+ {
+ return _r_idx;
+ }
+
+ size_t colIndex () const
+ {
+ return _c_idx;
+ }
+
+ bool operator != (const ConstIndexedIterator& r) const
+ {
+ return ((_c_idx != r._c_idx) || (_r_idx != r._r_idx) ||(_stride != r._stride) || (_c_dim != r._c_dim) );
+ }
+
+ const _Field& operator*() const
+ {
+ return *_cur;
+ }
+
+
+ friend std::ostream& operator<<(std::ostream& out, const ConstIndexedIterator m)
+ {
+ return out /* << m._cur << ' ' */
+ << m._stride << ' '
+ << m._c_dim << ' '
+ << m._r_idx << ' '
+ << m._c_idx;
+ }
+
+ const _Field & value() const
+ {
+ return this->operator*();
+
+ }
+
+ protected:
+ typename BlasMatrix<_Field>::ConstIterator _cur;
+ size_t _stride;
+ size_t _c_dim;
+ size_t _r_idx;
+ size_t _c_idx;
+ };
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::ConstIndexedIterator BlasSubmatrix<_Field>::IndexedBegin () const
+ {
+ return ConstIndexedIterator (_Mat->Begin () + ( _off ),
+ _row, _stride, 0, 0);
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::ConstIndexedIterator BlasSubmatrix<_Field>::IndexedEnd () const
+ {
+ return ConstIndexedIterator (_Mat->Begin () + ( (_row) * _stride + (_off+_col) ),
+ _col, _stride, _row-1, _col-1);
+ }
+
+ ////////
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::RowIterator BlasSubmatrix<_Field>::rowBegin ()
+ {
+ return RowIterator (_Mat->Begin () + ( _off ),
+ _col, _stride);
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::RowIterator BlasSubmatrix<_Field>::rowEnd ()
+ {
+ return RowIterator (_Mat->Begin () + ( (_row) * _stride + _off ),
+ _col, _stride);
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::ConstRowIterator BlasSubmatrix<_Field>::rowBegin () const
+ {
+ return ConstRowIterator (_Mat->Begin () + ( _off ),
+ _col, _stride);
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::ConstRowIterator BlasSubmatrix<_Field>::rowEnd () const
+ {
+ return ConstRowIterator (_Mat->Begin () + ( (_row) * _stride + _off ),
+ _col, _stride);
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::ColIterator BlasSubmatrix<_Field>::colBegin ()
+ {
+ return ColIterator (_Mat->Begin () + ( _off ),
+ _stride, _row);
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::ColIterator BlasSubmatrix<_Field>::colEnd ()
+ {
+ return ColIterator (_Mat->Begin () + ( (_col) + _off ),
+ _stride, _row);
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::ConstColIterator BlasSubmatrix<_Field>::colBegin () const
+ {
+ return ConstColIterator (_Mat->Begin () + ( _off ),
+ _stride, _row);
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix<_Field>::ConstColIterator BlasSubmatrix<_Field>::colEnd () const
+ {
+ return ConstColIterator (_Mat->Begin () + ( (_col) + _off ),
+ _stride, _row);
+ }
+
+ /* operators */
+ template <class _Field>
+ typename BlasSubmatrix< _Field>::Row BlasSubmatrix< _Field>::operator[] (size_t i)
+ {
+ return Row (_Mat->Begin () + (_r0+i) * _stride, _Mat->Begin () + ((_r0+i) * _stride + _stride) );
+ }
+
+ template <class _Field>
+ typename BlasSubmatrix< _Field>::ConstRow BlasSubmatrix< _Field>::operator[] (size_t i) const
+ {
+ return Row (_Mat->Begin () + (_r0+i) * _stride, _Mat->Begin () + ((_r0+i) * _stride + _stride) );
+ }
+
+} // LinBox
+
+///////////////////
+// I/O //
+///////////////////
+
+namespace LinBox
+{
+
+ template <class _Field>
+ std::istream& BlasSubmatrix< _Field>::read (std::istream &file)
+ {
+#if 0
+ Iterator p;
+ int m,n;
+ char c;
+ file>>m>>n>>c;
+
+ if (m*n < _row*_col)
+ cerr<<"NOT ENOUGH ELEMENT TO READ\n";
+ else {
+ for (p = Begin (); p != End (); ++p) {
+ integer tmp;
+ file>>tmp;cout<<tmp<<endl;
+ //file.ignore(1);
+ _Mat->_field.read (file, *p);
+ }
+ }
+#endif
+
+
+ Iterator p;
+ int m,n;
+ char c;
+ file>>m>>n>>c;
+ // std::cout << m << 'x' << n << ':' << c << std::endl;
+ _row = m; _col = n;
+
+ _Field zero;
+ _Mat->_field.init(zero,0UL);
+ // resize(_row,_col);
+
+ if ((c != 'M') && (c != 'm')) {
+ for (p = Begin (); p != End (); ++p) {
+ //file.ignore(1);
+ _Mat->_field.read (file, *p);
+ }
+
+ }
+ else { // sparse file format - needs fixing
+ int i, j;
+ while (true)
+ {
+ file >> i >> j;
+ //file.ignore(1);
+ //if (! file) break;
+ if (i+j <= 0) break;
+ // std::cout << i << ',' << j << ':' ;
+ _Mat->_field.read (file, _Mat->refEntry(i-1, j-1));
+ }
+ }
+
+ return file;
+ }
+
+ template <class _Field>
+ std::ostream &BlasSubmatrix< _Field>::write (std::ostream &os,
+ enum LinBoxTag::Format f) const
+ {
+
+ ConstRowIterator p;
+ switch(f) {
+ case (LinBoxTag::FormatPlain) : /* raw output */
+ {
+ integer c;
+ int wid;
+
+
+
+
+ _Mat->_field.cardinality (c);
+
+ if (c >0)
+ wid = (int) ceil (log ((double) c) / M_LN10);
+ else {
+ integer tmp;
+ size_t max=0;
+ ConstIterator it = Begin();
+ for (; it != End(); ++it){
+ _Mat->_field.convert(tmp,*it);
+ if (tmp.bitsize() > max)
+ max= tmp.bitsize();
+ }
+ wid= (int) ceil ((double)max / M_LN10)+1;
+ }
+
+ for (p = rowBegin (); p != rowEnd ();++p) {
+ typename ConstRow::const_iterator pe;
+
+ os << " [ ";
+
+ for (pe = p->begin (); pe != p->end (); ++pe) {
+ os.width (wid);
+ /*! @warning
+ * matrix base does not provide this field(), maybe should?
+ * _Mat.field ().write (os, *pe);
+ * os << *pe;
+ * fixed by using extra field
+ */
+
+ _Mat->_field.write (os, *pe);
+ os << " ";
+ }
+
+ os << "]" << std::endl;
+ }
+ }
+ break;
+ case (LinBoxTag::FormatMaple) : /* maple format */
+ {
+
+ os << "Matrix( " << rowdim() << ',' << coldim() << ",[" ;
+ for (p = rowBegin (); p != rowEnd (); ) {
+ typename ConstRow::const_iterator pe;
+
+ os << " [ ";
+
+ for (pe = p->begin (); pe != p->end (); ) {
+ _Mat->_field.write (os, *pe);
+ ++pe ;
+ if (pe != p->end())
+ os << ", ";
+ }
+
+ os << "]" ;
+ ++p ;
+ if (p != rowEnd() )
+ os << ',' << std::endl;;
+
+ }
+ os << "])" ;
+ }
+ break;
+ case (LinBoxTag::FormatHTML) : /* HTML format */
+ {
+
+ os << "<table border=\"1\">" ;
+ for (p = rowBegin (); p != rowEnd (); ) {
+ typename ConstRow::const_iterator pe;
+
+ os << "<tr>";
+
+ for (pe = p->begin (); pe != p->end (); ) {
+ _Mat->_field.write (os<< "<td>", *pe)<<"</td>";
+ ++pe ;
+ }
+
+ os << "</tr>" << std::endl;
+ ++p ;
+
+ }
+ os << "</table>" ;
+ }
+ break;
+ case (LinBoxTag::FormatLaTeX) : /* LaTex format */
+ {
+ os << "\\begin{pmatrix} " << std::endl;
+ for (p = rowBegin (); p != rowEnd (); ) {
+ typename ConstRow::const_iterator pe;
+
+ for (pe = p->begin (); pe != p->end (); ) {
+ _Mat->_field.write (os, *pe);
+ ++pe ;
+ if (pe != p->end())
+ os << "& ";
+ }
+
+ os << "\\\\" << std::endl;
+ ++p ;
+
+ }
+ os << "\\end{pmatrix}" ;
+ }
+ break;
+ default : /* this is an error */
+ {
+ throw LinBoxError("unknown format to write matrix in");
+ }
+ }
+
+ return os;
+ }
+
+ template <class _Field>
+ template<typename _Tp1>
+ struct BlasSubmatrix< _Field>::rebind {
+ typedef BlasMatrix<_Tp1> other;
+
+ void operator() (other & Ap, const Self_t& A) {
+ typedef typename BlasSubmatrix<_Field>::ConstIterator ConstSelfIterator ;
+ typedef typename other::Iterator OtherIterator ;
+ OtherIterator Ap_i;
+ ConstSelfIterator A_i;
+ Hom<Field, _Tp1> hom(A. field(), Ap. field());
+ for (A_i = A. Begin(), Ap_i = Ap.Begin();
+ A_i != A. End(); ++ A_i, ++ Ap_i)
+ hom.image (*Ap_i, *A_i);
+ }
+ };
+
+} // LinBox
+
+//////////////////
+// MISC //
+//////////////////
+
+namespace LinBox
+{
+} // LinBox
+#endif // __LINBOX_blas_submatrix_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/blas-triangularmatrix.inl b/linbox/matrix/blas-triangularmatrix.inl
new file mode 100644
index 0000000..ead78fb
--- /dev/null
+++ b/linbox/matrix/blas-triangularmatrix.inl
@@ -0,0 +1,144 @@
+/* linbox/matrix/blas-matrix.h
+ * Copyright (C) 2004 Pascal Giorgi, Clément Pernet
+ *
+ * Written by :
+ * Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
+ * Clément Pernet <clement.pernet at imag.fr>
+ * Brice Boyer <bboyer at imag.fr>
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/*!@internal
+ * @file matrix/blas-matrix.inl
+ * @ingroup matrix
+ * A \c BlasMatrix<\c _Field > represents a matrix as an array of
+ * <code>_Field</code>s.
+ */
+
+#ifndef __LINBOX_blas_triangularmatrix_INL
+#define __LINBOX_blas_triangularmatrix_INL
+namespace LinBox
+{
+ template<class _Field>
+ TriangularBlasMatrix<_Field>::TriangularBlasMatrix (const _Field & F, const size_t m, const size_t n,
+ LinBoxTag::Shape x,
+ LinBoxTag::Diag y) :
+ BlasMatrix<_Field>(F, m, n ) , _uplo(x), _diag(y)
+ {}
+
+ template<class _Field>
+ TriangularBlasMatrix<_Field>::TriangularBlasMatrix (const BlasMatrix<_Field>& A,
+ LinBoxTag::Shape x,
+ LinBoxTag::Diag y) :
+ BlasMatrix<_Field>(A) , _uplo(x), _diag(y)
+ {}
+
+ template<class _Field>
+ TriangularBlasMatrix<_Field>::TriangularBlasMatrix (BlasMatrix<_Field>& A,
+ LinBoxTag::Shape x,
+ LinBoxTag::Diag y) :
+ BlasMatrix<_Field>(A), _uplo(x), _diag(y)
+ {}
+
+ template<class _Field>
+ TriangularBlasMatrix<_Field>::TriangularBlasMatrix (const TriangularBlasMatrix<_Field>& A) :
+ BlasMatrix<_Field>(A.field(), A.rowdim(),A.coldim()), _uplo(A._uplo), _diag(A._diag)
+ {
+ switch (A._uplo) {
+ case LinBoxTag::Upper:
+ {
+ for (size_t i=0;i<A.rowdim();++i)
+ for (size_t j=i;j<A.coldim();++j)
+ this->setEntry(i,j,A.getEntry(i,j));
+ break;
+ }
+ case LinBoxTag::Lower:
+ {
+ for (size_t i=0;i<A.rowdim();++i) {
+ for (size_t j=0;j<=i;++j)
+ this->setEntry(i,j,A.getEntry(i,j));
+ }
+
+ break;
+ }
+ default:
+ throw LinboxError ("Error in copy constructor of TriangularBlasMatrix (incorrect argument)");
+ }
+ }
+
+ template<class _Field>
+ template<class Matrix>
+ TriangularBlasMatrix<_Field>::TriangularBlasMatrix (const Matrix& A,
+ LinBoxTag::Shape x,
+ LinBoxTag::Diag y) :
+ BlasMatrix<_Field>(A.rowdim(),A.coldim()), _uplo(x), _diag(y)
+ {
+ switch (x) {
+ case LinBoxTag::Upper:
+ {
+ for (size_t i=0;i<A.rowdim();++i){
+ for (size_t j=i;j<A.coldim();++j) {
+ Element tmp;
+ this->setEntry(i,j,getEntry(tmp, A,i,j));
+ }
+ }
+ break;
+ }
+ case LinBoxTag::Lower:
+ {
+ for (size_t i=0;i<A.rowdim();++i) {
+ for (size_t j=0;j<=i;++j) {
+ Element tmp;
+ this->setEntry(i,j,getEntry(tmp, A,i,j));
+ }
+ }
+
+ break;
+ }
+ default:
+ throw LinboxError ("Error in copy constructor of TriangularBlasMatrix (incorrect argument)");
+ }
+ }
+
+ template<class _Field>
+ LinBoxTag::Shape TriangularBlasMatrix<_Field>::getUpLo() const
+ {
+ return _uplo;
+ }
+
+ template<class _Field>
+ LinBoxTag::Diag TriangularBlasMatrix<_Field>::getDiag() const
+ {
+ return _diag;
+ }
+
+}
+#endif // __LINBOX_blas_triangularmatrix_INL
+
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/dense-rows-matrix.h b/linbox/matrix/dense-rows-matrix.h
index bed2dc6..329aedf 100644
--- a/linbox/matrix/dense-rows-matrix.h
+++ b/linbox/matrix/dense-rows-matrix.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/matrix/dense-rows-matrix.h
* Copyright (C) 2003 Bradford Hovinen
*
@@ -7,7 +5,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_dense_rows_matrix_H
@@ -53,7 +69,7 @@ namespace LinBox
/** Copy constructor.
*/
DenseRowsMatrix (const DenseRowsMatrix &A) :
- _A (A._A), _m (A._m), _n (A._n)
+ _Mat (A._Mat), _m (A._m), _n (A._n)
{}
/** Destructor. */
@@ -110,7 +126,7 @@ namespace LinBox
* @param value Value of the new entry
*/
void setEntry (size_t i, size_t j, const Element &value)
- { _A[i][j] = value; }
+ { _Mat[i][j] = value; }
/** Get a writeable reference to an entry in the matrix
* If there is no entry at the position (i, j), then a new entry
@@ -121,7 +137,7 @@ namespace LinBox
* @return Reference to matrix entry
*/
Element &refEntry (size_t i, size_t j)
- { return _A[i][j]; }
+ { return _Mat[i][j]; }
/** Get a read-only individual entry from the matrix
* @param i Row index
@@ -129,7 +145,7 @@ namespace LinBox
* @return Const reference to matrix entry
*/
const Element &getEntry (size_t i, size_t j) const
- { return _A[i][j]; }
+ { return _Mat[i][j]; }
/** Get an entry and store it in the given value
* This form is more in the Linbox style and is provided for interface
@@ -140,7 +156,7 @@ namespace LinBox
* @return Reference to x
*/
Element &getEntry (Element &x, size_t i, size_t j) const
- { return x = _A[i][j]; }
+ { return x = _Mat[i][j]; }
/** @name Columns of rows iterator
* The columns of row iterator gives each of the rows of the
@@ -152,13 +168,13 @@ namespace LinBox
typedef typename Rep::const_iterator ConstRowIterator;
///
- RowIterator rowBegin () { return _A.begin (); }
+ RowIterator rowBegin () { return _Mat.begin (); }
///
- RowIterator rowEnd () { return _A.end (); }
+ RowIterator rowEnd () { return _Mat.end (); }
///
- ConstRowIterator rowBegin () const { return _A.begin (); }
+ ConstRowIterator rowBegin () const { return _Mat.begin (); }
///
- ConstRowIterator rowEnd () const { return _A.end (); }
+ ConstRowIterator rowEnd () const { return _Mat.end (); }
/** @name Raw iterator
* The raw iterator is a method for accessing all nonzero
@@ -168,18 +184,18 @@ namespace LinBox
*/
///
- class RawIterator;
+ class Iterator;
///
- class ConstRawIterator;
+ class ConstIterator;
- /// rawBegin
- RawIterator rawBegin ();
- /// rawEnd
- RawIterator rawEnd ();
- /// const rawBegin
- ConstRawIterator rawBegin () const;
- /// const rawEnd
- ConstRawIterator rawEnd () const;
+ /// Begin
+ Iterator Begin ();
+ /// End
+ Iterator End ();
+ /// const Begin
+ ConstIterator Begin () const;
+ /// const End
+ ConstIterator End () const;
/** @name Index iterator
* The index iterator gives the row, column indices of all matrix
@@ -188,25 +204,25 @@ namespace LinBox
* first and second positions, respectively.
*/
- /// RawIndexedIterator
- class RawIndexedIterator;
- /// ConstRawIndexedIterator
- class ConstRawIndexedIterator;
+ /// IndexedIterator
+ class IndexedIterator;
+ /// ConstIndexedIterator
+ class ConstIndexedIterator;
- /// rawIndexedBegin
- RawIndexedIterator rawIndexedBegin ();
- /// rawIndexedEnd
- RawIndexedIterator rawIndexedEnd ();
- /// const rawIndexedBegin
- ConstRawIndexedIterator rawIndexedBegin () const;
- /// const rawIndexedEnd
- ConstRawIndexedIterator rawIndexedEnd () const;
+ /// IndexedBegin
+ IndexedIterator IndexedBegin ();
+ /// IndexedEnd
+ IndexedIterator IndexedEnd ();
+ /// const IndexedBegin
+ ConstIndexedIterator IndexedBegin () const;
+ /// const IndexedEnd
+ ConstIndexedIterator IndexedEnd () const;
/** Retrieve a row as a writeable reference
* @param i Row index
*/
Row &getRow (size_t i)
- { return _A[i]; }
+ { return _Mat[i]; }
/** Construct the transpose of this matrix and place it in the
* DenseRowsMatrix given.
@@ -221,7 +237,7 @@ namespace LinBox
friend class SparseMatrixWriteHelper<Element, Row>;
friend class SparseMatrixReadWriteHelper<Element, Row>;
- Rep _A;
+ Rep _Mat;
size_t _m;
size_t _n;
};
@@ -237,3 +253,12 @@ namespace LinBox
#endif // __LINBOX_dense_rows_matrix_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/dense-submatrix.h b/linbox/matrix/dense-submatrix.h
deleted file mode 100644
index c15ea71..0000000
--- a/linbox/matrix/dense-submatrix.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/matrix/dense-submatrix.h
- * Copyright (C) 2001 B. David Saunders,
- * 2001-2002 Bradford Hovinen,
- * 2002 Zhendong Wan
- *
- * Written by B. David Saunders <saunders at cis.udel.edu>,
- * Bradford Hovinen <hovinen at cis.udel.edu>,
- * Zhendong Wan <wan at mail.eecis.udel.edu>
- *
- * evolved from dense-matrix.h by -bds, Zhendong Wan
- *
- * --------------------------------------------------------
- * 2003-01-11 Bradford Hovinen <bghovinen at math.uwaterloo.ca>
- *
- * Move from blackbox to matrix
- * -----------------------------------------------------------
- * 2002-11-30 Bradford Hovinen <bghovinen at math.uwaterloo.ca>
- *
- * Have the constructor take a reference rather than a pointer
- * -----------------------------------------------------------
- * 2002-10-27 Bradford Hovinen <bghovinen at math.uwaterloo.ca>
- *
- * Rename from densesubmatrix.h
- *
- * Constructor modifications: changed the interface to match Submatrix
- *
- * Don't parameterize by Field, but instead by Element; remove all the black box
- * apply stuff
- * -----------------------------------------------------------
- *
- * See COPYING for license information
- */
-
-/*! @file matrix/dense-submatrix.h
- * @ingroup matrix
- * @brief Representation of a submatrix of a dense matrix, not resizeable.
- * This matrix type conforms to the \c LinBox::DenseMatrixBase interface.
- * \c LinBox::BlasMatrix is an example of DenseSubmatrix.
- */
-
-#ifndef __LINBOX_dense_submatrix_H
-#define __LINBOX_dense_submatrix_H
-
-#include "linbox/linbox-config.h"
-
-#include "linbox/util/debug.h"
-#include "linbox/matrix/dense.h"
-#include "linbox/matrix/matrix-domain.h"
-
-namespace LinBox
-{
-
- /** @brief %Submatrix of a dense matrix
- *
- * This matrix type conforms to the same interface as @ref DenseMatrixBase,
- * except that you cannot resize it. It represents a submatrix of a dense
- * matrix. Upon construction, one can freely manipulate the entries in the
- * DenseSubmatrix, and the corresponding entries in the underlying
- * DenseMatrixBase will be modified.
-
- \ingroup matrix
- */
- template<class _Element>
- class DenseSubmatrix {
- public:
-
- /* Iterators */
-
- //! @name Forward declaration of Raw Iterators.
- //@{
- // RawIterator.
- class RawIterator ;
- // Const RawIterator.
- class ConstRawIterator ;
-
- // RawIndexed
- class RawIndexedIterator ;
- // Const RawIndexed
- class ConstRawIndexedIterator ;
- //@}
-
- typedef _Element Element; //!< Element type
- typedef DenseSubmatrix<_Element> Self_t; //!< Self type
-
-
- /** @name typedef'd Row Iterators.
- *\brief
- * The row iterator gives the rows of the
- * matrix in ascending order. Dereferencing the iterator yields
- * a row vector in dense format
- * @{
- */
- typedef typename DenseMatrixBase<Element>::RowIterator RowIterator;
- typedef typename DenseMatrixBase<Element>::ConstRowIterator ConstRowIterator;
- typedef typename DenseMatrixBase<Element>::Row Row;
- typedef typename DenseMatrixBase<Element>::ConstRow ConstRow;
- //@} Row Iterators
-
- /** @name typedef'd Column Iterators.
- *\brief
- * The columns iterator gives the columns of the
- * matrix in ascending order. Dereferencing the iterator yields
- * a column vector in dense format
- * @{
- */
- typedef typename DenseMatrixBase<Element>::ColIterator ColIterator;
- typedef typename DenseMatrixBase<Element>::ConstColIterator ConstColIterator;
- typedef typename DenseMatrixBase<Element>::Col Col;
- typedef typename DenseMatrixBase<Element>::Column Column;
- typedef typename DenseMatrixBase<Element>::ConstCol ConstCol;
- //@} // Column Iterators
-
-
- /* constructors */
-
- /** NULL constructor. */
- DenseSubmatrix () :
- _M(NULL)
- {}
-
- /** Constructor from an existing @ref DenseMatrixBase and dimensions.
- * \param M Pointer to @ref DenseMatrixBase of which to construct submatrix
- * \param row Starting row
- * \param col Starting column
- * \param rowdim Row dimension
- * \param coldim Column dimension
- */
- DenseSubmatrix (DenseMatrixBase<Element> &M,
- size_t row,
- size_t col,
- size_t rowdim,
- size_t coldim);
-
- /** Constructor from an existing @ref DenseMatrixBase
- * \param M Pointer to @ref DenseMatrixBase of which to construct submatrix
- */
- DenseSubmatrix (DenseMatrixBase<Element> &M);
-
-
- /** Constructor from an existing submatrix and dimensions
- * @param SM Constant reference to DenseSubmatrix from which to
- * construct submatrix
- * @param row Starting row
- * @param col Starting column
- * @param rowdim Row dimension
- * @param coldim Column dimension
- */
- DenseSubmatrix (const DenseSubmatrix<Element> &SM,
- size_t row,
- size_t col,
- size_t rowdim,
- size_t coldim);
-
- /** Copy constructor.
- * @param SM Submatrix to copy
- */
- DenseSubmatrix (const DenseSubmatrix<Element> &SM);
-
- /* Members */
-
- /** Assignment operator.
- * Assign the given submatrix to this one
- * @param SM Submatrix to assign
- * @return Reference to this submatrix
- */
- DenseSubmatrix &operator = (const DenseSubmatrix<Element> &SM);
-
- /** Get the number of rows in the matrix
- * @return Number of rows in matrix
- */
- size_t rowdim () const
- {
- return _end_row - _beg_row;
- }
-
- /** Get the number of columns in the matrix
- * @return Number of columns in matrix
- */
- size_t coldim () const
- {
- return _end_col - _beg_col;
- }
-
- template<typename _Tp1>
- struct rebind {
- typedef DenseSubmatrix<typename _Tp1::Element> other;
- };
-
-
- /** Read the matrix from an input stream.
- * @param file Input stream from which to read
- * @param field
- */
- template<class Field>
- std::istream& read (std::istream &file, const Field& field);
-
- /** Write the matrix to an output stream.
- * @param os Output stream to which to write
- * @param field
- * @param mapleFormat write in Maple(r) format ?
- */
- template<class Field>
- std::ostream& write (std::ostream &os, const Field& field,
- bool mapleFormat = false) const;
-
- /** Write the matrix to an output stream.
- * This a raw version of \c write(os,F) (no field is given).
- * @param os Output stream to which to write
- * @param mapleFormat write in Maple(r) format ?
- */
- std::ostream& write (std::ostream &os,
- bool mapleFormat = false) const;
-
-
- /** Set the entry at (i, j).
- * @param i Row number, 0...rowdim () - 1
- * @param j Column number 0...coldim () - 1
- * @param a_ij Element to set
- */
- void setEntry (size_t i, size_t j, const Element &a_ij)
- {
- _M->setEntry (_beg_row + i, _beg_col + j, a_ij);
- }
-
- /** Get a writeable reference to an entry in the matrix.
- * @param i Row index of entry
- * @param j Column index of entry
- * @return Reference to matrix entry
- */
- Element &refEntry (size_t i, size_t j)
- {
- return _M->refEntry (i + _beg_row, j + _beg_col);
- }
-
- /** Get a read-only individual entry from the matrix.
- * @param i Row index
- * @param j Column index
- * @return Const reference to matrix entry
- */
- const Element &getEntry (size_t i, size_t j) const
- {
- return _M->getEntry (i + _beg_row, j + _beg_col);
- }
-
- /** Get an entry and store it in the given value.
- * This form is more in the Linbox style and is provided for interface
- * compatibility with other parts of the library
- * @param x Element in which to store result
- * @param i Row index
- * @param j Column index
- * @return Reference to x
- */
- Element &getEntry (Element &x, size_t i, size_t j) const
- {
- return _M->getEntry (x, i + _beg_row, j + _beg_col);
- }
-
- /// iterator to the begining of a row
- RowIterator rowBegin ();
- /// iterator to the end of a row
- RowIterator rowEnd ();
- /// const iterator to the begining of a row
- ConstRowIterator rowBegin () const;
- /// const iterator to the end of a row
- ConstRowIterator rowEnd () const;
-
- ColIterator colBegin ();
- ColIterator colEnd ();
- ConstColIterator colBegin () const;
- ConstColIterator colEnd () const;
-
- RawIterator rawBegin ();
- RawIterator rawEnd ();
- ConstRawIterator rawBegin () const;
- ConstRawIterator rawEnd () const;
-
-
- RawIndexedIterator rawIndexedBegin();
- RawIndexedIterator rawIndexedEnd();
- ConstRawIndexedIterator rawIndexedBegin() const;
- ConstRawIndexedIterator rawIndexedEnd() const;
-
-#if 0 /* operator[] */
- /*- Retrieve a reference to a row
- * @param i Row index
- */
- Row operator[] (int i); not actually used, causes a compile error...
- ConstRow operator[] (int i) const;
-#endif
-
- /*! Creates a transposed matrix of \c *this.
- * @param[in] tM
- * @return the transposed matrix of this.
- */
- DenseSubmatrix<Element> transpose(DenseMatrixBase<Element> & tM)
- {
- linbox_check(tM.coldim() == rowdim());
- linbox_check(tM.rowdim() == coldim());
- // DenseMatrixBase<Element> tM(coldim(),rowdim());
- DenseSubmatrix<Element> tA(tM);
- for (size_t i = 0 ; i < rowdim(); ++i)
- for (size_t j = 0 ; j < coldim(); ++j)
- tA.setEntry(j,i,getEntry(i,j));
- return tA;
- }
-
- /*! Creates a transposed matrix of \c *this.
- * @return the transposed matrix of this.
- */
- DenseSubmatrix<Element> & transpose(DenseSubmatrix<Element> & tA)
- {
- for (size_t i = 0 ; i < rowdim(); ++i)
- for (size_t j = 0 ; j < coldim(); ++j)
- tA.setEntry(j,i,getEntry(i,j));
- return tA;
- }
-
- protected:
- DenseMatrixBase<Element> *_M;
- size_t _beg_row;
- size_t _end_row;
- size_t _beg_col;
- size_t _end_col;
- };
-
- /*! Write a matrix to a stream.
- * The C++ way using <code>operator<<</code>
- * @param o output stream
- * @param M matrix to write.
- */
- template<class T>
- std::ostream& operator<< (std::ostream & o, const DenseSubmatrix<T> & M)
- {
- return M.write(o);
- }
-
-
- /*! @internal
- * @brief MatrixTraits
- */
- template <class Element>
- struct MatrixTraits< DenseSubmatrix<Element> > {
- typedef DenseSubmatrix<Element> MatrixType;
- typedef typename MatrixCategories::RowColMatrixTag MatrixCategory;
- };
-
-} // namespace LinBox
-
-#include "linbox/matrix/dense-submatrix.inl"
-
-#endif // __LINBOX_dense_submatrix_H
-
-
diff --git a/linbox/matrix/dense-submatrix.inl b/linbox/matrix/dense-submatrix.inl
deleted file mode 100644
index 1f983b5..0000000
--- a/linbox/matrix/dense-submatrix.inl
+++ /dev/null
@@ -1,780 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/matrix/dense-submatrix.inl
- * Copyright (C) 2001 B. David Saunders,
- * 2001-2002 Bradford Hovinen,
- * 2002 Zhendong Wan
- *
- * Written by B. David Saunders <saunders at cis.udel.edu>,
- * Bradford Hovinen <hovinen at cis.udel.edu>,
- * Zhendong Wan <wan at mail.eecis.udel.edu>
- *
- * evolved from dense-matrix.h by -bds, Zhendong Wan
- *
- * -----------------------------------------------------------
- * 2002-10-27 Bradford Hovinen <bghovinen at math.uwaterloo.ca>
- *
- * Rename from densesubmatrix.C
- *
- * Constructor modifications: changed the interface to match Submatrix
- * -----------------------------------------------------------
- *
- * See COPYING for license information
- */
-
-/*! @file matrix/dense-submatrix.inl
- * @brief Implementation of dense-submatrix.h
- */
-
-#ifndef __LINBOX_dense_submatrix_INL
-#define __LINBOX_dense_submatrix_INL
-
-#include "linbox/util/debug.h"
-#include "linbox/matrix/dense.h"
-#include "linbox/matrix/dense-submatrix.h"
-
-namespace LinBox
-{
-
- template <class _Element>
- DenseSubmatrix<_Element>::DenseSubmatrix (DenseMatrixBase<_Element> &M,
- size_t row,
- size_t col,
- size_t rowdim,
- size_t coldim) :
- _M (&M), _beg_row (row), _end_row (row + rowdim), _beg_col (col), _end_col (col + coldim)
- {
- linbox_check (_beg_row <= _end_row);
- linbox_check (_beg_col <= _end_col);
- linbox_check (_end_row <= M.rowdim ());
- linbox_check (_end_col <= M.coldim ());
- }
-
-
- template <class _Element>
- DenseSubmatrix<_Element>::DenseSubmatrix (DenseMatrixBase<_Element> &M) :
- _M(&M), _beg_row(0), _end_row(M.rowdim()), _beg_col(0), _end_col(M.coldim())
- {}
-
-
-
- template <class _Element>
- DenseSubmatrix<_Element>::DenseSubmatrix (const DenseSubmatrix<_Element> &SM,
- size_t row,
- size_t col,
- size_t rowdim,
- size_t coldim) :
- _M (SM._M),
- _beg_row (SM._beg_row + row),
- _end_row (SM._beg_row + row + rowdim),
- _beg_col (SM._beg_col + col),
- _end_col (SM._beg_col + col + coldim)
- {
- linbox_check (_beg_row <= _end_row);
- linbox_check (_beg_col <= _end_col);
- linbox_check (_end_row - _beg_row <= SM.rowdim ());
- linbox_check (_end_col - _beg_col <= SM.coldim ());
- }
-
- template <class _Element>
- DenseSubmatrix<_Element>::DenseSubmatrix (const DenseSubmatrix<_Element> &SM) :
- _M (SM._M), _beg_row (SM._beg_row), _end_row (SM._end_row), _beg_col (SM._beg_col), _end_col (SM._end_col)
- { }
-
- template <class _Element>
- DenseSubmatrix<_Element>& DenseSubmatrix<_Element>::operator=(const DenseSubmatrix<_Element> &SM)
- {
- _M = (SM._M);
- _beg_row = SM._beg_row;
- _end_row = SM._end_row;
- _beg_col = SM._beg_col;
- _end_col = SM._end_col;
-
- return *this;
- }
-
-
- /*! Raw Iterators.
- * @ingroup iterators
- *
- * The raw iterator is a method for accessing all entries in the matrix
- * in some unspecified order. This can be used, e.g. to reduce all
- * matrix entries modulo a prime before passing the matrix into an
- * algorithm.
- */
- template <class _Element>
- class DenseSubmatrix<_Element>::RawIterator {
- public:
- RawIterator (){}
-
- /*! @internal
- * @brief NO DOC
- */
- RawIterator (const typename DenseMatrixBase<_Element>::RawIterator& cur,
- const size_t c_dim,
- const size_t stride,
- const size_t c_idx) :
- _cur (cur), _c_dim (c_dim), _stride(stride), _c_idx (c_idx)
- {}
-
- /*! @internal
- * @brief copy operator.
- * @param r RawIterator to copy.
- */
- RawIterator& operator = (const RawIterator& r)
- {
- _cur = r._cur;
- _c_dim = r._c_dim;
- _stride = r._stride;
- _c_idx = r._c_idx;
- return *this;
- }
-
- /*! @internal
- * increment.
- * ??
- */
- RawIterator& operator ++()
- {
- if (_c_idx < _c_dim - 1){
- ++_cur; ++_c_idx;
- }
- else {
- _cur = _cur + _stride - _c_dim + 1;
- _c_idx = 0;
- }
-
- return *this;
- }
-
- /*! @internal
- * increment.
- * ??
- */
- RawIterator& operator++ (int)
- {
- return this->operator++ ();
- }
-
-
- /*! @internal
- * @brief operator !=.
- * @param r RawIterator to test inequaltity from.
- */
- bool operator != (const RawIterator& r) const
- {
- return (_cur != r._cur || _c_dim != r._c_dim) || (_stride != r._stride) || (_c_idx != r._c_idx);
- }
-
- //! @internal operator *.
- _Element& operator * ()
- {
- return *_cur;
- }
-
- //! @internal operator *.
- const _Element& operator * () const
- {
- return *_cur;
- }
-
- protected:
- typename DenseMatrixBase<_Element>::RawIterator _cur;
- size_t _c_dim;
- size_t _stride;
- size_t _c_idx;
- };
-
- /*! Raw Iterators (const version).
- * @ingroup iterators
- * The raw iterator is a method for accessing all entries in the matrix
- * in some unspecified order. This can be used, e.g. to reduce all
- * matrix entries modulo a prime before passing the matrix into an
- * algorithm.
- */
- template <class _Element>
- class DenseSubmatrix<_Element>::ConstRawIterator {
- public:
- //! @internal Null constructor
- ConstRawIterator (){}
-
-
- /*! @internal
- * @brief NO DOC
- */
- ConstRawIterator (const typename DenseMatrixBase<_Element>::ConstRawIterator& cur,
- const size_t c_dim,
- const size_t stride,
- const size_t c_idx) :
- _cur (cur), _c_dim (c_dim), _stride(stride), _c_idx (c_idx)
- {}
-
- /*! @internal
- * @brief copy operator.
- * @param r RawIterator to copy.
- */
- ConstRawIterator& operator = (const ConstRawIterator& r)
- {
- _cur = r._cur;
- _c_dim = r._c_dim;
- _stride = r._stride;
- _c_idx = r._c_idx;
- return *this;
- }
-
- /*! @internal
- * increment.
- * ??
- */
- ConstRawIterator& operator ++()
- {
- if (_c_idx < _c_dim - 1){
- ++_cur; ++_c_idx;
- }
- else {
- _cur = _cur + _stride - _c_dim + 1;
- _c_idx = 0;
- }
-
- return *this;
- }
-
- /*! @internal
- * increment.
- * ??
- */
- ConstRawIterator& operator++ (int)
- {
- return this->operator++ ();
- }
-
- /*! @internal
- * @brief operator !=.
- * @param r RawIterator to test inequaltity from.
- */
- bool operator != (const ConstRawIterator& r) const
- {
- return (_cur != r._cur) || (_c_dim != r._c_dim) || (_stride != r._stride) || (_c_idx != r._c_idx);
- }
-
- //! @internal operator *.
- const _Element& operator * () const
- {
- return *_cur;
- }
-
- protected:
- typename DenseMatrixBase<_Element>::ConstRawIterator _cur;
- size_t _c_dim;
- size_t _stride;
- size_t _c_idx;
- };
-
-#if 0
- template <class Element>
- class DenseSubmatrix<Element>::ConstRawIterator {
- public:
- ConstRawIterator (){}
-
- ConstRawIterator ( const typename DenseMatrixBase<Element>::ConstRawIterator& cur,
- size_t cont_len,
- size_t gap_len) :
- _beg (beg), _cur (cur), _cont_len (cont_len), _gap_len (gap_len)
- {}
-
- ConstRawIterator& operator = (const RawIterator& r)
- {
- _cur = r._cur;
- _beg = r._beg;
- _cont_len = r._cont_len;
- _gap_len = r._gap_len;
- return *this;
- }
-
- ConstRawIterator& operator = (const ConstRawIterator& r)
- {
- _cur = r._cur;
- _beg = r._beg;
- _cont_len = r._cont_len;
- _gap_len = r._gap_len;
- return *this;
- }
-
- ConstRawIterator& operator++()
- {
- if (((_cur - _beg + 1) % _cont_len) != 0)
- ++_cur;
- else
- {
- _cur = _cur + _gap_len + 1;
- _beg = _beg + _gap_len + _cont_len;
- }
- return *this;
- }
-
- ConstRawIterator operator++(int)
- {
- ConstRawIterator tmp = *this;
- this->operator++();
- return tmp;
- }
-
- bool operator != (const ConstRawIterator& r) const
- {
- return (_cur != r._cur) || (_beg != r._beg) || (_cont_len != r._cont_len) || (_gap_len != r._gap_len);
- }
-
- const Element& operator*()
- { return *_cur; }
-
- Element& operator*()
- { return *_cur; }
-
- const Element& operator*() const
- { return *_cur; }
-
- protected:
- typename DenseMatrixBase<Element>::ConstRawIterator _beg;
- typename DenseMatrixBase<Element>::ConstRawIterator _cur;
- size_t _cont_len;
- size_t _gap_len;
- };
-#endif
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::RawIterator DenseSubmatrix<_Element>::rawBegin ()
- {
- return RawIterator (_M->rawBegin () + _beg_row * _M->coldim () + _beg_col,
- coldim (), _M->coldim (), 0);
- }
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::RawIterator DenseSubmatrix<_Element>::rawEnd ()
- {
- return RawIterator (_M->rawBegin () + _end_row * _M->coldim () + _beg_col,
- coldim (), _M->coldim (), 0);
- }
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::ConstRawIterator DenseSubmatrix<_Element>::rawBegin () const
- {
- return ConstRawIterator (_M->rawBegin () + _beg_row * _M->coldim () + _beg_col,
- coldim (), _M->coldim (), 0);
- }
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::ConstRawIterator DenseSubmatrix<_Element>::rawEnd () const
- {
- return ConstRawIterator (_M->rawBegin () + _end_row * _M->coldim () + _beg_col,
- coldim (), _M->coldim (), 0);
- }
-
-#if 0
- template <class Element>
- typename DenseSubmatrix<Element>::ConstRawIterator DenseSubmatrix<Element>::rawBegin () const
- {
- return ConstRawIterator (_M->rawBegin () + _beg_row * _M->coldim () + _beg_col,
- _M->rawBegin () + _beg_row * _M->coldim () + _beg_col,
- coldim (), _M->coldim () - coldim ());
- }
-
- template <class Element>
- typename DenseSubmatrix<Element>::ConstRawIterator DenseSubmatrix<Element>::rawEnd () const
- {
- return ConstRawIterator (_M->rawBegin () + _end_row * _M->coldim () + _beg_col,
- _M->rawBegin () + _end_row * _M->coldim () + _beg_col,
- coldim (), _M->coldim () - coldim ());
- }
-#endif
-
- /*! Raw Indexed Iterator.
- * @ingroup iterators
- *
- * Like the raw iterator, the indexed iterator is a method for
- * accessing all entries in the matrix in some unspecified order.
- * At each position of the the indexed iterator, it also provides
- * the row and column indices of the currently referenced entry.
- * This is provided through it's \c rowIndex() and \c colIndex() functions.
- */
- template <class _Element>
- class DenseSubmatrix<_Element>::RawIndexedIterator {
- public:
- RawIndexedIterator (){}
-
- RawIndexedIterator (const typename DenseMatrixBase<_Element>::RawIterator& cur,
- size_t c_dim,
- size_t stride,
- size_t r_idx,
- size_t c_idx) :
- _cur (cur), _c_dim (c_dim), _stride (stride), _r_idx(r_idx), _c_idx (c_idx)
- {}
-
- RawIndexedIterator& operator = (const RawIndexedIterator& r)
- {
- _cur = r._cur;
- _stride = r._stride;
- _c_dim = r._c_dim;
- _r_idx = r._r_idx;
- _c_idx = r._c_idx;
- return *this;
- }
-
- RawIndexedIterator& operator++()
- {
- if (_c_idx < _c_dim - 1){
- ++_c_idx;
- ++_cur;
- }
- else
- {
- _cur = _cur + _stride - _c_dim + 1;
- _c_idx = 0;
- ++_r_idx;
- }
- return *this;
- }
-
- RawIndexedIterator& operator--()
- {
- if (_c_idx > 0){
- --_c_idx;
- --_cur;
- }
- else
- {
- _cur = _cur - _stride + _c_dim -1;
- _c_idx = 0;
- --_r_idx;
- }
- return *this;
- }
-
- RawIndexedIterator operator++(int)
- {
- RawIndexedIterator tmp = *this;
- this->operator++();
- return tmp;
- }
-
- RawIndexedIterator operator--(int)
- {
- RawIndexedIterator tmp = *this;
- this->operator--();
- return tmp;
- }
-
- bool operator != (const RawIndexedIterator& r) const
- {
- return ((_c_idx != r._c_idx) || (_r_idx != r._r_idx) ||(_stride != r._stride) || (_c_dim != r._c_dim) );
- }
-
- const _Element& operator*() const {return *_cur;}
-
- _Element& operator*() {return *_cur;}
-
- size_t rowIndex () const { return _r_idx; }
-
- size_t colIndex () const { return _c_idx; }
-
- const _Element& value () const {return *_cur;}
-
- protected:
- typename DenseMatrixBase<_Element>::RawIterator _cur;
- size_t _stride;
- size_t _c_dim;
- size_t _r_idx;
- size_t _c_idx;
- };
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::RawIndexedIterator DenseSubmatrix<_Element>::rawIndexedBegin ()
- {
- return RawIndexedIterator (_M->rawBegin () + _beg_row * _M->coldim () + _beg_col,
- coldim(), _M->coldim(), 0, 0);
- }
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::RawIndexedIterator DenseSubmatrix<_Element>::rawIndexedEnd ()
- {
- return RawIndexedIterator (_M->rawBegin () + _end_row * _M->coldim () + _end_col,
- coldim(), _M->coldim (), rowdim()-1, coldim()-1);
- }
-
- /*! Raw Indexed Iterator (const version).
- * @ingroup iterators
- *
- * Like the raw iterator, the indexed iterator is a method for
- * accessing all entries in the matrix in some unspecified order.
- * At each position of the the indexed iterator, it also provides
- * the row and column indices of the currently referenced entry.
- * This is provided through it's \c rowIndex() and \c colIndex() functions.
- */
- template <class _Element>
- class DenseSubmatrix<_Element>::ConstRawIndexedIterator {
- public:
- ConstRawIndexedIterator (){}
-
- ConstRawIndexedIterator (const typename DenseMatrixBase<_Element>::ConstRawIterator& cur,
- size_t c_dim,
- size_t stride,
- size_t r_idx,
- size_t c_idx) :
- _cur (cur), _stride (stride), _c_dim (c_dim), _r_idx(r_idx), _c_idx (c_idx)
- {}
-
- ConstRawIndexedIterator& operator = (const RawIndexedIterator& r)
- {
- _cur = r._cur;
- _stride = r._stride;
- _c_dim = r._c_dim;
- _r_idx = r._r_idx;
- _c_idx = r._c_idx;
- return *this;
- }
-
- ConstRawIndexedIterator& operator = (const ConstRawIndexedIterator& r)
- {
- _cur = r._cur;
- _stride = r._stride;
- _c_dim = r._c_dim;
- _r_idx = r._r_idx;
- _c_idx = r._c_idx;
- return *this;
- }
-
- ConstRawIndexedIterator& operator++()
- {
- if (_c_idx < _c_dim - 1){
- ++_c_idx;
- ++_cur;
- }
- else
- {
- _cur = _cur + _stride - _c_dim +1;
- _c_idx = 0;
- ++_r_idx;
- }
- return *this;
- }
- RawIndexedIterator& operator--()
- {
- if (_c_idx > 0){
- --_c_idx;
- --_cur;
- }
- else
- {
- _cur = _cur - _stride + _c_dim -1;
- _c_idx = 0;
- --_r_idx;
- }
- return *this;
- }
-
- ConstRawIndexedIterator operator++(int)
- {
- ConstRawIndexedIterator tmp = *this;
- this->operator++();
- return tmp;
- }
-
- ConstRawIndexedIterator operator--(int)
- {
- ConstRawIndexedIterator tmp = *this;
- this->operator--();
- return tmp;
- }
-
- size_t rowIndex () const { return _r_idx; }
-
- size_t colIndex () const { return _c_idx; }
-
- bool operator != (const ConstRawIndexedIterator& r) const
- {
- return ((_c_idx != r._c_idx) || (_r_idx != r._r_idx) ||(_stride != r._stride) || (_c_dim != r._c_dim) );
- }
-
- const _Element& operator*() const {return *_cur;}
-
-
- friend std::ostream& operator<<(std::ostream& out, const ConstRawIndexedIterator m) {
- return out /* << m._cur << ' ' */
- << m._stride << ' '
- << m._c_dim << ' '
- << m._r_idx << ' '
- << m._c_idx;
- }
-
- protected:
- typename DenseMatrixBase<_Element>::ConstRawIterator _cur;
- size_t _stride;
- size_t _c_dim;
- size_t _r_idx;
- size_t _c_idx;
- };
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::ConstRawIndexedIterator DenseSubmatrix<_Element>::rawIndexedBegin () const
- {
- return ConstRawIndexedIterator (_M->rawBegin () + _beg_row * _M->coldim () + _beg_col,
- coldim(), _M->coldim(), 0, 0);
- }
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::ConstRawIndexedIterator DenseSubmatrix<_Element>::rawIndexedEnd () const
- {
- return ConstRawIndexedIterator (_M->rawBegin () + _end_row * _M->coldim () + _end_col,
- coldim (), _M->coldim (), rowdim()-1, coldim()-1);
- }
-
- ////////
- template <class _Element>
- typename DenseSubmatrix<_Element>::RowIterator DenseSubmatrix<_Element>::rowBegin ()
- {
- return RowIterator (_M->rawBegin () + _beg_row * _M->coldim () + _beg_col,
- _end_col - _beg_col, _M->coldim ());
- }
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::RowIterator DenseSubmatrix<_Element>::rowEnd ()
- {
- return RowIterator (_M->rawBegin () + _end_row * _M->coldim () + _beg_col,
- _end_col - _beg_col, _M->coldim ());
- }
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::ConstRowIterator DenseSubmatrix<_Element>::rowBegin () const
- {
- return ConstRowIterator (_M->rawBegin () + _beg_row * _M->coldim () + _beg_col,
- _end_col - _beg_col, _M->coldim ());
- }
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::ConstRowIterator DenseSubmatrix<_Element>::rowEnd () const
- {
- return ConstRowIterator (_M->rawBegin () + _end_row * _M->coldim () + _beg_col,
- _end_col - _beg_col, _M->coldim ());
- }
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::ColIterator DenseSubmatrix<_Element>::colBegin ()
- {
- return ColIterator (_M->rawBegin () + _beg_col + _beg_row * _M->coldim (),
- _M->coldim (), rowdim ());
- }
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::ColIterator DenseSubmatrix<_Element>::colEnd ()
- {
- return ColIterator (_M->rawBegin () + _end_col + _beg_row * _M->coldim (),
- _M->coldim (), rowdim ());
- }
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::ConstColIterator DenseSubmatrix<_Element>::colBegin () const
- {
- return ConstColIterator (_M->rawBegin () + _beg_col + _beg_row * _M->coldim (),
- _M->coldim (), rowdim ());
- }
-
- template <class _Element>
- typename DenseSubmatrix<_Element>::ConstColIterator DenseSubmatrix<_Element>::colEnd () const
- {
- return ConstColIterator (_M->rawBegin () + _end_col + _beg_row * _M->coldim (),
- _M->coldim (), rowdim ());
- }
-
- template <class _Element>
- template <class Field>
- std::istream& DenseSubmatrix<_Element>::read (std::istream &file, const Field& field)
- {
- RawIterator p;
-
- for (p = rawBegin (); p != rawEnd (); ++p) {
- // each entry is seperated by one space.
- file.ignore (1);
- field.read (file, *p);
- }
-
- return file;
- }
-
- template <class _Element>
- template <class Field>
- std::ostream &DenseSubmatrix<_Element>::write (std::ostream &os, const Field& field,
- bool mapleFormat) const
- {
- ConstRowIterator p;
-
- // integer c;
- //int wid;
-
- // field.cardinality (c);
- //wid = (int) ceil (log ((double) c) / M_LN10); //BB : not used !
-
- typename ConstRow::const_iterator pe;
-
- if (mapleFormat) os << "[";
-
- for (p = rowBegin (); p != rowEnd (); ++p) {
- if (mapleFormat && (p != rowBegin()))
- os << ',';
- if (mapleFormat) os << "[";
-
- for (pe = p->begin (); pe != p->end (); ++pe) {
- if (mapleFormat && (pe != p->begin())) os << ',';
- // matrix base does not provide this field(), maybe should?
- //_M.field ().write (os, *pe);
- //os << *pe;
- //fixed by using extra field
-
- field.write (os, *pe);
- os << " ";
- }
-
- if (!mapleFormat)
- os << std::endl;
- else os << ']';
- }
-
- if (mapleFormat) os << ']';
- return os;
- }
-
- template <class _Element>
- std::ostream &DenseSubmatrix<_Element>::write (std::ostream &os, bool mapleFormat) const
- {
- ConstRowIterator p;
-
-
-
- typename ConstRow::const_iterator pe;
-
- if (mapleFormat) os << "[";
-
- for (p = rowBegin (); p != rowEnd (); ++p) {
- if (mapleFormat && (p != rowBegin()))
- os << ',';
- if (mapleFormat) os << "[";
-
- for (pe = p->begin (); pe != p->end (); ++pe) {
- if (mapleFormat && (pe != p->begin())) os << ',';
-
- os << *pe;
- os << " ";
- }
-
- if (!mapleFormat)
- os << std::endl;
- else os << ']';
- }
-
- if (mapleFormat) os << ']';
- return os;
- }
-
-
-} // namespace LinBox
-
-#endif // __LINBOX_dense_submatrix_INL
-
diff --git a/linbox/matrix/dense.h b/linbox/matrix/dense.h
deleted file mode 100644
index cc4814d..0000000
--- a/linbox/matrix/dense.h
+++ /dev/null
@@ -1,372 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/matrix/dense.h
- * Copyright (C) 2001 B. David Saunders,
- * 2001-2002 Bradford Hovinen,
- * 2002 Zhendong Wan
- *
- * Written by B. David Saunders <saunders at cis.udel.edu>,
- * Bradford Hovinen <hovinen at cis.udel.edu>,
- * Zhendong Wan <wan at mail.eecis.udel.edu>
- *
- * evolved from dense-matrix.h by -bds, Zhendong Wan
- *
- * --------------------------------------------------------
- * 2003-01-11 Bradford Hovinen <bghovinen at math.uwaterloo.ca>
- *
- * Move from blackbox/dense-base.h to matrix/dense.h
- * --------------------------------------------------------
- * 2002-11-29 Bradford Hovinen <bghovinen at math.uwaterloo.ca>
- *
- * Swap the order of arguments in read and write, so that it is consistent with
- * SparseMatrixBase
- * --------------------------------------------------------
- * 2002-10-28 Bradford Hovinen <bghovinen at math.uwaterloo.ca>
- *
- * Rename ColOfRowsIterator as RowIterator; similarly with RowOfColsIterator
- * --------------------------------------------------------
- * 2002-10-27 Bradford Hovinen <hovinen at cis.udel.edu>
- *
- * Split out container/iterator functionality into DenseMatrixBase
- * --------------------------------------------------------
- *
- * See COPYING for license information
- */
-
-/*! @file matrix/dense.h
- * @ingroup matrix
- * @brief Blackbox dense matrix.
- */
-
-#ifndef __LINBOX_matrix_dense_H
-#define __LINBOX_matrix_dense_H
-
-#include <iostream>
-#include <vector>
-#include <fstream>
-
-#include "linbox/vector/subiterator.h"
-#include "linbox/vector/subvector.h"
-#include "linbox/vector/stream.h"
-#include "linbox/matrix/matrix-domain.h"
-#include "linbox/linbox-config.h"
-#include "linbox/util/matrix-stream.h"
-#include "linbox/field/hom.h"
-
-
-namespace LinBox
-{
-
- /** @brief LinBox dense matrix template.
- * This is a class of dense matrices
- * templatized by the entry type, the \c Element type of some @link Fields field at endlink.
- * The matrix is stored as a one dimensional STL \c std::vector of the elements, by rows.
- * The interface provides for iteration over rows and over columns.
- *
- * The class \c LinBox::DenseMatrix builds on this base.
- *
- * Currently, only dense vectors are supported when doing matrix-vector applies.
- *
- * \ingroup matrix
- */
- template <class _Element>
- class DenseMatrixBase {
- public:
-
- typedef _Element Element; //!< Element type
- typedef typename RawVector<Element>::Dense Rep; //!< No doc
- typedef DenseMatrixBase<_Element> Self_t; //!< Self type
-
- template<typename _Tp1>
- struct rebind {
- typedef DenseMatrixBase<typename _Tp1::Element> other;
- };
-
- /// NULL constructor.
- DenseMatrixBase () :
- _rows (0), _cols (0)
- {}
-
- /** Constructor.
- * @param m row dimension
- * @param n column dimension
- */
- DenseMatrixBase (size_t m, size_t n) :
- _rep (m * n), _rows (m), _cols (n), _ptr(&_rep[0])
- {}
-
- /** Constructor from a matrix stream.
- * @param ms matrix stream
- */
- template< class Field >
- DenseMatrixBase( MatrixStream<Field>& ms );
-
- /*! copy constructor.
- * @param M Dense matrix to be copied.
- */
- DenseMatrixBase (const DenseMatrixBase &M) :
- _rep (M._rep),_rows (M._rows), _cols (M._cols), _ptr(&_rep[0])
- {}
-
- //! destructor.
- ~DenseMatrixBase(){}
-
- /*! copy operator.
- * @param M matrix to be copied.
- */
- DenseMatrixBase& operator= (const DenseMatrixBase& M)
- {
- (*this)._rep = M._rep;
- (*this)._rows = M._rows;
- (*this)._cols = M._cols;
- (*this)._ptr = &_rep[0];
- return (*this);
- }
-
- /** Get a pointer on the storage of the elements.
- * @returns a pointer on Elements
- /todo What is this?
- */
- Element* FullIterator() const
- {
- return const_cast<Element*>(&_rep[0]);
- }
-
- /** Get the number of rows in the matrix
- * @returns Number of rows in matrix
- */
- size_t rowdim () const
- {
- return _rows;
- }
-
- /** Get the number of columns in the matrix.
- * @returns Number of columns in matrix
- */
- size_t coldim () const
- {
- return _cols;
- }
-
- /** Resize the matrix to the given dimensions.
- * The state of the matrix's entries after a call to this method is
- * undefined
- * @param m Number of rows
- * @param n Number of columns
- * @param val
- */
- void resize (size_t m, size_t n, const Element& val = Element())
- {
- _rows = m;
- _cols = n;
- _rep.resize (m * n, val);
- }
-
- /** Read the matrix from an input stream.
- * @param file Input stream from which to read
- * @param F Field over which to read
- */
- template <class Field>
- std::istream &read (std::istream &file, const Field &F);
-
- /** Write the matrix to an output stream.
- * @param os Output stream to which to write
- * @param F Field over which to write
- * @param mapleFormat write in Maple format ?
- */
- template <class Field>
- std::ostream &write (std::ostream &os, const Field &F,
- bool mapleFormat=true) const;
-
- /** Write brutally the matrix to an output stream.
- * This a raw version of \c write(os,F) (no field is given).
- * @param os Output stream to which to write
- * @param mapleFormat write in maple format ?
- */
- std::ostream &write (std::ostream &os,
- bool mapleFormat=true) const;
-
-
- /** Set the entry at the (i, j) position to a_ij.
- * @param i Row number, 0...rowdim () - 1
- * @param j Column number 0...coldim () - 1
- * @param a_ij Element to set
- */
- void setEntry (size_t i, size_t j, const Element &a_ij)
- {
- _rep[i * _cols + j] = a_ij;
- }
-
- /** Get a writeable reference to the entry in the (i, j) position.
- * @param i Row index of entry
- * @param j Column index of entry
- * @returns Reference to matrix entry
- */
- Element &refEntry (size_t i, size_t j)
- {
- return _rep[i * _cols + j];
- }
-
- /** Get a read-only reference to the entry in the (i, j) position.
- * @param i Row index
- * @param j Column index
- * @returns Const reference to matrix entry
- */
- const Element &getEntry (size_t i, size_t j) const
- {
- return _rep[i * _cols + j];
- }
-
- /** Copy the (i, j) entry into x, and return a reference to x.
- * This form is more in the Linbox style and is provided for interface
- * compatibility with other parts of the library
- * @param x Element in which to store result
- * @param i Row index
- * @param j Column index
- * @returns Reference to x
- */
- Element &getEntry (Element &x, size_t i, size_t j) const
- {
- x = _rep[i * _cols + j]; return x;
- }
-
- /** @name Column of rows iterator
- * \brief
- * The column of rows iterator traverses the rows of the
- * matrix in ascending order. Dereferencing the iterator yields
- * a row vector in dense format
- */
- //@{
- typedef Subvector<typename Rep::iterator, typename Rep::const_iterator> Row;
- typedef Subvector<typename Rep::const_iterator> ConstRow;
-
- class RowIterator;
- class ConstRowIterator;
-
- RowIterator rowBegin ();
- RowIterator rowEnd ();
- ConstRowIterator rowBegin () const;
- ConstRowIterator rowEnd () const;
- //@}
-
- /** @name Row of columns iterator
- * \brief
- * The row of columns iterator traverses the columns of the
- * matrix in ascending order. Dereferencing the iterator yields
- * a column vector in dense format
- */
- //@{
- typedef Subvector<Subiterator<typename Rep::iterator> > Col;
- typedef Subvector<Subiterator<typename Rep::const_iterator> > ConstCol;
- typedef Col Column;
- typedef ConstCol ConstColumn;
-
- class ColIterator;
- class ConstColIterator;
-
- ColIterator colBegin ();
- ColIterator colEnd ();
- ConstColIterator colBegin () const;
- ConstColIterator colEnd () const;
- //@}
-
- /** @name Raw iterator
- * \brief
- *
- * The raw iterator is a method for accessing all entries in the matrix
- * in some unspecified order. This can be used, e.g. to reduce all
- * matrix entries modulo a prime before passing the matrix into an
- * algorithm.
- */
- //@{
- typedef typename Rep::iterator RawIterator;
- typedef typename Rep::const_iterator ConstRawIterator;
-
- RawIterator rawBegin ();
- RawIterator rawEnd ();
- ConstRawIterator rawBegin () const;
- ConstRawIterator rawEnd () const;
- //@}
-
- /** @name Raw Indexed iterator
- * \brief
- *
- * Like the raw iterator, the indexed iterator is a method for
- * accessing all entries in the matrix in some unspecified order.
- * At each position of the the indexed iterator, it also provides
- * the row and column indices of the currently referenced entry.
- * This is provided through it's \c rowIndex() and \c colIndex() functions.
- */
- //@{
- class RawIndexedIterator;
- class ConstRawIndexedIterator;
-
- RawIndexedIterator rawIndexedBegin ();
- RawIndexedIterator rawIndexedEnd ();
- ConstRawIndexedIterator rawIndexedBegin () const;
- ConstRawIndexedIterator rawIndexedEnd () const;
- //@}
-
- /** Retrieve a reference to a row.
- * Since rows may also be indexed, this allows A[i][j] notation
- * to be used.
- * @param i Row index
- */
- //@{
- Row operator[] (size_t i)
- {
- return Row (_rep.begin () + i * _cols, _rep.begin () + i * _cols + _cols);
- }
-
- ConstRow operator[] (size_t i) const
- {
- return Row (_rep.begin () + i * _cols, _rep.begin () + i * _cols + _cols);
- }
- //@}
-
- /** Compute column density.
- * @param v
- */
- template <class Vector>
- Vector &columnDensity (Vector &v) const
- {
- std::fill (v.begin (), v.end (), _rows);
- return v;
- }
-
- protected:
- std::vector<Element> _rep;
- size_t _rows, _cols;
- Element * _ptr;
-
- }; //class DenseMatrixBase
-
- /*! Write a matrix to a stream.
- * The C++ way using <code>operator<<</code>
- * @param o output stream
- * @param M matrix to write.
- */
- template<class T>
- std::ostream& operator<< (std::ostream & o, const DenseMatrixBase<T> & M)
- {
- return M.write(o);
- }
-
- template <class Element>
- struct MatrixTraits< DenseMatrixBase<Element> > {
- typedef DenseMatrixBase<Element> MatrixType;
- typedef typename MatrixCategories::RowColMatrixTag MatrixCategory;
- };
-
- template <class Element>
- struct MatrixTraits< const DenseMatrixBase<Element> > {
- typedef const DenseMatrixBase<Element> MatrixType;
- typedef typename MatrixCategories::RowColMatrixTag MatrixCategory;
- };
-
-} // namespace LinBox
-
-#include "dense.inl"
-
-#endif // __LINBOX_matrix_dense_H
-
diff --git a/linbox/matrix/dense.inl b/linbox/matrix/dense.inl
deleted file mode 100644
index 69e6cd7..0000000
--- a/linbox/matrix/dense.inl
+++ /dev/null
@@ -1,948 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* linbox/matrix/dense.inl
- * Copyright (C) 2001 B. David Saunders,
- * 2001-2002 Bradford Hovinen,
- * 2002 Zhendong Wan
- *
- * Written by B. David Saunders <saunders at cis.udel.edu>,
- * Bradford Hovinen <hovinen at cis.udel.edu>,
- * Zhendong Wan <wan at mail.eecis.udel.edu>
- *
- * evolved from dense-matrix.h by -bds, Zhendong Wan
- *
- * --------------------------------------------------------
- * 2003-01-11 Bradford Hovinen <bghovinen at math.uwaterloo.ca>
- *
- * Move from blackbox/dense-base.inl to matrix/dense.inl
- * --------------------------------------------------------
- * 2002-10-27 Bradford Hovinen <hovinen at cis.udel.edu>
- *
- * Split out container/iterator functionality into DenseMatrixBase
- * --------------------------------------------------------
- *
- * See COPYING for license information
- */
-
-#ifndef __LINBOX_matrix_dense_INL
-#define __LINBOX_matrix_dense_INL
-
-#include <iostream>
-#include <cmath>
-
-#include "linbox/matrix/dense.h"
-#include "linbox/util/debug.h"
-
-namespace LinBox
-{
-
- /* Constructor */
-
- template <class _Element>
- template <class Field>
- DenseMatrixBase<_Element>::DenseMatrixBase( MatrixStream<Field>& ms ) :
- _rep(0), _rows(0), _cols(0), _ptr(NULL)
- {
- if( !ms.getArray(_rep) || !ms.getRows(_rows) || !ms.getColumns(_cols) )
- throw ms.reportError(__FUNCTION__,__LINE__);
- _ptr = &_rep[0];
- }
-
- /* Iterator classes */
-
- /*! Const Row Iterator.
- * @ingroup iterators
- * @brief NO DOC
- */
- template <class Element>
- class DenseMatrixBase<Element>::ConstRowIterator {
- public:
- ConstRowIterator (const typename Rep::const_iterator& p, size_t len, size_t d) :
- _row (p, p + len), _dis (d)
- {}
-
- ConstRowIterator () {}
-
- ConstRowIterator (const ConstRowIterator& colp) :
- _row (colp._row), _dis (colp._dis)
- {}
-
- ConstRowIterator& operator = (const ConstRowIterator& colp)
- {
- _row = colp._row;
- _dis = colp._dis;
- return *this;
- }
-
- ConstRowIterator& operator --()
- {
- _row = ConstRow (_row.begin () - _dis, _row.end () - _dis);
- return *this;
- }
-
- ConstRowIterator operator-- (int)
- {
- ConstRowIterator tmp (*this);
- --*this;
- return tmp;
- }
-
-
- ConstRowIterator& operator++ ()
- {
- _row = ConstRow (_row.begin () + _dis, _row.end () + _dis);
- return *this;
- }
-
- ConstRowIterator operator++ (int)
- {
- ConstRowIterator tmp (*this);
- ++*this;
- return tmp;
- }
-
- ConstRowIterator operator+ (int i)
- {
- return ConstRowIterator (_row.begin () + _dis * i, _row.size (), _dis);
- }
-
- ConstRowIterator& operator += (int i)
- {
- _row = ConstRow (_row.begin () + _dis * i, _row.end () + _dis * i);
- return *this;
- }
-
- ConstRow operator[] (int i) const
- {
- return ConstRow (_row.begin () + _dis * i, _row.end () + _dis * i);
- }
-
- ConstRow* operator-> ()
- {
- return &_row;
- }
-
- ConstRow& operator* ()
- {
- return _row;
- }
-
- bool operator!= (const ConstRowIterator& c) const
- {
- return (_row.begin () != c._row.begin ()) || (_row.end () != c._row.end ()) || (_dis != c._dis);
- }
-
- private:
- ConstRow _row;
- size_t _dis;
- };
-
- /*! Row Iterator.
- * @ingroup iterators
- * @brief NO DOC
- */
- template <class Element>
- class DenseMatrixBase<Element>::RowIterator {
- public:
- RowIterator (const typename Rep::iterator& p, size_t len, size_t d) :
- _row (p, p + len), _dis (d)
- {}
-
- RowIterator () {}
-
- RowIterator (const RowIterator& colp) :
- _row (colp._row), _dis (colp._dis)
- {}
-
- RowIterator& operator = (const RowIterator& colp)
- {
- _row = colp._row;
- _dis = colp._dis;
- return *this;
- }
-
- RowIterator& operator ++ ()
- {
- _row = Row (_row.begin () + _dis, _row.end () + _dis);
- return *this;
- }
-
- RowIterator operator ++ (int)
- {
- RowIterator tmp (*this);
- ++*this;
- return tmp;
- }
-
- RowIterator& operator -- ()
- {
- _row = Row (_row.begin () - _dis, _row.end () - _dis);
- return *this;
- }
-
- RowIterator operator -- (int)
- {
- RowIterator tmp (*this);
- --*this;
- return tmp;
- }
-
- RowIterator operator + (int i)
- {
- return RowIterator (_row.begin () + _dis * i, _row.size (), _dis);
- }
-
- RowIterator& operator += (int i)
- {
- _row = Row (_row.begin () + _dis * i, _row.end () + _dis * i);
- return *this;
- }
-
- Row operator[] (int i) const
- {
- return Row (const_cast<Row&> (_row).begin () + _dis * i,
- const_cast<Row&> (_row).end () + _dis * i);
- }
-
- Row* operator-> ()
- {
- return &_row;
- }
-
- Row& operator* ()
- {
- return _row;
- }
-
- bool operator!= (const RowIterator& c) const
- {
- return (_row.begin () != c._row.begin ()) || (_row.end () != c._row.end ()) || (_dis != c._dis);
- }
-
- operator ConstRowIterator ()
- {
- return ConstRowIterator (_row.begin (), _row.size (), _dis);
- }
-
- private:
- Row _row;
- size_t _dis;
- };
-
- /*! Const Col Iterator.
- * @ingroup iterators
- * @brief NO DOC
- */
- template <class Element>
- class DenseMatrixBase<Element>::ConstColIterator {
- public:
- ConstColIterator (typename Rep::const_iterator p, size_t stride, size_t len) :
- _col (Subiterator<typename Rep::const_iterator> (p, stride),
- Subiterator<typename Rep::const_iterator> (p + len * stride, stride)),
- _stride (stride)
- {}
-
- ConstColIterator (const ConstCol& col, size_t stride) :
- _col (col),
- _stride (stride)
- {}
-
- ConstColIterator () {}
-
- ConstColIterator (const ConstColIterator& rowp) :
- _col (rowp._col)
- {}
-
- ConstColIterator& operator= (const ConstColIterator& rowp)
- {
- _col = rowp._col;
- _stride = rowp._stride;
- return *this;
- }
-
- ConstColIterator& operator++ ()
- {
- _col = ConstCol (Subiterator<typename Rep::const_iterator> (_col.begin ().operator-> () + 1, _stride),
- Subiterator<typename Rep::const_iterator> (_col.end ().operator-> () + 1, _stride));
- return *this;
- }
-
- ConstColIterator operator++ (int)
- {
- ConstColIterator old(*this);
- this->operator++ ();
- return old;
- }
-
- ConstColIterator operator + (int i)
- {
- return ConstColIterator (_col.begin ().operator-> () + i, _stride, _col.size ());
- }
-
- ConstColIterator& operator += (int i)
- {
- _col = ConstCol (Subiterator<typename Rep::const_iterator> (_col.begin ().operator-> () + i, _stride),
- Subiterator<typename Rep::const_iterator> (_col.end ().operator-> () + i, _stride));
- return *this;
- }
-
- ConstCol operator[] (int i) const
- {
- return ConstCol (Subiterator<typename Rep::const_iterator> (_col.begin ().operator-> () + i, _stride),
- Subiterator<typename Rep::const_iterator> (_col.end ().operator-> () + i, _stride));
- }
-
- ConstCol* operator-> ()
- {
- return &_col;
- }
-
- ConstCol& operator* ()
- {
- return _col;
- }
-
- bool operator!= (const ConstColIterator& c) const
- {
- return (_col.begin () != c._col.begin ()) || (_col.end () != c._col.end ());
- }
-
- private:
- ConstCol _col;
- size_t _stride;
- };
-
- /*! Col Iterator.
- * @ingroup iterators
- * @brief NO DOC
- */
- template <class Element>
- class DenseMatrixBase<Element>::ColIterator {
- public:
- ColIterator (typename Rep::iterator p, size_t stride, size_t len) :
- _col (Subiterator<typename Rep::iterator> (p, stride),
- Subiterator<typename Rep::iterator> (p + len * stride, stride)), _stride (stride)
- {}
-
- ColIterator () {}
-
- ColIterator (const ColIterator& rowp) :
- _col (rowp._col)
- {}
-
- ColIterator& operator= (const ColIterator& rowp)
- {
- _col = rowp._col;
- _stride = rowp._stride;
- return *this;
- }
-
- const ColIterator& operator= (const ColIterator& rowp) const
- {
- const_cast<ColIterator*> (this)->_col = rowp._col;
- return *this;
- }
-
- ColIterator& operator++ ()
- {
- _col = Col (Subiterator<typename Rep::iterator> (_col.begin ().operator-> () + 1, _stride),
- Subiterator<typename Rep::iterator> (_col.end ().operator-> () + 1, _stride));
- return *this;
- }
-
- ColIterator operator++ (int)
- {
- Col tmp (_col);
- this->operator++ ();
- return tmp;
- }
-
- ColIterator operator + (int i)
- {
- return ColIterator (_col.begin ().operator-> () + i, _stride, _col.size ());
- }
-
- ColIterator& operator += (int i)
- {
- _col = Col (Subiterator<typename Rep::iterator> (_col.begin ().operator-> () + i, _stride),
- Subiterator<typename Rep::iterator> (_col.end ().operator-> () + i, _stride));
- return *this;
- }
-
- Col operator[] (int i) const
- {
- return Col (Subiterator<typename Rep::iterator> (const_cast<Col&> (_col).begin ().operator-> () + i, _stride),
- Subiterator<typename Rep::iterator> (const_cast<Col&> (_col).end ().operator-> () + i, _stride));
- }
-
- Col* operator-> ()
- {
- return &_col;
- }
-
- Col& operator* ()
- {
- return _col;
- }
-
- bool operator!= (const ColIterator& c) const
- {
- return (_col.begin () != c._col.begin ()) || (_col.end () != c._col.end ());
- }
-
- operator ConstColIterator ()
- {
- return ConstColIterator (reinterpret_cast<ConstCol&> (_col) , _stride);
- }
-
- private:
-
- Col _col;
- size_t _stride;
- };
-
- /*! Raw Indexed Iterator.
- * @ingroup iterators
- * @brief NO DOC
- */
- template <class Element>
- class DenseMatrixBase<Element>::RawIndexedIterator {
- size_t _r_index;
- size_t _c_index;
- size_t _dim;
- typename Rep::iterator _begin;
-
- public:
- RawIndexedIterator (const size_t &dim,
- const size_t &r_index,
- const size_t &c_index,
- const typename Rep::iterator &begin) :
- _r_index (r_index), _c_index (c_index), _dim (dim), _begin (begin)
- {}
-
- RawIndexedIterator () :
- _r_index (0), _c_index (0), _dim (1), _begin (0)
- {}
-
- RawIndexedIterator (const RawIndexedIterator& r) :
- _r_index (r._r_index), _c_index (r._c_index), _dim (r._dim), _begin (r._begin)
- {}
-
- RawIndexedIterator& operator = (const RawIndexedIterator &iter)
- {
- _r_index = iter._r_index;
- _c_index = iter._c_index;
- _dim = iter._dim;
- _begin = iter._begin;
- return *this;
- }
-
- bool operator == (const RawIndexedIterator &iter) const
- {
- return (_r_index == iter._r_index) &&
- (_c_index == iter._c_index) &&
- (_dim == iter._dim) &&
- (_begin==iter._begin);
- }
-
- bool operator != (const RawIndexedIterator& iter) const
- {
- return (_r_index != iter._r_index) ||
- (_c_index != iter._c_index) ||
- (_dim != iter._dim) ||
- (_begin!=iter._begin);
- }
-
- RawIndexedIterator &operator ++ ()
- {
- ++_c_index;
-
- if (_c_index == _dim) {
- _c_index = 0;
- ++_r_index;
- }
-
- return *this;
- }
-
-
- RawIndexedIterator operator ++ (int)
- {
- RawIndexedIterator tmp = *this;
- ++(*this);
- return tmp;
- }
-
- RawIndexedIterator &operator -- ()
- {
- if (_c_index)
- --_c_index;
- else {
- --_r_index;
- _c_index = _dim - 1;
- }
-
- return *this;
- }
-
-
- RawIndexedIterator operator -- (int)
- {
- RawIndexedIterator tmp = *this;
- --(*this);
- return tmp;
- }
-
- Element &operator * () const
- {
- return *(_begin + (_r_index * _dim + _c_index));
- }
-
-
- Element* operator -> () const
- {
- return _begin + (_r_index * _dim + _c_index);
- }
-
-
- size_t rowIndex () const
- {
- return _r_index;
- }
-
- size_t colIndex () const
- {
- return _c_index;
- }
-
- const Element &value () const
- {
- return *(_begin + (_r_index * _dim + _c_index));
- }
-
-
- };
-
- /*! Const Raw Indexed Iterator.
- * @ingroup iterators
- * @brief NO DOC
- */
- template <class Element>
- class DenseMatrixBase<Element>::ConstRawIndexedIterator {
- size_t _r_index;
- size_t _c_index;
- size_t _dim;
- typedef Element value_type;
- typename Rep::const_iterator _begin;
-
- public:
- ConstRawIndexedIterator (const size_t &dim,
- const size_t &r_index,
- const size_t &c_index,
- const typename Rep::const_iterator &begin) :
- _r_index (r_index), _c_index (c_index), _dim (dim), _begin (begin)
- {}
-
- ConstRawIndexedIterator () :
- _r_index (0), _c_index (0), _dim (1), _begin (0)
- {}
-
- ConstRawIndexedIterator (const ConstRawIndexedIterator& r) :
- _r_index (r._r_index), _c_index (r._c_index), _dim (r._dim), _begin (r._begin)
- {}
-
- ConstRawIndexedIterator& operator = (const ConstRawIndexedIterator &iter)
- {
- _r_index = iter._r_index;
- _c_index = iter._c_index;
- _dim = iter._dim;
- _begin = iter._begin;
- return *this;
- }
-
- bool operator == (const ConstRawIndexedIterator &iter) const
- {
- return (_r_index == iter._r_index) &&
- (_c_index == iter._c_index) &&
- (_dim == iter._dim) &&
- (_begin==iter._begin);
- }
-
- bool operator != (const ConstRawIndexedIterator& iter) const
- {
- return (_r_index != iter._r_index) ||
- (_c_index != iter._c_index) ||
- (_dim != iter._dim) ||
- (_begin!=iter._begin);
- }
-
- ConstRawIndexedIterator &operator ++ ()
- {
- ++_c_index;
-
- if (_c_index == _dim) {
- _c_index = 0;
- ++_r_index;
- }
-
- return *this;
- }
-
-
- ConstRawIndexedIterator operator ++ (int)
- {
- ConstRawIndexedIterator tmp = *this;
- ++(*this);
- return tmp;
- }
-
- ConstRawIndexedIterator &operator -- ()
- {
- if (_c_index)
- --_c_index;
- else {
- --_r_index;
- _c_index = _dim - 1;
- }
-
- return *this;
- }
-
-
-
- ConstRawIndexedIterator operator -- (int)
- {
- ConstRawIndexedIterator tmp = *this;
- --(*this);
- return tmp;
- }
-
- const Element &operator * () const
- {
- return *(_begin + (_r_index * _dim + _c_index));
- }
-
- const Element *operator -> () const
- {
- return _begin + (_r_index * _dim + _c_index);
- }
-
- size_t rowIndex () const
- {
- return _r_index;
- }
-
- size_t colIndex () const
- {
- return _c_index;
- }
-
- const Element &value() const
- {
- return *(_begin + (_r_index * _dim + _c_index));
- }
- };
-
- /* Raw */
-
- // Entry access raw view. Size m*n vector in C (row major) order.
- template <class Element>
- typename DenseMatrixBase<Element>::RawIterator DenseMatrixBase<Element>::rawBegin ()
- {
- return _rep.begin ();
- }
-
- template <class Element>
- typename DenseMatrixBase<Element>::RawIterator DenseMatrixBase<Element>::rawEnd ()
- {
- return _rep.end ();
- }
-
- template <class Element>
- typename DenseMatrixBase<Element>::ConstRawIterator DenseMatrixBase<Element>::rawBegin () const
- {
- return _rep.begin ();
- }
-
- template <class Element>
- typename DenseMatrixBase<Element>::ConstRawIterator DenseMatrixBase<Element>::rawEnd () const
- {
- return _rep.end ();
- }
-
- /* Raw Indexed */
-
- template <class Element>
- typename DenseMatrixBase<Element>::RawIndexedIterator DenseMatrixBase<Element>::rawIndexedBegin ()
- {
- return RawIndexedIterator (coldim (), 0, 0, _rep.begin ());
- }
-
- template <class Element>
- typename DenseMatrixBase<Element>::RawIndexedIterator DenseMatrixBase<Element>::rawIndexedEnd ()
- {
- return RawIndexedIterator (coldim (), rowdim (), 0, _rep.begin ());
- }
-
- template <class Element>
- typename DenseMatrixBase<Element>::ConstRawIndexedIterator DenseMatrixBase<Element>::rawIndexedBegin () const
- {
- return ConstRawIndexedIterator (coldim (), 0, 0, _rep.begin ());
- }
-
- template <class Element>
- typename DenseMatrixBase<Element>::ConstRawIndexedIterator DenseMatrixBase<Element>::rawIndexedEnd () const
- {
- return ConstRawIndexedIterator (coldim (), rowdim (), 0, _rep.begin ());
- }
-
- /* Row */
-
- template <class Element>
- typename DenseMatrixBase<Element>::RowIterator DenseMatrixBase<Element>::rowBegin ()
- {
- return RowIterator (_rep.begin (), _cols, _cols);
- }
-
- template <class Element>
- typename DenseMatrixBase<Element>::RowIterator DenseMatrixBase<Element>::rowEnd ()
- {
- return RowIterator (_rep.end (), _cols, _cols);
- }
-
- template <class Element>
- typename DenseMatrixBase<Element>::ConstRowIterator DenseMatrixBase<Element>::rowBegin () const
- {
- return ConstRowIterator (_rep.begin (), _cols, _cols);
- }
-
- template <class Element>
- typename DenseMatrixBase<Element>::ConstRowIterator DenseMatrixBase<Element>::rowEnd () const
- {
- return ConstRowIterator (_rep.end (), _cols, _cols);
- }
-
- /* Col */
-
- template <class Element>
- typename DenseMatrixBase<Element>::ColIterator DenseMatrixBase<Element>::colBegin ()
- {
- return typename DenseMatrixBase<Element>::ColIterator (_rep.begin (), _cols, _rows);
- }
-
- template <class Element>
- typename DenseMatrixBase<Element>::ColIterator DenseMatrixBase<Element>::colEnd ()
- {
- return typename DenseMatrixBase<Element>::ColIterator (_rep.begin ()+_cols, _cols, _rows);
- }
-
- template <class Element>
- typename DenseMatrixBase<Element>::ConstColIterator DenseMatrixBase<Element>::colBegin () const
- {
- return typename DenseMatrixBase<Element>::ConstColIterator (_rep.begin (), _cols, _rows);
- }
-
- template <class Element>
- typename DenseMatrixBase<Element>::ConstColIterator DenseMatrixBase<Element>::colEnd () const
- {
- return typename DenseMatrixBase<Element>::ConstColIterator (_rep.begin ()+_cols, _cols, _rows);
- }
-
-
- /* read/write */
-
- template <class Element>
- template <class Field>
- std::istream &DenseMatrixBase<Element>::read (std::istream &file, const Field &F)
- {
-#if 0
- RawIterator p;
- int m,n;
- char c;
- file>>m>>n>>c;
-
- if (m*n < _rows*_cols)
- cerr<<"NOT ENOUGH ELEMENT TO READ\n";
- else {
- for (p = rawBegin (); p != rawEnd (); ++p) {
- integer tmp;
- file>>tmp;cout<<tmp<<endl;
- //file.ignore(1);
- F.read (file, *p);
- }
- }
-#endif
-
-
- RawIterator p;
- int m,n;
- char c;
- file>>m>>n>>c;
- _rows = m; _cols = n;
-
- Element zero;
- F.init(zero,0UL);
- _rep.resize(_rows * _cols, zero);
- _ptr= &_rep[0];
-
- if ((c != 'M') && (c != 'm'))
- for (p = rawBegin (); p != rawEnd (); ++p)
- {
- //file.ignore(1);
- F.read (file, *p);
- }
-
- else { // sparse file format - needs fixing
- int i, j;
- while (true)
- {
- file >> i >> j;
- //file.ignore(1);
- //if (! file) break;
- if (i+j <= 0) break;
- F.read (file, _rep[_cols*(i-1) + j-1]);
- }
- }
-
- return file;
- }
-
- template <class Element>
- template <class Field>
- std::ostream& DenseMatrixBase<Element>::write (std::ostream &os, const Field &F,
- bool mapleFormat) const
- {
-
- ConstRowIterator p;
-
- if (!mapleFormat) {
- integer c;
- int wid;
-
-
-
-
- F.cardinality (c);
-
- if (c >0)
- wid = (int) ceil (log ((double) c) / M_LN10);
- else {
- integer tmp;
- size_t max=0;
- ConstRawIterator it = rawBegin();
- for (; it != rawEnd(); ++it){
- F.convert(tmp,*it);
- if (tmp.bitsize() > max)
- max= tmp.bitsize();
- }
- wid= (int) ceil ((double)max / M_LN10)+1;
- }
-
- for (p = rowBegin (); p != rowEnd ();++p) {
- typename ConstRow::const_iterator pe;
-
- os << " [ ";
-
- for (pe = p->begin (); pe != p->end (); ++pe) {
- os.width (wid);
- F.write (os, *pe);
- os << " ";
- }
-
- os << "]" << std::endl;
- }
- }
- else {
-
- os << "Matrix( " << rowdim() << ',' << coldim() << ",[" ;
- for (p = rowBegin (); p != rowEnd (); ) {
- typename ConstRow::const_iterator pe;
-
- os << " [ ";
-
- for (pe = p->begin (); pe != p->end (); ) {
- F.write (os, *pe);
- ++pe ;
- if (pe != p->end())
- os << ", ";
- }
-
- os << "]" ;
- ++p ;
- if (p != rowEnd() )
- os << ',' << std::endl;;
-
- }
- os << "])" ;
- }
- return os;
- }
-
- template <class Element>
- std::ostream& DenseMatrixBase<Element>::write (std::ostream &os,
- bool mapleFormat) const
- {
-
- ConstRowIterator p;
- if (!mapleFormat) {
- integer c;
- int wid;
-
-
-
-
- integer tmp;
- size_t max=0;
- ConstRawIterator it = rawBegin();
- for (; it != rawEnd(); ++it){
- tmp = (integer) *it;
- if (tmp.bitsize() > max)
- max= tmp.bitsize();
- }
- wid= (int) ceil ((double)max / M_LN10)+1;
-
- for (p = rowBegin (); p != rowEnd (); ++p) {
- typename ConstRow::const_iterator pe;
-
- os << " [ ";
-
- for (pe = p->begin (); pe != p->end (); ++pe) {
- os.width (wid);
- os << *pe;
- os << " ";
- }
-
- os << "]" << std::endl;
- }
- }
- else {
-
- os << "Matrix( " << rowdim() << ',' << coldim() << ",[" ;
- for (p = rowBegin (); p != rowEnd (); ) {
- typename ConstRow::const_iterator pe;
-
- os << " [ ";
-
- for (pe = p->begin (); pe != p->end (); ) {
- os << *pe;
- ++pe ;
- if (pe != p->end())
- os << ", ";
- }
-
- os << "]" ;
- ++p ;
- if (p != rowEnd() )
- os << ',' << std::endl;
- }
- os << "])" ;
- }
-
- return os;
- }
-
-
-} // namespace LinBox
-
-#endif // __LINBOX_matrix_dense_INL
-
diff --git a/linbox/matrix/factorized-matrix.h b/linbox/matrix/factorized-matrix.h
index f2494bd..0f6e129 100644
--- a/linbox/matrix/factorized-matrix.h
+++ b/linbox/matrix/factorized-matrix.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/matrix/factorized-matrix.h
* Copyright (C) 2004 Pascal Giorgi, Clément Pernet
*
@@ -7,10 +5,13 @@
* Pascal Giorgi pascal.giorgi at ens-lyon.fr
* Clément Pernet clement.pernet at imag.fr
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,28 +19,23 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_factorized_matrix_H
#define __LINBOX_factorized_matrix_H
-#if 0
-#undef _P
-#undef _Q
-#endif
#include <vector>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/blackbox/blas-blackbox.h>
-#include <linbox/algorithms/blas-domain.h>
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/algorithms/blas-domain.h"
#include <fflas-ffpack/ffpack/ffpack.h>
-#include "linbox/matrix/matrix-permutation.h"
+#include "linbox/matrix/permutation-matrix.h"
namespace LinBox
{
@@ -53,89 +49,18 @@ namespace LinBox
template <class Field>
class LQUPMatrix;
- /// @internal
- template <class Field, class Operand>
- class FactorizedMatrixLeftSolve {
- public:
- Operand& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- Operand& X, const Operand& B ) const;
- Operand& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- Operand& B ) const;
- }; // end of class FactorizedMatrixLeftSolve
-
- /// @internal
- template <class Field, class Operand>
- class FactorizedMatrixRightSolve {
- public:
- Operand& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- Operand& X, const Operand& B ) const;
- Operand& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- Operand& B ) const;
- }; // end of class FactorizedMatrixRightSolve
-
- /// @internal
- template <class Field, class Operand>
- class FactorizedMatrixLeftLSolve {
- public:
- Operand& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- Operand& X, const Operand& B ) const;
- Operand& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- Operand& B ) const;
- }; // end of class FactorizedMatrixLeftLSolve
-
- /// @internal
- template <class Field, class Operand>
- class FactorizedMatrixRightLSolve {
- public:
- Operand& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- Operand& X, const Operand& B ) const;
- Operand& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- Operand& B ) const;
- }; // end of class FactorizedMatrixRightLsolve
-
- /// @internal
- template <class Field, class Operand>
- class FactorizedMatrixLeftUSolve {
- public:
- Operand& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- Operand& X, const Operand& B ) const;
- Operand& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- Operand& B ) const;
- }; // end of class FactorizedMatrixLeftUSolve
-
- /// @internal
- template <class Field, class Operand>
- class FactorizedMatrixRightUSolve {
- public:
- Operand& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- Operand& X, const Operand& B ) const;
- Operand& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- Operand& B ) const;
- }; // end of class FactorizedMatrixRightUSolve
/*! LQUP factorisation.
- * This is a class to ease the use LU factorisation (see \ref LUdivine
- * in \ref FFPACK)
+ * This is a class to ease the use LU factorisation (see FFPACK::LUdivine
+ * (bug link here.))
*
* The factorisation is \f$ A = L Q U P \f$ with \c L lower unit
* triangular, \c U upper non-unit triangular, \c P and \c Q
* permutations.
*
* There are two kind of contructors (with and without permutations)
- * and they build a LQUP factorisation of a BlasMatrix/BlasBlackbox on
- * a finite field. There are methods for retrieving L,Q,U and P
+ * and they build a \c LQUP factorisation of a \c BlasMatrix/\c BlasBlackbox on
+ * a finite field. There are methods for retrieving \p L,\p Q,\p U and \p P
* matrices and methods for solving systems.
*/
template <class Field>
@@ -147,10 +72,10 @@ namespace LinBox
protected:
- Field _F;
- BlasMatrix<Element> &_LU;
- BlasPermutation<size_t> &_PP;
- BlasPermutation<size_t> &_QQ; //note: this is actually Qt!
+ Field _field;
+ BlasMatrix<Field> &_factLU;
+ BlasPermutation<size_t> &_permP;
+ BlasPermutation<size_t> &_permQ; //note: this is actually Qt!
size_t _m;
size_t _n;
size_t _rank;
@@ -159,97 +84,67 @@ namespace LinBox
public:
-#if 1
+#if 0
//! Contruction of LQUP factorization of A (making a copy of A)
- LQUPMatrix (const Field& F, const BlasMatrix<Element>& A) :
- _F(F), _LU(*(new BlasMatrix<Element> (A))) ,
- _PP(*(new BlasPermutation<size_t>(A.coldim()))),
- _QQ(*(new BlasPermutation<size_t>(A.rowdim()))),
+ LQUPMatrix (const Field& F, const BlasMatrix<Field>& A) :
+ _field(F), _factLU(*(new BlasMatrix<Field> (A))) ,
+ _permP(*(new BlasPermutation<size_t>(A.coldim()))),
+ _permQ(*(new BlasPermutation<size_t>(A.rowdim()))),
_m(A.rowdim()), _n(A.coldim()),
_alloc(true),_plloc(true)
{
//std::cerr<<"Je passe par le constructeur const"<<std::endl;
- _rank= FFPACK::LUdivine( _F,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, _m, _n,
- _LU.getPointer(),_LU.getStride(),
- _PP.getWritePointer(), _QQ.getWritePointer(), FFPACK::FfpackLQUP );
- _PP.setOrder(_rank);
- _QQ.setOrder(_rank);
-
- }
-
- //! Contruction of LQUP factorization of A (in-place in A)
- LQUPMatrix (const Field& F, BlasMatrix<Element>& A) :
- _F(F), _LU(A) ,
- _PP(*(new BlasPermutation<size_t>(A.coldim()))),
- _QQ(*(new BlasPermutation<size_t>(A.rowdim()))),
- _m(A.rowdim()), _n(A.coldim()),
- _alloc(false),_plloc(true)
- {
- //std::cerr<<"Je passe par le constructeur non const"<<std::endl;
- _rank= FFPACK::LUdivine( _F,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, _m, _n,
- _LU.getPointer(),_LU.getStride(),
- _PP.getWritePointer(), _QQ.getWritePointer(), FFPACK::FfpackLQUP );
- _PP.setOrder(_rank);
- _QQ.setOrder(_rank);
-
- }
-
- //! Contruction of LQUP factorization of A (making a copy of A)
- LQUPMatrix (const BlasBlackbox<Field>& A) :
- _F(A.field()), _LU(*(new BlasMatrix<Element> (A))) ,
- _PP(*(new BlasPermutation<size_t>(A.coldim()))),
- _QQ(*(new BlasPermutation<size_t>(A.rowdim()))),
- _m(A.rowdim()), _n(A.coldim()),
- _alloc(true),_plloc(true)
- {
-
- _rank= FFPACK::LUdivine( _F,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, _m, _n,
- _LU.getPointer(),_LU.getStride(),
- _PP.getWritePointer(), _QQ.getWritePointer(), FFPACK::FfpackLQUP );
- _PP.setOrder(_rank);
- _QQ.setOrder(_rank);
+ _rank= FFPACK::LUdivine((typename Field::Father_t) _field,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, _m, _n,
+ _factLU.getPointer(),_factLU.getStride(),
+ _permP.getWritePointer(), _permQ.getWritePointer(), FFPACK::FfpackLQUP );
+ _permP.setOrder(_rank);
+ _permQ.setOrder(_rank);
}
//! Contruction of LQUP factorization of A (in-place in A)
- LQUPMatrix (BlasBlackbox<Field>& A) :
- _F(A.field()), _LU(static_cast<BlasMatrix<Element>&> (A)) ,
- _PP(*(new BlasPermutation<size_t>(A.coldim()))),
- _QQ(*(new BlasPermutation<size_t>(A.rowdim()))),
- _PP(A.coldim()), _QQ(A.rowdim()),
+ LQUPMatrix (const Field& F, BlasMatrix<Field>& A) :
+ _field(F), _factLU(A) ,
+ _permP(*(new BlasPermutation<size_t>(A.coldim()))),
+ _permQ(*(new BlasPermutation<size_t>(A.rowdim()))),
_m(A.rowdim()), _n(A.coldim()),
_alloc(false),_plloc(true)
{
-
- _rank= FFPACK::LUdivine( _F,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, _m, _n,
- _LU.getPointer(),_LU.getStride(),
- _PP.getWritePointer(), _QQ.getWritePointer(), FFPACK::FfpackLQUP );
- _PP.setOrder(_rank);
- _QQ.setOrder(_rank);
+ if (!A.coldim() || !A.rowdim()) {
+ // throw LinBoxError("LQUP does not accept empty matrices");
+ _rank = 0 ;
+ }
+ else {
+ //std::cerr<<"Je passe par le constructeur non const"<<std::endl;
+ _rank= FFPACK::LUdivine((typename Field::Father_t) _field,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, _m, _n,
+ _factLU.getPointer(),_factLU.getStride(),
+ _permP.getWritePointer(), _permQ.getWritePointer(), FFPACK::FfpackLQUP );
+ }
+ _permP.setOrder(_rank);
+ _permQ.setOrder(_rank);
}
-#endif
/*! Contruction of LQUP factorization of A (making a copy of A).
* P and Q are arguments !
*/
- LQUPMatrix (const Field& F, const BlasMatrix<Element>& A,
+ LQUPMatrix (const BlasMatrix<Field>& A,
BlasPermutation<size_t> & P, BlasPermutation<size_t> & Q) :
- _F(F), _LU(*(new BlasMatrix<Element> (A))) ,
- _PP(P), _QQ(Q),
+ _field(F), _factLU(*(new BlasMatrix<Field> (A))) ,
+ _permP(P), _permQ(Q),
_m(A.rowdim()), _n(A.coldim()),
_alloc(true),_plloc(false)
{
//std::cerr<<"Je passe par le constructeur const"<<std::endl;
- linbox_check(_QQ.getOrder()==A.rowdim());
- linbox_check(_PP.getOrder()==A.coldim());
- _rank= FFPACK::LUdivine( _F,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, _m, _n,
- _LU.getPointer(),_LU.getStride(),
- _PP.getWritePointer(), _QQ.getWritePointer(), FFPACK::FfpackLQUP );
- _PP.setOrder(_rank);
- _QQ.setOrder(_rank);
+ linbox_check(_permQ.getOrder()==A.rowdim());
+ linbox_check(_permP.getOrder()==A.coldim());
+ _rank= FFPACK::LUdivine((typename Field::Father_t) _field,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, _m, _n,
+ _factLU.getPointer(),_factLU.getStride(),
+ _permP.getWritePointer(), _permQ.getWritePointer(), FFPACK::FfpackLQUP );
+ _permP.setOrder(_rank);
+ _permQ.setOrder(_rank);
}
@@ -257,127 +152,77 @@ namespace LinBox
/*! Contruction of LQUP factorization of A (in-place in A).
* P and Q are arguments !
*/
- LQUPMatrix (const Field& F, BlasMatrix<Element>& A,
+ LQUPMatrix ( BlasMatrix<Field>& A,
BlasPermutation<size_t> & P, BlasPermutation<size_t> & Q) :
- _F(F), _LU(A) , _PP(P), _QQ(Q),
+ _field(F), _factLU(A) , _permP(P), _permQ(Q),
_m(A.rowdim()), _n(A.coldim()),
_alloc(false),_plloc(false)
{
//std::cerr<<"Je passe par le constructeur non const"<<std::endl;
- linbox_check(_QQ.getOrder()<=A.rowdim());
- linbox_check(_PP.getOrder()<=A.coldim());
-
- _rank= FFPACK::LUdivine( _F,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, _m, _n,
- _LU.getPointer(),_LU.getStride(),
- _PP.getWritePointer(), _QQ.getWritePointer(), FFPACK::FfpackLQUP );
- _PP.setOrder(_rank);
- _QQ.setOrder(_rank);
+ linbox_check(_permQ.getOrder()<=A.rowdim());
+ linbox_check(_permP.getOrder()<=A.coldim());
+ if (_permQ.getOrder() == 0)
+ _permQ.resize(A.rowdim());
+ if (_permP.getOrder() == 0)
+ _permP.resize(A.coldim());
+
+ _rank= FFPACK::LUdivine((typename Field::Father_t) _field,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, _m, _n,
+ _factLU.getPointer(),_factLU.getStride(),
+ _permP.getWritePointer(), _permQ.getWritePointer(), FFPACK::FfpackLQUP );
+ _permP.setOrder(_rank);
+ _permQ.setOrder(_rank);
}
+#endif
+ //! Contruction of LQUP factorization of A (making a copy of A)
+ LQUPMatrix (const BlasMatrix<Field>& A) ;
+
+ //! Contruction of LQUP factorization of A (in-place in A)
+ LQUPMatrix (BlasMatrix<Field>& A) ;
+
/*! Contruction of LQUP factorization of A (making a copy of A).
* P and Q are arguments !
*/
- LQUPMatrix (const BlasBlackbox<Field>& A,
- BlasPermutation<size_t> & P, BlasPermutation<size_t> & Q) :
- _F(A.field()), _LU(*(new BlasMatrix<Element> (A))) ,
- _PP(P), _QQ(Q),
- _m(A.rowdim()), _n(A.coldim()),
- _alloc(true),_plloc(false)
- {
-
- linbox_check(_QQ.getOrder()==A.rowdim());
- linbox_check(_PP.getOrder()==A.coldim());
-
-
- _rank= FFPACK::LUdivine( _F,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, _m, _n,
- _LU.getPointer(),_LU.getStride(),
- _PP.getWritePointer(), _QQ.getWritePointer(), FFPACK::FfpackLQUP );
-
- _PP.setOrder(_rank);
- _QQ.setOrder(_rank);
-
- }
+ LQUPMatrix (const BlasMatrix<Field>& A,
+ BlasPermutation<size_t> & P, BlasPermutation<size_t> & Q) ;
/*! Contruction of LQUP factorization of A (in-place in A).
* P and Q are arguments !
+ * @bug in place ?
*/
- LQUPMatrix (BlasBlackbox<Field>& A,
- BlasPermutation<size_t> & P, BlasPermutation<size_t> & Q) :
- _F(A.field()), _LU(static_cast<BlasMatrix<Element>&> (A)) ,
- _PP(P), _QQ(Q),
- _m(A.rowdim()), _n(A.coldim()),
- _alloc(false),_plloc(false)
- {
-
- linbox_check(_QQ.getOrder()==A.rowdim());
- linbox_check(_PP.getOrder()==A.coldim());
-
-
- _rank= FFPACK::LUdivine( _F,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans, _m, _n,
- _LU.getPointer(),_LU.getStride(),
- _PP.getWritePointer(), _QQ.getWritePointer(), FFPACK::FfpackLQUP );
- _PP.setOrder(_rank);
- _QQ.setOrder(_rank);
-
- }
+ LQUPMatrix (BlasMatrix<Field>& A,
+ BlasPermutation<size_t> & P, BlasPermutation<size_t> & Q) ;
//! destructor.
- ~LQUPMatrix ()
- {
- if (_alloc)
- delete &_LU;
- if (_plloc) {
- delete &_PP;
- delete &_QQ;
- }
- }
+ ~LQUPMatrix () ;
//! get the field on which the factorization is done
- Field& field()
- {
- return _F;
- }
+ Field& field() ;
//! get row dimension
- size_t rowdim() const
- {
- return _m;
- }
+ size_t rowdim() const ;
//! get column dimension
- size_t coldim() const
- {
- return _n;
- }
+ size_t coldim() const ;
//! get the rank of matrix
- size_t getrank() const
- {
- return _rank;
- }
+ size_t getRank() const ;
/*! get the permutation P.
* (no copy)
*/
- const BlasPermutation<size_t>& getP() const
- {
- return _PP;
- }
+ const BlasPermutation<size_t>& getP() const ;
/*! get the permutation P.
* (copy)
*/
- BlasPermutation<size_t> & getP( BlasPermutation<size_t> & P ) const
- {
- P = BlasPermutation<size_t>(_PP.getPointer(),_rank);
- return P;
- }
+ BlasPermutation<size_t> & getP( BlasPermutation<size_t> & P ) const ;
/** Get the <i>transpose</i> of the permutation \p Q.
* @warning This does not return \p Q itself! (because it is
* more difficult to compute) If needed, \p Q can be obtained
- * as a \p TransposedBlasMatrix from the return value One
+ * as a \p TransposedBlasMatrix from the return value. One
* reason this confusion exists is that left-multiplying by
* a permuation matrix corresponds to a row permuation \f$\pi \in S_n\f$,
* while right-multiplying by the same matrix corresponds to
@@ -385,20 +230,13 @@ namespace LinBox
* is handled intelligently (eg by \c applyP) but you must be
* careful with \c getQ().
*/
- const BlasPermutation<size_t>& getQ() const
- {
- return _QQ;
- }
+ const BlasPermutation<size_t>& getQ() const ;
/*! get the permutation Qt.
* (copy)
* @warning see <code>LQUPMatrix::getQ()</code>
*/
- BlasPermutation<size_t> & getQ( BlasPermutation<size_t> & Qt ) const
- {
- Qt = BlasPermutation<size_t>(_QQ.getPointer(),_rank);
- return Qt ;
- }
+ BlasPermutation<size_t> & getQ( BlasPermutation<size_t> & Qt ) const ;
/*! get the Matrix \c L.
* @param[out] L
@@ -406,108 +244,78 @@ namespace LinBox
* else \c L is form \c LQUP decomposition.
* @pre \c L has unit diagonal
*/
- TriangularBlasMatrix<Element>& getL(TriangularBlasMatrix<Element>& L, bool _QLUP = false) const;
+ TriangularBlasMatrix<Field>& getL(TriangularBlasMatrix<Field>& L, bool _QLUP = false) const;
/*! get the matrix \c U.
* @pre \c U has non-unit diagonal
*/
- TriangularBlasMatrix<Element>& getU(TriangularBlasMatrix<Element>& U) const;
+ TriangularBlasMatrix<Field>& getU(TriangularBlasMatrix<Field>& U) const;
/*! get the matrix S.
* from the LSP factorization of A deduced from LQUP)
*/
- BlasMatrix<Element>& getS( BlasMatrix<Element>& S) const;
+ BlasMatrix<Field>& getS( BlasMatrix<Field>& S) const;
/*! @internal get a pointer to the begin of storage.
*/
- Element* getPointer() const
- {
- return _LU.getPointer();
- }
+ Element* getPointer() const ;
- /*! @internal get the stride in \c _LU
+ /*! @internal get the stride in \c _factLU
*/
- size_t getStride() const
- {
- return _LU.getStride();
- }
+ size_t getStride() const ;
/*!
* Solvers with matrices or vectors
- * Operand can be a BlasMatrix<Element> or a std::vector<Element>
+ * Operand can be a BlasMatrix<Field> or a std::vector<Element>
*/
//@{
// solve AX=B
template <class Operand>
- Operand& left_solve(Operand& X, const Operand& B) const {
- return FactorizedMatrixLeftSolve<Field,Operand>()( _F, *this, X, B );
- }
+ Operand& left_solve(Operand& X, const Operand& B) const;
// solve AX=B (X is stored in B)
template <class Operand>
- Operand& left_solve(Operand& B) const {
- return FactorizedMatrixLeftSolve<Field,Operand>()( _F, *this, B );
- }
+ Operand& left_solve(Operand& B) const;
// solve XA=B
template <class Operand>
- Operand& right_solve(Operand& X, const Operand& B) const {
- return FactorizedMatrixRightSolve<Field,Operand>()( _F, *this, X, B );
- }
+ Operand& right_solve(Operand& X, const Operand& B) const;
// solve XA=B (X is stored in B)
template <class Operand>
- Operand& right_solve(Operand& B) const{
- return FactorizedMatrixRightSolve<Field,Operand>()( _F, *this, B );
- }
+ Operand& right_solve(Operand& B) const;
// solve LX=B (L from LQUP)
template <class Operand>
- Operand& left_Lsolve(Operand& X, const Operand& B) const{
- return FactorizedMatrixLeftLSolve<Field,Operand>()( _F, *this, X, B );
- }
+ Operand& left_Lsolve(Operand& X, const Operand& B) const;
// solve LX=B (L from LQUP) (X is stored in B)
template <class Operand>
- Operand& left_Lsolve(Operand& B) const{
- return FactorizedMatrixLeftLSolve<Field,Operand>()( _F, *this, B );
- }
+ Operand& left_Lsolve(Operand& B) const;
// solve XL=B (L from LQUP)
template <class Operand>
- Operand& right_Lsolve(Operand& X, const Operand& B) const{
- return FactorizedMatrixRightLSolve<Field,Operand>()( _F, *this, X, B );
- }
+ Operand& right_Lsolve(Operand& X, const Operand& B) const;
// solve XL=B (L from LQUP) (X is stored in B)
template <class Operand>
- Operand& right_Lsolve(Operand& B) const{
- return FactorizedMatrixRightLSolve<Field,Operand>()( _F, *this, B );
- }
+ Operand& right_Lsolve(Operand& B) const;
// solve UX=B (U from LQUP is r by r)
template <class Operand>
- Operand& left_Usolve(Operand& X, const Operand& B) const{
- return FactorizedMatrixLeftUSolve<Field,Operand>()( _F, *this, X, B );
- }
+ Operand& left_Usolve(Operand& X, const Operand& B) const;
// solve UX=B (U from LQUP) (X is stored in B)
template <class Operand>
- Operand& rleft_Usolve(Operand& B) const{
- return FactorizedMatrixLeftUSolve<Field,Operand>()( _F, *this, B );
- }
+ Operand& rleft_Usolve(Operand& B) const;
// solve XU=B (U from LQUP)
template <class Operand>
- Operand& right_Usolve(Operand& X, const Operand& B) const{
- return FactorizedMatrixRightUSolve<Field,Operand>()( _F, *this, X, B );
- }
+ Operand& right_Usolve(Operand& X, const Operand& B) const;
// solve XU=B (U from LQUP) (X is stored in B)
template <class Operand>
- Operand& right_Usolve(Operand& B) const{
- return FactorizedMatrixRightUSolve<Field,Operand>()( _F, *this, B );
- }
+ Operand& right_Usolve(Operand& B) const;
//@}
@@ -516,7 +324,16 @@ namespace LinBox
//-}
} // end of namespace LinBox
-#include <linbox/matrix/factorized-matrix.inl>
+#include "linbox/matrix/factorized-matrix.inl"
#endif //__LINBOX_factorized_matrix_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/factorized-matrix.inl b/linbox/matrix/factorized-matrix.inl
index 3a480dc..aed4d33 100644
--- a/linbox/matrix/factorized-matrix.inl
+++ b/linbox/matrix/factorized-matrix.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/matrix/factorized-matrix.inl
* Copyright (C) 2004 Pascal Giorgi, Clément Pernet
*
@@ -7,10 +5,13 @@
* Pascal Giorgi pascal.giorgi at ens-lyon.fr
* Clément Pernet clement.pernet at imag.fr
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_factorized_matrix_INL
@@ -28,756 +29,1076 @@
namespace LinBox
{
+ namespace Protected
+ {
+ /// @internal
+ template <class Field, class Operand>
+ class FactorizedMatrixLeftSolve {
+ public:
+ Operand& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ Operand& X, const Operand& B ) const;
+ Operand& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ Operand& B ) const;
+ }; // end of class FactorizedMatrixLeftSolve
+
+ /// @internal
+ template <class Field, class Operand>
+ class FactorizedMatrixRightSolve {
+ public:
+ Operand& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ Operand& X, const Operand& B ) const;
+ Operand& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ Operand& B ) const;
+ }; // end of class FactorizedMatrixRightSolve
+
+ /// @internal
+ template <class Field, class Operand>
+ class FactorizedMatrixLeftLSolve {
+ public:
+ Operand& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ Operand& X, const Operand& B ) const;
+ Operand& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ Operand& B ) const;
+ }; // end of class FactorizedMatrixLeftLSolve
+
+ /// @internal
+ template <class Field, class Operand>
+ class FactorizedMatrixRightLSolve {
+ public:
+ Operand& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ Operand& X, const Operand& B ) const;
+ Operand& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ Operand& B ) const;
+ }; // end of class FactorizedMatrixRightLsolve
+
+ /// @internal
+ template <class Field, class Operand>
+ class FactorizedMatrixLeftUSolve {
+ public:
+ Operand& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ Operand& X, const Operand& B ) const;
+ Operand& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ Operand& B ) const;
+ }; // end of class FactorizedMatrixLeftUSolve
+
+ /// @internal
+ template <class Field, class Operand>
+ class FactorizedMatrixRightUSolve {
+ public:
+ Operand& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ Operand& X, const Operand& B ) const;
+ Operand& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ Operand& B ) const;
+ }; // end of class FactorizedMatrixRightUSolve
+
+ /*
+ * Solvers with Matrices: Operand=BlasMatrix<Field>
+ */
+
+ template <class Field>
+ class FactorizedMatrixLeftSolve<Field, BlasMatrix<Field> > {
+ public:
+
+ BlasMatrix<Field>& operator() (const Field& F,
+ const LQUPMatrix<Field>& A,
+ BlasMatrix<Field>& X,
+ const BlasMatrix<Field>& B) const
+ {
+ linbox_check (A.coldim() == X.rowdim());
+ linbox_check (A.rowdim() == B.rowdim());
+ linbox_check (B.coldim() == X.coldim());
+ int info;
+
+ FFPACK::fgetrs ((typename Field::Father_t)F, FFLAS::FflasLeft, A.rowdim(), A.coldim(), B.coldim(), A.getRank(),
+ A.getPointer(), A.getStride(), A.getP().getPointer(), A.getQ().getPointer(),
+ X.getPointer(), X.getStride(),
+ B.getPointer(), B.getStride(), &info);
+ if (info > 0)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+
+ return X;
+ }
+ BlasMatrix<Field>& operator() (const Field& F,
+ const LQUPMatrix<Field>& A,
+ BlasMatrix<Field>& B) const
+ {
- // get the Matrix L
- template <class Field>
- inline TriangularBlasMatrix<typename Field::Element>& LQUPMatrix<Field>::getL( TriangularBlasMatrix<Element >& L,
- bool _QLUP ) const
- {
+ int info;
+ linbox_check (A.coldim() == A.rowdim());
+ linbox_check (A.coldim() == B.rowdim());
- linbox_check( L.coldim() == _m);
- linbox_check( L.rowdim() == _m);
- linbox_check( L.getUpLo() == BlasTag::low);
- linbox_check( L.getDiag() == BlasTag::unit);
+ FFPACK::fgetrs ((typename Field::Father_t)F, FFLAS::FflasLeft, B.rowdim(), B.coldim(), A.getRank(),
+ A.getPointer(), A.getStride(),
+ A.getP().getPointer(), A.getQ().getPointer(),
+ B.getPointer(), B.getStride(), &info);
+ if (info > 0)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
- typename Field::Element zero,one;
- _F.init( zero, 0UL );
- _F.init( one, 1UL );
-#if 0
- if (_m > _n) {
- size_t i = 0 ;
- for ( ; i<_n; ++i ){
- size_t j=0;
- for (; j<i ; ++j )
- L.setEntry( i, j, _LU.getEntry(i,j) );
- for (; j<_m; ++j )
- L.setEntry( i, j, zero );
+ return B;
}
- for ( ; i<_m; ++i ){
- size_t j=0;
- for (; j<_n ; ++j )
- L.setEntry( i, j, _LU.getEntry(i,j) );
- for (; j<_m; ++j )
- L.setEntry( i, j, zero );
+ }; // end of class FactorizedMatrixLeftSolve
+
+ template <class Field>
+ class FactorizedMatrixRightSolve<Field, BlasMatrix<Field> > {
+ public:
+
+ BlasMatrix<Field>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ BlasMatrix<Field>& X,
+ const BlasMatrix<Field>& B ) const
+ {
+ linbox_check (A.rowdim() == X.coldim());
+ linbox_check (A.coldim() == B.coldim());
+ linbox_check (B.rowdim() == X.rowdim());
+ int info;
+
+ FFPACK::fgetrs ((typename Field::Father_t)F, FFLAS::FflasRight, A.rowdim(), A.coldim(), B.rowdim(), A.getRank(),
+ A.getPointer(), A.getStride(),
+ A.getP().getPointer(), A.getQ().getPointer(),
+ X.getPointer(), X.getStride(),
+ B.getPointer(), B.getStride(), &info);
+ if (info > 0)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+
+ return X;
}
+ BlasMatrix<Field>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ BlasMatrix<Field>& B ) const
+ {
- }
- else {
- for ( size_t i=0; i<_m; ++i ){
- size_t j=0;
- for (; j<i ; ++j )
- L.setEntry( i, j, _LU.getEntry(i,j) );
- for (; j<_m; ++j )
- L.setEntry( i, j, zero );
- }
- }
-#endif
-#if 1 /* slower */
- for ( size_t i=0; i<_m; ++i ){
- size_t j=0;
- for (; j< ((i<_n)?i:_n) ; ++j )
- L.setEntry( i, j, _LU.getEntry(i,j) );
- for (; j<_m; ++j )
- L.setEntry( i, j, zero );
- }
-#endif
+ int info;
+ linbox_check (A.coldim() == A.rowdim());
+ linbox_check (A.rowdim() == B.coldim());
- if (!_QQ.isIdentity())
- FFPACK::applyP( _F, FFLAS::FflasRight, FFLAS::FflasNoTrans,
- _m,0,_QQ.getOrder(),
- L.getWritePointer(), _m, _QQ.getPointer() );
- for ( size_t i=0; i<_m; ++i )
- L.setEntry( i, i, one );
- if (_QLUP) {
- if (!_QQ.isIdentity()) {
- FFPACK::applyP( _F, FFLAS::FflasLeft, FFLAS::FflasNoTrans,
- _m,0,_QQ.getOrder(),
- L.getWritePointer(), _m, _QQ.getPointer() );
- FFPACK::applyP( _F, FFLAS::FflasRight, FFLAS::FflasTrans,
- _m,0,_QQ.getOrder(),
- L.getWritePointer(), _m, _QQ.getPointer() );
+ FFPACK::fgetrs ((typename Field::Father_t)F, FFLAS::FflasRight, B.rowdim(), B.coldim(), A.getRank(),
+ A.getPointer(), A.getStride(),
+ A.getP().getPointer(), A.getQ().getPointer(),
+ B.getPointer(), B.getStride(), &info);
+ if (info > 0)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+ return B;
}
- }
- return L;
+ }; // end of class FactorizedMatrixRightSolve
+
+ template <class Field>
+ class FactorizedMatrixLeftLSolve<Field, BlasMatrix<Field> > {
+ public:
+ BlasMatrix<Field>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ BlasMatrix<Field>& X,
+ const BlasMatrix<Field>& B ) const
+ {
+ linbox_check (A.rowdim() == B.rowdim());
+ X = B;
+ return (*this)(F, A, X);
+ }
- }
+ BlasMatrix<Field>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ BlasMatrix<Field>& B ) const
+ {
- // get the matrix U
- template <class Field>
- inline TriangularBlasMatrix<typename Field::Element>& LQUPMatrix<Field>::getU( TriangularBlasMatrix<typename Field::Element >& U ) const
- {
+ linbox_check (A.rowdim() == B.rowdim());
- linbox_check( U.rowdim() == _m);
- linbox_check( U.coldim() == _n);
- linbox_check( U.getUpLo() == BlasTag::up);
- linbox_check( U.getDiag() == BlasTag::nonunit);
- for ( size_t i=0; i<_m; ++i )
- for ( size_t j=i; j<_n; ++j )
- U.setEntry( i, j, _LU.getEntry(i,j) );
- return U;
- }
+ FFPACK::solveLB2 ((typename Field::Father_t)F, FFLAS::FflasLeft, B.rowdim(), B.coldim(), A.getRank(),
+ A.getPointer(), A.getStride(),
+ A.getQ().getPointer(),
+ B.getPointer(), B.getStride());
- // get the Matrix S (from the LSP factorization of A deduced from LQUP)
- template <class Field>
- inline BlasMatrix<typename Field::Element>& LQUPMatrix<Field>::getS( BlasMatrix<typename Field::Element >& S) const
- {
+ return B;
+ }
+ }; // end of class FactorizedMatrixLeftLSolve
+
+ template <class Field>
+ class FactorizedMatrixRightLSolve<Field, BlasMatrix<Field> > {
+ public:
+ BlasMatrix<Field>& operator() (const Field& F,
+ const LQUPMatrix<Field>& A,
+ BlasMatrix<Field>& X,
+ const BlasMatrix<Field>& B) const
+ {
+ linbox_check (A.rowdim() == B.coldim());
+ X = B;
+ return (*this)( F, A, X );
+ }
- linbox_check( S.rowdim() == _m);
- linbox_check( S.coldim() == _n);
- typename Field::Element zero;
- _F.init( zero, 0UL);
- for ( size_t i=0; i<_m; ++i ){
- for ( size_t j=0; j<i; ++j )
- S.setEntry( i, j, zero );
- for ( size_t j=i; j<_n; ++j )
- S.setEntry( i, j, _LU.getEntry(i,j) );
- }
+ BlasMatrix<Field>& operator() (const Field& F,
+ const BlasMatrix<Field>& A,
+ BlasMatrix<Field>& B) const
+ {
- if (!_QQ.isIdentity())
- FFPACK::applyP( _F, FFLAS::FflasLeft, FFLAS::FflasTrans,
- _n, 0, _QQ.getOrder(),
- S.getWritePointer(), _n, _QQ.getPointer() );
- return S;
- }
+ linbox_check( A.rowdim() == B.coldim() );
+ FFPACK::solveLB2 ((typename Field::Father_t)F, FFLAS::FflasRight, B.rowdim(), B.coldim(), A.getRank(),
+ A.getPointer(), A.getStride(),
+ A.getQ().getPointer(), B.getPointer(), B.getStride());
+ return B;
+ }
+ }; // end of class FactorizedMatrixRightLsolve
+
+ template <class Field>
+ class FactorizedMatrixLeftUSolve<Field, BlasMatrix<Field> > {
+ public:
+
+ BlasMatrix<Field>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ BlasMatrix<Field>& X,
+ const BlasMatrix<Field>& B ) const
+ {
+
+ linbox_check (A.coldim() == X.rowdim());
+ linbox_check (B.coldim() == X.coldim());
+ linbox_check (A.rowdim() == B.rowdim());
+
+ bool consistent = true;
+ size_t ldb = B.getStride();
+ size_t ldx = X.getStride();
+ typename Field::Element * Bp = B.getPointer();
+ typename Field::Element * Xp = X.getPointer();
+
+ for (size_t i = A.getRank(); i < B.rowdim(); ++i)
+ for (size_t j = 0; j < B.coldim(); ++j)
+ if (!F.isZero (*(Bp + i*ldb + j)))
+ consistent = false;
+ if (!consistent)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+ // The last rows of B are now supposed to be 0
- /*
- * Solvers with Matrices: Operand=BlasMatrix<Element>
- */
+ for (size_t i=0; i < A.getRank(); ++i)
+ FFLAS::fcopy ((typename Field::Father_t)F, B.coldim(), Xp + i*ldx, 1, Bp + i*ldx,1);
- template <class Field>
- class FactorizedMatrixLeftSolve<Field, BlasMatrix<typename Field::Element> > {
- public:
-
- BlasMatrix<typename Field::Element>& operator() (const Field& F,
- const LQUPMatrix<Field>& A,
- BlasMatrix<typename Field::Element>& X,
- const BlasMatrix<typename Field::Element>& B) const
- {
- linbox_check (A.coldim() == X.rowdim());
- linbox_check (A.rowdim() == B.rowdim());
- linbox_check (B.coldim() == X.coldim());
- int info;
-
- FFPACK::fgetrs (F, FFLAS::FflasLeft, A.rowdim(), A.coldim(), B.coldim(), A.getrank(),
- A.getPointer(), A.getStride(), A.getP().getPointer(), A.getQ().getPointer(),
- X.getPointer(), X.getStride(),
- B.getPointer(), B.getStride(), &info);
- if (info > 0)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
-
- return X;
- }
+ FFLAS::ftrsm ((typename Field::Father_t)F, FFLAS::FflasLeft, FFLAS::FflasUpper, FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
+ A.getRank(), X.coldim(), F.one, A.getPointer(), A.getStride(), X.getPointer(), X.getStride());
- BlasMatrix<typename Field::Element>& operator() (const Field& F,
- const LQUPMatrix<Field>& A,
- BlasMatrix<typename Field::Element>& B) const
- {
+ for (size_t i=A.getRank(); i < X.rowdim(); ++i)
+ for (size_t j = 0; j < X.coldim(); ++j)
+ F.assign (*(Xp + i*ldx + j), F.zero);
- int info;
- linbox_check (A.coldim() == A.rowdim());
- linbox_check (A.coldim() == B.rowdim());
+ return X;
- FFPACK::fgetrs (F, FFLAS::FflasLeft, B.rowdim(), B.coldim(), A.getrank(),
- A.getPointer(), A.getStride(),
- A.getP().getPointer(), A.getQ().getPointer(),
- B.getPointer(), B.getStride(), &info);
- if (info > 0)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+ }
+ BlasMatrix<Field>& operator() ( const Field& F,
+ const BlasMatrix<Field>& A,
+ BlasMatrix<Field>& B ) const
+ {
+
+ linbox_check (A.coldim() == A.rowdim());
+ linbox_check (A.coldim() == B.rowdim());
+ typename Field::Element * Bp = B.getPointer();
+ size_t ldb = B.getStride();
+ bool consistent = true;
+
+ for (size_t i = A.getRank(); i < B.rowdim(); ++i)
+ for (size_t j = 0; j < B.coldim(); ++j)
+ if (!F.isZero (*(Bp + i*ldb + j)))
+ consistent = false;
+ if (!consistent)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
- return B;
- }
- }; // end of class FactorizedMatrixLeftSolve
+ FFLAS::ftrsm ((typename Field::Father_t)F, FFLAS::FflasLeft, FFLAS::FflasUpper, FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
+ A.getRank(), B.coldim(), F.one, A.getPointer(), A.getStride(), Bp, ldb);
- template <class Field>
- class FactorizedMatrixRightSolve<Field, BlasMatrix<typename Field::Element> > {
- public:
-
- BlasMatrix<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- BlasMatrix<typename Field::Element>& X,
- const BlasMatrix<typename Field::Element>& B ) const
- {
- linbox_check (A.rowdim() == X.coldim());
- linbox_check (A.coldim() == B.coldim());
- linbox_check (B.rowdim() == X.rowdim());
- int info;
-
- FFPACK::fgetrs (F, FFLAS::FflasRight, A.rowdim(), A.coldim(), B.rowdim(), A.getrank(),
- A.getPointer(), A.getStride(),
- A.getP().getPointer(), A.getQ().getPointer(),
- X.getPointer(), X.getStride(),
- B.getPointer(), B.getStride(), &info);
- if (info > 0)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
-
- return X;
- }
+ return B;
+ }
- BlasMatrix<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- BlasMatrix<typename Field::Element>& B ) const
- {
+ }; // end of class FactorizedMatrixLeftUSolve
+
+ template <class Field>
+ class FactorizedMatrixRightUSolve<Field, BlasMatrix<Field> > {
+ public:
+ BlasMatrix<Field>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ BlasMatrix<Field>& X,
+ const BlasMatrix<Field>& B ) const
+ {
+ linbox_check (X.coldim() == A.rowdim());
+ linbox_check (X.rowdim() == B.rowdim());
+ linbox_check (A.coldim() == B.coldim());
+ typename Field::Element * Bp = B.getPointer();
+ typename Field::Element * Xp = X.getPointer();
+ size_t R = A.getRank();
+ size_t ldb = B.getStride();
+ size_t ldx = X.getStride();
+
+ for (size_t i = 0; i < X.getrowdim(); ++i)
+ FFLAS::fcopy ((typename Field::Father_t)F, R, Xp + i*ldx, 1, Bp + i*ldb,1);
+
+ FFLAS::ftrsm ((typename Field::Father_t)F, FFLAS::FflasRight, FFLAS::FflasUpper, FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
+ X.rowdim(), R, F.one, A.getPointer(), A.getStride(), X.getPointer(), X.getStride());
+
+ bool consistent = true;
+ if (B.coldim() > X.coldim()) {
+ typename Field::Element* W = new typename Field::Element [B.rowdim() * (B.coldim() - R)];
+ size_t ldw = B.rowdim();
+
+ FFLAS::fgemm ((typename Field::Father_t) F, FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
+ X.rowdim(), B.coldim() - R, R,
+ F.one, Xp, X.getStride(), A.getPointer() + R, A.getStride,
+ F.zero, W, ldw);
+
+ for (size_t i = 0; i < B.rowdim(); ++i)
+ for (size_t j = 0; j < B.coldim()-R; ++j)
+ if (!F.areEqual (*(W + i*ldw + j), *(Bp + R + i*ldb +j)))
+ consistent = false;
+ delete[] W;
+ }
+ else {
+ FFLAS::fgemm ((typename Field::Father_t)F, FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
+ X.rowdim(), B.coldim() - R, R,
+ F.one, Xp, X.getStride(), A.getPointer() + R, A.getStride,
+ F.zero, Xp + R, X.getStride());
+
+ for (size_t i = 0; i < B.rowdim(); ++i)
+ for (size_t j = R; j < B.coldim(); ++j)
+ if (!F.areEqual (*(X + i*ldx + j), *(Bp + i*ldb +j)))
+ consistent = false;
+ }
+ if (!consistent)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+
+ for (size_t i = 0; i < X.rowdim(); ++i)
+ for (size_t j = R; j < X.coldim(); ++j)
+ F.assign (*(Xp + i*ldx + j), F.zero);
+ return X;
+ }
- int info;
- linbox_check (A.coldim() == A.rowdim());
- linbox_check (A.rowdim() == B.coldim());
+ BlasMatrix<Field>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ BlasMatrix<Field>& B ) const
+ {
+ linbox_check (A.coldim() == A.rowdim());
+ linbox_check (B.coldim() == A.rowdim());
- FFPACK::fgetrs (F, FFLAS::FflasRight, B.rowdim(), B.coldim(), A.getrank(),
- A.getPointer(), A.getStride(),
- A.getP().getPointer(), A.getQ().getPointer(),
- B.getPointer(), B.getStride(), &info);
- if (info > 0)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+ typename Field::Element * Bp = B.getPointer();
+ size_t ldb = B.getStride();
+ size_t R = A.getRank();
- return B;
- }
+ FFLAS::ftrsm ((typename Field::Father_t)F, FFLAS::FflasRight, FFLAS::FflasUpper, FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
+ B.rowdim(), R, F.one, A.getPointer(), A.getStride(), B.getPointer(), B.getStride());
- }; // end of class FactorizedMatrixRightSolve
+ FFLAS::fgemm ((typename Field::Father_t)F, FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
+ B.rowdim(), B.coldim() - R, R,
+ F.one, Bp, B.getStride(), A.getPointer() + R, A.getStride,
+ F.mOne, Bp + R, B.getStride());
+ bool consistent = true;
+ for (size_t i = 0; i < B.rowdim(); ++i)
+ for (size_t j = R; j < B.coldim(); ++j)
+ if (!F.isZero (*(Bp + i*ldb + j)))
+ consistent = false;
+ if (!consistent)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
- template <class Field>
- class FactorizedMatrixLeftLSolve<Field, BlasMatrix<typename Field::Element> > {
- public:
- BlasMatrix<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- BlasMatrix<typename Field::Element>& X,
- const BlasMatrix<typename Field::Element>& B ) const
- {
- linbox_check (A.rowdim() == B.rowdim());
- X = B;
- return (*this)(F, A, X);
- }
+ return B;
- BlasMatrix<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- BlasMatrix<typename Field::Element>& B ) const
- {
+ }
+ }; // end of class FactorizedMatrixRightUSolve
+
+
+ /*
+ * Solvers with vectors: Operand=std::vector<Element>
+ */
+
+ template <class Field>
+ class FactorizedMatrixLeftSolve<Field, std::vector<typename Field::Element> > {
+ public:
+ std::vector<typename Field::Element>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ std::vector<typename Field::Element>& x,
+ const std::vector<typename Field::Element>& b ) const
+ {
+ linbox_check (A.coldim() == x.size());
+ linbox_check (A.rowdim() == b.size());
+ int info;
+
+ FFPACK::fgetrs ((typename Field::Father_t)F, FFLAS::FflasLeft, A.rowdim(), A.coldim(), 1, A.getRank(),
+ A.getPointer(), A.getStride(), A.getP().getPointer(), A.getQ().getPointer(),
+ &x[0], 1, &b[0], 1, &info);
+ if (info > 0)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+
+ return x;
+ }
- linbox_check (A.rowdim() == B.rowdim());
+ std::vector<typename Field::Element>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ std::vector<typename Field::Element>& b ) const
+ {
- FFPACK::solveLB2 (F, FFLAS::FflasLeft, B.rowdim(), B.coldim(), A.getrank(),
- A.getPointer(), A.getStride(),
- A.getQ().getPointer(),
- B.getPointer(), B.getStride());
+ int info;
+ linbox_check (A.coldim() == A.rowdim());
+ linbox_check (A.coldim() == b.size());
- return B;
- }
- }; // end of class FactorizedMatrixLeftLSolve
+ FFPACK::fgetrs ((typename Field::Father_t)F, FFLAS::FflasLeft, b.size(), 1, A.getRank(),
+ A.getPointer(), A.getStride(),
+ A.getP().getPointer(), A.getQ().getPointer(),
+ &b[0], 1, &info);
+ if (info > 0)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
- template <class Field>
- class FactorizedMatrixRightLSolve<Field, BlasMatrix<typename Field::Element> > {
- public:
- BlasMatrix<typename Field::Element>& operator() (const Field& F,
- const LQUPMatrix<Field>& A,
- BlasMatrix<typename Field::Element>& X,
- const BlasMatrix<typename Field::Element>& B) const
- {
- linbox_check (A.rowdim() == B.coldim());
- X = B;
- return (*this)( F, A, X );
- }
+ return b;
+ }
+ }; // end of class FactorizedMatrixLeftSolve
+
+ template <class Field>
+ class FactorizedMatrixRightSolve<Field, std::vector<typename Field::Element> > {
+ public:
+
+ std::vector<typename Field::Element>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ std::vector<typename Field::Element>& x,
+ const std::vector<typename Field::Element>& b ) const
+ {
+ linbox_check (A.rowdim() == x.size());
+ linbox_check (A.coldim() == b.size());
+ int info;
+
+ FFPACK::fgetrs ((typename Field::Father_t)F, FFLAS::FflasRight, A.rowdim(), A.coldim(), 1, A.getRank(),
+ A.getPointer(), A.getStride(),
+ A.getP().getPointer(), A.getQ().getPointer(),
+ &x[0], x.size(), &b[0], b.size(), &info);
+ if (info > 0)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+
+ return x;
+ }
- BlasMatrix<typename Field::Element>& operator() (const Field& F,
- const BlasMatrix<typename Field::element>& A,
- BlasMatrix<typename Field::Element>& B) const
- {
+ std::vector<typename Field::Element>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ std::vector<typename Field::Element>& b ) const
+ {
- linbox_check( A.rowdim() == B.coldim() );
+ int info;
+ linbox_check (A.coldim() == A.rowdim());
+ linbox_check (A.rowdim() == b.size());
- FFPACK::solveLB2 (F, FFLAS::FflasRight, B.rowdim(), B.coldim(), A.getrank(),
- A.getPointer(), A.getStride(),
- A.getQ().getPointer(), B.getPointer(), B.getStride());
- return B;
- }
- }; // end of class FactorizedMatrixRightLsolve
+ FFPACK::fgetrs ((typename Field::Father_t)F, FFLAS::FflasRight, 1, b.size(), A.getRank(),
+ A.getPointer(), A.getStride(),
+ A.getP().getPointer(), A.getQ().getPointer(),
+ &b[0], b.size(), &info);
+ if (info > 0)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
- template <class Field>
- class FactorizedMatrixLeftUSolve<Field, BlasMatrix<typename Field::Element> > {
- public:
-
- BlasMatrix<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- BlasMatrix<typename Field::Element>& X,
- const BlasMatrix<typename Field::Element>& B ) const
- {
-
- linbox_check (A.coldim() == X.rowdim());
- linbox_check (B.coldim() == X.coldim());
- linbox_check (A.rowdim() == B.rowdim());
-
- bool consistent = true;
- size_t ldb = B.getStride();
- size_t ldx = X.getStride();
- typename Field::Element * Bp = B.getPointer();
- typename Field::Element * Xp = X.getPointer();
- typename Field::Element zero,one;
- F.init(zero, 0UL);
- F.init(one, 1UL);
-
- for (size_t i = A.getrank(); i < B.rowdim(); ++i)
- for (size_t j = 0; j < B.coldim(); ++j)
- if (!F.isZero (*(Bp + i*ldb + j)))
- consistent = false;
- if (!consistent)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+ return b;
+ }
+ }; // end of class FactorizedMatrixRightSolve
+
+ template <class Field>
+ class FactorizedMatrixLeftLSolve<Field, std::vector<typename Field::Element> > {
+ public:
+ std::vector<typename Field::Element>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ std::vector<typename Field::Element>& x,
+ const std::vector<typename Field::Element>& b ) const
+ {
+ linbox_check( A.rowdim() == b.size() );
+ x = b;
+ return (*this)( F, A, x );
+ }
- // The last rows of B are now supposed to be 0
+ std::vector<typename Field::Element>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ std::vector<typename Field::Element>& b ) const
+ {
+ linbox_check (A.rowdim() == b.size());
+
+ FFPACK::solveLB2 ((typename Field::Father_t)F, FFLAS::FflasLeft, b.size(), 1, A.getRank(),
+ A.getPointer(), A.getStride(),
+ A.getQ().getPointer(), &b[0], 1);
+
+ return b;
+
+ /* BB: unreachable !
+ size_t n = b.size(); // bds: b not B
+ linbox_check( A.rowdim() == n );
+ size_t r = A.getRank();
+
+ // To be changed: solveLB is designed for matrices, not for vectors
+ if ( A.rowdim() <= A.coldim() ) {
+ FFPACK::solveLB((typename Field::Father_t) F, FFLAS::FflasLeft, n, 1, r, A.getPointer(), A.getStride(),
+ A.getQ().getPointer(), &b[0], b.size() );
+ }
+ else
+ FFPACK::solveLB2((typename Field::Father_t) F, FFLAS::FflasLeft, n, 1, r, A.getPointer(), A.getStride(),
+ A.getQ().getPointer(), b.getPointer(), b.getStride() );
+ return b;
+ */
+ }
+ }; // end of class FactorizedMatrixLeftLSolve
+
+ template <class Field>
+ class FactorizedMatrixRightLSolve<Field, std::vector<typename Field::Element> > {
+ public:
+ std::vector<typename Field::Element>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ std::vector<typename Field::Element>& x,
+ const std::vector<typename Field::Element>& b ) const
+ {
+ linbox_check( A.rowdim() == b.size() );
+ x = b;
+ return (*this)( F, A, x );
+ }
- for (size_t i=0; i < A.getrank(); ++i)
- FFLAS::fcopy (F, B.coldim(), Xp + i*ldx, 1, Bp + i*ldx,1);
+ std::vector<typename Field::Element>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ std::vector<typename Field::Element>& b ) const
+ {
+ linbox_check (A.rowdim() == b.size());
- FFLAS::ftrsm (F, FFLAS::FflasLeft, FFLAS::FflasUpper, FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
- A.getrank(), X.coldim(), one, A.getPointer(), A.getStride(), X.getPointer(), X.getStride());
+ FFPACK::solveLB2 ((typename Field::Father_t)F, FFLAS::FflasRight, 1, b.size(), A.getRank(),
+ A.getPointer(), A.getStride(),
+ A.getQ().getPointer(), &b[0], b.size());
+ return b;
+ }
+ }; // end of class FactorizedMatrixRightLsolve
+
+ template <class Field>
+ class FactorizedMatrixLeftUSolve<Field, std::vector<typename Field::Element> > {
+ public:
+ std::vector<typename Field::Element>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ std::vector<typename Field::Element>& x,
+ const std::vector<typename Field::Element>& b ) const
+ {
+ linbox_check (A.coldim() == x.size());
+ linbox_check (A.rowdim() == b.size());
+
+ bool consistent = true;
+ typename Field::Element * bp = &b[0]; ;
+ typename Field::Element * xp = &x[0];
+
+ for (size_t i = A.getRank(); i < b.size(); ++i)
+ if (!F.isZero (b[i]))
+ consistent = false;
+ if (!consistent)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
- for (size_t i=A.getrank(); i < X.rowdim(); ++i)
- for (size_t j = 0; j < X.coldim(); ++j)
- F.assign (*(Xp + i*ldx + j), zero);
+ // The last rows of B are now supposed to be 0
- return X;
+ for (size_t i=0; i < A.getRank(); ++i)
+ F.assign (x[i], b[i]);
- }
- BlasMatrix<typename Field::Element>& operator() ( const Field& F,
- const BlasMatrix<typename Field::Element>& A,
- BlasMatrix<typename Field::Element>& B ) const
- {
-
- linbox_check (A.coldim() == A.rowdim());
- linbox_check (A.coldim() == B.rowdim());
- typename Field::Element one,zero;
- typename Field::Element * Bp = B.getPointer();
- size_t ldb = B.getStride();
- F.init(one, 1UL);
- F.init(zero, 0UL);
- bool consistent = true;
-
- for (size_t i = A.getrank(); i < B.rowdim(); ++i)
- for (size_t j = 0; j < B.coldim(); ++j)
- if (!F.isZero (*(Bp + i*ldb + j)))
- consistent = false;
- if (!consistent)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+ FFLAS::ftrsv ((typename Field::Father_t)F, FFLAS::FflasUpper, FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
+ A.getRank(), A.getPointer(), A.getStride(), xp, 1);
- FFLAS::ftrsm (F, FFLAS::FflasLeft, FFLAS::FflasUpper, FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
- A.getrank(), B.coldim(), one, A.getPointer(), A.getStride(), Bp, ldb);
+ for (size_t i=A.getRank(); i < x.size(); ++i)
+ F.assign (x[i], F.zero);
+ return x;
- return B;
- }
+ }
- }; // end of class FactorizedMatrixLeftUSolve
+ std::vector<typename Field::Element>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ std::vector<typename Field::Element>& b ) const
+ {
- template <class Field>
- class FactorizedMatrixRightUSolve<Field, BlasMatrix<typename Field::Element> > {
- public:
- BlasMatrix<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- BlasMatrix<typename Field::Element>& X,
- const BlasMatrix<typename Field::Element>& B ) const
- {
- linbox_check (X.coldim() == A.rowdim());
- linbox_check (X.rowdim() == B.rowdim());
- linbox_check (A.coldim() == B.coldim());
- typename Field::Element one,zero;
- F.init(one, 1UL);
- F.init(zero, 0UL);
- typename Field::Element * Bp = B.getPointer();
- typename Field::Element * Xp = X.getPointer();
- size_t R = A.getrank();
- size_t ldb = B.getStride();
- size_t ldx = X.getStride();
-
- for (size_t i = 0; i < X.getrowdim(); ++i)
- FFLAS::fcopy (F, R, Xp + i*ldx, 1, Bp + i*ldb,1);
-
- FFLAS::ftrsm (F, FFLAS::FflasRight, FFLAS::FflasUpper, FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
- X.rowdim(), R, one, A.getPointer(), A.getStride(), X.getPointer(), X.getStride());
-
- bool consistent = true;
- if (B.coldim() > X.coldim()) {
- typename Field::Element* W = new typename Field::Element [B.rowdim() * (B.coldim() - R)];
- size_t ldw = B.rowdim();
-
- FFLAS::fgemm (F, FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
- X.rowdim(), B.coldim() - R, R,
- one, Xp, X.getStride(), A.getPointer() + R, A.getStride,
- zero, W, ldw);
+ linbox_check (A.coldim() == A.rowdim());
+ linbox_check (A.coldim() == b.size());
+ bool consistent = true;
- for (size_t i = 0; i < B.rowdim(); ++i)
- for (size_t j = 0; j < B.coldim()-R; ++j)
- if (!F.areEqual (*(W + i*ldw + j), *(Bp + R + i*ldb +j)))
- consistent = false;
- delete[] W;
+ for (size_t i = A.getRank(); i < b.size(); ++i)
+ if (!F.isZero (b[i]))
+ consistent = false;
+ if (!consistent)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+
+ FFLAS::ftrsv ((typename Field::Father_t)F, FFLAS::FflasUpper, FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
+ A.getRank(), A.getPointer(), A.getStride(), &b[0], 1);
+
+ return b;
}
- else {
- FFLAS::fgemm (F, FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
- X.rowdim(), B.coldim() - R, R,
- one, Xp, X.getStride(), A.getPointer() + R, A.getStride,
- zero, Xp + R, X.getStride());
- for (size_t i = 0; i < B.rowdim(); ++i)
- for (size_t j = R; j < B.coldim(); ++j)
- if (!F.areEqual (*(X + i*ldx + j), *(Bp + i*ldb +j)))
+ }; // end of class FactorizedMatrixLeftUSolve
+
+ template <class Field>
+ class FactorizedMatrixRightUSolve<Field, std::vector<typename Field::Element> > {
+ public:
+ std::vector<typename Field::Element>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ std::vector<typename Field::Element>& x,
+ const std::vector<typename Field::Element>& b ) const
+ {
+ linbox_check (x.size() == A.rowdim());
+ linbox_check (A.coldim() == b.size());
+ typename Field::Element * bp = b.getPointer();
+ typename Field::Element * xp = x.getPointer();
+ size_t R = A.getRank();
+
+ for (size_t i = 0; i < R; ++i)
+ F.assign (x[i], b[i]);
+
+ FFLAS::ftrsv ((typename Field::Father_t)F, FFLAS::FflasUpper, FFLAS::FflasTrans, FFLAS::FflasNonUnit,
+ R, A.getPointer(), A.getStride(), xp, 1);
+
+ bool consistent = true;
+ if (b.size() > x.size()) {
+ typename Field::Element* W = new typename Field::Element [b.size() - R];
+
+ FFLAS::fgemv ((typename Field::Father_t)F, FFLAS::FflasTrans,
+ R, b.size() - R,
+ F.one, A.getPointer() + R, A.getStride, xp, 1,
+ F.zero, W, 1);
+
+ for (size_t i = 0; i < b.size() - R; ++i)
+ if (!F.areEqual (W[i], b[i + R]))
consistent = false;
+ delete[] W;
+ }
+ else {
+ FFLAS::fgemv ((typename Field::Father_t)F, FFLAS::FflasTrans,
+ R, b.size() - R,
+ F.one, A.getPointer() + R, A.getStride, xp, 1,
+ F.zero, xp + R, 1);
+
+ for (size_t i = R; i < b.size(); ++i)
+ if (!F.areEqual (x[i], b[i]))
+ consistent = false;
+ }
+
+ if (!consistent)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+
+ for (size_t j = R; j < x.size(); ++j)
+ F.assign (x[j], F.zero);
+ return x;
}
- if (!consistent)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+ std::vector<typename Field::Element>& operator() ( const Field& F,
+ const LQUPMatrix<Field>& A,
+ std::vector<typename Field::Element>& b ) const
+ {
+ linbox_check (A.coldim() == A.rowdim());
+ linbox_check (b.size() == A.rowdim());
- for (size_t i = 0; i < X.rowdim(); ++i)
- for (size_t j = R; j < X.coldim(); ++j)
- F.assign (*(Xp + i*ldx + j), zero);
- return X;
- }
+ typename Field::Element * bp = &b[0];
+ size_t R = A.getRank();
+
+ FFLAS::ftrsv ((typename Field::Father_t)F, FFLAS::FflasUpper, FFLAS::FflasTrans, FFLAS::FflasNonUnit,
+ R, F.one, A.getPointer(), A.getStride(), bp, 1);
+
+ FFLAS::fgemv ((typename Field::Father_t)F, FFLAS::FflasTrans,
+ R, b.size() - R,
+ F.one, A.getPointer() + R, A.getStride, bp, 1,
+ F.mOne, bp + R, 1);
- BlasMatrix<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- BlasMatrix<typename Field::Element>& B ) const
- {
- linbox_check (A.coldim() == A.rowdim());
- linbox_check (B.coldim() == A.rowdim());
-
- typename Field::Element one,zero,mone;
- F.init (one, 1UL);
- F.neg (mone,one);
- F.init (zero, 0UL);
- typename Field::Element * Bp = B.getPointer();
- size_t ldb = B.getStride();
- size_t R = A.getrank();
-
- FFLAS::ftrsm (F, FFLAS::FflasRight, FFLAS::FflasUpper, FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
- B.rowdim(), R, one, A.getPointer(), A.getStride(), B.getPointer(), B.getStride());
-
- FFLAS::fgemm (F, FFLAS::FflasNoTrans, FFLAS::FflasNoTrans,
- B.rowdim(), B.coldim() - R, R,
- one, Bp, B.getStride(), A.getPointer() + R, A.getStride,
- mone, Bp + R, B.getStride());
-
- bool consistent = true;
- for (size_t i = 0; i < B.rowdim(); ++i)
- for (size_t j = R; j < B.coldim(); ++j)
- if (!F.isZero (*(Bp + i*ldb + j)))
+ bool consistent = true;
+ for (size_t j = R; j < b.size(); ++j)
+ if (!F.isZero (b[j]))
consistent = false;
- if (!consistent)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+ if (!consistent)
+ throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
- return B;
+ return b;
+ }
+ }; // end of class FactorizedMatrixRightUSolve
- }
- }; // end of class FactorizedMatrixRightUSolve
+ }
+}
- /*
- * Solvers with vectors: Operand=std::vector<Element>
- */
+namespace LinBox
+{
+ template <class Field>
+ LQUPMatrix<Field>::LQUPMatrix (const BlasMatrix<Field>& A) :
+ _field(A.field()), _factLU(*(new BlasMatrix<Field> (A))) ,
+ _permP(*(new BlasPermutation<size_t>(A.coldim()))),
+ _permQ(*(new BlasPermutation<size_t>(A.rowdim()))),
+ _m(A.rowdim()), _n(A.coldim()),
+ _alloc(true),_plloc(true)
+ {
+ if (!A.coldim() || !A.rowdim()) {
+ // throw LinBoxError("LQUP does not accept empty matrices");
+ _rank = 0 ;
+ }
+ else {
+ _rank= FFPACK::LUdivine((typename Field::Father_t) _field,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans,
+ _m, _n,
+ _factLU.getPointer(),_factLU.getStride(),
+ _permP.getWritePointer(), _permQ.getWritePointer(),
+ FFPACK::FfpackLQUP );
+ }
+ _permP.setOrder(_rank);
+ _permQ.setOrder(_rank);
+
+ }
template <class Field>
- class FactorizedMatrixLeftSolve<Field, std::vector<typename Field::Element> > {
- public:
- std::vector<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- std::vector<typename Field::Element>& x,
- const std::vector<typename Field::Element>& b ) const
- {
- linbox_check (A.coldim() == x.size());
- linbox_check (A.rowdim() == b.size());
- int info;
-
- FFPACK::fgetrs (F, FFLAS::FflasLeft, A.rowdim(), A.coldim(), 1, A.getrank(),
- A.getPointer(), A.getStride(), A.getP().getPointer(), A.getQ().getPointer(),
- &x[0], 1, &b[0], 1, &info);
- if (info > 0)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
-
- return x;
+ LQUPMatrix<Field>::LQUPMatrix (BlasMatrix<Field>& A) :
+ _field(A.field()), _factLU(static_cast<BlasMatrix<Field>&> (A)) ,
+ _permP(*(new BlasPermutation<size_t>(A.coldim()))),
+ _permQ(*(new BlasPermutation<size_t>(A.rowdim()))),
+ // _permP(A.coldim()), _permQ(A.rowdim()),
+ _m(A.rowdim()), _n(A.coldim()),
+ _alloc(false),_plloc(true)
+ {
+ if (!A.coldim() || !A.rowdim()) {
+ // throw LinBoxError("LQUP does not accept empty matrices");
+ _rank = 0 ;
}
+ else {
+ _rank= FFPACK::LUdivine((typename Field::Father_t) _field,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans,
+ _m, _n,
+ _factLU.getPointer(),_factLU.getStride(),
+ _permP.getWritePointer(), _permQ.getWritePointer(),
+ FFPACK::FfpackLQUP );
+ }
+ _permP.setOrder(_rank);
+ _permQ.setOrder(_rank);
- std::vector<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- std::vector<typename Field::Element>& b ) const
- {
+ }
- int info;
- linbox_check (A.coldim() == A.rowdim());
- linbox_check (A.coldim() == b.size());
+ template <class Field>
+ LQUPMatrix<Field>::LQUPMatrix (const BlasMatrix<Field>& A,
+ BlasPermutation<size_t> & P, BlasPermutation<size_t> & Q) :
+ _field(A.field()), _factLU(*(new BlasMatrix<Field> (A))) ,
+ _permP(P), _permQ(Q),
+ _m(A.rowdim()), _n(A.coldim()),
+ _alloc(true),_plloc(false)
+ {
- FFPACK::fgetrs (F, FFLAS::FflasLeft, b.size(), 1, A.getrank(),
- A.getPointer(), A.getStride(),
- A.getP().getPointer(), A.getQ().getPointer(),
- &b[0], 1, &info);
- if (info > 0)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+ linbox_check(_permQ.getOrder()==A.rowdim());
+ linbox_check(_permP.getOrder()==A.coldim());
- return b;
- }
- }; // end of class FactorizedMatrixLeftSolve
+
+ _rank= FFPACK::LUdivine((typename Field::Father_t) _field,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans,
+ _m, _n,
+ _factLU.getPointer(),_factLU.getStride(),
+ _permP.getWritePointer(), _permQ.getWritePointer(),
+ FFPACK::FfpackLQUP );
+
+ _permP.setOrder(_rank);
+ _permQ.setOrder(_rank);
+
+ }
template <class Field>
- class FactorizedMatrixRightSolve<Field, std::vector<typename Field::Element> > {
- public:
-
- std::vector<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- std::vector<typename Field::Element>& x,
- const std::vector<typename Field::Element>& b ) const
- {
- linbox_check (A.rowdim() == x.size());
- linbox_check (A.coldim() == b.size());
- int info;
-
- FFPACK::fgetrs (F, FFLAS::FflasRight, A.rowdim(), A.coldim(), 1, A.getrank(),
- A.getPointer(), A.getStride(),
- A.getP().getPointer(), A.getQ().getPointer(),
- &x[0], x.size(), &b[0], b.size(), &info);
- if (info > 0)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
-
- return x;
- }
+ LQUPMatrix<Field>::LQUPMatrix (BlasMatrix<Field>& A,
+ BlasPermutation<size_t> & P, BlasPermutation<size_t> & Q) :
+ _field(A.field()), _factLU(static_cast<BlasMatrix<Field>&> (A)) ,
+ _permP(P), _permQ(Q),
+ _m(A.rowdim()), _n(A.coldim()),
+ _alloc(false),_plloc(false)
+ {
- std::vector<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- std::vector<typename Field::Element>& b ) const
- {
- int info;
- linbox_check (A.coldim() == A.rowdim());
- linbox_check (A.rowdim() == b.size());
+ linbox_check(_permQ.getOrder()<=A.rowdim());
+ linbox_check(_permP.getOrder()<=A.coldim());
+ if (_permQ.getOrder() == 0)
+ _permQ.resize(A.rowdim());
+ if (_permP.getOrder() == 0)
+ _permP.resize(A.coldim());
- FFPACK::fgetrs (F, FFLAS::FflasRight, 1, b.size(), A.getrank(),
- A.getPointer(), A.getStride(),
- A.getP().getPointer(), A.getQ().getPointer(),
- &b[0], b.size(), &info);
- if (info > 0)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
- return b;
- }
- }; // end of class FactorizedMatrixRightSolve
+ _rank= FFPACK::LUdivine((typename Field::Father_t) _field,FFLAS::FflasNonUnit, FFLAS::FflasNoTrans,
+ _m, _n,
+ _factLU.getPointer(),_factLU.getStride(),
+ _permP.getWritePointer(), _permQ.getWritePointer(),
+ FFPACK::FfpackLQUP );
+ _permP.setOrder(_rank);
+ _permQ.setOrder(_rank);
+
+ }
template <class Field>
- class FactorizedMatrixLeftLSolve<Field, std::vector<typename Field::Element> > {
- public:
- std::vector<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- std::vector<typename Field::Element>& x,
- const std::vector<typename Field::Element>& b ) const
- {
- linbox_check( A.rowdim() == b.size() );
- x = b;
- return (*this)( F, A, x );
+ LQUPMatrix<Field>::~LQUPMatrix ()
+ {
+ if (_alloc)
+ delete &_factLU;
+ if (_plloc) {
+ delete &_permP;
+ delete &_permQ;
}
+ }
+
+ template <class Field>
+ Field& LQUPMatrix<Field>::field()
+ {
+ return _field;
+ }
- std::vector<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- std::vector<typename Field::Element>& b ) const
- {
- linbox_check (A.rowdim() == b.size());
+ template <class Field>
+ size_t LQUPMatrix<Field>::rowdim() const
+ {
+ return _m;
+ }
- FFPACK::solveLB2 (F, FFLAS::FflasLeft, b.size(), 1, A.getrank(),
- A.getPointer(), A.getStride(),
- A.getQ().getPointer(), &b[0], 1);
+ template <class Field>
+ size_t LQUPMatrix<Field>::coldim() const
+ {
+ return _n;
+ }
- return b;
+ template <class Field>
+ size_t LQUPMatrix<Field>::getRank() const
+ {
+ return _rank;
+ }
- /* BB: unreachable !
- size_t n = b.size(); // bds: b not B
- linbox_check( A.rowdim() == n );
- size_t r = A.getrank();
+ template <class Field>
+ const BlasPermutation<size_t>& LQUPMatrix<Field>::getP() const
+ {
+ return _permP;
+ }
- // To be changed: solveLB is designed for matrices, not for vectors
- if ( A.rowdim() <= A.coldim() ) {
- FFPACK::solveLB( F, FFLAS::FflasLeft, n, 1, r, A.getPointer(), A.getStride(),
- A.getQ().getPointer(), &b[0], b.size() );
- }
- else
- FFPACK::solveLB2( F, FFLAS::FflasLeft, n, 1, r, A.getPointer(), A.getStride(),
- A.getQ().getPointer(), b.getPointer(), b.getStride() );
- return b;
- */
- }
- }; // end of class FactorizedMatrixLeftLSolve
+ template <class Field>
+ BlasPermutation<size_t> & LQUPMatrix<Field>::getP( BlasPermutation<size_t> & P ) const
+ {
+ P = BlasPermutation<size_t>(_permP.getPointer(),_rank);
+ return P;
+ }
template <class Field>
- class FactorizedMatrixRightLSolve<Field, std::vector<typename Field::Element> > {
- public:
- std::vector<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- std::vector<typename Field::Element>& x,
- const std::vector<typename Field::Element>& b ) const
- {
- linbox_check( A.rowdim() == b.size() );
- x = b;
- return (*this)( F, A, x );
+ const BlasPermutation<size_t>& LQUPMatrix<Field>::getQ() const
+ {
+ return _permQ;
+ }
+
+ template <class Field>
+ BlasPermutation<size_t> & LQUPMatrix<Field>::getQ( BlasPermutation<size_t> & Qt ) const
+ {
+ Qt = BlasPermutation<size_t>(_permQ.getPointer(),_rank);
+ return Qt ;
+ }
+
+
+ // get the Matrix L
+ template <class Field>
+ inline TriangularBlasMatrix<Field>&
+ LQUPMatrix<Field>::getL( TriangularBlasMatrix<Field>& L,
+ bool _QLUP ) const
+ {
+
+ linbox_check( L.coldim() == _m);
+ linbox_check( L.rowdim() == _m);
+ linbox_check( L.getUpLo() == LinBoxTag::Lower);
+ linbox_check( L.getDiag() == LinBoxTag::Unit);
+
+#if 0
+ if (_m > _n) {
+ size_t i = 0 ;
+ for ( ; i<_n; ++i ){
+ size_t j=0;
+ for (; j<i ; ++j )
+ L.setEntry( i, j, _factLU.getEntry(i,j) );
+ for (; j<_m; ++j )
+ L.setEntry( i, j, zero );
+ }
+ for ( ; i<_m; ++i ){
+ size_t j=0;
+ for (; j<_n ; ++j )
+ L.setEntry( i, j, _factLU.getEntry(i,j) );
+ for (; j<_m; ++j )
+ L.setEntry( i, j, zero );
+ }
+
+
}
+ else {
+ for ( size_t i=0; i<_m; ++i ){
+ size_t j=0;
+ for (; j<i ; ++j )
+ L.setEntry( i, j, _factLU.getEntry(i,j) );
+ for (; j<_m; ++j )
+ L.setEntry( i, j, zero );
+ }
+ }
+#endif
+#if 1 /* slower */
+ for ( size_t i=0; i<_m; ++i ){
+ size_t j=0;
+ for (; j< ((i<_n)?i:_n) ; ++j )
+ L.setEntry( i, j, _factLU.getEntry(i,j) );
+ for (; j<_m; ++j )
+ L.setEntry( i, j, _field.zero );
+ }
+#endif
- std::vector<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- std::vector<typename Field::Element>& b ) const
- {
- linbox_check (A.rowdim() == b.size());
+ if (!_permQ.isIdentity())
+ FFPACK::applyP((typename Field::Father_t) _field, FFLAS::FflasRight, FFLAS::FflasNoTrans,
+ _m,0,(int)_permQ.getOrder(),
+ L.getWritePointer(), _m, _permQ.getPointer() );
+ for ( size_t i=0; i<_m; ++i )
+ L.setEntry( i, i, _field.one );
+ if (_QLUP) {
+ if (!_permQ.isIdentity()) {
+ FFPACK::applyP((typename Field::Father_t) _field, FFLAS::FflasLeft, FFLAS::FflasNoTrans,
+ _m,0,(int)_permQ.getOrder(),
+ L.getWritePointer(), _m, _permQ.getPointer() );
+ FFPACK::applyP((typename Field::Father_t) _field, FFLAS::FflasRight, FFLAS::FflasTrans,
+ _m,0,(int)_permQ.getOrder(),
+ L.getWritePointer(), _m, _permQ.getPointer() );
- FFPACK::solveLB2 (F, FFLAS::FflasRight, 1, b.size(), A.getrank(),
- A.getPointer(), A.getStride(),
- A.getQ().getPointer(), &b[0], b.size());
- return b;
+ }
}
- }; // end of class FactorizedMatrixRightLsolve
+ return L;
+
+ }
+
+ // get the matrix U
+ template <class Field>
+ inline TriangularBlasMatrix<Field>&
+ LQUPMatrix<Field>::getU( TriangularBlasMatrix<Field>& U ) const
+ {
+
+ linbox_check( U.rowdim() == _m);
+ linbox_check( U.coldim() == _n);
+ linbox_check( U.getUpLo() == LinBoxTag::Upper);
+ linbox_check( U.getDiag() == LinBoxTag::NonUnit);
+ for ( size_t i=0; i<_m; ++i )
+ for ( size_t j=i; j<_n; ++j )
+ U.setEntry( i, j, _factLU.getEntry(i,j) );
+ return U;
+ }
+
+ // get the Matrix S (from the LSP factorization of A deduced from LQUP)
template <class Field>
- class FactorizedMatrixLeftUSolve<Field, std::vector<typename Field::Element> > {
- public:
- std::vector<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- std::vector<typename Field::Element>& x,
- const std::vector<typename Field::Element>& b ) const
- {
- linbox_check (A.coldim() == x.size());
- linbox_check (A.rowdim() == b.size());
-
- bool consistent = true;
- typename Field::Element * bp = &b[0]; ;
- typename Field::Element * xp = &x[0];
- typename Field::Element zero,one;
- F.init(zero, 0UL);
- F.init(one, 1UL);
-
- for (size_t i = A.getrank(); i < b.size(); ++i)
- if (!F.isZero (b[i]))
- consistent = false;
- if (!consistent)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
-
- // The last rows of B are now supposed to be 0
-
- for (size_t i=0; i < A.getrank(); ++i)
- F.assign (x[i], b[i]);
-
- FFLAS::ftrsv (F, FFLAS::FflasUpper, FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
- A.getrank(), A.getPointer(), A.getStride(), xp, 1);
-
- for (size_t i=A.getrank(); i < x.size(); ++i)
- F.assign (x[i], zero);
- return x;
+ inline BlasMatrix<Field>&
+ LQUPMatrix<Field>::getS( BlasMatrix<Field>& S) const
+ {
+ linbox_check( S.rowdim() == _m);
+ linbox_check( S.coldim() == _n);
+ for ( size_t i=0; i<_m; ++i ){
+ for ( size_t j=0; j<i; ++j )
+ S.setEntry( i, j, _field.zero );
+ for ( size_t j=i; j<_n; ++j )
+ S.setEntry( i, j, _factLU.getEntry(i,j) );
}
- std::vector<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- std::vector<typename Field::Element>& b ) const
- {
+ if (!_permQ.isIdentity())
+ FFPACK::applyP((typename Field::Father_t) _field, FFLAS::FflasLeft, FFLAS::FflasTrans,
+ _n, 0,(int) _permQ.getOrder(),
+ S.getWritePointer(), _n, _permQ.getPointer() );
+ return S;
+ }
- linbox_check (A.coldim() == A.rowdim());
- linbox_check (A.coldim() == b.size());
- typename Field::Element one,zero;
- F.init(one, 1UL);
- F.init(zero, 0UL);
- bool consistent = true;
+ template <class Field>
+ typename Field::Element* LQUPMatrix<Field>::getPointer() const
+ {
+ return _factLU.getPointer();
+ }
- for (size_t i = A.getrank(); i < b.size(); ++i)
- if (!F.isZero (b[i]))
- consistent = false;
- if (!consistent)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+ /*! @internal get the stride in \c _factLU
+ */
+ template <class Field>
+ size_t LQUPMatrix<Field>::getStride() const
+ {
+ return _factLU.getStride();
+ }
- FFLAS::ftrsv (F, FFLAS::FflasUpper, FFLAS::FflasNoTrans, FFLAS::FflasNonUnit,
- A.getrank(), A.getPointer(), A.getStride(), &b[0], 1);
+ // solve AX=B
+ template <class Field>
+ template <class Operand>
+ Operand& LQUPMatrix<Field>::left_solve(Operand& X, const Operand& B) const
+ {
+ return Protected::FactorizedMatrixLeftSolve<Field,Operand>()( _field, *this, X, B );
+ }
- return b;
- }
+ // solve AX=B (X is stored in B)
+ template <class Field>
+ template <class Operand>
+ Operand& LQUPMatrix<Field>::left_solve(Operand& B) const
+ {
+ return Protected::FactorizedMatrixLeftSolve<Field,Operand>()( _field, *this, B );
+ }
- }; // end of class FactorizedMatrixLeftUSolve
+ // solve XA=B
+ template <class Field>
+ template <class Operand>
+ Operand& LQUPMatrix<Field>::right_solve(Operand& X, const Operand& B) const
+ {
+ return Protected::FactorizedMatrixRightSolve<Field,Operand>()( _field, *this, X, B );
+ }
+ // solve XA=B (X is stored in B)
template <class Field>
- class FactorizedMatrixRightUSolve<Field, std::vector<typename Field::Element> > {
- public:
- std::vector<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- std::vector<typename Field::Element>& x,
- const std::vector<typename Field::Element>& b ) const
- {
- linbox_check (x.size() == A.rowdim());
- linbox_check (A.coldim() == b.size());
- typename Field::Element one,zero;
- F.init(one, 1UL);
- F.init(zero, 0UL);
- typename Field::Element * bp = b.getPointer();
- typename Field::Element * xp = x.getPointer();
- size_t R = A.getrank();
-
- for (size_t i = 0; i < R; ++i)
- F.assign (x[i], b[i]);
-
- FFLAS::ftrsv (F, FFLAS::FflasUpper, FFLAS::FflasTrans, FFLAS::FflasNonUnit,
- R, A.getPointer(), A.getStride(), xp, 1);
-
- bool consistent = true;
- if (b.size() > x.size()) {
- typename Field::Element* W = new typename Field::Element [b.size() - R];
-
- FFLAS::fgemv (F, FFLAS::FflasTrans,
- R, b.size() - R,
- one, A.getPointer() + R, A.getStride, xp, 1,
- zero, W, 1);
+ template <class Operand>
+ Operand& LQUPMatrix<Field>::right_solve(Operand& B) const
+ {
+ return Protected::FactorizedMatrixRightSolve<Field,Operand>()( _field, *this, B );
+ }
- for (size_t i = 0; i < b.size() - R; ++i)
- if (!F.areEqual (W[i], b[i + R]))
- consistent = false;
- delete[] W;
- }
- else {
- FFLAS::fgemv (F, FFLAS::FflasTrans,
- R, b.size() - R,
- one, A.getPointer() + R, A.getStride, xp, 1,
- zero, xp + R, 1);
+ // solve LX=B (L from LQUP)
+ template <class Field>
+ template <class Operand>
+ Operand& LQUPMatrix<Field>::left_Lsolve(Operand& X, const Operand& B) const
+ {
+ return Protected::FactorizedMatrixLeftLSolve<Field,Operand>()( _field, *this, X, B );
+ }
- for (size_t i = R; i < b.size(); ++i)
- if (!F.areEqual (x[i], b[i]))
- consistent = false;
- }
+ // solve LX=B (L from LQUP) (X is stored in B)
+ template <class Field>
+ template <class Operand>
+ Operand& LQUPMatrix<Field>::left_Lsolve(Operand& B) const
+ {
+ return Protected::FactorizedMatrixLeftLSolve<Field,Operand>()( _field, *this, B );
+ }
- if (!consistent)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
+ // solve XL=B (L from LQUP)
+ template <class Field>
+ template <class Operand>
+ Operand& LQUPMatrix<Field>::right_Lsolve(Operand& X, const Operand& B) const
+ {
+ return Protected::FactorizedMatrixRightLSolve<Field,Operand>()( _field, *this, X, B );
+ }
- for (size_t j = R; j < x.size(); ++j)
- F.assign (x[j], zero);
- return x;
- }
- std::vector<typename Field::Element>& operator() ( const Field& F,
- const LQUPMatrix<Field>& A,
- std::vector<typename Field::Element>& b ) const
- {
- linbox_check (A.coldim() == A.rowdim());
- linbox_check (b.size() == A.rowdim());
-
- typename Field::Element one,zero,mone;
- F.init (one, 1UL);
- F.neg (mone,one);
- F.init (zero, 0UL);
- typename Field::Element * bp = &b[0];
- size_t R = A.getrank();
-
- FFLAS::ftrsv (F, FFLAS::FflasUpper, FFLAS::FflasTrans, FFLAS::FflasNonUnit,
- R, one, A.getPointer(), A.getStride(), bp, 1);
-
- FFLAS::fgemv (F, FFLAS::FflasTrans,
- R, b.size() - R,
- one, A.getPointer() + R, A.getStride, bp, 1,
- mone, bp + R, 1);
-
- bool consistent = true;
- for (size_t j = R; j < b.size(); ++j)
- if (!F.isZero (b[j]))
- consistent = false;
- if (!consistent)
- throw LinboxMathInconsistentSystem ("Linear system is inconsistent");
-
- return b;
- }
- }; // end of class FactorizedMatrixRightUSolve
+ // solve XL=B (L from LQUP) (X is stored in B)
+ template <class Field>
+ template <class Operand>
+ Operand& LQUPMatrix<Field>::right_Lsolve(Operand& B) const
+ {
+ return Protected::FactorizedMatrixRightLSolve<Field,Operand>()( _field, *this, B );
+ }
+
+ // solve UX=B (U from LQUP is r by r)
+ template <class Field>
+ template <class Operand>
+ Operand& LQUPMatrix<Field>::left_Usolve(Operand& X, const Operand& B) const
+ {
+ return Protected::FactorizedMatrixLeftUSolve<Field,Operand>()( _field, *this, X, B );
+ }
+
+ // solve UX=B (U from LQUP) (X is stored in B)
+ template <class Field>
+ template <class Operand>
+ Operand& LQUPMatrix<Field>::rleft_Usolve(Operand& B) const
+ {
+ return Protected::FactorizedMatrixLeftUSolve<Field,Operand>()( _field, *this, B );
+ }
+
+ // solve XU=B (U from LQUP)
+ template <class Field>
+ template <class Operand>
+ Operand& LQUPMatrix<Field>::right_Usolve(Operand& X, const Operand& B) const
+ {
+ return Protected::FactorizedMatrixRightUSolve<Field,Operand>()( _field, *this, X, B );
+ }
+
+ // solve XU=B (U from LQUP) (X is stored in B)
+ template <class Field>
+ template <class Operand>
+ Operand& LQUPMatrix<Field>::right_Usolve(Operand& B) const
+ {
+ return Protected::FactorizedMatrixRightUSolve<Field,Operand>()( _field, *this, B );
+ }
} //end of namespace LinBox
@@ -785,3 +1106,12 @@ namespace LinBox
#endif // __LINBOX_factorized_matrix_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/matrix-category.h b/linbox/matrix/matrix-category.h
index e3d9b90..6eed813 100644
--- a/linbox/matrix/matrix-category.h
+++ b/linbox/matrix/matrix-category.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/matrix/matrix-category.h
* Copyright (C) 2005 Pascal Giorgi
*
* Written by :
* Pascal Giorgi pascal.giorgi at ens-lyon.fr
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,24 +18,30 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_matrix_category_H
#define __LINBOX_matrix_category_H
-#include <linbox/matrix/sparse.h>
-#include <linbox/matrix/dense.h>
+#include "linbox/matrix/sparse.h"
+// #include "linbox/matrix/blas-matrix.h"
-#include <linbox/blackbox/sparse.h>
-#include <linbox/blackbox/dense.h>
+#include "linbox/blackbox/sparse.h"
namespace LinBox
{
+ template<class _Field>
+ class BlasMatrix ;
+
+ template<class _Field>
+ class BlasSubmatrix ;
+
+
struct MatrixContainerCategory {
struct BlasContainer{};
struct Container{};
@@ -47,22 +54,34 @@ namespace LinBox
typedef MatrixContainerCategory::Blackbox Type;
};
-
- template <class Element>
- class MatrixContainerTrait<DenseMatrixBase<Element> > {
+ template <class Field>
+ class MatrixContainerTrait<BlasMatrix<Field> > {
public:
- typedef MatrixContainerCategory::Container Type;
+ typedef MatrixContainerCategory::BlasContainer Type;
};
- template <class Element>
- class MatrixContainerTrait<SparseMatrixBase<Element> > {
+ template <class Field>
+ class MatrixContainerTrait<const BlasMatrix<Field> > {
public:
- typedef MatrixContainerCategory::Container Type;
+ typedef MatrixContainerCategory::BlasContainer Type;
};
+#if 0
+ template <class Field>
+ class MatrixContainerTrait<BlasMatrix<Field> > {
+ public:
+ typedef MatrixContainerCategory::BlasContainer Type;
+ };
+#endif
template <class Field>
- class MatrixContainerTrait<DenseMatrix<Field> > {
+ class MatrixContainerTrait<const BlasSubmatrix<Field> > {
+ public:
+ typedef MatrixContainerCategory::BlasContainer Type;
+ };
+
+ template <class Element>
+ class MatrixContainerTrait<SparseMatrixBase<Element> > {
public:
typedef MatrixContainerCategory::Container Type;
};
@@ -77,3 +96,12 @@ namespace LinBox
#endif //__LINBOX_matrix_category_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/matrix-domain-gf2.h b/linbox/matrix/matrix-domain-gf2.h
new file mode 100644
index 0000000..4a3753b
--- /dev/null
+++ b/linbox/matrix/matrix-domain-gf2.h
@@ -0,0 +1,192 @@
+/* linbox/matrix/matrix-domain.h
+ * Copyright (C) 2002 Zhendong Wan, Bradford Hovinen
+ *
+ * Written by Zhendong Wan <wan at mail.eecis.udel.edu>,
+ * Bradford Hovinen <bghovinen at math.uwaterloo.ca>
+ *
+ * ------------------------------------------------------------
+ * 2002-11-26 Bradford Hovinen <bghovinen at math.uwaterloo.ca>
+ *
+ * Added detailed documentation, cleaned up the interface slightly, and added
+ * support for matrix traits. Added read, write, neg, negin, axpy, and
+ * matrix-vector and matrix-black box operations.
+ * ------------------------------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+#ifndef __LINBOX_matrix_domain_H
+#define __LINBOX_matrix_domain_H
+
+#include <iostream>
+
+#include "linbox/field/gf2.h"
+#include "linbox/matrix/matrix-domain.h"
+
+// Specialization of MatrixDomain for GF2
+namespace LinBox
+{
+ /*! Specialization of MatrixDomain for GF2.
+ * @bug this is half done and makes MatrixDomain on GF2 hardly usable.
+ * @todo this is where m4ri will play.
+ */
+ template <>
+ class MatrixDomain<GF2> {
+ public:
+ MatrixDomain (const GF2 &F) :
+ _VD (F)
+ {}
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &vectorMul (Vector1 &w, const Matrix &A, const Vector2 &v) const
+ {
+ return mulSpecialized (w, A, v, typename MatrixTraits<Matrix>::MatrixCategory ());
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
+ MatrixCategories::RowMatrixTag) const
+ {
+ return mulRowSpecialized (w, A, v, typename VectorTraits<Vector1>::VectorCategory ());
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
+ MatrixCategories::ColMatrixTag) const
+ {
+ return mulColSpecialized (w, A, v,
+ typename VectorTraits<Vector1>::VectorCategory (),
+ typename VectorTraits<Vector2>::VectorCategory ());
+ }
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
+ MatrixCategories::RowColMatrixTag) const
+ {
+ return mulRowSpecialized (w, A, v, typename VectorTraits<Vector1>::VectorCategory ());
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulRowSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseZeroOneVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulRowSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseZeroOneVectorTag) const;
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const;
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &mulColSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const;
+
+ VectorDomain<GF2> _VD;
+ };
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MatrixDomain<GF2>::mulRowSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstRowIterator i = A.rowBegin ();
+ typename Vector1::iterator j = w.begin ();
+
+ for (; j != w.end (); ++j, ++i)
+ _VD.dot (*j, v, *i);
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MatrixDomain<GF2>::mulRowSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ typename Matrix::ConstRowIterator i = A.rowBegin ();
+ GF2::Element t;
+ unsigned int idx = 0;
+
+ w.clear ();
+
+ for (; i != A.rowEnd (); ++i, ++idx) {
+ _VD.dot (t, v, *i);
+
+ if (t)
+ w.push_back (t);
+ }
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2 >
+ Vector1 &MatrixDomain<GF2>::mulColSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ linbox_check (A.coldim () == v.size ());
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Matrix::ConstColIterator i = A.colBegin ();
+ typename Vector2::const_iterator j = v.begin ();
+
+ //!@bug what's happening here ?
+ _VD.subin (w, w);
+
+ for (; j != v.end (); ++j, ++i)
+ _VD.axpyin (w, *j, *i);
+
+ return w;
+ }
+
+ template <class Vector1, class Matrix, class Vector2>
+ Vector1 &MatrixDomain<GF2>::mulColSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ linbox_check (A.rowdim () == w.size ());
+
+ typename Vector2::const_iterator j = v.begin ();
+
+ _VD.subin (w, w);
+
+ for (; j != v.end (); ++j) {
+ typename Matrix::ConstColIterator i = A.colBegin () + *j;
+ _VD.axpyin (w, true, *i);
+ }
+
+ return w;
+ }
+
+}
+
+#endif // __LINBOX_matrix_domain_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/matrix-domain.h b/linbox/matrix/matrix-domain.h
index 6e4e8ca..2113b28 100644
--- a/linbox/matrix/matrix-domain.h
+++ b/linbox/matrix/matrix-domain.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/matrix/matrix-domain.h
* Copyright (C) 2002 Zhendong Wan, Bradford Hovinen
*
@@ -14,7 +12,25 @@
* matrix-vector and matrix-black box operations.
* ------------------------------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_matrix_domain_H
@@ -74,7 +90,7 @@ namespace LinBox
* equivalent to BLAS levels 2 and 3. The arithmetic methods are parameterized
* by matrix type so that they may be used the same way with sparse matrices,
* dense matrices, and dense submatrices. Except where otherwise noted, they
- * require the matrix inputs to meet the \ref DenseMatrix archetype.
+ * require the matrix inputs to meet the \ref BlasMatrix archetype.
*
* These methods are specialized so that they can run efficiently with different
* matrix representations. If a matrix has an efficient row iterator, but not an
@@ -84,7 +100,7 @@ namespace LinBox
*
* For all of the arithmetic operations that output matrices, it is assumed that
* the output matrix has an efficient row iterator. In typical use, the output
- * matrix will be a \ref DenseMatrixBase or a \ref DenseSubmatrix, which has
+ * matrix will be a \ref BlasMatrix or a \ref BlasSubmatrix, which has
* efficient row and column iterators. In particular, one should not perform
* these arithmetic operations outputting to a \ref SparseMatrixBase.
*
@@ -98,13 +114,13 @@ namespace LinBox
/// Constructor.
//! @param F field for MatrixDomain operations.
MatrixDomain (const Field &F) :
- _F (F), _VD (F)
+ _field (F), _VD (F)
{}
/// Copy operator.
MatrixDomain& operator= (const MatrixDomain& MD)
{
- _F = MD._F;
+ _field = MD._field;
_VD = MD._VD;
return *this;
}
@@ -117,11 +133,11 @@ namespace LinBox
//@{
const Field &field () const
{
- return _F;
+ return _field;
}
Field &field ()
{
- return _F;
+ return _field;
}
//@}
@@ -133,7 +149,7 @@ namespace LinBox
template <class Matrix>
inline std::ostream &write (std::ostream &os, const Matrix &A) const
{
- return A.write (os, _F);
+ return A.write (os);
}
/** Read matrix.
@@ -144,7 +160,7 @@ namespace LinBox
template <class Matrix>
inline std::istream &read (std::istream &is, Matrix &A) const
{
- return A.read (is, _F);
+ return A.read (is, _field);
}
/** Matrix copy
@@ -295,7 +311,7 @@ namespace LinBox
*
* C must support both row and column iterators, and the vector
* representations must be dense. Examples of supported matrices are
- * \ref DenseMatrixBase and \ref DenseSubmatrix.
+ * \ref BlasMatrix and \ref BlasSubmatrix.
*
* Either A or B, or both, may have limited iterators. However, either A
* must support row iterators or B must support column iterators. If
@@ -417,6 +433,16 @@ namespace LinBox
typename MatrixTraits<Matrix3>::MatrixCategory ());
}
+ //! Y <- AX-Y
+ template <class Matrix1, class Matrix2, class Matrix3>
+ inline Matrix1 &axmyin (Matrix1 &Y, const Matrix2 &A, const Matrix3 &X) const
+ {
+ negin(Y);
+ axpyin(Y,A,X);
+ return Y;
+ }
+
+
/*! General matrix multiply
* \f$ D \gets \alpha A B + \beta C\f$.
* @todo not efficient...
@@ -987,7 +1013,7 @@ namespace LinBox
VectorCategories::DenseVectorTag,
VectorCategories::DenseVectorTag) const
{
- return mulColDense (_VD, w, A, v);
+ return this->mulColDense (_VD, w, A, v);
}
template <class Vector1, class Matrix, class Vector2>
Vector1 &mulColSpecialized (Vector1 &w, const Matrix &A, const Vector2 &v,
@@ -1159,14 +1185,22 @@ namespace LinBox
return permuteColsByCol (A, P_start, P_end);
}
- Field _F;
+ Field _field;
VectorDomain<Field> _VD;
};
}
-
#include "linbox/matrix/matrix-domain.inl"
#endif // __LINBOX_matrix_domain_H
+
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+
diff --git a/linbox/matrix/matrix-domain.inl b/linbox/matrix/matrix-domain.inl
index 5785fff..edd8a3e 100644
--- a/linbox/matrix/matrix-domain.inl
+++ b/linbox/matrix/matrix-domain.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/matrix/matrix-domain.inl
* Copyright (C) 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_matrix_domain_INL
@@ -561,7 +577,7 @@ namespace LinBox
for (i = A.rowBegin (), l1 = Y.rowBegin (); i != A.rowEnd (); ++i, ++l1) {
for (j = X.colBegin (), l2 = l1->begin (); j != X.colEnd (); ++j, ++l2) {
_VD.dot (t, *i, *j);
- _F.addin (*l2, t);
+ _field.addin (*l2, t);
}
}
@@ -586,7 +602,7 @@ namespace LinBox
for (j = X.colBegin (), l1 = Y.colBegin (); j != X.colEnd (); ++j, ++l1) {
for (i = A.rowBegin (), l2 = l1->begin (); i != A.rowEnd (); ++i, ++l2) {
_VD.dot (t, *i, *j);
- _F.addin (*l2, t);
+ _field.addin (*l2, t);
}
}
@@ -652,8 +668,10 @@ namespace LinBox
// A must decide if dot is possible, not w
// for (; j != w.end (); ++j, ++i)
// _VD.dot (*j, v, *i);
- for (; i != A.rowEnd (); ++j, ++i)
+ for (; i != A.rowEnd (); ++j, ++i) {
+ linbox_check(j != w.end());
_VD.dot (*j, v, *i);
+ }
return w;
}
@@ -672,7 +690,7 @@ namespace LinBox
for (; i != A.rowEnd (); ++i, ++idx) {
_VD.dot (t, v, *i);
- if (!_F.isZero (t))
+ if (!_field.isZero (t))
w.push_back (std::pair<size_t, typename Field::Element> (idx, t));
}
@@ -693,7 +711,7 @@ namespace LinBox
for (; i != A.rowEnd (); ++i, ++idx) {
_VD.dot (t, v, *i);
- if (!_F.isZero (t))
+ if (!_field.isZero (t))
w[idx] = t;
}
@@ -715,7 +733,7 @@ namespace LinBox
for (; i != A.rowEnd (); ++i, ++idx) {
_VD.dot (t, v, *i);
- if (!_F.isZero (t)) {
+ if (!_field.isZero (t)) {
w.first.push_back (idx);
w.second.push_back (t);
}
@@ -819,7 +837,7 @@ namespace LinBox
for (; j != y.end (); ++j, ++i) {
_VD.dot (t, x, *i);
- _F.addin (*j, t);
+ _field.addin (*j, t);
}
return y;
@@ -1082,10 +1100,10 @@ namespace LinBox
(M1.rowdim()==M2.rowdim()));
- typename Matrix1::RawIterator p=M1.rawBegin();
- for(;p!=M1.rawEnd();++p)
+ typename Matrix1::Iterator p=M1.Begin();
+ for(;p!=M1.End();++p)
M1.field().init(*p,0);
- for(p=M1.rawBegin();p<M1.rawEnd();)
+ for(p=M1.Begin();p<M1.End();)
{
M1.field().init(*p,1);
p=p+M1.rowdim()+1;
@@ -1108,10 +1126,10 @@ namespace LinBox
if(k==0)
{
- typename Matrix1::RawIterator p=M1.rawBegin();
- for(;p!=M1.rawEnd();++p)
+ typename Matrix1::Iterator p=M1.Begin();
+ for(;p!=M1.End();++p)
M1.field().init(*p,0);
- for(p=M1.rawBegin();p<M1.rawEnd();)
+ for(p=M1.Begin();p<M1.End();)
{
M1.field().init(*p,1);
p+=M1.rowdim()+1;
@@ -1119,9 +1137,9 @@ namespace LinBox
return M1;
}
- typename Matrix1::RawIterator p1;
- typename Matrix2::ConstRawIterator p2;
- for(p1=M1.rawBegin(),p2=M2.rawBegin();p1!=M1.rawEnd();++p1,++p2)
+ typename Matrix1::Iterator p1;
+ typename Matrix2::ConstIterator p2;
+ for(p1=M1.Begin(),p2=M2.Begin();p1!=M1.End();++p1,++p2)
M1.field().assign(*p1,*p2);
std::vector<bool> bit;
@@ -1154,3 +1172,12 @@ namespace LinBox
#endif // __LINBOX_matrix_domain_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/matrix-permutation.h b/linbox/matrix/matrix-permutation.h
deleted file mode 100644
index c60a994..0000000
--- a/linbox/matrix/matrix-permutation.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-
-/* Copyright (C) 2010 LinBox
- * Written by <brice.boyer at imag.fr>
- *
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/** @file matrix/matrix-permutation.h
- * @ingroup matrix
- * A permutation class for operations on permutations, their representations
- * and matrix row/column permuting.
- *
- * We provide a \ref LinBox::BlasPermutation class that stores the
- * permutation packed in a Lapack style and a \ref LinBox::MatrixPermutation
- * class that represents a permutation naturally. Converstions are provided.
- */
-
-#ifndef __LINBOX_matrix_permutation_H
-#define __LINBOX_matrix_permutation_H
-
-#include <vector>
-#include <ostream>
-
-
-// BlasPermutation
-namespace LinBox
-{
-
-#if 0
- template<class _Uint>
- class PermutationInterface {
- public :
- virtual _Uint getSize() = 0;
- };
-#endif
-
- // forward declaration
- template<class _Uint>
- class MatrixPermutation ;
-
- template<class _Uint>
- class BlasPermutation ;
-
- /** Lapack-style permutation.
- * @ingroup permutation
- *
- * A Lapack permutation is represented with a vector \f$[p_1,p_2,\cdots, p_r]\f$
- * such that \f$p_i > i\f$. Converting it to a classic representation
- * of a permutation corresponds to taking an identity permutation and
- * then successively permuting \f$(i,p_i)\f$.
- * Example : if <code>P=[1,4,4]</code> and <code>V=[1,2,3,4,5]</code>, then <code>P.V=[1,4,2,3,5]</code>.
- * @internal
- * @pre if \c Q_ is built, then \c P_=Q_
- */
- template<class _UnsignedInt> // unsigned * ou Integer
- class BlasPermutation /* : PermutationInterface<_UnsignedInt> */ {
- typedef BlasPermutation<_UnsignedInt> BlasPerm ;
- public :
- BlasPermutation() ;
- ~BlasPermutation() ;
-
- BlasPermutation(size_t n) ;
-
- BlasPermutation(const _UnsignedInt * V, const _UnsignedInt & n) ;
- BlasPermutation(const std::vector<_UnsignedInt> & V);
- BlasPermutation(const MatrixPermutation<_UnsignedInt> &M);
-
-#if 0
- BlasPermutation(MatrixPermutation & P);
- BlasPermutation(TranspositionPermutation & P);
-
- // void Invert() ;
- // BlasPerm & getInverse(BlasPerm & P) ;
-
-
- template<class _Perm>
- _Perm & convert(_Perm & NewP);
-
- template<class _Perm>
- _Perm & convertTranspose(_Perm & NewP);
-
- void getOrder() ;
- void resize() ;
- void size() ;
-
-
- void Tranpsose() ;
- BlasPerm & getTranspose(BlasPerm & P) ;
- void Tranpsose(Index &i, Index & j);
-
- void applyP( BlasPerm & P, enum Side s, enum Trans = NoTranspose) ;
- void applyPT( BlasPerm & P, enum Side s) ;
-#endif
-
- // operator =
- BlasPermutation<_UnsignedInt>& operator= (const BlasPermutation<_UnsignedInt> & P)
- {
- r_ = P.r_;
- n_ = P.n_;
- P_ = P.P_;
- Q_ = P.Q_;
- inv_ = P.inv_ ;
-
- return (*this) ;
- }
-
- /* size */
- _UnsignedInt getSize() const ;
- // _UnsignedInt getOrder() ;
-
- _UnsignedInt getOrder() const ;
- void setOrder( size_t r) ;
-
- std::vector<_UnsignedInt> & getStorage() ;
- void resize(_UnsignedInt & s, bool with_zeros=true) ;
-
- // template<class OutVector, class InVector>
- // OutVector &apply (OutVector &y, const InVector &x) ;
- // template<class OutVector, class InVector>
- // OutVector &applyTranspose (OutVector &y, const InVector &x) ;
-
- /* properties */
- bool isIdentity() const
- {
- return (!r_);
- }
-
- /* convert */
- /*! Converts a \c BlasPermutation to a \c MatrixPermutation.
- * @param[out] P MatrixPermutation to be created. Need not be initialized.
- */
- MatrixPermutation<_UnsignedInt> & Convert(MatrixPermutation<_UnsignedInt> &P);
-
- /* apply */
- // /*! \f$ M \gets P M\f$ */
- // template<class Matrix>
- // Matrix & applyRows(Matrix &M);
- // /*! \f$ M \gets M P\f$ */
- // template<class Matrix>
- // Matrix & applyCols(Matrix &M);
-
- // /*! \f$ M \gets M P^t\f$ */
- // template<class Matrix>
- // Matrix & applyTransposeRows(Matrix &M);
- // /*! \f$ M \gets P^t M\f$ */
- // template<class Matrix>
- // Matrix & applyTransposeCols(Matrix &M);
-
- //_UnsignedInt & operator[] (const _UnsignedInt &i) ;
- _UnsignedInt operator[] (const _UnsignedInt i) const ;
-
- // /*! col \p i and col \p j are swapped
- // */
- // void TransposeCols(_UnsignedInt i, _UnsignedInt j);
-
- // /*! row \p i and row \p j are swapped
- // */
- // void TransposeRows(_UnsignedInt i, _UnsignedInt j);
-
- const _UnsignedInt* getPointer() const
- {
- linbox_check(r_);
- return &P_[0];
- }
-
- _UnsignedInt* getWritePointer()
- {
- linbox_check(r_);
- return &P_[0];
- }
-
- /* invert */
- void Transpose();
- void Invert();
- BlasPerm & Transpose(BlasPerm &Mt);
- BlasPerm & Invert(BlasPerm &Mt);
-
- /* clean */
- void Compress() ;
-
- /* print */
- /*! writes on output stream \p o */
- std::ostream & write(std::ostream & o, bool Lapack=true) const ;
-
- /*! writes \p P on output stream \p o */
- template<class _Uint>
- friend std::ostream & operator<<(std::ostream &o, BlasPerm & P) ;
-
-
- protected :
- _UnsignedInt r_ ; // size of compressed permutation
- mutable _UnsignedInt n_ ; // dim of permutation
- std::vector<_UnsignedInt> P_ ; // blas permutation
- mutable std::vector<_UnsignedInt> Q_ ; // corresponding matrix permutation
- bool inv_ ; // matrix is inverted ?
-
- // hmmmm...
- // using stl vectors instead of pointers for the sake of simplicity...
- // this allows permutation up to MAX_INT size. Not so restricting for now...
-
- void BuildQ_() const ;
- void InvertQ_();
- std::vector<_UnsignedInt> &InvertQ_(std::vector<_UnsignedInt> & Qinv);
- void BuildP_(std::vector<_UnsignedInt>&Q, std::vector<_UnsignedInt>&Qinv);
- bool CheckP_();
- void InitQ_() const ;
-
-
- };
-} // LinBox
-
-// MatrixPermutation
-namespace LinBox
-{
-
- /*! Permutation classique.
- * @ingroup permutation
- */
- template<class _UnsignedInt>
- class MatrixPermutation /* : PermutationInterface<_UnsignedInt> */ {
- typedef MatrixPermutation<_UnsignedInt> MatPerm ;
- private :
- _UnsignedInt n_ ; // order of permutation
- std::vector<_UnsignedInt> P_ ; // _M_[i] = j ssi P(i) = j
-
- public :
- MatrixPermutation();
- ~MatrixPermutation() {};
- MatrixPermutation(const _UnsignedInt * V, const _UnsignedInt & n) ;
- MatrixPermutation(const std::vector<_UnsignedInt> & V) ;
-
- _UnsignedInt operator[] (const _UnsignedInt i) const ;
- _UnsignedInt getSize() const ;
- // _UnsignedInt getSize() ;
-
- void resize( _UnsignedInt n ) ;
-
- void Transpose();
- void Invert();
- MatPerm & Transpose(MatPerm &Mt);
- MatPerm & Invert(MatPerm &Mt);
-
-
-
- /* print */
- /*! writes on output stream \p o */
- std::ostream & write(std::ostream & o) const ;
-
- /*! writes \p P on output stream \p o */
- template<class _Uint>
- friend std::ostream & operator<<(std::ostream &o, MatPerm & P) ;
-
- template<class OutVector, class InVector>
- OutVector &apply (OutVector &y, const InVector &x) const ;
- template<class OutVector, class InVector>
- OutVector &applyTranspose (OutVector &y, const InVector &x) const ;
-
-
- void TransposeRows(_UnsignedInt i, _UnsignedInt j);
- void TransposeCols(_UnsignedInt i, _UnsignedInt j);
-
- };
-
-} // LinBox
-
-#if 0 /* stuff to be removed */
-namespace LinBox
-{
-
- //! produit de permutations
- template<class _UnsignedInt>
- class TranspositionPermutation {
- typedef std::pair<_UnsignedInt,_UnsignedInt> Transposition ;
- private :
- _UnsignedInt _n_ ; // order of permutation
- _UnsignedInt _r_ ; // number of transpositions
- std::vector<Transposition> _T_ ; // if _T_[k] = (i,j) then P(i) = j
-
- public :
- };
-
- //!@todo produit de cycles à supports disjoints
-
-
- //! on regroupe dedans les parties "BB" des perms précédentes.
-
- template<class _Field>
- class BlackboxInterface {
- public :
- typedef BlackboxInterface<_Field> Self_t ;
- virtual size_t rowdim() const ;
- virtual size_t coldim() const ;
- template<class OutVec,InVec>
- virtual OutVec &apply (OutVec & , const InVec & ) const ;
- template<class OutVec,InVec>
- virtual OutVec &applyTranspose (OutVec & , const InVec & ) const ;
- virtual _Field & field() const ;
- template<class _Tp1>
- virtual struct rebind {
- typedef BlackboxInterface<_Tp1> other ;
- virtual void operator() (other &, cosnt Self_t &, const _Tp1 &) ;
- } ;
- };
-
- template<class _Perm, class _Field>
- class BlackBoxPermutation : public BlackboxInterface { // ?????????????
- private :
- _Perm _P_ ;
- _Field _F_ ; //????????????????????????
- public :
- size_t rowdim() ;
- size_t coldim() ;
- void permute( Index i, Index j);
- const Field & field() { return _F_ ;}
- apply();
- applyTranspose() ;
- template<typename _Tp1>
- struct rebind {} ;
-
- setStorage();
- getStorage();
-
- };
-
-#if 0
- template<class _Perm>
- class PermutationDomain {
- private :
- _Perm _P_ ;
- public :
- // P.permute(A) ??? :)
- template<class _Matrix>
- _Matrix & permute (_Matrix & M, enum Side s, enum Trans t = NoTranspose) ;
- template<class _Matrix>
- _Matrix & invmute (_Matrix & M, enum Side s) ;
-
-
-
- };
-#endif
-}
-#endif
-
-#include "matrix-permutation.inl"
-
-#endif //__LINBOX_matrix_permutation_H
diff --git a/linbox/matrix/matrix-permutation.inl b/linbox/matrix/matrix-permutation.inl
deleted file mode 100644
index b5476a1..0000000
--- a/linbox/matrix/matrix-permutation.inl
+++ /dev/null
@@ -1,619 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-
-/* Copyright (C) 2010 LinBox
- * Written by <brice.boyer at imag.fr>
- *
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/** @file matrix-permutation.inl
- * @brief Implementation of matrix-permutation.h
- */
-
-#ifndef __LINBOX_matrix_permutation_INL
-#define __LINBOX_matrix_permutation_INL
-
-#define _LB_DBG
-
-#include <algorithm>
-#include "linbox/util/debug.h"
-
-// BlasPermutation
-namespace LinBox
-{
- template<class _Uint>
- BlasPermutation<_Uint>::BlasPermutation() :
- r_(0),n_((_Uint)-1),P_(0),Q_(0),inv_(false)
- {
- std::cout << "NULL permutation created. Beware !" << std::endl;
- };
-
- template<class _Uint>
- BlasPermutation<_Uint>::BlasPermutation(size_t n) :
- r_(n),n_((_Uint)-1),P_(n),Q_(0),inv_(false)
- { };
-
-
- template<class _Uint>
- BlasPermutation<_Uint>::~BlasPermutation() {}
-
- // n_ is not computed here.
- template<class _Uint>
- BlasPermutation<_Uint>::BlasPermutation(const _Uint *P, const _Uint & r ) :
- r_(r), n_((_Uint)-1),P_(0),Q_(0),inv_(false)
- {
- // std::cout << "CTOR 2" << std::endl;
- // std::cout << "got : perm of " << r << std::endl;
- // for (size_t i = 0 ; i< r ; ++i) std::cout << P[i] << ' ' ;
- // std::cout<<std::endl;
- if (!r) {
- // n_ = 0 ;
- return ;
- }
- P_.resize(r_);
- for (_Uint i = 0 ; i < r_ ; ++i) {
- P_[i] = P[i] ;
- }
-
- // std::cout << "return : perm (" << cleaned_ << ") of " << r_ << std::endl;
- // for (size_t i = 0 ; i< r_ ; ++i) std::cout << P_[i] << ' ' ;
- // std::cout<<std::endl;
-
- return ;
-
- }
-
- // n_ is not computed here.
- template<class _Uint>
- BlasPermutation<_Uint>::BlasPermutation(const std::vector<_Uint> & P) :
- r_(P.size()), n_((_Uint)-1),P_(0),Q_(0),inv_(false)
- {
- if ( !r_ ) {
- // n_ = 0 ;
- return ;
- }
- P_ = P;
- return ;
-
- }
-
- // n_ is not computed here.
- template<class _Uint>
- BlasPermutation<_Uint>::BlasPermutation(const MatrixPermutation<_Uint> & P) :
- r_(P.getSize()), n_((_Uint)/*P.getSize()*/-1),P_(P.getSize()),Q_(P),inv_(false)
- {
- if ( !r_ ) {
- return ;
- }
- std::vector<_Uint> Qinv(n_);
- InvertQ_(Qinv);
- BuildP_(Qinv,Q_);
- }
-
- // n_ is computed here
- template<class _Uint>
- _Uint
- BlasPermutation<_Uint>::getSize() const
- {
- // std::cout << "getting size (" << r_ << ") :";
- // this->write(std::cout) << std::endl ;
-
- // std::cout << " was " << n_ << std::endl;
- if ( n_ == (_Uint) -1 ) { //! @warning potentially catastrophic
- if (!r_)
- n_ = 0 ;
- else
- n_ = (*(std::max_element(P_.begin(),P_.end())))+1 ;
- }
- // std::cout << " is " << n_ << std::endl;
- return n_ ;
- }
-
- template<class _Uint>
- _Uint
- BlasPermutation<_Uint>::getOrder() const
- {
- return r_ ;
- }
-
- template<class _Uint>
- void BlasPermutation<_Uint>::setOrder( size_t r)
- {
- r_ = r ;
- n_ = (_Uint) -1 ;
- }
-
-
- template<class _Uint>
- MatrixPermutation<_Uint> &
- BlasPermutation<_Uint>::Convert (MatrixPermutation<_Uint> & P)
- {
- getSize() ; // si c'était pas déjà fait...
- P.resize(n_); // sets P to identity
- for (_Uint i = 0 ; i < n_ ; ++i)
- std::swap(P[i],P[P_[i]]);
- return P ;
- }
-
- /// compresses BlasPermutation to a smaller \c r_.
- template<class _Uint>
- void BlasPermutation<_Uint>::Compress()
- {
- // std::cout << r_ << std::endl;
- if (!r_) {
- linbox_check(!n_);
- P_.resize(0) ;
- return ;
- }
- _Uint rr = r_-1 ;
- while ( rr && (P_[rr] == 0 )) --rr ; // removing trailing zeros
- while ( rr && (P_[rr] == rr )) --rr ; // useless information
- if ((rr == 0) && (P_[0] == 0)) {
- r_ = 0 ;
- n_ = 0 ;
- P_.resize(0) ;
- return ;
- }
- r_ = rr+1 ;
- P_.resize(r_,0); // done cleaning.
- n_ = -1 ;
- // recomputing n_ if lost.
- // if (n_ != (_Uint) -1) {
- // n_ = getSize();
- // }
- return ;
- }
-
- template<class _Uint>
- void BlasPermutation<_Uint>::InitQ_() const
- {
- getSize();
- Q_.resize(n_);
- for (_Uint i = 0 ; i < n_ ; ++i) Q_[i] = i ;
- }
-
- template<class _Uint>
- void BlasPermutation<_Uint>::Transpose()
- {
- Invert();
- }
-
- template<class _Uint>
- void BlasPermutation<_Uint>::Invert()
- {
- if (!r_) {
- return ;
- }
- if (inv_) {
- inv_ = false ;
- return ;
- }
- inv_ = false ;
- getSize();
- // if not already computed :
- BuildQ_();
- std::vector<_Uint> Qinv(n_) ;
- InvertQ_(Qinv);
- BuildP_(Q_,Qinv);
- Q_.resize(0);
- return ;
- }
-
- // P = convert(Q), using Qinv
- template<class _Uint>
- void BlasPermutation<_Uint>::BuildP_( std::vector<_Uint> &Q, std::vector<_Uint> &Qinv)
- {
- linbox_check( r_ );
- P_.resize(getSize());
- /* building */
- // std::cout << "Buiding P (" << n_ << ")" << std::endl;
- _Uint pi,qi,qpi ;
- for (_Uint i = 0 ;i < n_ ; ++i) {
- pi = P_[i] = Qinv[i];
- if(i == pi) continue ;
- qi = Q[i];
- qpi = Q[pi] ;
- std::swap(Q[i],Q[pi]);
- std::swap(Qinv[qi],Qinv[qpi]);
- }
- /* cleaning */
- linbox_check(n_ && (n_ != (_Uint)-1) );
- r_ = n_-1 ;
- Compress();
- // while (r && P_[r] == r) --r ;
- // if (P_[0] != 0) ++r ;
- //std::cout << "new :" << r << std::endl;
- // r_ = r ;
- // P_.resize(r_) ;
- /* rebuild Q */
- //for (_Uint i = 0 ; i < r_ ; ++i) std::swap(Q[i],Q[P_[i]]);
- }
-
- template<class _Uint>
- void BlasPermutation<_Uint>::BuildQ_() const
- {
- if ((_Uint)Q_.size() == n_) return ; // si Q_ est déjà initialisée, alors P_ == Q_
- // set Q_ to identity
- InitQ_();
- // then permute it
- // faster if P_ is ::Compress()ed
- for (_Uint i = 0 ; i < r_ ; ++i) {
- if (P_[i]>i) {
- std::swap(Q_[i],Q_[P_[i]]);
- }
- }
- return ;
- }
-
- template<class _Uint>
- bool BlasPermutation<_Uint>::CheckP_()
- {
- for (_Uint i = 0 ; i < r_ ; ++i)
- if (P_[i] && P_[i] < i)
- return false ;
- return true ;
- }
-
- template<class _Uint>
- std::vector<_Uint> & BlasPermutation<_Uint>::InvertQ_(std::vector<_Uint> & Qinv)
- {
- linbox_check(n_ != (_Uint) -1);
- for (_Uint i = 0 ; i < n_ ; ++i)
- Qinv[Q_[i]] = i ;
- return Qinv ;
- }
-
-#if 0 /* non-sense */
- template<class _Uint>
- void BlasPermutation<_Uint>::InvertQ_()
- {
- linbox_check(n_ != (_Uint) -1);
- for (_Uint i = 0 ; i < n_ ; ++i)
- Q_[Q_[i]] = i ;
- }
-#endif
-
-#if 0
- template<class _Uint>
- inline _Uint
- BlasPermutation<_Uint>::operator[](const _Uint & i)
- {
- BuildQ_() ;
- linbox_check( i<Q_.size() ) ;
- return Q_[i] ;
- }
-#endif
-
- template<class _Uint>
- inline _Uint
- BlasPermutation<_Uint>::operator[](const _Uint i) const
- {
- if (!r_) return i ;
- getSize() ;
- BuildQ_() ;
- linbox_check(n_ == Q_.size() );
- if (i >= n_)
- return i ;
- return Q_[i] ;
- }
-
-
- /* ****** */
- /* output */
- /* ****** */
- template<class _Uint>
- std::ostream & BlasPermutation<_Uint>::write (std::ostream & o, bool Lapack) const
- {
- if (Lapack) {
- o << '[' ;
- _Uint i = 0 ;
- if (r_) {
- if (r_ > 1) {
- for ( ; i < r_-1 ; ++i)
- o << P_[i] << ',';
- }
- o << P_[i] ;
- }
- o << ']' ;
- if (inv_) o << "^{-1}" ;
- o << '(' << (long int) (n_+1)-(long int)1 << ')' ;
- }
- else {
- // std::cout << "order : " << r_ << std::endl;
- // std::cout << "P_ := " << (std::vector<_Uint>)P_ << std::endl;
- // std::cout << "Q_ := " << (std::vector<_Uint>)Q_ << std::endl;
- // std::cout << Q_.size() << std::endl;
- BuildQ_() ;
- // std::cout << "Q_ := " << (std::vector<_Uint>)Q_ << std::endl;
- // std::cout << Q_.size() << std::endl;
- o << '[' ;
- _Uint i = 0 ;
- if (n_) {
- if (n_ > 1) {
- for ( ; i < n_-1 ; ++i)
- o << Q_[i] << ',';
- }
- o << Q_[i] ;
- }
- o << ']' ;
- if (inv_) o << "^{-1}" ;
- o << '(' << (long int) (n_+1)-(long int)1 << ')' ;
- }
- return o;
- }
-
- template<class _Uint>
- std::ostream & operator<<(std::ostream &o, BlasPermutation<_Uint> & P)
- {
- return P.write(o) ;
- }
-
-#if 0
-
- /* ******* */
- /* Apply */
- /* ******* */
-
- template<class _Uint>
- template<class OutVector, class InVector>
- OutVector &BlasPermutation<_Uint>::apply (OutVector &y, const InVector &x)
- {
- linbox_check((_Uint)x.size() == getSize());
- linbox_check((_Uint)y.size() == getSize());
- y = x ; // no need for Field operations...
- for (_Uint i = 0 ; i < r_ ; ++i)
- std::swap(y[i],y[P_[i]]) ;
-
- return y ;
- }
-
- template<class _Uint>
- template<class OutVector, class InVector>
- OutVector &BlasPermutation<_Uint>::applyTranspose (OutVector &y, const InVector &x)
- {
- linbox_check((_Uint)x.size() == getSize());
- linbox_check((_Uint)y.size() == getSize());
- y = x ; // no need for Field operations...
- _Uint i = r_ ;
- for ( ; i-- ; )
- std::swap(y[i],y[P_[i]]) ;
-
- return y ;
- }
-
-#endif
-
-#if 0
- /* *************** */
- /* Transposition */
- /* *************** */
-
- template<class _Uint>
- void BlasPermutation<_Uint>::TransposeRows(_Uint i, _Uint j)
- {
- if (i == j) return ;
- linbox_check(i<getSize());
- linbox_check(j<getSize());
- BuildQ_() ;
- std::vector<_Uint> Qinv(n_) ;
- InvertQ_(Qinv);
- std::swap(Q_[Qinv[i]],Q_[Qinv[j]]);
- std::swap(Qinv[i],Qinv[j]);
- BuildP_(Qinv,Q_);
- Q_.resize(0);
-
- }
-
- template<class _Uint>
- void BlasPermutation<_Uint>::TransposeCols(_Uint i, _Uint j)
- {
- if (i == j) return ;
- linbox_check(i<getSize());
- linbox_check(j<getSize());
- BuildQ_() ;
- std::swap(Q_[i],Q_[j]);
- std::vector<_Uint> Qinv(n_) ;
- InvertQ_(Qinv);
- BuildP_(Qinv,Q_);
- Q_.resize(0);
-
- }
-#endif
-
-}
-
-
-namespace LinBox
-{
- template<class _Uint>
- MatrixPermutation<_Uint>::MatrixPermutation() :
- n_(0), P_(0)
- {}
-
- template<class _Uint>
- MatrixPermutation<_Uint>::MatrixPermutation(const _Uint *P, const _Uint &n) :
- n_(n), P_(n)
- {
- for (_Uint i = 0 ; i < n ; ++i)
- P_[i] = P[i] ;
- }
-
- template<class _Uint>
- MatrixPermutation<_Uint>::MatrixPermutation(const std::vector<_Uint> & P) :
- n_(P.size()), P_(P)
- {}
-
- template<class _Uint>
- inline _Uint
- MatrixPermutation<_Uint>::operator[](const _Uint i) const
- {
- return P_[i] ;
- }
-
-
- template<class _Uint>
- _Uint
- MatrixPermutation<_Uint>::getSize() const
- { return n_ ; }
-
- template<class _Uint>
- void
- MatrixPermutation<_Uint>::resize( _Uint n)
- {
- if (n < n_) {
-#ifdef DEBUG
- /* checking that we do only remove terms
- * that don't alter the fact P_ is a permuation of [[1,n]].
- */
- bool lost = false ;
- for (_Uint i = n ; !lost && i < n_ ; ++i)
- if (P_[i]<n-1) lost = true ;
- if (lost)
- std::cerr << "Warning ! (in " << __FILE__ << " at " << __func__ << " (" << __LINE__ << ") your permutation is no longer consistent" << std::endl;
-#endif
- }
- /* resizing to identity */
- P_.resize(n);
- for (_Uint i = n_ ; i< n ; ++i)
- P_[i] = i ;
- n_ = n ;
-
- return ;
- }
-
-
- /* ****** */
- /* output */
- /* ****** */
- template<class _Uint>
- std::ostream & MatrixPermutation<_Uint>::write (std::ostream & o) const
- {
- o << '[' ;
- for (_Uint i = 0 ; i < n_ ; ++i)
- { o << P_[i] ; if (i< n_-1) o << ','; }
- o << ']' ;
- return o;
- }
-
-
- template<class _Uint>
- std::ostream & operator<<(std::ostream &o, MatrixPermutation<_Uint> & P)
- {
- return P.write(o) ;
- }
-
- template<class _Uint>
- void MatrixPermutation<_Uint>::Transpose()
- {
- /* out of place */
- std::vector<_Uint> Q(n_) ;
- for (_Uint i = 0 ; i < (_Uint) n_ ; ++i)
- Q[P_[i]] = i ;
- P_ = Q ;
- /* in place */
- //! @todo in place ! (revient à parcourir des cycles)
-
- }
-
- template<class _Uint>
- void MatrixPermutation<_Uint>::Invert()
- {
- Transpose() ;
- }
-
- template<class _Uint>
- MatrixPermutation<_Uint> & MatrixPermutation<_Uint>::Transpose(MatrixPermutation<_Uint> &Mt)
- {
- //Mt(*this);
- Mt.P_ = P_;
- Mt.n_ = n_;
- Mt.Transpose();
- return Mt ;
- }
-
- template<class _Uint>
- MatrixPermutation<_Uint> & MatrixPermutation<_Uint>::Invert(MatrixPermutation<_Uint> &Mt)
- {
- return Transpose(Mt) ;
- }
-
-
- // MatPerm & TransposeCols(_UnsignedInt i, _UnsignedInt j);
-
- template<class _Uint>
- template<class OutVector, class InVector>
- OutVector &MatrixPermutation<_Uint>::apply (OutVector &y, const InVector &x) const
- {
- linbox_check((_Uint)x.size() == n_);
- linbox_check((_Uint)y.size() == n_);
- _Uint i = n_;
- for (;i--;)
- y[i] = x[P_[i]] ; // no need for Field operations...
-
- return y ;
- }
-
- template<class _Uint>
- template<class OutVector, class InVector>
- OutVector &MatrixPermutation<_Uint>::applyTranspose (OutVector &y, const InVector &x) const
- {
- linbox_check((_Uint)x.size() == n_);
- linbox_check((_Uint)y.size() == n_);
- _Uint i = n_;
- for (;i--;)
- y[P_[i]] = x[i] ; // no need for Field operations...
-
- return y ;
- }
-
- template<class _Uint>
- void MatrixPermutation<_Uint>::TransposeCols(_Uint i, _Uint j)
- {
- linbox_check(i<n_);
- linbox_check(j<n_);
- if (i == j) return ;
- std::swap(P_[i],P_[j]);
- }
-
- template<class _Uint>
- void MatrixPermutation<_Uint>::TransposeRows(_Uint i, _Uint j)
- {
- linbox_check(i<n_);
- linbox_check(j<n_);
- if (i == j) return ;
- _Uint iloc = 0 ;
- _Uint jloc = 0 ;
- _Uint l = 0 ;
- for ( ; l < n_ && !(iloc && jloc) ; ++l)
- if (P_[l] == i)
- iloc = l+1;
- else if (P_[l] == j)
- jloc = l+1;
- linbox_check(iloc);
- linbox_check(jloc);
- --iloc ;
- --jloc ;
- std::swap(P_[iloc],P_[jloc]);
-
- }
-
-}
-
-#endif //__LINBOX_matrix_permutation_INL
-
diff --git a/linbox/matrix/matrix.doxy b/linbox/matrix/matrix.doxy
index 25a5d52..a431893 100644
--- a/linbox/matrix/matrix.doxy
+++ b/linbox/matrix/matrix.doxy
@@ -1,4 +1,23 @@
// Copyright 2010 LinBox. See COPYING for licence information.
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** \ingroup linbox
\defgroup matrix matrix
diff --git a/linbox/matrix/permutation-matrix.h b/linbox/matrix/permutation-matrix.h
new file mode 100644
index 0000000..ad3c41d
--- /dev/null
+++ b/linbox/matrix/permutation-matrix.h
@@ -0,0 +1,281 @@
+
+/* Copyright (C) 2010 LinBox
+ * Written by <brice.boyer at imag.fr>
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/** @file matrix/permutation-matrix.h
+ * @ingroup matrix
+ * A permutation class for operations on permutations, their representations
+ * and matrix row/column permuting.
+ *
+ * We provide a \ref LinBox::BlasPermutation class that stores the
+ * permutation packed in a Lapack style and a \ref LinBox::MatrixPermutation
+ * class that represents a permutation naturally. Converstions are provided.
+ */
+
+#ifndef __LINBOX_matrix_permutation_H
+#define __LINBOX_matrix_permutation_H
+
+#include <vector>
+#include <ostream>
+
+
+// BlasPermutation
+namespace LinBox
+{
+
+
+ // forward declaration
+ template<class _UnsignedInt>
+ class MatrixPermutation ;
+
+ template<class _UnsignedInt>
+ class BlasPermutation ;
+
+ /** Lapack-style permutation.
+ * @ingroup permutation
+ *
+ * A Lapack permutation is represented with a vector \f$[p_1,p_2,\cdots, p_r]\f$
+ * such that \f$p_i > i\f$. Converting it to a classic representation
+ * of a permutation corresponds to taking an identity permutation and
+ * then successively permuting \f$(i,p_i)\f$.
+ * Example : if <code>P=[1,4,4]</code> and <code>V=[1,2,3,4,5]</code>, then <code>P.V=[1,4,2,3,5]</code>.
+ * @internal
+ * @pre if \c Q_ is built, then \c P_=Q_
+ */
+ template<class _UnsignedInt> // unsigned * ou Integer
+ class BlasPermutation /* : PermutationInterface<_UnsignedInt> */ {
+ typedef BlasPermutation<_UnsignedInt> BlasPerm ;
+ public :
+ BlasPermutation() ;
+ ~BlasPermutation() ;
+
+ BlasPermutation(size_t n) ;
+
+ BlasPermutation(const _UnsignedInt * V, const _UnsignedInt & n) ;
+ BlasPermutation(const std::vector<_UnsignedInt> & V);
+ BlasPermutation(const MatrixPermutation<_UnsignedInt> &M);
+
+
+ //! copy operator (with copy)
+ BlasPermutation<_UnsignedInt>& operator= (const BlasPermutation<_UnsignedInt> & P)
+ {
+ r_ = P.r_;
+ n_ = P.n_;
+ P_ = P.P_;
+ Q_ = P.Q_;
+ inv_ = P.inv_ ;
+
+ return (*this) ;
+ }
+
+ /*! Returns the size of the permuation.
+ * If given, we return \p n as we see \p P in \f$S_n\f$.
+ * We default to the order of the permutation (minimal such \p n)
+ */
+ _UnsignedInt getSize() const ;
+ // _UnsignedInt getOrder() ;
+
+ /*! Returns the order of the permuation */
+ _UnsignedInt getOrder() const ;
+ void setOrder( size_t r) ;
+
+ //! returns a copy of the raw storage.
+ std::vector<_UnsignedInt> getStorage() const
+ {
+ return P_;
+ };
+
+ // resize a blas permutation.
+ void resize(_UnsignedInt s, bool with_zeros=true)
+ {
+ if (s < r_) {
+ r_ = s ;
+#ifndef NDEBUG
+ std::cout << "*** Warning *** you are resizing a Blas Permutation (possibly corrupting it)" << std::endl;
+#endif
+ }
+ n_ = s ;
+ P_.resize(s);
+ if (Q_.size())
+ Q_.resize(s);
+ }
+
+ // template<class OutVector, class InVector>
+ // OutVector &apply (OutVector &y, const InVector &x) ;
+ // template<class OutVector, class InVector>
+ // OutVector &applyTranspose (OutVector &y, const InVector &x) ;
+
+ /* properties */
+ bool isIdentity() const
+ {
+ return (!r_);
+ }
+
+ /* convert */
+ /*! Converts a \c BlasPermutation to a \c MatrixPermutation.
+ * @param[out] P MatrixPermutation to be created. Need not be initialized.
+ */
+ MatrixPermutation<_UnsignedInt> & Convert(MatrixPermutation<_UnsignedInt> &P);
+
+ /* apply */
+ // /*! \f$ M \gets P M\f$ */
+ // template<class Matrix>
+ // Matrix & applyRows(Matrix &M);
+ // /*! \f$ M \gets M P\f$ */
+ // template<class Matrix>
+ // Matrix & applyCols(Matrix &M);
+
+ // /*! \f$ M \gets M P^t\f$ */
+ // template<class Matrix>
+ // Matrix & applyTransposeRows(Matrix &M);
+ // /*! \f$ M \gets P^t M\f$ */
+ // template<class Matrix>
+ // Matrix & applyTransposeCols(Matrix &M);
+
+ //_UnsignedInt & operator[] (const _UnsignedInt &i) ;
+ _UnsignedInt operator[] (const _UnsignedInt i) const ;
+
+ // /*! col \p i and col \p j are swapped
+ // */
+ // void TransposeCols(_UnsignedInt i, _UnsignedInt j);
+
+ // /*! row \p i and row \p j are swapped
+ // */
+ // void TransposeRows(_UnsignedInt i, _UnsignedInt j);
+
+ const _UnsignedInt* getPointer() const
+ {
+ linbox_check(P_.size());
+ return &P_[0];
+ }
+
+ _UnsignedInt* getWritePointer()
+ {
+ linbox_check(P_.size());
+ return &P_[0];
+ }
+
+ /* invert */
+ void Transpose();
+ void Invert();
+ BlasPerm & Transpose(BlasPerm &Mt);
+ BlasPerm & Invert(BlasPerm &Mt);
+
+ /* clean */
+ void Compress() ;
+
+ /* print */
+ /*! writes on output stream \p o */
+ std::ostream & write(std::ostream & o, bool Lapack=true) const ;
+
+ /*! writes \p P on output stream \p o */
+ template<class _Uint>
+ friend std::ostream & operator<<(std::ostream &o, BlasPerm & P) ;
+
+
+ protected :
+ _UnsignedInt r_ ; // size of compressed permutation
+ mutable _UnsignedInt n_ ; // dim of permutation
+ std::vector<_UnsignedInt> P_ ; // internal blas permutation
+ mutable std::vector<_UnsignedInt> Q_ ; // corresponding matrix permutation
+ bool inv_ ; // matrix is inverted ?
+
+ void BuildQ_() const ;
+ void InvertQ_();
+ std::vector<_UnsignedInt> &InvertQ_(std::vector<_UnsignedInt> & Qinv);
+ void BuildP_(std::vector<_UnsignedInt>&Q, std::vector<_UnsignedInt>&Qinv);
+ bool CheckP_();
+ void InitQ_() const ;
+
+
+ };
+} // LinBox
+
+// MatrixPermutation
+namespace LinBox
+{
+
+ /*! Permutation classique.
+ * @ingroup permutation
+ */
+ template<class _UnsignedInt>
+ class MatrixPermutation /* : PermutationInterface<_UnsignedInt> */ {
+ typedef MatrixPermutation<_UnsignedInt> Self_t ;
+ private :
+ _UnsignedInt n_ ; // order of permutation
+ std::vector<_UnsignedInt> P_ ; // _M_[i] = j ssi P(i) = j
+
+ public :
+ MatrixPermutation();
+ ~MatrixPermutation() {};
+ MatrixPermutation(const _UnsignedInt * V, const _UnsignedInt & n) ;
+ MatrixPermutation(const std::vector<_UnsignedInt> & V) ;
+
+ _UnsignedInt operator[] (const _UnsignedInt i) const ;
+ _UnsignedInt getSize() const ;
+ // _UnsignedInt getSize() ;
+
+ void resize( _UnsignedInt n ) ;
+
+ void Transpose();
+ void Invert();
+ Self_t & Transpose(Self_t &Mt);
+ Self_t & Invert(Self_t &Mt);
+
+
+
+ /* print */
+ /*! writes on output stream \p o */
+ std::ostream & write(std::ostream & o) const ;
+
+ /*! writes \p P on output stream \p o */
+ template<class _Uint>
+ friend std::ostream & operator<<(std::ostream &o, Self_t & P) ;
+
+ template<class OutVector, class InVector>
+ OutVector &apply (OutVector &y, const InVector &x) const ;
+ template<class OutVector, class InVector>
+ OutVector &applyTranspose (OutVector &y, const InVector &x) const ;
+
+
+ void TransposeRows(_UnsignedInt i, _UnsignedInt j);
+ void TransposeCols(_UnsignedInt i, _UnsignedInt j);
+
+ };
+
+} // LinBox
+
+
+#include "permutation-matrix.inl"
+
+#endif //__LINBOX_matrix_permutation_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/permutation-matrix.inl b/linbox/matrix/permutation-matrix.inl
new file mode 100644
index 0000000..8f5edba
--- /dev/null
+++ b/linbox/matrix/permutation-matrix.inl
@@ -0,0 +1,620 @@
+
+/* Copyright (C) 2010 LinBox
+ * Written by <brice.boyer at imag.fr>
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+/** @internal
+ * @file permutation-permutation.inl
+ * @brief Implementation of permutation-matrix.h
+ */
+
+#ifndef __LINBOX_matrix_permutation_INL
+#define __LINBOX_matrix_permutation_INL
+
+#define _LB_DBG
+
+#include <algorithm>
+#include "linbox/util/debug.h"
+
+// BlasPermutation
+namespace LinBox
+{
+ template<class _Uint>
+ BlasPermutation<_Uint>::BlasPermutation() :
+ r_(0),n_((_Uint)-1),P_(0),Q_(0),inv_(false)
+ {
+#ifndef NDEBUG
+ std::cout << "NULL permutation created. Beware !" << std::endl;
+#endif
+ }
+
+ template<class _Uint>
+ BlasPermutation<_Uint>::BlasPermutation(size_t n) :
+ r_(n),n_((_Uint)-1),P_(n),Q_(0),inv_(false)
+ { }
+
+
+ template<class _Uint>
+ BlasPermutation<_Uint>::~BlasPermutation() {}
+
+ // n_ is not computed here.
+ template<class _Uint>
+ BlasPermutation<_Uint>::BlasPermutation(const _Uint *P, const _Uint & r ) :
+ r_(r), n_((_Uint)-1),P_(0),Q_(0),inv_(false)
+ {
+ // std::cout << "CTOR 2" << std::endl;
+ // std::cout << "got : perm of " << r << std::endl;
+ // for (size_t i = 0 ; i< r ; ++i) std::cout << P[i] << ' ' ;
+ // std::cout<<std::endl;
+ if (!r) {
+ // n_ = 0 ;
+ return ;
+ }
+ P_.resize(r_);
+ for (_Uint i = 0 ; i < r_ ; ++i) {
+ P_[i] = P[i] ;
+ }
+
+ // std::cout << "return : perm (" << cleaned_ << ") of " << r_ << std::endl;
+ // for (size_t i = 0 ; i< r_ ; ++i) std::cout << P_[i] << ' ' ;
+ // std::cout<<std::endl;
+
+ return ;
+
+ }
+
+ // n_ is not computed here.
+ template<class _Uint>
+ BlasPermutation<_Uint>::BlasPermutation(const std::vector<_Uint> & P) :
+ r_(P.size()), n_((_Uint)-1),P_(0),Q_(0),inv_(false)
+ {
+ if ( !r_ ) {
+ // n_ = 0 ;
+ return ;
+ }
+ P_ = P;
+ return ;
+
+ }
+
+ // n_ is not computed here.
+ template<class _Uint>
+ BlasPermutation<_Uint>::BlasPermutation(const MatrixPermutation<_Uint> & P) :
+ r_(P.getSize()), n_((_Uint)/*P.getSize()*/-1),P_(P.getSize()),Q_(P),inv_(false)
+ {
+ if ( !r_ ) {
+ return ;
+ }
+ std::vector<_Uint> Qinv(n_);
+ InvertQ_(Qinv);
+ BuildP_(Qinv,Q_);
+ }
+
+ // n_ is computed here
+ template<class _Uint>
+ _Uint
+ BlasPermutation<_Uint>::getSize() const
+ {
+ // std::cout << "getting size (" << r_ << ") :";
+ // this->write(std::cout) << std::endl ;
+
+ // std::cout << " was " << n_ << std::endl;
+ if ( n_ == (_Uint) -1 ) { //! @warning potentially catastrophic
+ if (!r_)
+ n_ = 0 ;
+ else
+ n_ = (*(std::max_element(P_.begin(),P_.end())))+1 ;
+ }
+ // std::cout << " is " << n_ << std::endl;
+ return n_ ;
+ }
+
+ template<class _Uint>
+ _Uint
+ BlasPermutation<_Uint>::getOrder() const
+ {
+ return r_ ;
+ }
+
+ template<class _Uint>
+ void BlasPermutation<_Uint>::setOrder( size_t r)
+ {
+ r_ = r ;
+ n_ = (_Uint) -1 ;
+ }
+
+
+ template<class _Uint>
+ MatrixPermutation<_Uint> &
+ BlasPermutation<_Uint>::Convert (MatrixPermutation<_Uint> & P)
+ {
+ getSize() ; // si c'était pas déjà fait...
+ P.resize(n_); // sets P to identity
+ for (_Uint i = 0 ; i < n_ ; ++i)
+ std::swap(P[i],P[P_[i]]);
+ return P ;
+ }
+
+ /// compresses BlasPermutation to a smaller \c r_.
+ template<class _Uint>
+ void BlasPermutation<_Uint>::Compress()
+ {
+ // std::cout << r_ << std::endl;
+ if (!r_) {
+ linbox_check(!n_);
+ P_.resize(0) ;
+ return ;
+ }
+ _Uint rr = r_-1 ;
+ while ( rr && (P_[rr] == 0 )) --rr ; // removing trailing zeros
+ while ( rr && (P_[rr] == rr )) --rr ; // useless information
+ if ((rr == 0) && (P_[0] == 0)) {
+ r_ = 0 ;
+ n_ = 0 ;
+ P_.resize(0) ;
+ return ;
+ }
+ r_ = rr+1 ;
+ P_.resize(r_,0); // done cleaning.
+ n_ = -1 ;
+ // recomputing n_ if lost.
+ // if (n_ != (_Uint) -1) {
+ // n_ = getSize();
+ // }
+ return ;
+ }
+
+ template<class _Uint>
+ void BlasPermutation<_Uint>::InitQ_() const
+ {
+ getSize();
+ Q_.resize(n_);
+ for (_Uint i = 0 ; i < n_ ; ++i) Q_[i] = i ;
+ }
+
+ template<class _Uint>
+ void BlasPermutation<_Uint>::Transpose()
+ {
+ Invert();
+ }
+
+ template<class _Uint>
+ void BlasPermutation<_Uint>::Invert()
+ {
+ if (!r_) {
+ return ;
+ }
+ if (inv_) {
+ inv_ = false ;
+ return ;
+ }
+ inv_ = false ;
+ getSize();
+ /* if not already computed, build standard permuation Q_ */
+ BuildQ_();
+ std::vector<_Uint> Qinv(n_) ;
+ /* invert standard matrix Q_*/
+ InvertQ_(Qinv);
+ /* recover P_ from Qinv) */
+ BuildP_(Q_,Qinv);
+ /* free Q_ (no longer representing P_ */
+ Q_.resize(0); // Q_ = Qinv ?
+ return ;
+ }
+
+ // P = convert(Q), using Qinv
+ template<class _Uint>
+ void BlasPermutation<_Uint>::BuildP_( std::vector<_Uint> &Q, std::vector<_Uint> &Qinv)
+ {
+ linbox_check( r_ );
+ P_.resize(getSize());
+ /* building */
+ // std::cout << "Buiding P (" << n_ << ")" << std::endl;
+ _Uint pi,qi,qpi ;
+ for (_Uint i = 0 ;i < n_ ; ++i) {
+ pi = P_[i] = Qinv[i];
+ if(i == pi) continue ;
+ qi = Q[i];
+ qpi = Q[pi] ;
+ std::swap(Q[i],Q[pi]);
+ std::swap(Qinv[qi],Qinv[qpi]);
+ }
+ /* cleaning */
+ linbox_check(n_ && (n_ != (_Uint)-1) );
+ r_ = n_-1 ;
+ Compress();
+ }
+
+ // apply P_ to identity to get Q_
+ template<class _Uint>
+ void BlasPermutation<_Uint>::BuildQ_() const
+ {
+ if ((_Uint)Q_.size() == n_) return ; // si Q_ est déjà initialisée, alors P_ == Q_
+ // set Q_ to identity
+ InitQ_();
+ // then permute it
+ // faster if P_ is ::Compress()ed
+ for (_Uint i = 0 ; i < r_ ; ++i) {
+ if (P_[i]>i) {
+ std::swap(Q_[i],Q_[P_[i]]);
+ }
+ }
+ return ;
+ }
+
+ template<class _Uint>
+ bool BlasPermutation<_Uint>::CheckP_()
+ {
+ for (_Uint i = 0 ; i < r_ ; ++i)
+ if (P_[i] && P_[i] < i)
+ return false ;
+ return true ;
+ }
+
+ // invert a standard permutation
+ template<class _Uint>
+ std::vector<_Uint> & BlasPermutation<_Uint>::InvertQ_(std::vector<_Uint> & Qinv)
+ {
+ linbox_check(n_ != (_Uint) -1);
+ for (_Uint i = 0 ; i < n_ ; ++i)
+ Qinv[Q_[i]] = i ;
+ return Qinv ;
+ }
+
+#if 0
+ template<class _Uint>
+ inline _Uint
+ BlasPermutation<_Uint>::operator[](const _Uint & i)
+ {
+ BuildQ_() ;
+ linbox_check( i<Q_.size() ) ;
+ return Q_[i] ;
+ }
+#endif
+
+ template<class _Uint>
+ inline _Uint
+ BlasPermutation<_Uint>::operator[](const _Uint i) const
+ {
+ if (!r_) return i ;
+ getSize() ;
+ BuildQ_() ;
+ linbox_check(n_ == Q_.size() );
+ if (i >= n_)
+ return i ;
+ return Q_[i] ;
+ }
+
+
+ /* ****** */
+ /* output */
+ /* ****** */
+ template<class _Uint>
+ std::ostream & BlasPermutation<_Uint>::write (std::ostream & o, bool Lapack) const
+ {
+ if (Lapack) {
+ o << '[' ;
+ _Uint i = 0 ;
+ if (r_) {
+ if (r_ > 1) {
+ for ( ; i < r_-1 ; ++i)
+ o << P_[i] << ',';
+ }
+ o << P_[i] ;
+ }
+ o << ']' ;
+ if (inv_) o << "^{-1}" ;
+ o << '(' << (long int) (n_+1)-(long int)1 << ')' ;
+ }
+ else {
+ // std::cout << "order : " << r_ << std::endl;
+ // std::cout << "P_ := " << (std::vector<_Uint>)P_ << std::endl;
+ // std::cout << "Q_ := " << (std::vector<_Uint>)Q_ << std::endl;
+ // std::cout << Q_.size() << std::endl;
+ BuildQ_() ;
+ // std::cout << "Q_ := " << (std::vector<_Uint>)Q_ << std::endl;
+ // std::cout << Q_.size() << std::endl;
+ o << '[' ;
+ _Uint i = 0 ;
+ if (n_) {
+ if (n_ > 1) {
+ for ( ; i < n_-1 ; ++i)
+ o << Q_[i] << ',';
+ }
+ o << Q_[i] ;
+ }
+ o << ']' ;
+ if (inv_) o << "^{-1}" ;
+ o << '(' << (long int) (n_+1)-(long int)1 << ')' ;
+ }
+ return o;
+ }
+
+ template<class _Uint>
+ std::ostream & operator<<(std::ostream &o, BlasPermutation<_Uint> & P)
+ {
+ return P.write(o) ;
+ }
+
+#if 0
+
+ /* ******* */
+ /* Apply */
+ /* ******* */
+
+ template<class _Uint>
+ template<class OutVector, class InVector>
+ OutVector &BlasPermutation<_Uint>::apply (OutVector &y, const InVector &x)
+ {
+ linbox_check((_Uint)x.size() == getSize());
+ linbox_check((_Uint)y.size() == getSize());
+ y = x ; // no need for Field operations...
+ for (_Uint i = 0 ; i < r_ ; ++i)
+ std::swap(y[i],y[P_[i]]) ;
+
+ return y ;
+ }
+
+ template<class _Uint>
+ template<class OutVector, class InVector>
+ OutVector &BlasPermutation<_Uint>::applyTranspose (OutVector &y, const InVector &x)
+ {
+ linbox_check((_Uint)x.size() == getSize());
+ linbox_check((_Uint)y.size() == getSize());
+ y = x ; // no need for Field operations...
+ _Uint i = r_ ;
+ for ( ; i-- ; )
+ std::swap(y[i],y[P_[i]]) ;
+
+ return y ;
+ }
+
+#endif
+
+#if 0
+ /* *************** */
+ /* Transposition */
+ /* *************** */
+
+ template<class _Uint>
+ void BlasPermutation<_Uint>::TransposeRows(_Uint i, _Uint j)
+ {
+ if (i == j) return ;
+ linbox_check(i<getSize());
+ linbox_check(j<getSize());
+ BuildQ_() ;
+ std::vector<_Uint> Qinv(n_) ;
+ InvertQ_(Qinv);
+ std::swap(Q_[Qinv[i]],Q_[Qinv[j]]);
+ std::swap(Qinv[i],Qinv[j]);
+ BuildP_(Qinv,Q_);
+ Q_.resize(0);
+
+ }
+
+ template<class _Uint>
+ void BlasPermutation<_Uint>::TransposeCols(_Uint i, _Uint j)
+ {
+ if (i == j) return ;
+ linbox_check(i<getSize());
+ linbox_check(j<getSize());
+ BuildQ_() ;
+ std::swap(Q_[i],Q_[j]);
+ std::vector<_Uint> Qinv(n_) ;
+ InvertQ_(Qinv);
+ BuildP_(Qinv,Q_);
+ Q_.resize(0);
+
+ }
+#endif
+
+}
+
+
+namespace LinBox
+{
+ template<class _UnsignedInt>
+ MatrixPermutation<_UnsignedInt>::MatrixPermutation() :
+ n_(0), P_(0)
+ {}
+
+ template<class _UnsignedInt>
+ MatrixPermutation<_UnsignedInt>::MatrixPermutation(const _UnsignedInt *P, const _UnsignedInt &n) :
+ n_(n), P_(n)
+ {
+ for (_UnsignedInt i = 0 ; i < n ; ++i)
+ P_[i] = P[i] ;
+ }
+
+ template<class _UnsignedInt>
+ MatrixPermutation<_UnsignedInt>::MatrixPermutation(const std::vector<_UnsignedInt> & P) :
+ n_(P.size()), P_(P)
+ {}
+
+ template<class _UnsignedInt>
+ inline _UnsignedInt
+ MatrixPermutation<_UnsignedInt>::operator[](const _UnsignedInt i) const
+ {
+ return P_[i] ;
+ }
+
+
+ template<class _UnsignedInt>
+ _UnsignedInt
+ MatrixPermutation<_UnsignedInt>::getSize() const
+ { return n_ ; }
+
+ template<class _UnsignedInt>
+ void
+ MatrixPermutation<_UnsignedInt>::resize( _UnsignedInt n)
+ {
+ if (n < n_) {
+#ifdef DEBUG
+ /* checking that we do only remove terms
+ * that don't alter the fact P_ is a permuation of [[1,n]].
+ */
+ bool lost = false ;
+ for (_UnsignedInt i = n ; !lost && i < n_ ; ++i)
+ if (P_[i]<n-1) lost = true ;
+ if (lost)
+ std::cerr << "Warning ! (in " << __FILE__ << " at " << __func__ << " (" << __LINE__ << ") your permutation is no longer consistent" << std::endl;
+#endif
+ }
+ /* resizing to identity */
+ P_.resize(n);
+ for (_UnsignedInt i = n_ ; i< n ; ++i)
+ P_[i] = i ;
+ n_ = n ;
+
+ return ;
+ }
+
+
+ /* ****** */
+ /* output */
+ /* ****** */
+ template<class _UnsignedInt>
+ std::ostream & MatrixPermutation<_UnsignedInt>::write (std::ostream & o) const
+ {
+ o << '[' ;
+ for (_UnsignedInt i = 0 ; i < n_ ; ++i)
+ { o << P_[i] ; if (i< n_-1) o << ','; }
+ o << ']' ;
+ return o;
+ }
+
+
+ template<class _UnsignedInt>
+ std::ostream & operator<<(std::ostream &o, MatrixPermutation<_UnsignedInt> & P)
+ {
+ return P.write(o) ;
+ }
+
+ template<class _UnsignedInt>
+ void MatrixPermutation<_UnsignedInt>::Transpose()
+ {
+ /* not in place */
+ std::vector<_UnsignedInt> Q(n_) ;
+ for (_UnsignedInt i = 0 ; i < (_UnsignedInt) n_ ; ++i)
+ Q[P_[i]] = i ;
+ P_ = Q ;
+ /* in place */
+ //! @todo in place ! (revient à parcourir des cycles)
+
+ }
+
+ template<class _UnsignedInt>
+ void MatrixPermutation<_UnsignedInt>::Invert()
+ {
+ Transpose() ;
+ }
+
+ template<class _UnsignedInt>
+ MatrixPermutation<_UnsignedInt> & MatrixPermutation<_UnsignedInt>::Transpose(Self_t &Mt)
+ {
+ //Mt(*this);
+ Mt.P_ = P_;
+ Mt.n_ = n_;
+ Mt.Transpose();
+ return Mt ;
+ }
+
+ template<class _UnsignedInt>
+ MatrixPermutation<_UnsignedInt> & MatrixPermutation<_UnsignedInt>::Invert(Self_t &Mt)
+ {
+ return Transpose(Mt) ;
+ }
+
+
+ // Self_t & TransposeCols(_UnsignedInt i, _UnsignedInt j);
+
+ template<class _UnsignedInt>
+ template<class OutVector, class InVector>
+ OutVector &MatrixPermutation<_UnsignedInt>::apply (OutVector &y, const InVector &x) const
+ {
+ linbox_check((_UnsignedInt)x.size() == n_);
+ linbox_check((_UnsignedInt)y.size() == n_);
+ _UnsignedInt i = n_;
+ for (;i--;)
+ y[i] = x[P_[i]] ; // no need for Field operations...
+
+ return y ;
+ }
+
+ template<class _UnsignedInt>
+ template<class OutVector, class InVector>
+ OutVector &MatrixPermutation<_UnsignedInt>::applyTranspose (OutVector &y, const InVector &x) const
+ {
+ linbox_check((_UnsignedInt)x.size() == n_);
+ linbox_check((_UnsignedInt)y.size() == n_);
+ _UnsignedInt i = n_;
+ for (;i--;)
+ y[P_[i]] = x[i] ; // no need for Field operations...
+
+ return y ;
+ }
+
+ template<class _UnsignedInt>
+ void MatrixPermutation<_UnsignedInt>::TransposeCols(_UnsignedInt i, _UnsignedInt j)
+ {
+ linbox_check(i<n_);
+ linbox_check(j<n_);
+ if (i == j) return ;
+ std::swap(P_[i],P_[j]);
+ }
+
+ template<class _UnsignedInt>
+ void MatrixPermutation<_UnsignedInt>::TransposeRows(_UnsignedInt i, _UnsignedInt j)
+ {
+ linbox_check(i<n_);
+ linbox_check(j<n_);
+ if (i == j) return ;
+ _UnsignedInt iloc = 0 ;
+ _UnsignedInt jloc = 0 ;
+ _UnsignedInt l = 0 ;
+ for ( ; l < n_ && !(iloc && jloc) ; ++l)
+ if (P_[l] == i)
+ iloc = l+1;
+ else if (P_[l] == j)
+ jloc = l+1;
+ linbox_check(iloc);
+ linbox_check(jloc);
+ --iloc ;
+ --jloc ;
+ std::swap(P_[iloc],P_[jloc]);
+
+ }
+
+}
+
+#endif //__LINBOX_matrix_permutation_INL
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/random-matrix.h b/linbox/matrix/random-matrix.h
index e5a72bd..eb8650c 100644
--- a/linbox/matrix/random-matrix.h
+++ b/linbox/matrix/random-matrix.h
@@ -3,10 +3,13 @@
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/** @file matrix/random-matrix.h
@@ -33,7 +36,7 @@
#include "linbox/matrix/blas-matrix.h"
#include "linbox/randiter/random-integer.h"
#include "linbox/randiter/random-prime.h"
-#include "linbox/matrix/matrix-permutation.h"
+#include "linbox/matrix/permutation-matrix.h"
#include "linbox/algorithms/blas-domain.h"
#include "linbox/algorithms/cra-domain.h"
@@ -42,32 +45,34 @@
namespace LinBox
{
- struct zarb {
- zarb() {}
- } ;
- struct _LU_ : public zarb {
- _LU_(){}
- } ;
- // LU_sparse_,
- // LU_cra_,
- struct _Rank_update_ : public zarb {
- _Rank_update_() {}
- } ;
-
- /// random method for constructing rank
- struct RankBuilder {
- // private :
- // balancedLC_
- // public:
- typedef _LU_ LU_ ;
- typedef _Rank_update_ Rank_update_ ;
- RankBuilder(){}
- };
+ // non dependant struct -> out of class.
+ struct RankBuildMethod {
+ RankBuildMethod() {}
+ } ;
+ struct _LU_ : public RankBuildMethod {
+ _LU_(){}
+ } ;
+ // LU_sparse_,
+ // LU_cra_,
+ struct _Rank_update_ : public RankBuildMethod {
+ _Rank_update_() {}
+ } ;
+
+ /// random method for constructing rank
+ struct RankBuilder {
+ // private :
+ // balancedLC_
+ // public:
+ typedef _LU_ LU_ ;
+ typedef _Rank_update_ Rank_update_ ;
+ RankBuilder(){}
+ };
/// Random Dense Matrix builder.
template<class Randiter, class Field>
class RandomDenseMatrix {
+
protected:
private :
@@ -98,32 +103,31 @@ namespace LinBox
Matrix & random(Matrix & A) ;
/*! provide a matrix with prescribed rank.
+ * Default method.
+ * @param A
+ * @param rank expected rank
+ * @warning No certificate yet.
+ */
+ template<class Matrix>
+ Matrix & randomRank(Matrix & A, int rank);
+
+
+ /*! provide a matrix with prescribed rank.
+ * @param A
* @param rank expected rank
* @param meth how is the matrix generated ? see \ref RankBuilder.
* @warning No certificate yet.
*/
- template<class Matrix,class Method>
- Matrix & randomRank(Matrix & A, int rank
- , const Method & meth );
template<class Matrix>
Matrix & randomRank(Matrix & A, int rank
, const RankBuilder::LU_ & meth );
-
template<class Matrix>
Matrix & randomRank(Matrix & A, int rank
, const RankBuilder::Rank_update_ & meth );
- /*! provide a matrix with prescribed rank.
- * Default method.
- * @param rank expected rank
- * @warning No certificate yet.
- */
- template<class Matrix>
- Matrix & randomRank(Matrix & A, int rank);
-
// template<class Matrix>
// void randomInvertible();
@@ -134,501 +138,22 @@ namespace LinBox
// return A = A_ ;
// }
- };
-
- template<class Randiter, class Field>
- template<class Matrix>
- Matrix &
- RandomDenseMatrix<Randiter, Field>::random( Matrix & A)
- {
- // A_ = A ; // no copy ?
- for (size_t i = 0 ; i < A.rowdim() ; ++i)
- for (size_t j = 0 ; j < A.coldim() ; ++j)
- R_.random(A.refEntry(i,j));
- return A;
- }
-
- template<class Randiter, class Field>
- template<class Matrix,class Method>
- Matrix &
- RandomDenseMatrix<Randiter, Field>::randomRank(Matrix & A,
- int rank
- , const Method & meth )
- {
- throw NotImplementedYet(__func__,__FILE__,__LINE__);
- }
-
-
- template<class Randiter, class Field>
- template<class Matrix>
- Matrix &
- RandomDenseMatrix<Randiter, Field>::randomRank(
- Matrix & A
- , int rank
- )
- {
- return randomRank(A,rank,RankBuilder::LU_());
- }
-
-#if 0 /* invalid use of incomplete type... */
- template<class Randiter>
- DenseMatrix<PID_integer> & RandomDenseMatrix<Randiter,PID_integer>::randomRank(
- DenseMatrix<PID_integer> & A
- , int rank
- )
- {
- return randomRank(A,rank,RankBuilder::Rank_update_());
- }
-
-#endif
-
- template<class Randiter, class Field>
- template< class Matrix>
- Matrix &
- RandomDenseMatrix<Randiter, Field>::randomRank(
- Matrix & A
- , int rank
- , const RankBuilder::LU_ & meth
- )
- {
- return random_lu_rank(F_,R_,A,rank);
- }
-
- template<class Randiter, class Field>
- template<class Matrix>
- Matrix &
- RandomDenseMatrix<Randiter, Field>::randomRank(
- Matrix & A
- , int rank
- , const RankBuilder::Rank_update_ & meth
- )
- {
- return random_rankupdate(F_,R_,A,rank);
- }
-
- /* dense matrix with random entries */
-
- /// @todo To be factorized.
- void RandomBlasPermutation(BlasPermutation<size_t> & P)
- {
- size_t * Pt = P.getWritePointer();
- // size_t n = P.getSize();
- size_t r = P.getOrder();
- size_t n = r ; // no size given ?
- for (size_t i = 0 ; i < r ; ++i) {
- Pt[i] = i + size_t( (n-i)*( drand48() ) ) ;
- }
- return ;
- }
-
- template<class Randiter,class Field>
- DenseMatrix<Field> &
- random_lu_rank(const Field & F,
- const Randiter & R,
- DenseMatrix<Field> & A,
- int & rank)
- {
- size_t m = A.rowdim() ;
- size_t n = A.coldim() ;
-
- linbox_check(m != 0);
- linbox_check(n != 0);
- if (rank == -1) rank = std::min(m,n)*drand48() ;
- linbox_check(!(rank<0 || rank>std::min(m,n)));
-
- typedef typename Field::Element Element ;
-
- // be ready for PLUQ
- //size_t * P = new size_t [m] ;
- BlasPermutation<size_t> P(m);
- //Element * L = new Element[m*m] ;
- //TriangularBlasMatrix<Element> L(m,m,BlasTag::low,BlasTag::unit);
- //! @todo !!!
- BlasMatrix<Element> L(m,m);
- // Element * U = new Element[m*n] ;
- // TriangularBlasMatrix<Element> U(m,n,BlasTag::up,BlasTag::nonunit);
- //
- BlasMatrix<Element> U(m,n);
- //size_t * Q = new size_t [n] ;
- BlasPermutation<size_t> Q(n);
-
- // be ready for random elements
- NonzeroRandIter<Randiter, Field> Rnz(F,R);
- Element one,zero;
- F.init(one,1UL);
- F.init(zero,0UL);
-
- /* Create L a random invertible lower unit triangular matrix (m x m format) */
- for (size_t j=0 ; j<m ; ++j)
- for (size_t i=j+1; i<m;++i)
- R.random( L.refEntry( i,j ) );
-#if 1
- for (size_t i = 0; i < (size_t) m; ++i)
- Rnz.random( L.refEntry( i,i ) ); // non zero diagonal
- for (size_t j=0 ; j<m ; ++j)
- for (size_t i=0; i<j;++i)
- L.setEntry( i,j,zero );
-
-
-#endif
-
- /* Create U a random rank-r upper non-unit triangular matrix (m x n format) */
- for (size_t i = 0 ; i < (size_t) rank; ++i)
- for (size_t j = i+1; j < n; ++j)
- R.random( U.refEntry( i,j ) ); // r random 'triangular' lines
- for (size_t i = 0; i < (size_t) rank; ++i)
- Rnz.random( U.refEntry( i,i ) ); // non zero diagonal on rank first lines
-#if 1
- for (size_t i = rank ; i < m ; ++i)
- for (size_t j = i ; j < n ; ++j)
- U.setEntry( i,j,zero ) ; // zero on remaining 'triangular' lines
-#endif
-
- /**
- * @todo RandomPermutation avec P de type [Matrix-Blas]Permutation
- */
- RandomBlasPermutation(P);
- RandomBlasPermutation(Q);
-
- BlasMatrixDomain< Field > BMD(F) ;
- // LU
- /**
- * @todo : L = [[L1,0],[A,L2]] ;U = [[U1,B],[0,U2]] ; LU = [[ rec(L1,U1), ftrmm(L1,B)],[ftrmm(A,U1),fgemm(A,B)+rec(L2,U2) ]]
- * de même UL
- */
-
- BlasMatrix<Element> A_ptr(A) ;
-
- BMD.mul(A_ptr,L,U);
-
- /*!
- * @todo create BMD.applyP(A,P,BlasTag::Left) ;
- * avec P : BlasPermutation
- * ou P : MatrixPermutation
- * @todo BlasPermutation a un ordre \p p et une taille \p r distinctes !!!
- */
-
- BMD.mulin_left(A_ptr,Q);
- BMD.mulin_right(P,A_ptr);
-
- return A ;
-
- }
-
-#if 0 /* bad LU mod p + CRA idea */
- template<class Field>
- struct LU_mod_p {
- typedef typename Field::Element Element;
- long int r_ ;
- size_t m_ ;
- size_t n_ ;
- LU_mod_p (size_t rows, size_t cols, long int rank) :
- r_(rank),m_(rows),n_(cols)
- {} ;
- BlasMatrix<Element>& operator()(BlasMatrix<Element>& A, const Field& F) const
- {
- BlasMatrix<Element> AA(m_,n_);
- A = AA ; // grrrrrr....
- // std::cout << m_ << ',' << A.rowdim();
- // linbox_check( m_ == A.rowdim() );
- // linbox_check( n_ == A.coldim() ) ;
-
- linbox_check(!(r_<0 || r_>(long int)std::min(m_,n_)));
-
-
- BlasMatrix<Element> L(m_,m_);
- BlasMatrix<Element> U(m_,n_);
-
- // be ready for random elements
- typedef typename Field::RandIter Randiter ;
- Randiter R(F) ;
- NonzeroRandIter<Field> Rnz(F,R);
- Element one,zero;
- F.init(one,1UL);
- F.init(zero,0UL);
-
- /* Create L a random invertible lower unit triangular matrix (m x m format) */
- for (size_t j=0 ; j<m_ ; ++j)
- for (size_t i=j+1; i<m_;++i)
- R.random( L.refEntry( i,j ) );
-#if 1
- for (size_t i = 0; i < (size_t) m_; ++i)
- Rnz.random( L.refEntry( i,i ) ); // non zero diagonal
- for (size_t j=0 ; j<m_ ; ++j)
- for (size_t i=0; i<j;++i)
- L.setEntry( i,j,zero );
-
-
-#endif
-
- /* Create U a random rank-r upper non-unit triangular matrix (m x n format) */
- for (size_t i = 0 ; i < (size_t) r_; ++i)
- for (size_t j = i+1; j < n_; ++j)
- R.random( U.refEntry( i,j ) ); // r random 'triangular' lines
- for (size_t i = 0; i < (size_t) r_; ++i)
- Rnz.random( U.refEntry( i,i ) ); // non zero diagonal on rank first lines
-#if 1
- for (size_t i = r_ ; i < m_ ; ++i)
- for (size_t j = i ; j < n_ ; ++j)
- U.setEntry( i,j,zero ) ; // zero on remaining 'triangular' lines
-#endif
-
- BlasMatrixDomain< Field > BMD(F) ;
- // LU
- /**
- * @todo : L = [[L1,0],[A,L2]] ;U = [[U1,B],[0,U2]] ; LU = [[ rec(L1,U1), ftrmm(L1,B)],[ftrmm(A,U1),fgemm(A,B)+rec(L2,U2) ]]
- * de même UL
- */
-
- // BlasMatrix<Element> A_ptr(A) ;
-
- // std::cout << "A" << F.characteristic() << " := " ;
- // A.write(std::cout,true) << ';' << std::endl;
-
- // std::cout << "L" << F.characteristic() << " := " ;
- // L.write(std::cout,true) << ';' << std::endl;
-
- // std::cout << "U" << F.characteristic() << " := " ;
- // U.write(std::cout,true) << ';' << std::endl;
- // exit(-1);
- BMD.mul(A,L,U);
-
-
- return A ;
-
- }
-
- BlasMatrix<Element> initialize()
- {
- return BlasMatrix<Element>(m_,n_);
- }
-
- };
-
- template<class Field> struct CRATemporaryVectorTrait< LU_mod_p<Field>, typename Field::Element>
- {
- //typedef BlasMatrix<double>::pointer Type_t;
- typedef BlasMatrix<typename Field::Element> Type_t;
- // typedef FixedBlasMatrixDouble Type_t;
};
+ /// @todo To be factorized.
+ void RandomBlasPermutation(BlasPermutation<size_t> & P) ;
+}
-#define _LB_LOG2 0.6931471807
- template<class Randiter>
- BlasMatrix<integer> &
- random_lu_rank(const PID_integer & F,
- const Randiter & R,
- BlasMatrix<integer> &A,
- int & rank)
- {
-
- typedef Modular<double> Field ;
- typedef Field::Element Element ;
- /*- CRA -*/
- size_t PrimeSize = 10;
- double UpperBound = _LB_LOG2 * R.getBits() ;
- RandomPrimeIterator genprime( PrimeSize );
- // ChineseRemainder< FullMultipFixedCRA< Field > > cra( std::pair<size_t,double>(A.rowdim()*A.coldim(), UpperBound) );
- ChineseRemainder< FullMultipBlasMatCRA< Field > > cra( std::pair<size_t,double>(A.rowdim()*A.coldim(), UpperBound) );
-
- LU_mod_p<Field> Iteration(A.rowdim(),A.coldim(),rank);
-
- // typename BlasMatrix<integer>::RawIterator A_it = A.rawBegin() ;
-
- cra(A, Iteration, genprime);
-
- /*- P A Q -*/
- BlasPermutation<size_t> P(A.rowdim());
- BlasPermutation<size_t> Q(A.coldim());
-
- RandomBlasPermutation(P);
- RandomBlasPermutation(Q);
-
- PID_integer ZZ ;
- BlasMatrixDomain< PID_integer > BMD(ZZ) ;
-
- // BMD.mulin_left (A,Q);
- // BMD.mulin_right(P,A);
- // throw(NotImplementedYet(__func__,__FILE__,__LINE__));
- return A ;
- }
-#undef _LB_LOG2
-#endif
-
- template<class Randiter>
- BlasMatrix<integer> &
- random_lu_rank(const PID_integer & ZZ,
- const Randiter & R,
- BlasMatrix<integer> &A,
- int & rank)
- {
-
- size_t m = A.rowdim() ;
- size_t n = A.coldim() ;
-
- linbox_check(m != 0);
- linbox_check(n != 0);
- if (rank == -1) rank = std::min(m,n)*drand48() ;
- linbox_check(!(rank<0 || rank>(int)std::min(m,n)));
-
-
- // be ready for PLUQ
- BlasPermutation<size_t> P(m);
- BlasMatrix<integer> L(m,m);
- BlasMatrix<integer> U(m,n);
- BlasPermutation<size_t> Q(n);
-
- // be ready for random elements
- Randiter S_(R);
- S_.setBits(R.getBits()-1);
- RandomIntegerIter<false> T_(3);
- NonzeroRandIter<PID_integer,RandomIntegerIter<false> > U_(ZZ,T_);
-
- integer one(1),zero(0);
-
- /* Create L a random invertible lower unit triangular matrix (m x m format) */
- for (size_t j=0 ; j<m ; ++j)
- for (size_t i=j+1; i<m;++i)
- S_.random( L.refEntry( i,j ) );
-#if 1
- for (size_t i = 0; i < (size_t) m; ++i)
- U_.random( L.refEntry( i,i ) ); // non zero diagonal
- for (size_t j=0 ; j<m ; ++j)
- for (size_t i=0; i<j;++i)
- L.setEntry( i,j,zero );
-
-
-#endif
-
- /* Create U a random rank-r upper non-unit triangular matrix (m x n format) */
- for (size_t i = 0 ; i < (size_t) rank; ++i)
- for (size_t j = i+1; j < n; ++j)
- T_.random( U.refEntry( i,j ) ); // r random 'triangular' lines
- for (size_t i = 0; i < (size_t) rank; ++i)
- U_.random( U.refEntry( i,i ) ); // non zero diagonal on rank first lines
-#if 1
- for (size_t i = rank ; i < m ; ++i)
- for (size_t j = i ; j < n ; ++j)
- U.setEntry( i,j,zero ) ; // zero on remaining 'triangular' lines
-#endif
-
- RandomBlasPermutation(P);
- RandomBlasPermutation(Q);
-
- BlasMatrixDomain< PID_integer > BMD(ZZ) ;
- MatrixDomain< PID_integer > MD(ZZ) ;
- // LU
- // L.write(std::cout << "L:=",true ) << ';' << std::endl;
- // L.write(std::cout << "U:=",true ) << ';' << std::endl;
-
- MD.mul(A,L,U);
- // A.write(std::cout << "pre A=",true) << std::endl;
-
- BMD.mulin_left(A,Q);
- BMD.mulin_right(P,A);
-
- // P.write(std::cout<<"P:=",false) << std::endl;
- // P.write(std::cout<<"Q:=",false) << std::endl;
- // P.write(std::cout<<"Q:=",true) << std::endl;
-
- return A ;
- }
-
-#if 0 /* DenseMatrixBase spec. */
- template<class Randiter, class Field>
- DenseMatrix<Field> &
- random_rankupdate( const Field & F
- ,const Randiter & R
- ,DenseMatrix<Field>& A
- , int & rank
- )
- {
- size_t m = A.rowdim();
- size_t n = A.coldim();
-
-
- DenseMatrix<Field> D(F,m,rank) ;
- DenseMatrix<Field> G(F,rank,n) ;
- RandomDenseMatrix<Randiter, Field> RandMatGen(F,R);
- RandMatGen.random(D) ;
- RandMatGen.random(G) ;
- MatrixDomain<Field> MD(F);
- MD.mul(A,D,G);
- return A ;
- }
-
- template<class Randiter>
- DenseMatrix<PID_integer> &
- random_rankupdate( PID_integer & F //!@bug const !
- ,const Randiter & R
- ,DenseMatrix<PID_integer> & A
- , int & rank
- )
- {
- //! @todo check randomness
- size_t m = A.rowdim();
- size_t n = A.coldim();
-
- DenseMatrix<PID_integer> D(F,(size_t)m,(size_t)rank) ;
- DenseMatrix<PID_integer> G(F,(size_t)rank,(size_t)n) ;
- Randiter S_(R);
- S_.setBits(R.getBits()-1);
- RandomDenseMatrix<Randiter,PID_integer > RandMatGen(F,S_);
- RandMatGen.random(D) ;
- RandomIntegerIter<false> T_(3);
- RandomDenseMatrix<RandomIntegerIter<false>,PID_integer > RandSmallMatGen(F,T_);
- RandMatGen.random(G) ;
- MatrixDomain<PID_integer> MD(F);
- MD.mul(A,D,G);
- return A ;
- }
-#endif
-
- template<class Randiter>
- BlasMatrix<integer> &
- random_rankupdate( PID_integer & F //!@bug const !
- ,const Randiter & R
- ,BlasMatrix<integer> & A
- , int & rank
- )
- {
- size_t m = A.rowdim();
- size_t n = A.coldim();
-
- BlasMatrix<integer> D((size_t)m,(size_t)rank) ;
- BlasMatrix<integer> G((size_t)rank,(size_t)n) ;
- Randiter S_(R);
- S_.setBits(R.getBits()-1);
- RandomDenseMatrix<Randiter,PID_integer > RandMatGen(F,S_);
- RandMatGen.random(D) ;
- RandomIntegerIter<false> T_(3);
- RandomDenseMatrix<RandomIntegerIter<false>,PID_integer > RandSmallMatGen(F,T_);
- RandMatGen.random(G) ;
-
- MatrixDomain<PID_integer> MD(F);
- MD.mul(A,D,G);
-
-#if 0 /* necessary */
- BlasPermutation<size_t> P(m);
- BlasPermutation<size_t> Q(n);
-
- RandomBlasPermutation(P);
- RandomBlasPermutation(Q);
-
- PID_integer ZZ ;
- BlasMatrixDomain< PID_integer > BMD(ZZ) ;
-
- BMD.mulin_left (A,Q);
- BMD.mulin_right(P,A);
-#endif
-
- return A ;
- }
+#include "linbox/matrix/random-matrix.inl"
-}
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s:syntax=cpp.doxygen:foldmethod=syntax
diff --git a/linbox/matrix/random-matrix.inl b/linbox/matrix/random-matrix.inl
new file mode 100644
index 0000000..0760044
--- /dev/null
+++ b/linbox/matrix/random-matrix.inl
@@ -0,0 +1,428 @@
+/* Copyright (C) 2011 LinBox
+ * Written by Brice Boyer <brice.boyer at imag.fr>
+ *
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+#ifndef __LINBOX_matrix_random_matrix_INL
+#define __LINBOX_matrix_random_matrix_INL
+/** @file matrix/random-matrix.inl
+ * @ingroup matrix
+ * @brief Implementation of random matrices.
+ *
+ */
+
+namespace LinBox
+{
+
+ //! This is the namespace all LinBox internal code is in.
+ namespace Protected {
+
+ template<class Randiter,class Field>
+ BlasMatrix<Field> &
+ random_lu_rank(const Field & F,
+ const Randiter & R,
+ BlasMatrix<Field> & A,
+ int & rank,
+ const RingCategories::ModularTag & tag)
+ {
+ size_t m = A.rowdim() ;
+ size_t n = A.coldim() ;
+
+ linbox_check(m != 0);
+ linbox_check(n != 0);
+ if (rank == -1)
+ rank = (int) ( (double)std::min(m,n)*drand48() );
+ linbox_check(!(rank<0 || rank>(int)std::min(m,n)));
+
+ typedef typename Field::Element Element ;
+
+ // be ready for PLUQ
+ //size_t * P = new size_t [m] ;
+ BlasPermutation<size_t> P(m);
+ //Element * L = new Element[m*m] ;
+ //TriangularBlasMatrix<Element> L(m,m,LinBoxTag::Lower,LinBoxTag::Unit);
+ //! @todo !!!
+ BlasMatrix<Field> L(F,m,m);
+ // Element * U = new Element[m*n] ;
+ // TriangularBlasMatrix<Element> U(m,n,LinBoxTag::Upper,LinBoxTag::NonUnit);
+ //
+ BlasMatrix<Field> U(F,m,n);
+ //size_t * Q = new size_t [n] ;
+ BlasPermutation<size_t> Q(n);
+
+ // be ready for random elements
+ NonzeroRandIter<Field> Rnz(F,R);
+ Element one,zero;
+ F.init(one,1UL);
+ F.init(zero,0UL);
+
+ /* Create L a random invertible lower unit triangular matrix (m x m format) */
+ for (size_t j=0 ; j<m ; ++j)
+ for (size_t i=j+1; i<m;++i)
+ R.random( L.refEntry( i,j ) );
+#if 1
+ for (size_t i = 0; i < (size_t) m; ++i)
+ Rnz.random( L.refEntry( i,i ) ); // non zero diagonal
+ for (size_t j=0 ; j<m ; ++j)
+ for (size_t i=0; i<j;++i)
+ L.setEntry( i,j,zero );
+
+
+#endif
+
+ /* Create U a random rank-r upper non-unit triangular matrix (m x n format) */
+ for (size_t i = 0 ; i < (size_t) rank; ++i)
+ for (size_t j = i+1; j < n; ++j)
+ R.random( U.refEntry( i,j ) ); // r random 'triangular' lines
+ for (size_t i = 0; i < (size_t) rank; ++i)
+ Rnz.random( U.refEntry( i,i ) ); // non zero diagonal on rank first lines
+#if 1
+ for (size_t i = rank ; i < m ; ++i)
+ for (size_t j = i ; j < n ; ++j)
+ U.setEntry( i,j,zero ) ; // zero on remaining 'triangular' lines
+#endif
+
+ /**
+ * @todo RandomPermutation avec P de type [Matrix-Blas]Permutation
+ */
+ RandomBlasPermutation(P);
+ RandomBlasPermutation(Q);
+
+ BlasMatrixDomain< Field > BMD(F) ;
+ // LU
+ /**
+ * @todo : L = [[L1,0],[A,L2]] ;U = [[U1,B],[0,U2]] ; LU = [[ rec(L1,U1), ftrmm(L1,B)],[ftrmm(A,U1),fgemm(A,B)+rec(L2,U2) ]]
+ * de même UL
+ */
+
+ // BlasMatrix<Field> A_ptr(A) ;
+
+ BMD.mul(A,L,U);
+
+ /*!
+ * @todo create BMD.applyP(A,P,LinBoxTag::Left) ;
+ * avec P : BlasPermutation
+ * ou P : MatrixPermutation
+ * @todo BlasPermutation a un ordre \p p et une taille \p r distinctes !!!
+ */
+
+ BMD.mulin_left(A,Q);
+ BMD.mulin_right(P,A);
+
+ return A ;
+
+ }
+
+
+ //!@todo ZZ is A.field() !
+ template<class Randiter, class Ring>
+ BlasMatrix<Ring> &
+ random_lu_rank(const Ring & ZZ,
+ const Randiter & R,
+ BlasMatrix<Ring> &A,
+ int & rank,
+ const RingCategories::IntegerTag & tag)
+ {
+
+ typedef typename Ring::Element Int ;
+ size_t m = A.rowdim() ;
+ size_t n = A.coldim() ;
+
+ linbox_check(m != 0);
+ linbox_check(n != 0);
+ if (rank == -1)
+ rank = (int) ( (double)std::min(m,n)*drand48() );
+ linbox_check(!(rank<0 || rank>(int)std::min(m,n)));
+
+
+ // be ready for PLUQ
+ BlasPermutation<size_t> P(m);
+ BlasMatrix<Ring> L(ZZ,m,m);
+ BlasMatrix<Ring> U(ZZ,m,n);
+ BlasPermutation<size_t> Q(n);
+
+ // be ready for random elements
+ Randiter S_(R);
+ S_.setBits(R.getBits()-1);
+ RandomIntegerIter<false> T_(3);
+ NonzeroRandIter<Ring,RandomIntegerIter<false> > U_(ZZ,T_);
+
+ Int one(1),zero(0);
+
+ /* Create L a random invertible lower unit triangular matrix (m x m format) */
+ for (size_t j=0 ; j<m ; ++j)
+ for (size_t i=j+1; i<m;++i)
+ S_.random( L.refEntry( i,j ) );
+#if 1
+ for (size_t i = 0; i < (size_t) m; ++i)
+ U_.random( L.refEntry( i,i ) ); // non zero diagonal
+ for (size_t j=0 ; j<m ; ++j)
+ for (size_t i=0; i<j;++i)
+ L.setEntry( i,j,zero );
+
+
+#endif
+
+ /* Create U a random rank-r upper non-unit triangular matrix (m x n format) */
+ for (size_t i = 0 ; i < (size_t) rank; ++i)
+ for (size_t j = i+1; j < n; ++j)
+ T_.random( U.refEntry( i,j ) ); // r random 'triangular' lines
+ for (size_t i = 0; i < (size_t) rank; ++i)
+ U_.random( U.refEntry( i,i ) ); // non zero diagonal on rank first lines
+#if 1
+ for (size_t i = rank ; i < m ; ++i)
+ for (size_t j = i ; j < n ; ++j)
+ U.setEntry( i,j,zero ) ; // zero on remaining 'triangular' lines
+#endif
+
+ RandomBlasPermutation(P);
+ RandomBlasPermutation(Q);
+
+ BlasMatrixDomain< Ring > BMD(ZZ) ;
+ MatrixDomain< Ring > MD(ZZ) ;
+ // LU
+ // L.write(std::cout << "L:=",true ) << ';' << std::endl;
+ // L.write(std::cout << "U:=",true ) << ';' << std::endl;
+
+ typedef typename Ring::Element Element;
+ // BlasMatrix<Element> A_ptr(A) ;
+
+ MD.mul(A,L,U);
+ // A.write(std::cout << "pre A=",true) << std::endl;
+
+ BMD.mulin_left(A,Q);
+ BMD.mulin_right(P,A);
+
+ // P.write(std::cout<<"P:=",false) << std::endl;
+ // P.write(std::cout<<"Q:=",false) << std::endl;
+ // P.write(std::cout<<"Q:=",true) << std::endl;
+
+ return A ;
+ }
+
+#if 0
+ template<class Randiter,class Field>
+ BlasMatrix<typename Field::Element> &
+ random_lu_rank(const Field & F,
+ const Randiter & R,
+ BlasMatrix<typename Field::Element> & A,
+ int & rank,
+ const RingCategories::IntegerTag & tag)
+ {
+ BlasBlackbox<Field> Alink(F,A);
+ random_lu_rank(F,R,Alink,rank,RingCategories::IntegerTag());
+ return A ;
+ }
+
+#endif
+#if 0 /* BlasMatrix spec. */
+ template<class Randiter, class Field>
+ BlasBlackbox<Field> &
+ random_rankupdate( const Field & F
+ ,const Randiter & R
+ ,BlasBlackbox<Field>& A
+ , int & rank
+ )
+ {
+ size_t m = A.rowdim();
+ size_t n = A.coldim();
+
+
+ BlasBlackbox<Field> D(F,m,rank) ;
+ BlasBlackbox<Field> G(F,rank,n) ;
+ RandomBlasBlackbox<Randiter, Field> RandMatGen(F,R);
+ RandMatGen.random(D) ;
+ RandMatGen.random(G) ;
+ MatrixDomain<Field> MD(F);
+ MD.mul(A,D,G);
+ return A ;
+ }
+
+ template<class Randiter>
+ BlasBlackbox<PID_integer> &
+ random_rankupdate( PID_integer & F //!@bug const !
+ ,const Randiter & R
+ ,BlasBlackbox<PID_integer> & A
+ , int & rank
+ )
+ {
+ //! @todo check randomness
+ size_t m = A.rowdim();
+ size_t n = A.coldim();
+
+ BlasBlackbox<PID_integer> D(F,(size_t)m,(size_t)rank) ;
+ BlasBlackbox<PID_integer> G(F,(size_t)rank,(size_t)n) ;
+ Randiter S_(R);
+ S_.setBits(R.getBits()-1);
+ RandomBlasBlackbox<Randiter,PID_integer > RandMatGen(F,S_);
+ RandMatGen.random(D) ;
+ RandomIntegerIter<false> T_(3);
+ RandomBlasBlackbox<RandomIntegerIter<false>,PID_integer > RandSmallMatGen(F,T_);
+ RandMatGen.random(G) ;
+ MatrixDomain<PID_integer> MD(F);
+ MD.mul(A,D,G);
+ return A ;
+ }
+#endif
+
+ template<class Randiter,class Field>
+ BlasMatrix<Field> &
+ random_rankupdate( Field & F //!@bug const !
+ ,const Randiter & R
+ ,BlasMatrix<Field> & A
+ , int & rank
+ , const RingCategories::IntegerTag &tag
+ )
+ {
+ typedef typename Field::Element Int ;
+ size_t m = A.rowdim();
+ size_t n = A.coldim();
+
+ BlasMatrix<Field> D(F,(size_t)m,(size_t)rank) ;
+ BlasMatrix<Field> G(F,(size_t)rank,(size_t)n) ;
+ Randiter S_(R);
+ S_.setBits(R.getBits()-1);
+ RandomDenseMatrix<Randiter,Field > RandMatGen(F,S_);
+ RandMatGen.random(D) ;
+ RandomIntegerIter<false> T_(3);
+ RandomDenseMatrix<RandomIntegerIter<false>,Field > RandSmallMatGen(F,T_);
+ RandMatGen.random(G) ;
+
+ MatrixDomain<Field> MD(F);
+ MD.mul(A,D,G);
+
+ /// @bug do perms ?
+
+#if 0 /* necessary */
+ BlasPermutation<size_t> P(m);
+ BlasPermutation<size_t> Q(n);
+
+ RandomBlasPermutation(P);
+ RandomBlasPermutation(Q);
+
+ PID_integer ZZ ;
+ BlasMatrixDomain< PID_integer > BMD(ZZ) ;
+
+ BMD.mulin_left (A,Q);
+ BMD.mulin_right(P,A);
+#endif
+
+ return A ;
+ }
+ } // Protected
+
+ //////// Random Matrix
+ template<class Randiter, class Field>
+ template<class Matrix>
+ Matrix &
+ RandomDenseMatrix<Randiter, Field>::random( Matrix & A)
+ {
+ for (size_t i = 0 ; i < A.rowdim() ; ++i)
+ for (size_t j = 0 ; j < A.coldim() ; ++j)
+ R_.random(A.refEntry(i,j));
+ return A;
+ }
+
+ //////// Random Matrix with prescribed Rank
+#if 0
+ template<class Randiter, class Field>
+ template<class Matrix,class Method>
+ Matrix &
+ RandomDenseMatrix<Randiter, Field>::randomRank(Matrix & A,
+ int rank
+ , const Method & meth )
+ {
+ throw NotImplementedYet(__func__,__FILE__,__LINE__);
+ }
+#endif
+
+
+ template<class Randiter, class Field>
+ template<class Matrix>
+ Matrix &
+ RandomDenseMatrix<Randiter, Field>::randomRank(
+ Matrix & A
+ , int rank
+ )
+ {
+ //! @todo use CatergoryTag
+ return randomRank(A,rank,RankBuilder::LU_());
+ }
+
+ template<class Randiter, class Field>
+ template< class Matrix>
+ Matrix &
+ RandomDenseMatrix<Randiter, Field>::randomRank(
+ Matrix & A
+ , int rank
+ , const RankBuilder::LU_ & meth
+ )
+ {
+ Protected::random_lu_rank( F_,R_,A,rank,
+ typename FieldTraits<Field>::categoryTag());
+ return A ;
+ }
+
+
+
+ template<class Randiter, class Field>
+ template<class Matrix>
+ Matrix &
+ RandomDenseMatrix<Randiter, Field>::randomRank(
+ Matrix & A
+ , int rank
+ , const RankBuilder::Rank_update_ & meth
+ )
+ {
+ return Protected::random_rankupdate(F_,R_,A,rank,
+ typename FieldTraits<Field>::categoryTag());
+ }
+
+ /* dense matrix with random entries */
+
+ void RandomBlasPermutation(BlasPermutation<size_t> & P)
+ {
+ size_t * Pt = P.getWritePointer();
+ // size_t n = P.getSize();
+ size_t r = P.getOrder();
+ size_t n = r ; // no size given ?
+ for (size_t i = 0 ; i < r ; ++i) {
+ Pt[i] = i + size_t(double (n-i)*( drand48() ) ) ;
+ }
+ return ;
+ }
+
+
+} // LinBox
+
+#endif // __LINBOX_matrix_random_matrix_INL
+
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/sparse.h b/linbox/matrix/sparse.h
index 4c1ba70..3451313 100644
--- a/linbox/matrix/sparse.h
+++ b/linbox/matrix/sparse.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/matrix/sparse.h
* Copyright (C) 2001-2002 Bradford Hovinen
* 1999-2001 William J Turner,
@@ -17,7 +15,7 @@
* - Renamed ColOfRowsIterator to RowIterator
* - Named template argument _Row rather than Row; add a typedef to Row
* - Named template argument _Element rather than Row; add a typedef to Element
- * - Renamed RawIndexIterator as RawIndexedIterator, and adjusted to match
+ * - Renamed IndexIterator as IndexedIterator, and adjusted to match
* interface in DenseMatrixBase
* ------------------------------------
* 2002-08-06 Bradford Hovinen <hovinen at cis.udel.edu>
@@ -32,12 +30,30 @@
* - New read/write implementations for SparseMatrixBase, supporting multiple
* formats
* - Eliminated Gaussian elimination code
- * - Added iterators, including ColOfRowsIterator, RawIterator, and
- * RawIndexIterator
+ * - Added iterators, including ColOfRowsIterator, Iterator, and
+ * IndexIterator
* - Eliminated operator []; added getEntry; changed put_value to setEntry
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_matrix_sparse_H
@@ -77,9 +93,13 @@ namespace LinBox
typedef _Element Element;
std::istream &read (std::istream &stream, Element &elt) const
- { return stream >> elt; }
+ {
+ return stream >> elt;
+ }
std::ostream &write (std::ostream &stream, const Element &elt) const
- { return stream << elt; }
+ {
+ return stream << elt;
+ }
};
// made global to avoid duplicate code.
@@ -90,9 +110,9 @@ namespace LinBox
// Forward declaration
template <class _Element,
- class _Row = typename RawVector<_Element>::Sparse,
- class Trait = typename VectorTraits<_Row>::VectorCategory>
- class SparseMatrixBase;
+ class _Row = typename RawVector<_Element>::Sparse,
+ class Trait = typename VectorTraits<_Row>::VectorCategory>
+ class SparseMatrixBase;
// Small helper classes to make read and write easier
@@ -106,10 +126,17 @@ namespace LinBox
public:
typedef _Element Element;
+ template<class T>
+ Element & init(Element & a, const T & b = 0) const { return a = b ; }
+
std::istream &read (std::istream &stream, Element &elt) const
- { return stream >> elt; }
+ {
+ return stream >> elt;
+ }
std::ostream &write (std::ostream &stream, const Element &elt) const
- { return stream << elt; }
+ {
+ return stream << elt;
+ }
};
template <class Field>
@@ -146,10 +173,17 @@ namespace LinBox
public:
typedef _Element Element;
+ template<class T>
+ Element & init(Element & a, const T & b = 0) const { return a = b ; }
+
std::istream &read (std::istream &stream, Element &elt) const
- { return stream >> elt; }
+ {
+ return stream >> elt;
+ }
std::ostream &write (std::ostream &stream, const Element &elt) const
- { return stream << elt; }
+ {
+ return stream << elt;
+ }
};
template <class Field>
@@ -188,7 +222,7 @@ namespace LinBox
* @param n column dimension
*/
SparseMatrixBase (size_t m, size_t n) :
- _A(m), _m(m), _n(n)
+ _matA(m), _m(m), _n(n)
{};
@@ -212,19 +246,26 @@ namespace LinBox
/** Retreive row dimension of the matrix.
* @return integer number of rows of SparseMatrixBase matrix.
*/
- size_t rowdim () const { return _m; }
+ size_t rowdim () const
+ {
+ return _m;
+ }
/** Retreive column dimension of matrix.
* @return integer number of columns of SparseMatrixBase matrix.
*/
- size_t coldim () const { return _n; }
+ size_t coldim () const
+ {
+ return _n;
+ }
/** Retreive number of elements in the matrix.
* @return integer number of elements of SparseMatrixBase matrix.
*/
- size_t size () const {
+ size_t size () const
+ {
size_t s(0);
- for(typename Rep::const_iterator it = _A.begin(); it != _A.end(); ++it)
+ for(typename Rep::const_iterator it = _matA.begin(); it != _matA.end(); ++it)
s+= LinBox::RawVector<_Element>::size(*it);
return s;
}
@@ -312,17 +353,17 @@ namespace LinBox
* passing the matrix into an algorithm.
*/
- class RawIterator;
- class ConstRawIterator;
+ class Iterator;
+ class ConstIterator;
- /// rawBegin.
- RawIterator rawBegin ();
- /// rawEnd.
- RawIterator rawEnd ();
- /// const rawBegin.
- ConstRawIterator rawBegin () const;
- /// const rawEnd
- ConstRawIterator rawEnd () const;
+ /// Begin.
+ Iterator Begin ();
+ /// End.
+ Iterator End ();
+ /// const Begin.
+ ConstIterator Begin () const;
+ /// const End
+ ConstIterator End () const;
/** @name Index iterator
* The index iterator gives the row, column indices of all matrix
@@ -331,17 +372,17 @@ namespace LinBox
* first and second positions, respectively.
*/
- class RawIndexedIterator;
- class ConstRawIndexedIterator;
+ class IndexedIterator;
+ class ConstIndexedIterator;
- /// rawIndexedBegin
- RawIndexedIterator rawIndexedBegin ();
- /// rawIndexedEnd
- RawIndexedIterator rawIndexedEnd ();
- /// const rawIndexedBegin
- ConstRawIndexedIterator rawIndexedBegin () const;
- /// const rawIndexedEnd
- ConstRawIndexedIterator rawIndexedEnd () const;
+ /// IndexedBegin
+ IndexedIterator IndexedBegin ();
+ /// IndexedEnd
+ IndexedIterator IndexedEnd ();
+ /// const IndexedBegin
+ ConstIndexedIterator IndexedBegin () const;
+ /// const IndexedEnd
+ ConstIndexedIterator IndexedEnd () const;
/** Retrieve a row as a writeable reference
* @param i Row index
@@ -375,12 +416,12 @@ namespace LinBox
friend class SparseMatrixWriteHelper<Element, Row>;
friend class SparseMatrixReadWriteHelper<Element, Row>;
- Rep _A;
+ Rep _matA;
size_t _m;
size_t _n;
template<class F, class R, class T> friend class SparseMatrixBase;
- };
+ };
/* Specialization for sparse sequence vectors */
@@ -394,11 +435,12 @@ namespace LinBox
typedef _SP_BB_VECTOR_<Row> Rep;
template<typename _Tp1, typename _R1 = typename Rebind<_Row,_Tp1>::other >
- struct rebind
- { typedef SparseMatrixBase<typename _Tp1::Element, _R1, VectorCategories::SparseSequenceVectorTag> other; };
+ struct rebind {
+ typedef SparseMatrixBase<typename _Tp1::Element, _R1, VectorCategories::SparseSequenceVectorTag> other;
+ };
SparseMatrixBase (size_t m, size_t n) :
- _A (m), _m (m), _n (n)
+ _matA (m), _m (m), _n (n)
{}
/** Constructor from a MatrixStream
@@ -407,28 +449,34 @@ namespace LinBox
SparseMatrixBase ( MatrixStream<Field>& ms );
SparseMatrixBase (const SparseMatrixBase<Element, Row> &A) :
- _A (A._A), _m (A._m), _n (A._n)
+ _matA (A._matA), _m (A._m), _n (A._n)
{}
template<class VectorType>
SparseMatrixBase (const SparseMatrixBase<Element, VectorType> &A) :
- _A(A._m), _m (A._m), _n (A._n)
+ _matA(A._m), _m (A._m), _n (A._n)
{
- typename Rep::iterator meit = this->_A.begin();
- typename SparseMatrixBase<Element, VectorType>::Rep::const_iterator copit = A._A.begin();
- for( ; meit != this->_A.end(); ++meit, ++copit)
+ typename Rep::iterator meit = this->_matA.begin();
+ typename SparseMatrixBase<Element, VectorType>::Rep::const_iterator copit = A._matA.begin();
+ for( ; meit != this->_matA.end(); ++meit, ++copit)
LinBox::RawVector<Element>::convert(*meit, *copit);
}
~SparseMatrixBase () {}
- size_t rowdim () const { return _m; }
- size_t coldim () const { return _n; }
+ size_t rowdim () const
+ {
+ return _m;
+ }
+ size_t coldim () const
+ {
+ return _n;
+ }
size_t size () const
{
size_t s(0);
- for(typename Rep::const_iterator it = _A.begin(); it != _A.end(); ++it)
+ for(typename Rep::const_iterator it = _matA.begin(); it != _matA.end(); ++it)
s+= LinBox::RawVector<_Element>::size(*it);
return s;
}
@@ -479,30 +527,30 @@ namespace LinBox
ConstRowIterator rowBegin () const
{
- return _A.begin ();
+ return _matA.begin ();
}
ConstRowIterator rowEnd () const
{
- return _A.end ();
+ return _matA.end ();
}
RowIterator rowBegin ()
{
- return _A.begin ();
+ return _matA.begin ();
}
RowIterator rowEnd ()
{
- return _A.end ();
+ return _matA.end ();
}
template <class RepIterator, class RowIterator, class _I_Element>
- class _RawIterator {
+ class _Iterator {
public:
typedef _I_Element value_type;
- _RawIterator (const RepIterator &i, const RowIterator &j, const RepIterator &A_end) :
+ _Iterator (const RepIterator &i, const RowIterator &j, const RepIterator &A_end) :
_i (i), _j (j), _A_end (A_end)
{
if( _i == _A_end ) return;
@@ -512,13 +560,13 @@ namespace LinBox
}
}
- _RawIterator (const _RawIterator &iter) :
+ _Iterator (const _Iterator &iter) :
_i (iter._i), _j (iter._j), _A_end (iter._A_end)
{}
- _RawIterator () {}
+ _Iterator () {}
- _RawIterator &operator = (const _RawIterator &iter)
+ _Iterator &operator = (const _Iterator &iter)
{
_i = iter._i;
_j = iter._j;
@@ -527,13 +575,17 @@ namespace LinBox
return *this;
}
- bool operator == (const _RawIterator &i) const
- { return (_i == i._i) && (_j == i._j); }
+ bool operator == (const _Iterator &i) const
+ {
+ return (_i == i._i) && (_j == i._j);
+ }
- bool operator != (const _RawIterator &i) const
- { return (_i != i._i) || (_j != i._j); }
+ bool operator != (const _Iterator &i) const
+ {
+ return (_i != i._i) || (_j != i._j);
+ }
- _RawIterator &operator ++ ()
+ _Iterator &operator ++ ()
{
++_j;
while( _j == _i->end ()) {
@@ -547,14 +599,14 @@ namespace LinBox
return *this;
}
- _RawIterator operator ++ (int)
+ _Iterator operator ++ (int)
{
- _RawIterator tmp = *this;
+ _Iterator tmp = *this;
++(*this);
return tmp;
}
- _RawIterator &operator -- ()
+ _Iterator &operator -- ()
{
while (_j == _i->begin ())
_j = (--_i)->end ();
@@ -562,892 +614,1098 @@ namespace LinBox
return *this;
}
- _RawIterator operator -- (int)
+ _Iterator operator -- (int)
{
- _RawIterator tmp = *this;
+ _Iterator tmp = *this;
--(*this);
return tmp;
}
value_type &operator * ()
- { return _j->second; }
- // { return *(new value_type(_j->second)); }
- // Dan Roche 2005-7-7 I believe this was a memory leak.
- value_type *operator -> ()
- { return &(_j->second); }
- const value_type &operator*() const { return _j->second; }
- const value_type *operator-> () const { return &(_j->second); }
-
- private:
- RepIterator _i;
- RowIterator _j;
- RepIterator _A_end;
- };
+ {
+ return _j->second;
+ }
+ // Dan Roche 2005-7-7 I believe this was a memory leak.
+ value_type *operator -> ()
+ {
+ return &(_j->second);
+ }
+ const value_type &operator*() const
+ {
+ return _j->second;
+ }
+ const value_type *operator-> () const
+ {
+ return &(_j->second);
+ }
+
+ private:
+ RepIterator _i;
+ RowIterator _j;
+ RepIterator _A_end;
+ };
- typedef _RawIterator<typename Rep::iterator, typename Row::iterator, Element> RawIterator;
- typedef _RawIterator<typename Rep::const_iterator, typename Row::const_iterator, const Element> ConstRawIterator;
+ typedef _Iterator<typename Rep::iterator, typename Row::iterator, Element> Iterator;
+ typedef _Iterator<typename Rep::const_iterator, typename Row::const_iterator, const Element> ConstIterator;
- RawIterator rawBegin ()
- { return RawIterator (_A.begin (), _A.front ().begin (), _A.end ()); }
- RawIterator rawEnd ()
- { return RawIterator (_A.end (), _A.back ().end (), _A.end ()); }
- ConstRawIterator rawBegin () const
- { return ConstRawIterator (_A.begin (), _A.front ().begin (), _A.end ()); }
- ConstRawIterator rawEnd () const
- { return ConstRawIterator (_A.end (), _A.back ().end (), _A.end ()); }
+ Iterator Begin ()
+ {
+ return Iterator (_matA.begin (), _matA.front ().begin (), _matA.end ());
+ }
+ Iterator End ()
+ {
+ return Iterator (_matA.end (), _matA.back ().end (), _matA.end ());
+ }
+ ConstIterator Begin () const
+ {
+ return ConstIterator (_matA.begin (), _matA.front ().begin (), _matA.end ());
+ }
+ ConstIterator End () const
+ {
+ return ConstIterator (_matA.end (), _matA.back ().end (), _matA.end ());
+ }
- /* Generic trait for iterators without type */
- template<typename U>
- struct IteratorValueType {
- typedef typename U::value_type value_type;
- };
+ /* Generic trait for iterators without type */
+ template<typename U>
+ struct IteratorValueType {
+ typedef typename U::value_type value_type;
+ };
- template<typename X>
- struct IteratorValueType<const X*> {
- typedef X value_type;
- };
+ template<typename X>
+ struct IteratorValueType<const X*> {
+ typedef X value_type;
+ };
- /* Generic trait for iterators without type */
+ /* Generic trait for iterators without type */
- template <class RepIterator, class RowIdxIterator>
- class _RawIndexedIterator {
- public:
+ template <class RepIterator, class RowIdxIterator>
+ class _IndexedIterator {
+ public:
#if 0
- typedef std::pair<size_t, size_t> value_type;
- typedef typename RowIdxIterator/*::value_type*/::second_type value_type;
- typedef typename RowIdxIterator::value_type::second_type value_type;
+ typedef std::pair<size_t, size_t> value_type;
+ typedef typename RowIdxIterator/*::value_type*/::second_type value_type;
+ typedef typename RowIdxIterator::value_type::second_type value_type;
#endif
- typedef typename IteratorValueType< RowIdxIterator >::value_type::second_type value_type;
+ typedef typename IteratorValueType< RowIdxIterator >::value_type::second_type value_type;
- _RawIndexedIterator (size_t idx, const RepIterator &i, const RowIdxIterator &j, const RepIterator &A_end) :
- _i (i), _j (j), _A_end (A_end), _r_index (idx)
- {
- if( _i == _A_end ) return;
- while(_j == _i->end ()) {
- ++_r_index;
- if (++_i == _A_end) return;
- _j = _i->begin ();
- }
- _c_index =_j->first;
+ _IndexedIterator (size_t idx, const RepIterator &i, const RowIdxIterator &j, const RepIterator &A_end) :
+ _i (i), _j (j), _A_end (A_end), _r_index (idx)
+ {
+ if( _i == _A_end ) return;
+ while(_j == _i->end ()) {
+ ++_r_index;
+ if (++_i == _A_end) return;
+ _j = _i->begin ();
}
+ _c_index =_j->first;
+ }
- _RawIndexedIterator (const _RawIndexedIterator &iter) :
- _i (iter._i), _j (iter._j), _A_end (iter._A_end), _r_index (iter._r_index), _c_index (iter._c_index)
- {}
+ _IndexedIterator (const _IndexedIterator &iter) :
+ _i (iter._i), _j (iter._j), _A_end (iter._A_end), _r_index (iter._r_index), _c_index (iter._c_index)
+ {}
- _RawIndexedIterator ()
- {}
+ _IndexedIterator ()
+ {}
- _RawIndexedIterator &operator = (const _RawIndexedIterator &iter)
- {
- _A_end = iter._A_end;
- _i = iter._i;
- _j = iter._j;
- _r_index = iter._r_index;
- _c_index = iter._c_index;
+ _IndexedIterator &operator = (const _IndexedIterator &iter)
+ {
+ _A_end = iter._A_end;
+ _i = iter._i;
+ _j = iter._j;
+ _r_index = iter._r_index;
+ _c_index = iter._c_index;
- return *this;
- }
+ return *this;
+ }
- bool operator == (const _RawIndexedIterator &i) const
- { return (_i == i._i) && (_j == i._j); }
+ bool operator == (const _IndexedIterator &i) const
+ {
+ return (_i == i._i) && (_j == i._j);
+ }
- bool operator != (const _RawIndexedIterator &i) const
- { return (_i != i._i) || (_j != i._j); }
+ bool operator != (const _IndexedIterator &i) const
+ {
+ return (_i != i._i) || (_j != i._j);
+ }
- _RawIndexedIterator &operator ++ ()
- {
- ++_j;
- while(_j == _i->end ()){
- ++_r_index;
- if (++_i == _A_end) return *this;
- _j = _i->begin ();
- }
- _c_index = _j->first;
+ _IndexedIterator &operator ++ ()
+ {
+ ++_j;
+ while(_j == _i->end ()){
+ ++_r_index;
+ if (++_i == _A_end) return *this;
+ _j = _i->begin ();
+ }
+ _c_index = _j->first;
#if 0
- if (++_j == _i->end ()) {
- if (++_i != _A_end) {
- _j = _i->begin ();
- ++_r_index;
- }
+ if (++_j == _i->end ()) {
+ if (++_i != _A_end) {
+ _j = _i->begin ();
+ ++_r_index;
}
+ }
- _c_index = _j->first;
+ _c_index = _j->first;
#endif
- return *this;
- }
+ return *this;
+ }
- _RawIndexedIterator operator ++ (int)
- {
- _RawIndexedIterator tmp = *this;
- ++(*this);
- return tmp;
+ _IndexedIterator operator ++ (int)
+ {
+ _IndexedIterator tmp = *this;
+ ++(*this);
+ return tmp;
+ }
+
+ _IndexedIterator &operator -- ()
+ {
+ while (_j == _i->begin ()) {
+ _j = (--_i)->end ();
+ --_r_index;
}
- _RawIndexedIterator &operator -- ()
- {
- while (_j == _i->begin ()) {
- _j = (--_i)->end ();
- --_r_index;
- }
+ --_j;
+ _c_index = _j->first;
+ return *this;
+ }
- --_j;
- _c_index = _j->first;
- return *this;
- }
+ _IndexedIterator operator -- (int)
+ {
+ _IndexedIterator tmp = *this;
+ --(*this);
+ return tmp;
+ }
- _RawIndexedIterator operator -- (int)
- {
- _RawIndexedIterator tmp = *this;
- --(*this);
- return tmp;
- }
+ value_type &operator * ()
+ {
+ return _j->second;
+ }
+ const value_type &operator * () const
+ {
+ return _j->second;
+ }
+ value_type *operator -> ()
+ {
+ return &(_j->second);
+ }
+ const value_type *operator -> () const
+ {
+ return &(_j->second);
+ }
- value_type &operator * ()
- { return _j->second; }
- const value_type &operator * () const
- { return _j->second; }
- value_type *operator -> ()
- { return &(_j->second); }
- const value_type *operator -> () const
- { return &(_j->second); }
-
- size_t rowIndex () const
- { return _r_index; }
- size_t colIndex () const
- { return _c_index; }
- const value_type &value() const
- { return _j->second; }
-
- private:
- RepIterator _i;
- RowIdxIterator _j;
- RepIterator _A_end;
-
- mutable size_t _r_index;
- mutable size_t _c_index;
- };
+ size_t rowIndex () const
+ {
+ return _r_index;
+ }
+ size_t colIndex () const
+ {
+ return _c_index;
+ }
+ const value_type &value() const
+ {
+ return _j->second;
+ }
- typedef _RawIndexedIterator<typename Rep::iterator, typename Row::iterator> RawIndexedIterator;
- typedef _RawIndexedIterator<typename Rep::const_iterator, typename Row::const_iterator> ConstRawIndexedIterator;
+ private:
+ RepIterator _i;
+ RowIdxIterator _j;
+ RepIterator _A_end;
- RawIndexedIterator rawIndexedBegin ()
- { return RawIndexedIterator (0, _A.begin (), _A.front ().begin (), _A.end ()); }
- RawIndexedIterator rawIndexedEnd ()
- { return RawIndexedIterator (_m, _A.end (), _A.back ().end (), _A.end ()); }
- ConstRawIndexedIterator rawIndexedBegin () const
- { return ConstRawIndexedIterator (0, _A.begin (), _A.front ().begin (), _A.end ()); }
- ConstRawIndexedIterator rawIndexedEnd () const
- { return ConstRawIndexedIterator (_m, _A.end (), _A.back ().end (), _A.end ()); }
+ mutable size_t _r_index;
+ mutable size_t _c_index;
+ };
- Row &getRow (size_t i) { return _A[i]; }
- Row &operator [] (size_t i) { return _A[i]; }
- ConstRow &operator [] (size_t i) const { return _A[i]; }
+ typedef _IndexedIterator<typename Rep::iterator, typename Row::iterator> IndexedIterator;
+ typedef _IndexedIterator<typename Rep::const_iterator, typename Row::const_iterator> ConstIndexedIterator;
- template <class Vector> Vector &columnDensity (Vector &v) const;
- SparseMatrixBase &transpose (SparseMatrixBase &AT) const;
+ IndexedIterator IndexedBegin ()
+ {
+ return IndexedIterator (0, _matA.begin (), _matA.front ().begin (), _matA.end ());
+ }
+ IndexedIterator IndexedEnd ()
+ {
+ return IndexedIterator (_m, _matA.end (), _matA.back ().end (), _matA.end ());
+ }
+ ConstIndexedIterator IndexedBegin () const
+ {
+ return ConstIndexedIterator (0, _matA.begin (), _matA.front ().begin (), _matA.end ());
+ }
+ ConstIndexedIterator IndexedEnd () const
+ {
+ return ConstIndexedIterator (_m, _matA.end (), _matA.back ().end (), _matA.end ());
+ }
+
+ Row &getRow (size_t i) {
+ return _matA[i];
+ }
+ Row &operator [] (size_t i) {
+ return _matA[i];
+ }
+ ConstRow &operator [] (size_t i) const
+ {
+ return _matA[i];
+ }
- protected:
+ template <class Vector> Vector &columnDensity (Vector &v) const;
+ SparseMatrixBase &transpose (SparseMatrixBase &AT) const;
- friend class SparseMatrixWriteHelper<Element, Row>;
- friend class SparseMatrixReadWriteHelper<Element, Row>;
+protected:
- Rep _A;
- size_t _m;
- size_t _n;
+ friend class SparseMatrixWriteHelper<Element, Row>;
+ friend class SparseMatrixReadWriteHelper<Element, Row>;
- template<class F, class R, class T> friend class SparseMatrixBase;
- };
+ Rep _matA;
+ size_t _m;
+ size_t _n;
- /* Specialization for sparse associative vectors */
+ template<class F, class R, class T> friend class SparseMatrixBase;
+};
- template <class _Element, class _Row>
- class SparseMatrixBase<_Element, _Row, VectorCategories::SparseAssociativeVectorTag > {
- public:
+/* Specialization for sparse associative vectors */
- typedef _Element Element;
- typedef _Row Row;
- typedef const Row ConstRow;
- typedef _SP_BB_VECTOR_<Row> Rep;
+template <class _Element, class _Row>
+class SparseMatrixBase<_Element, _Row, VectorCategories::SparseAssociativeVectorTag > {
+public:
- template<typename _Tp1, typename _R1 = typename Rebind<_Row,_Tp1>::other >
- struct rebind
- { typedef SparseMatrixBase<typename _Tp1::Element, _R1, VectorCategories::SparseAssociativeVectorTag> other; };
+ typedef _Element Element;
+ typedef _Row Row;
+ typedef const Row ConstRow;
+ typedef _SP_BB_VECTOR_<Row> Rep;
- SparseMatrixBase (size_t m, size_t n) :
- _A (m), _m (m), _n (n)
- {}
- SparseMatrixBase (const SparseMatrixBase<Element, Row> &A) :
- _A (A._A), _m (A._m), _n (A._n)
- {}
+ template<typename _Tp1, typename _R1 = typename Rebind<_Row,_Tp1>::other >
+ struct rebind {
+ typedef SparseMatrixBase<typename _Tp1::Element, _R1, VectorCategories::SparseAssociativeVectorTag> other;
+ };
- template<class VectorType>
- SparseMatrixBase (const SparseMatrixBase<Element, VectorType> &A) :
- _A(A.m), _m (A._m), _n (A._n)
+ SparseMatrixBase (size_t m, size_t n) :
+ _matA (m), _m (m), _n (n)
+ {}
+ SparseMatrixBase (const SparseMatrixBase<Element, Row> &A) :
+ _matA (A._matA), _m (A._m), _n (A._n)
+ {}
+
+ template<class VectorType>
+ SparseMatrixBase (const SparseMatrixBase<Element, VectorType> &A) :
+ _matA(A.m), _m (A._m), _n (A._n)
+ {
+ typename Rep::iterator meit = this->_matA.begin();
+ typename SparseMatrixBase<Element, VectorType>::Rep::const_iterator copit = A._matA.begin();
+ for( ; meit != this->_matA.end(); ++meit, ++copit)
+ LinBox::RawVector<Element>::convert(*meit, *copit);
+ }
+
+ /** Constructor from a MatrixStream
+ */
+ template <class Field>
+ SparseMatrixBase ( MatrixStream<Field>& ms );
+ ~SparseMatrixBase () {}
+
+ size_t rowdim () const
+ {
+ return _m;
+ }
+ size_t coldim () const
+ {
+ return _n;
+ }
+ size_t size () const
+ {
+ size_t s(0);
+ for(typename Rep::const_iterator it = _matA.begin(); it != _matA.end(); ++it)
+ s+= LinBox::RawVector<_Element>::size(*it);
+ return s;
+ }
+
+ template <class Field>
+ std::istream &read (std::istream &is, const Field &F, FileFormatTag format = FORMAT_DETECT)
+ {
+ return SparseMatrixReadWriteHelper<Element, Row>::read
+ (*this, is, F, format);
+ }
+ std::istream &read (std::istream &is, FileFormatTag format = FORMAT_DETECT)
+ {
+ return SparseMatrixReadWriteHelper<Element, Row>::read
+ (*this, is, SparseMatrixReadWriteHelper<Element, Row>::NoField (),
+ format);
+ }
+ template <class Field>
+ std::ostream &write (std::ostream &os, const Field &F, FileFormatTag format = FORMAT_PRETTY) const
+ {
+ return SparseMatrixReadWriteHelper<Element, Row>::write
+ (*this, os, F, format);
+ }
+ std::ostream &write (std::ostream &os, FileFormatTag format = FORMAT_PRETTY) const
+ {
+ return SparseMatrixReadWriteHelper<Element, Row>::write
+ (*this, os, SparseMatrixReadWriteHelper<Element, Row>::NoField (),
+ format);
+ }
+
+ void setEntry (size_t i, size_t j, const Element &value) { _matA[i][j] = value;
+ }
+ Element &refEntry (size_t i, size_t j) {
+ return _matA[i][j];
+ }
+ const Element &getEntry (size_t i, size_t j) const;
+ Element &getEntry (Element &x, size_t i, size_t j) const
+ {
+ return x = _matA[i][j];
+ }
+
+ typedef typename Rep::iterator RowIterator;
+ typedef typename Rep::const_iterator ConstRowIterator;
+
+ ConstRowIterator rowBegin () const
+ {
+ return _matA.begin ();
+ }
+ ConstRowIterator rowEnd () const
+ {
+ return _matA.end ();
+ }
+ RowIterator rowBegin ()
+ {
+ return _matA.begin ();
+ }
+ RowIterator rowEnd ()
+ {
+ return _matA.end ();
+ }
+
+ template <class RepIterator, class RowEltIterator, class _I_Element>
+ class _Iterator {
+ public:
+ typedef _I_Element value_type;
+
+ _Iterator (const RepIterator &i, const RowEltIterator &j, const RepIterator &A_end) :
+ _i (i), _j (j), _A_end (A_end)
{
- typename Rep::iterator meit = this->_A.begin();
- typename SparseMatrixBase<Element, VectorType>::Rep::const_iterator copit = A._A.begin();
- for( ; meit != this->_A.end(); ++meit, ++copit)
- LinBox::RawVector<Element>::convert(*meit, *copit);
+ if( _i == _A_end ) return;
+ while( _j == _i->end() ) {
+ if( ++_i == _A_end ) return;
+ _j = _i->begin();
+ }
}
- /** Constructor from a MatrixStream
- */
- template <class Field>
- SparseMatrixBase ( MatrixStream<Field>& ms );
- ~SparseMatrixBase () {}
+ _Iterator (const _Iterator &iter) :
+ _i (iter._i), _j (iter._j), _A_end (iter._A_end)
+ {}
- size_t rowdim () const { return _m; }
- size_t coldim () const { return _n; }
- size_t size () const {
- size_t s(0);
- for(typename Rep::const_iterator it = _A.begin(); it != _A.end(); ++it)
- s+= LinBox::RawVector<_Element>::size(*it);
- return s;
- }
+ _Iterator () {}
- template <class Field>
- std::istream &read (std::istream &is, const Field &F, FileFormatTag format = FORMAT_DETECT)
+ _Iterator &operator = (const _Iterator &iter)
{
- return SparseMatrixReadWriteHelper<Element, Row>::read
- (*this, is, F, format);
+ _i = iter._i;
+ _j = iter._j;
+ _A_end = iter._A_end;
+
+ return *this;
}
- std::istream &read (std::istream &is, FileFormatTag format = FORMAT_DETECT)
+
+ bool operator == (const _Iterator &i) const
{
- return SparseMatrixReadWriteHelper<Element, Row>::read
- (*this, is, SparseMatrixReadWriteHelper<Element, Row>::NoField (),
- format);
+ return (_i == i._i) && (_j == i._j);
}
- template <class Field>
- std::ostream &write (std::ostream &os, const Field &F, FileFormatTag format = FORMAT_PRETTY) const
+
+ bool operator != (const _Iterator &i) const
{
- return SparseMatrixReadWriteHelper<Element, Row>::write
- (*this, os, F, format);
+ return (_i != i._i) || (_j != i._j);
}
- std::ostream &write (std::ostream &os, FileFormatTag format = FORMAT_PRETTY) const
+
+ _Iterator &operator ++ ()
{
- return SparseMatrixReadWriteHelper<Element, Row>::write
- (*this, os, SparseMatrixReadWriteHelper<Element, Row>::NoField (),
- format);
+ while (++_j == _i->end ()) {
+ if (++_i == _A_end ()) return *this;
+ _j = _i->begin ();
+ }
+ return *this;
}
- void setEntry (size_t i, size_t j, const Element &value) { _A[i][j] = value; }
- Element &refEntry (size_t i, size_t j) { return _A[i][j]; }
- const Element &getEntry (size_t i, size_t j) const;
- Element &getEntry (Element &x, size_t i, size_t j) const { return x = _A[i][j];}
-
- typedef typename Rep::iterator RowIterator;
- typedef typename Rep::const_iterator ConstRowIterator;
+ _Iterator operator ++ (int)
+ {
+ _Iterator tmp = *this;
+ ++(*this);
+ return tmp;
+ }
- ConstRowIterator rowBegin () const
+ _Iterator &operator -- ()
{
- return _A.begin ();
+ while (_j == _i->begin ())
+ _j = (--_i)->end ();
+ --_j;
+ return *this;
}
- ConstRowIterator rowEnd () const
+
+ _Iterator operator -- (int)
{
- return _A.end ();
+ _Iterator tmp = *this;
+ --(*this);
+ return tmp;
}
- RowIterator rowBegin ()
+
+ value_type &operator * ()
{
- return _A.begin ();
+ return _j->second;
}
- RowIterator rowEnd ()
+ value_type *operator -> ()
{
- return _A.end ();
+ return &(_j->second);
}
- template <class RepIterator, class RowEltIterator, class _I_Element>
- class _RawIterator {
- public:
- typedef _I_Element value_type;
-
- _RawIterator (const RepIterator &i, const RowEltIterator &j, const RepIterator &A_end) :
- _i (i), _j (j), _A_end (A_end)
- {
- if( _i == _A_end ) return;
- while( _j == _i->end() ) {
- if( ++_i == _A_end ) return;
- _j = _i->begin();
- }
- }
+ private:
+ RepIterator _i;
+ RowEltIterator _j;
+ RepIterator _A_end;
+ };
- _RawIterator (const _RawIterator &iter) :
- _i (iter._i), _j (iter._j), _A_end (iter._A_end)
- {}
+ typedef _Iterator<typename Rep::iterator, typename Row::iterator, Element> Iterator;
+ typedef _Iterator<typename Rep::const_iterator, typename Row::const_iterator, const Element> ConstIterator;
- _RawIterator () {}
+ Iterator Begin ()
+ {
+ return Iterator (_matA.begin (), _matA.front ().begin (), _matA.end ());
+ }
+ Iterator End ()
+ {
+ return Iterator (_matA.end (), _matA.back ().end (), _matA.end ());
+ }
+ ConstIterator Begin () const
+ {
+ return ConstIterator (_matA.begin (), _matA.front ().begin (), _matA.end ());
+ }
+ ConstIterator End () const
+ {
+ return ConstIterator (_matA.end (), _matA.back ().end (), _matA.end ());
+ }
- _RawIterator &operator = (const _RawIterator &iter)
- {
- _i = iter._i;
- _j = iter._j;
- _A_end = iter._A_end;
+ template <class RepIterator, class RowIdxIterator>
+ class _IndexedIterator {
+ public:
+ typedef std::pair<size_t, size_t> value_type;
- return *this;
+ _IndexedIterator (size_t idx, const RepIterator &i, const RowIdxIterator &j, const RepIterator &A_end) :
+ _i (i), _j (j), _A_end (A_end), _r_index (idx), _c_index (0)
+ {
+ if( _i == _A_end ) return;
+ while( _j == _i->end() ) {
+ ++_r_index;
+ if( ++_i == _A_end ) return;
+ _j = _i->begin();
}
+ _c_index = _j->second;
+ }
- bool operator == (const _RawIterator &i) const
- { return (_i == i._i) && (_j == i._j); }
+ _IndexedIterator (const _IndexedIterator &iter) :
+ _i (iter._i), _j (iter._j), _A_end (iter._A_end), _r_index (iter._r_index), _c_index (iter._c_index)
+ {}
- bool operator != (const _RawIterator &i) const
- { return (_i != i._i) || (_j != i._j); }
+ _IndexedIterator ()
+ {}
- _RawIterator &operator ++ ()
- {
- while (++_j == _i->end ()) {
- if (++_i == _A_end ()) return *this;
- _j = _i->begin ();
- }
- return *this;
- }
+ _IndexedIterator &operator = (const _IndexedIterator &iter)
+ {
+ _A_end = iter._A_end;
+ _i = iter._i;
+ _j = iter._j;
+ _r_index = iter._r_index;
+ _c_index = iter._c_index;
- _RawIterator operator ++ (int)
- {
- _RawIterator tmp = *this;
- ++(*this);
- return tmp;
- }
+ return *this;
+ }
- _RawIterator &operator -- ()
- {
- while (_j == _i->begin ())
- _j = (--_i)->end ();
- --_j;
- return *this;
- }
+ bool operator == (const _IndexedIterator &i) const
+ {
+ return (_i == i._i) && (_j == i._j);
+ }
- _RawIterator operator -- (int)
- {
- _RawIterator tmp = *this;
- --(*this);
- return tmp;
- }
+ bool operator != (const _IndexedIterator &i) const
+ {
+ return (_i != i._i) || (_j != i._j);
+ }
- value_type &operator * ()
- { return _j->second; }
- value_type *operator -> ()
- { return &(_j->second); }
-
- private:
- RepIterator _i;
- RowEltIterator _j;
- RepIterator _A_end;
- };
+ _IndexedIterator &operator ++ ()
+ {
+ ++_j;
+ while (_j == _i->end ()) {
+ ++_r_index;
+ if (++_i == _A_end ()) return *this;
+ _j = _i->begin ();
+ }
- typedef _RawIterator<typename Rep::iterator, typename Row::iterator, Element> RawIterator;
- typedef _RawIterator<typename Rep::const_iterator, typename Row::const_iterator, const Element> ConstRawIterator;
+ _c_index = _j->second;
- RawIterator rawBegin ()
- { return RawIterator (_A.begin (), _A.front ().begin (), _A.end ()); }
- RawIterator rawEnd ()
- { return RawIterator (_A.end (), _A.back ().end (), _A.end ()); }
- ConstRawIterator rawBegin () const
- { return ConstRawIterator (_A.begin (), _A.front ().begin (), _A.end ()); }
- ConstRawIterator rawEnd () const
- { return ConstRawIterator (_A.end (), _A.back ().end (), _A.end ()); }
+ return *this;
+ }
- template <class RepIterator, class RowIdxIterator>
- class _RawIndexedIterator {
- public:
- typedef std::pair<size_t, size_t> value_type;
+ _IndexedIterator operator ++ (int)
+ {
+ _IndexedIterator tmp = *this;
+ ++(*this);
+ return tmp;
+ }
- _RawIndexedIterator (size_t idx, const RepIterator &i, const RowIdxIterator &j, const RepIterator &A_end) :
- _i (i), _j (j), _A_end (A_end), _r_index (idx), _c_index (0)
- {
- if( _i == _A_end ) return;
- while( _j == _i->end() ) {
- ++_r_index;
- if( ++_i == _A_end ) return;
- _j = _i->begin();
- }
- _c_index = _j->second;
+ _IndexedIterator &operator -- ()
+ {
+ while (_j == _i->begin ()) {
+ _j = (--_i)->end ();
+ --_r_index;
}
- _RawIndexedIterator (const _RawIndexedIterator &iter) :
- _i (iter._i), _j (iter._j), _A_end (iter._A_end), _r_index (iter._r_index), _c_index (iter._c_index)
- {}
+ --_j;
+ _c_index = _j->second;
+ return *this;
+ }
- _RawIndexedIterator ()
- {}
+ _IndexedIterator operator -- (int)
+ {
+ _IndexedIterator tmp = *this;
+ --(*this);
+ return tmp;
+ }
- _RawIndexedIterator &operator = (const _RawIndexedIterator &iter)
- {
- _A_end = iter._A_end;
- _i = iter._i;
- _j = iter._j;
- _r_index = iter._r_index;
- _c_index = iter._c_index;
+ value_type &operator * ()
+ {
+ return *_j;
+ }
+ const value_type &operator * () const
+ {
+ return *_j;
+ }
+ value_type *operator -> ()
+ {
+ return &(*_j);
+ }
+ const value_type *operator -> () const
+ {
+ return &(*_j);
+ }
- return *this;
- }
+ size_t rowIndex () const
+ {
+ return _r_index;
+ }
+ size_t colIndex () const
+ {
+ return _c_index;
+ }
+ const value_type &value() const
+ {
+ return *_j;
+ }
- bool operator == (const _RawIndexedIterator &i) const
- { return (_i == i._i) && (_j == i._j); }
+ private:
+ RepIterator _i;
+ RowIdxIterator _j;
+ RepIterator _A_end;
- bool operator != (const _RawIndexedIterator &i) const
- { return (_i != i._i) || (_j != i._j); }
+ mutable size_t _r_index;
+ mutable size_t _c_index;
+ };
- _RawIndexedIterator &operator ++ ()
- {
- ++_j;
- while (_j == _i->end ()) {
- ++_r_index;
- if (++_i == _A_end ()) return *this;
- _j = _i->begin ();
- }
+ typedef _IndexedIterator<typename Rep::iterator, typename Row::iterator> IndexedIterator;
+ typedef _IndexedIterator<typename Rep::const_iterator, typename Row::const_iterator> ConstIndexedIterator;
- _c_index = _j->second;
+ IndexedIterator IndexedBegin ()
+ {
+ return IndexedIterator (0, _matA.begin (), _matA.front ().begin (), _matA.end ());
+ }
+ IndexedIterator IndexedEnd ()
+ {
+ return IndexedIterator (_m, _matA.end (), _matA.back ().end (), _matA.end ());
+ }
+ ConstIndexedIterator IndexedBegin () const
+ {
+ return ConstIndexedIterator (0, _matA.begin (), _matA.front ().begin (), _matA.end ());
+ }
+ ConstIndexedIterator IndexedEnd () const
+ {
+ return ConstIndexedIterator (_m, _matA.end (), _matA.back ().end (), _matA.end ());
+ }
+
+ Row &getRow (size_t i) {
+ return _matA[i];
+ }
+ Row &operator [] (size_t i) {
+ return _matA[i];
+ }
+ ConstRow &operator [] (size_t i) const
+ {
+ return _matA[i];
+ }
- return *this;
- }
+ template <class Vector> Vector &columnDensity (Vector &v) const;
+ SparseMatrixBase &transpose (SparseMatrixBase &AT) const;
- _RawIndexedIterator operator ++ (int)
- {
- _RawIndexedIterator tmp = *this;
- ++(*this);
- return tmp;
- }
+protected:
- _RawIndexedIterator &operator -- ()
- {
- while (_j == _i->begin ()) {
- _j = (--_i)->end ();
- --_r_index;
- }
+ friend class SparseMatrixWriteHelper<Element, Row>;
+ friend class SparseMatrixReadWriteHelper<Element, Row>;
- --_j;
- _c_index = _j->second;
- return *this;
- }
+ Rep _matA;
+ size_t _m;
+ size_t _n;
- _RawIndexedIterator operator -- (int)
- {
- _RawIndexedIterator tmp = *this;
- --(*this);
- return tmp;
- }
+ template<class F, class R, class T> friend class SparseMatrixBase;
+};
- value_type &operator * ()
- { return *_j; }
- const value_type &operator * () const
- { return *_j; }
- value_type *operator -> ()
- { return &(*_j); }
- const value_type *operator -> () const
- { return &(*_j); }
-
- size_t rowIndex () const
- { return _r_index; }
- size_t colIndex () const
- { return _c_index; }
- const value_type &value() const
- { return *_j; }
-
- private:
- RepIterator _i;
- RowIdxIterator _j;
- RepIterator _A_end;
-
- mutable size_t _r_index;
- mutable size_t _c_index;
- };
+/* Specialization for sparse parallel vectors */
- typedef _RawIndexedIterator<typename Rep::iterator, typename Row::iterator> RawIndexedIterator;
- typedef _RawIndexedIterator<typename Rep::const_iterator, typename Row::const_iterator> ConstRawIndexedIterator;
+template <class _Element, class _Row>
+class SparseMatrixBase<_Element, _Row, VectorCategories::SparseParallelVectorTag > {
+public:
- RawIndexedIterator rawIndexedBegin ()
- { return RawIndexedIterator (0, _A.begin (), _A.front ().begin (), _A.end ()); }
- RawIndexedIterator rawIndexedEnd ()
- { return RawIndexedIterator (_m, _A.end (), _A.back ().end (), _A.end ()); }
- ConstRawIndexedIterator rawIndexedBegin () const
- { return ConstRawIndexedIterator (0, _A.begin (), _A.front ().begin (), _A.end ()); }
- ConstRawIndexedIterator rawIndexedEnd () const
- { return ConstRawIndexedIterator (_m, _A.end (), _A.back ().end (), _A.end ()); }
+ typedef _Element Element;
+ typedef _Row Row;
+ typedef const Row ConstRow;
+ typedef _SP_BB_VECTOR_<Row> Rep;
- Row &getRow (size_t i) { return _A[i]; }
- Row &operator [] (size_t i) { return _A[i]; }
- ConstRow &operator [] (size_t i) const { return _A[i]; }
+ template<typename _Tp1, typename _R1 = typename Rebind<_Row,_Tp1>::other >
+ struct rebind {
+ typedef SparseMatrixBase<typename _Tp1::Element, _R1, VectorCategories::SparseParallelVectorTag> other;
+ };
- template <class Vector> Vector &columnDensity (Vector &v) const;
- SparseMatrixBase &transpose (SparseMatrixBase &AT) const;
+ SparseMatrixBase (size_t m, size_t n) :
+ _matA (m), _m (m), _n (n)
+ {}
- protected:
+ template<class Field>
+ SparseMatrixBase (Field & F, size_t m, size_t n) :
+ _matA (m), _m (m), _n (n)
+ {}
- friend class SparseMatrixWriteHelper<Element, Row>;
- friend class SparseMatrixReadWriteHelper<Element, Row>;
- Rep _A;
- size_t _m;
- size_t _n;
+ SparseMatrixBase (const SparseMatrixBase<Element, Row> &A) :
+ _matA (A._matA), _m (A._m), _n (A._n)
+ {}
- template<class F, class R, class T> friend class SparseMatrixBase;
- };
+ template<class VectorType>
+ SparseMatrixBase (const SparseMatrixBase<Element, VectorType> &A) :
+ _matA(A._m), _m (A._m), _n (A._n)
+ {
+ typename Rep::iterator meit = this->_matA.begin();
+ typename SparseMatrixBase<Element, VectorType>::Rep::const_iterator copit = A._matA.begin();
+ for( ; meit != this->_matA.end(); ++meit, ++copit)
+ LinBox::RawVector<Element>::convert(*meit, *copit);
+ }
- /* Specialization for sparse parallel vectors */
+ /** Constructor from a MatrixStream
+ */
+ template <class Field>
+ SparseMatrixBase ( MatrixStream<Field>& ms );
- template <class _Element, class _Row>
- class SparseMatrixBase<_Element, _Row, VectorCategories::SparseParallelVectorTag > {
- public:
+ ~SparseMatrixBase () {}
- typedef _Element Element;
- typedef _Row Row;
- typedef const Row ConstRow;
- typedef _SP_BB_VECTOR_<Row> Rep;
+ size_t rowdim () const
+ {
+ return _m;
+ }
+ size_t coldim () const
+ {
+ return _n;
+ }
+ size_t size () const
+ {
+ size_t s(0);
+ for(typename Rep::const_iterator it = _matA.begin(); it != _matA.end(); ++it)
+ s+= LinBox::RawVector<_Element>::size(*it);
+ return s;
+ }
+
+ template <class Field>
+ std::istream &read (std::istream &is, const Field &F, FileFormatTag format = FORMAT_DETECT)
+ {
+ return SparseMatrixReadWriteHelper<Element, Row>::read
+ (*this, is, F, format);
+ }
- template<typename _Tp1, typename _R1 = typename Rebind<_Row,_Tp1>::other >
- struct rebind
- { typedef SparseMatrixBase<typename _Tp1::Element, _R1, VectorCategories::SparseParallelVectorTag> other; };
+ std::istream &read (std::istream &is, FileFormatTag format = FORMAT_DETECT)
+ {
+ return SparseMatrixReadWriteHelper<Element, Row>::read
+ (*this, is, SparseMatrixReadWriteHelper<Element, Row>::NoField (),
+ format);
+ }
- SparseMatrixBase (size_t m, size_t n) :
- _A (m), _m (m), _n (n)
- {}
- SparseMatrixBase (const SparseMatrixBase<Element, Row> &A) :
- _A (A._A), _m (A._m), _n (A._n)
- {}
+ template <class Field>
+ std::ostream &write (std::ostream &os, const Field &F, FileFormatTag format = FORMAT_PRETTY) const
+ {
+ return SparseMatrixReadWriteHelper<Element, Row>::write
+ (*this, os, F, format);
+ }
- template<class VectorType>
- SparseMatrixBase (const SparseMatrixBase<Element, VectorType> &A) :
- _A(A._m), _m (A._m), _n (A._n)
- {
- typename Rep::iterator meit = this->_A.begin();
- typename SparseMatrixBase<Element, VectorType>::Rep::const_iterator copit = A._A.begin();
- for( ; meit != this->_A.end(); ++meit, ++copit)
- LinBox::RawVector<Element>::convert(*meit, *copit);
- }
+ std::ostream &write (std::ostream &os, FileFormatTag format = FORMAT_PRETTY) const
+ {
+ return SparseMatrixReadWriteHelper<Element, Row>::write
+ (*this, os, typename SparseMatrixReadWriteHelper<Element, Row>::NoField (),
+ format);
+ }
+
+ void setEntry (size_t i, size_t j, const Element &value);
+ Element &refEntry (size_t i, size_t j);
+ const Element &getEntry (size_t i, size_t j) const;
+ Element &getEntry (Element &x, size_t i, size_t j) const
+ {
+ return x = getEntry (i, j);
+ }
- /** Constructor from a MatrixStream
- */
- template <class Field>
- SparseMatrixBase ( MatrixStream<Field>& ms );
+ typedef typename Rep::iterator RowIterator;
+ typedef typename Rep::const_iterator ConstRowIterator;
- ~SparseMatrixBase () {}
+ ConstRowIterator rowBegin () const
+ {
+ return _matA.begin ();
+ }
+ ConstRowIterator rowEnd () const
+ {
+ return _matA.end ();
+ }
+ RowIterator rowBegin ()
+ {
+ return _matA.begin ();
+ }
+ RowIterator rowEnd ()
+ {
+ return _matA.end ();
+ }
- size_t rowdim () const { return _m; }
- size_t coldim () const { return _n; }
- size_t size () const {
- size_t s(0);
- for(typename Rep::const_iterator it = _A.begin(); it != _A.end(); ++it)
- s+= LinBox::RawVector<_Element>::size(*it);
- return s;
- }
+ template <class RepIterator, class RowEltIterator, class _I_Element>
+ class _Iterator {
+ public:
+ typedef _I_Element value_type;
- template <class Field>
- std::istream &read (std::istream &is, const Field &F, FileFormatTag format = FORMAT_DETECT)
+ _Iterator (const RepIterator &i, const RowEltIterator &j, const RepIterator &A_end) :
+ _i (i), _j (j), _A_end (A_end)
{
- return SparseMatrixReadWriteHelper<Element, Row>::read
- (*this, is, F, format);
+ if( _i == _A_end ) return;
+ while( _j == _i->second.end() ) {
+ if( ++_i == _A_end ) return;
+ _j = _i->second.begin();
+ }
}
- std::istream &read (std::istream &is, FileFormatTag format = FORMAT_DETECT)
+
+ _Iterator (const _Iterator &iter) :
+ _i (iter._i), _j (iter._j), _A_end (iter._A_end)
+ {}
+
+ _Iterator () {}
+
+ _Iterator &operator = (const _Iterator &iter)
{
- return SparseMatrixReadWriteHelper<Element, Row>::read
- (*this, is, SparseMatrixReadWriteHelper<Element, Row>::NoField (),
- format);
+ _i = iter._i;
+ _j = iter._j;
+ _A_end = iter._A_end;
+
+ return *this;
}
- template <class Field>
- std::ostream &write (std::ostream &os, const Field &F, FileFormatTag format = FORMAT_PRETTY) const
+
+ bool operator == (const _Iterator &i) const
{
- return SparseMatrixReadWriteHelper<Element, Row>::write
- (*this, os, F, format);
+ return (_i == i._i) && (_j == i._j);
}
- std::ostream &write (std::ostream &os, FileFormatTag format = FORMAT_PRETTY) const
+
+ bool operator != (const _Iterator &i) const
{
- return SparseMatrixReadWriteHelper<Element, Row>::write
- (*this, os, SparseMatrixReadWriteHelper<Element, Row>::NoField (),
- format);
+ return (_i != i._i) || (_j != i._j);
}
- void setEntry (size_t i, size_t j, const Element &value);
- Element &refEntry (size_t i, size_t j);
- const Element &getEntry (size_t i, size_t j) const;
- Element &getEntry (Element &x, size_t i, size_t j) const
+ _Iterator &operator ++ ()
{
- return x = getEntry (i, j);
+ ++_j;
+ while( _j == _i->second.end() ) {
+ if( ++_i == _A_end ) return *this;
+ _j = _i->second.begin();
+ }
+ return *this;
}
- typedef typename Rep::iterator RowIterator;
- typedef typename Rep::const_iterator ConstRowIterator;
+ _Iterator operator ++ (int)
+ {
+ _Iterator tmp = *this;
+ ++(*this);
+ return tmp;
+ }
- ConstRowIterator rowBegin () const
+ _Iterator &operator -- ()
{
- return _A.begin ();
+ while (_j == _i->second.begin ())
+ _j = (--_i)->second.end ();
+ --_j;
+ return *this;
}
- ConstRowIterator rowEnd () const
+
+ _Iterator operator -- (int)
{
- return _A.end ();
+ _Iterator tmp = *this;
+ --(*this);
+ return tmp;
}
- RowIterator rowBegin ()
+
+ value_type &operator * ()
{
- return _A.begin ();
+ return static_cast<value_type&>(*_j);
}
- RowIterator rowEnd ()
+ value_type *operator -> ()
{
- return _A.end ();
+ return &(*_j);
}
- template <class RepIterator, class RowEltIterator, class _I_Element>
- class _RawIterator {
- public:
- typedef _I_Element value_type;
-
- _RawIterator (const RepIterator &i, const RowEltIterator &j, const RepIterator &A_end) :
- _i (i), _j (j), _A_end (A_end)
- {
- if( _i == _A_end ) return;
- while( _j == _i->second.end() ) {
- if( ++_i == _A_end ) return;
- _j = _i->second.begin();
- }
- }
-
- _RawIterator (const _RawIterator &iter) :
- _i (iter._i), _j (iter._j), _A_end (iter._A_end)
- {}
+ private:
+ RepIterator _i;
+ RowEltIterator _j;
+ RepIterator _A_end;
+ };
- _RawIterator () {}
+ typedef _Iterator<typename Rep::iterator, typename Row::second_type::iterator, Element> Iterator;
+ typedef _Iterator<typename Rep::const_iterator, typename Row::second_type::const_iterator, const Element> ConstIterator;
- _RawIterator &operator = (const _RawIterator &iter)
- {
- _i = iter._i;
- _j = iter._j;
- _A_end = iter._A_end;
+ Iterator Begin ()
+ {
+ return Iterator (_matA.begin (), _matA.front ().second.begin (), _matA.end ());
+ }
+ Iterator End ()
+ {
+ return Iterator (_matA.end (), _matA.back ().second.end (), _matA.end ());
+ }
+ ConstIterator Begin () const
+ {
+ return ConstIterator (_matA.begin (), _matA.front ().second.begin (), _matA.end ());
+ }
+ ConstIterator End () const
+ {
+ return ConstIterator (_matA.end (), _matA.back ().second.end (), _matA.end ());
+ }
- return *this;
- }
+ /* Generic trait for iterators without type */
+ template<typename U>
+ struct IteratorValueType {
+ typedef typename U::value_type value_type;
+ };
- bool operator == (const _RawIterator &i) const
- { return (_i == i._i) && (_j == i._j); }
+ template<typename X>
+ struct IteratorValueType<const X*> {
+ typedef X value_type;
+ };
- bool operator != (const _RawIterator &i) const
- { return (_i != i._i) || (_j != i._j); }
- _RawIterator &operator ++ ()
- {
- ++_j;
- while( _j == _i->second.end() ) {
- if( ++_i == _A_end ) return *this;
- _j = _i->second.begin();
- }
- return *this;
- }
+ template <class RepIterator, class RowIdxIterator>
+ class _IndexedIterator {
+ public:
+ typedef typename IteratorValueType<RepIterator>::value_type PairValue ;
+ typedef typename PairValue::second_type::value_type value_type;
- _RawIterator operator ++ (int)
- {
- _RawIterator tmp = *this;
- ++(*this);
- return tmp;
- }
+ // typedef typename IteratorValueType< RepIterator >::second_type::value_type value_type;
- _RawIterator &operator -- ()
- {
- while (_j == _i->second.begin ())
- _j = (--_i)->second.end ();
- --_j;
- return *this;
+ // Dan Roche 7-6-05 Fixed a seg fault this code was causing
+ _IndexedIterator (size_t idx, const RepIterator &i,
+ const RowIdxIterator &j, const RepIterator &A_end) :
+ _i (i), _j (j), _A_end (A_end), _r_index (idx), _c_index(0), _value_index(0)
+ {
+ if( _i == _A_end ) return;
+ while( _j == _i->first.end() ) {
+ if( ++_i == _A_end ) return;
+ ++_r_index;
+ _j = _i->first.begin();
}
- _RawIterator operator -- (int)
- {
- _RawIterator tmp = *this;
- --(*this);
- return tmp;
- }
+ _c_index = *_j;
+ _value_index = _j-_i->first.begin();
+ }
- value_type &operator * ()
- { return static_cast<value_type&>(*_j); }
- value_type *operator -> ()
- { return &(*_j); }
-
- private:
- RepIterator _i;
- RowEltIterator _j;
- RepIterator _A_end;
- };
+ _IndexedIterator (const _IndexedIterator &iter) :
+ _i (iter._i), _j (iter._j),
+ _A_end (iter._A_end), _r_index (iter._r_index),
+ _c_index (iter._c_index), _value_index( iter._value_index )
+ {}
- typedef _RawIterator<typename Rep::iterator, typename Row::second_type::iterator, Element> RawIterator;
- typedef _RawIterator<typename Rep::const_iterator, typename Row::second_type::const_iterator, const Element> ConstRawIterator;
+ _IndexedIterator ()
+ {}
- RawIterator rawBegin ()
- { return RawIterator (_A.begin (), _A.front ().second.begin (), _A.end ()); }
- RawIterator rawEnd ()
- { return RawIterator (_A.end (), _A.back ().second.end (), _A.end ()); }
- ConstRawIterator rawBegin () const
- { return ConstRawIterator (_A.begin (), _A.front ().second.begin (), _A.end ()); }
- ConstRawIterator rawEnd () const
- { return ConstRawIterator (_A.end (), _A.back ().second.end (), _A.end ()); }
+ _IndexedIterator &operator = (const _IndexedIterator &iter)
+ {
+ _A_end = iter._A_end;
+ _i = iter._i;
+ _j = iter._j;
+ _r_index = iter._r_index;
+ _c_index = iter._c_index;
+ _value_index = iter._value_index;
+
+ return *this;
+ }
- template <class RepIterator, class RowIdxIterator>
- class _RawIndexedIterator {
- public:
- typedef typename RepIterator::value_type::second_type::value_type value_type;
+ bool operator == (const _IndexedIterator &i) const
+ {
+ return (_i == i._i) && (_j == i._j);
+ }
- // Dan Roche 7-6-05 Fixed a seg fault this code was causing
- _RawIndexedIterator (size_t idx, const RepIterator &i, const RowIdxIterator &j, const RepIterator &A_end) :
- _i (i), _j (j), _A_end (A_end), _r_index (idx), _c_index(0), _value_index(0)
- {
- if( _i == _A_end ) return;
- while( _j == _i->first.end() ) {
- if( ++_i == _A_end ) return;
- ++_r_index;
- _j = _i->first.begin();
- }
+ bool operator != (const _IndexedIterator &i) const
+ {
+ return (_i != i._i) || (_j != i._j);
+ }
- _c_index = *_j;
- _value_index = _j-_i->first.begin();
+ _IndexedIterator &operator ++ ()
+ {
+ if(_j != _i->first.end ()) {
+ ++_j ;
+ ++_value_index;
}
-
- _RawIndexedIterator (const _RawIndexedIterator &iter) :
- _i (iter._i), _j (iter._j), _A_end (iter._A_end), _r_index (iter._r_index), _c_index (iter._c_index), _value_index( iter._value_index )
- {}
-
- _RawIndexedIterator ()
- {}
-
- _RawIndexedIterator &operator = (const _RawIndexedIterator &iter)
- {
- _A_end = iter._A_end;
- _i = iter._i;
- _j = iter._j;
- _r_index = iter._r_index;
- _c_index = iter._c_index;
- _value_index = iter._value_index;
-
- return *this;
+ while(_j == _i->first.end ()) {
+ ++_r_index;
+ if (++_i == _A_end) return *this;
+ _j = _i->first.begin ();
+ _value_index = 0;
}
+ _c_index = *_j;
- bool operator == (const _RawIndexedIterator &i) const
- { return (_i == i._i) && (_j == i._j); }
-
- bool operator != (const _RawIndexedIterator &i) const
- { return (_i != i._i) || (_j != i._j); }
+ return *this;
+ }
- _RawIndexedIterator &operator ++ ()
- {
- if(_j != _i->first.end ()) {
- ++_j ;
- ++_value_index;
- }
- while(_j == _i->first.end ()) {
- ++_r_index;
- if (++_i == _A_end) return *this;
- _j = _i->first.begin ();
- _value_index = 0;
- }
- _c_index = *_j;
+ _IndexedIterator operator ++ (int)
+ {
+ _IndexedIterator tmp = *this;
+ ++(*this);
+ return tmp;
+ }
- return *this;
+ _IndexedIterator &operator -- ()
+ {
+ while (_j == _i->first.begin ()) {
+ _j = (--_i)->first.end ();
+ _value_index = _i->first.size();
+ --_r_index;
}
- _RawIndexedIterator operator ++ (int)
- {
- _RawIndexedIterator tmp = *this;
- ++(*this);
- return tmp;
- }
+ --_j;
+ --_value_index;
+ _c_index = *_j;
+ return *this;
+ }
- _RawIndexedIterator &operator -- ()
- {
- while (_j == _i->first.begin ()) {
- _j = (--_i)->first.end ();
- _value_index = _i->first.size();
- --_r_index;
- }
+ _IndexedIterator operator -- (int)
+ {
+ _IndexedIterator tmp = *this;
+ --(*this);
+ return tmp;
+ }
- --_j;
- --_value_index;
- _c_index = *_j;
- return *this;
- }
+#if 0
+ const value_type &operator * () const
+ {
+ return *(_i->second.begin () + _c_index);
+ }
+#endif
+ value_type &operator * ()
+ {
+ return (value_type&)(_i->second)[_value_index];
+ }
+#if 0
+ value_type *operator -> ()
+ {
+ return &(*(_i->second.begin () + _c_index));
+ }
+ const value_type *operator -> () const
+ {
+ return &(*(_i->second.begin () + _c_index));
+ }
+#endif
- _RawIndexedIterator operator -- (int)
- {
- _RawIndexedIterator tmp = *this;
- --(*this);
- return tmp;
- }
+ size_t rowIndex () const
+ {
+ return _r_index;
+ }
+ size_t colIndex () const
+ {
+ return _c_index;
+ }
+ const value_type &value () const
+ {
+ return (const value_type&)(_i->second)[_value_index];
+ }
- // const value_type &operator * () const
- // { return *(_i->second.begin () + _c_index); }
- value_type &operator * ()
- { return (value_type&)(_i->second)[_value_index]; }
- // value_type *operator -> ()
- // { return &(*(_i->second.begin () + _c_index)); }
- // const value_type *operator -> () const
- // { return &(*(_i->second.begin () + _c_index)); }
-
- size_t rowIndex () const
- { return _r_index; }
- size_t colIndex () const
- { return _c_index; }
- const value_type &value () const
- { return (value_type&)(_i->second)[_value_index]; }
-
- private:
- RepIterator _i;
- RowIdxIterator _j;
- RepIterator _A_end;
-
- mutable size_t _r_index;
- mutable size_t _c_index;
- mutable size_t _value_index;
- };
+ private:
+ RepIterator _i;
+ RowIdxIterator _j;
+ RepIterator _A_end;
- typedef _RawIndexedIterator<typename Rep::iterator, typename Row::first_type::iterator> RawIndexedIterator;
- typedef _RawIndexedIterator<typename Rep::const_iterator, typename Row::first_type::const_iterator> ConstRawIndexedIterator;
+ mutable size_t _r_index;
+ mutable size_t _c_index;
+ mutable size_t _value_index;
+ };
- RawIndexedIterator rawIndexedBegin ()
- { return RawIndexedIterator (0, _A.begin (), _A.front ().first.begin (), _A.end ()); }
- RawIndexedIterator rawIndexedEnd ()
- { return RawIndexedIterator (_m, _A.end (), _A.back ().first.end (), _A.end ()); }
- ConstRawIndexedIterator rawIndexedBegin () const
- { return ConstRawIndexedIterator (0, _A.begin (), _A.front ().first.begin (), _A.end ()); }
- ConstRawIndexedIterator rawIndexedEnd () const
- { return ConstRawIndexedIterator (_m, _A.end (), _A.back ().first.end (), _A.end ()); }
+ typedef _IndexedIterator<typename Rep::iterator, typename Row::first_type::iterator> IndexedIterator;
+ typedef _IndexedIterator<typename Rep::const_iterator, typename Row::first_type::const_iterator> ConstIndexedIterator;
- Row &getRow (size_t i) { return _A[i]; }
- Row &operator [] (size_t i) { return _A[i]; }
- ConstRow &operator [] (size_t i) const { return _A[i]; }
+ IndexedIterator IndexedBegin ()
+ {
+ return IndexedIterator (0, _matA.begin (), _matA.front ().first.begin (), _matA.end ());
+ }
+ IndexedIterator IndexedEnd ()
+ {
+ return IndexedIterator (_m, _matA.end (), _matA.back ().first.end (), _matA.end ());
+ }
+ ConstIndexedIterator IndexedBegin () const
+ {
+ return ConstIndexedIterator (0, _matA.begin (), _matA.front ().first.begin (), _matA.end ());
+ }
+ ConstIndexedIterator IndexedEnd () const
+ {
+ return ConstIndexedIterator (_m, _matA.end (), _matA.back ().first.end (), _matA.end ());
+ }
+
+ Row &getRow (size_t i) {
+ return _matA[i];
+ }
+ Row &operator [] (size_t i) {
+ return _matA[i];
+ }
+ ConstRow &operator [] (size_t i) const
+ {
+ return _matA[i];
+ }
- template <class Vector> Vector &columnDensity (Vector &v) const;
- SparseMatrixBase &transpose (SparseMatrixBase &AT) const;
+ template <class Vector> Vector &columnDensity (Vector &v) const;
+ SparseMatrixBase &transpose (SparseMatrixBase &AT) const;
- protected:
+protected:
- friend class SparseMatrixWriteHelper<Element, Row>;
- friend class SparseMatrixReadWriteHelper<Element, Row>;
+ friend class SparseMatrixWriteHelper<Element, Row>;
+ friend class SparseMatrixReadWriteHelper<Element, Row>;
- Rep _A;
- size_t _m;
- size_t _n;
+ Rep _matA;
+ size_t _m;
+ size_t _n;
- template<class F, class R, class T> friend class SparseMatrixBase;
- };
+ template<class F, class R, class T> friend class SparseMatrixBase;
+};
- template <class Element, class Row>
- std::ostream &operator << (std::ostream &os, const SparseMatrixBase<Element, Row> &A)
- { return A.write (os); }
+template <class Element, class Row>
+std::ostream &operator << (std::ostream &os, const SparseMatrixBase<Element, Row> &A)
+{
+ return A.write (os);
+}
- template <class Element, class Row>
- std::istream &operator >> (std::istream &is, SparseMatrixBase<Element, Row> &A)
- { return A.read (is); }
+template <class Element, class Row>
+std::istream &operator >> (std::istream &is, SparseMatrixBase<Element, Row> &A)
+{
+ return A.read (is);
+}
- template <class Element, class Row, class Trait>
- struct MatrixTraits< SparseMatrixBase<Element, Row, Trait> >
- {
- typedef SparseMatrixBase<Element, Row, Trait> MatrixType;
- typedef typename MatrixCategories::RowMatrixTag MatrixCategory;
- };
+template <class Element, class Row, class Trait>
+struct MatrixTraits< SparseMatrixBase<Element, Row, Trait> >
+{
+ typedef SparseMatrixBase<Element, Row, Trait> MatrixType;
+ typedef typename MatrixCategories::RowMatrixTag MatrixCategory;
+};
- template <class Element, class Row, class Trait>
- struct MatrixTraits< const SparseMatrixBase<Element, Row, Trait> >
- {
- typedef const SparseMatrixBase<Element, Row, Trait> MatrixType;
- typedef typename MatrixCategories::RowMatrixTag MatrixCategory;
- };
+template <class Element, class Row, class Trait>
+struct MatrixTraits< const SparseMatrixBase<Element, Row, Trait> >
+{
+ typedef const SparseMatrixBase<Element, Row, Trait> MatrixType;
+ typedef typename MatrixCategories::RowMatrixTag MatrixCategory;
+};
} // namespace LinBox
@@ -1455,3 +1713,12 @@ namespace LinBox
#endif // __LINBOX_matrix_sparse_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/sparse.inl b/linbox/matrix/sparse.inl
index e6a8b05..3873b9c 100644
--- a/linbox/matrix/sparse.inl
+++ b/linbox/matrix/sparse.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/matrix/sparse.inl
* Copyright (C) 2001-2002 Bradford Hovinen
* 1999-2001 William J Turner,
@@ -18,7 +16,25 @@
* - Named template argument _Row rather than Row; add a typedef to Row
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_matrix_sparse_INL
@@ -37,7 +53,7 @@
#include "linbox/vector/vector-traits.h"
#include "linbox/vector/vector-domain.h"
#include "linbox/util/debug.h"
-#include <linbox/util/commentator.h>
+#include "linbox/util/commentator.h"
namespace LinBox
{
@@ -48,8 +64,8 @@ namespace LinBox
{
size_t i, j;
- A._A.clear ();
- A._A.resize (A._m);
+ A._matA.clear ();
+ A._matA.resize (A._m);
do {
std::istringstream str (buf);
@@ -75,8 +91,8 @@ namespace LinBox
std::istringstream str (buf);
str >> A._m >> A._n;
- A._A.clear ();
- A._A.resize (A._m);//cerr<<A.coldim()<<" "<<A.rowdim()<<endl;
+ A._matA.clear ();
+ A._matA.resize (A._m);//cerr<<A.coldim()<<" "<<A.rowdim()<<endl;
Element x;
while (is >> i) {
@@ -131,13 +147,13 @@ namespace LinBox
char c;
A._m = 0;
- A._A.clear ();
+ A._matA.clear ();
i = 0;
do {
A._m++;
- A._A.push_back (Row ());
+ A._matA.push_back (Row ());
std::istringstream str (buf);
@@ -181,7 +197,7 @@ namespace LinBox
const char pairstart = '[', pairend = ']';
A._m = A._n = 0;
- A._A.clear ();
+ A._matA.clear ();
do {is.get(c);} while (c != matrixstart ); // find matrix start
i = 0;
@@ -192,7 +208,7 @@ namespace LinBox
else
{
A._m++;
- A._A.push_back (Row ());
+ A._matA.push_back (Row ());
//processrow(i)
while (true)
{
@@ -281,7 +297,7 @@ namespace LinBox
// Avoid massive unneeded overhead in the case that this
// printing is disabled
- if (commentator.isNullStream (os))
+ if (commentator().isNullStream (os))
return os;
switch (format) {
@@ -291,7 +307,7 @@ namespace LinBox
case FORMAT_TURNER:
// The i j v triples, with zero based indices.
- for (i = A._A.begin (), i_idx = 0; i != A._A.end (); i++, i_idx++) {
+ for (i = A._matA.begin (), i_idx = 0; i != A._matA.end (); i++, i_idx++) {
for (j = i->begin (), j_idx = 0; j != i->end (); j++, j_idx++) {
os << i_idx << ' ' << j->first << ' ';
F.write (os, j->second);
@@ -302,7 +318,7 @@ namespace LinBox
case FORMAT_ONE_BASED:
// The i j v triples, with zero based indices.
- for (i = A._A.begin (), i_idx = 0; i != A._A.end (); i++, i_idx++) {
+ for (i = A._matA.begin (), i_idx = 0; i != A._matA.end (); i++, i_idx++) {
for (j = i->begin (), j_idx = 0; j != i->end (); j++, j_idx++) {
os << i_idx + 1 << ' ' << j->first + 1 << ' ';
F.write (os, j->second);
@@ -316,7 +332,7 @@ namespace LinBox
// followed by 0 0 0.
os << A._m << ' ' << A._n << " M" << std::endl;
- for (i = A._A.begin (), i_idx = 0; i != A._A.end (); i++, i_idx++) {
+ for (i = A._matA.begin (), i_idx = 0; i != A._matA.end (); i++, i_idx++) {
for (j = i->begin (), j_idx = 0; j != i->end (); j++, j_idx++) {
os << i_idx + 1 << ' ' << j->first + 1 << ' ';
F.write (os, j->second);
@@ -333,7 +349,7 @@ namespace LinBox
os << "[";
- for (i = A._A.begin (), i_idx = 0; i != A._A.end (); i++, i_idx++) {
+ for (i = A._matA.begin (), i_idx = 0; i != A._matA.end (); i++, i_idx++) {
j = i->begin ();
for (j_idx = 0; j_idx < A._n; j_idx++) {
@@ -361,7 +377,7 @@ namespace LinBox
os << "[";
firstrow=true;
- for (i = A._A.begin (), i_idx = 0; i != A._A.end (); ++i, ++i_idx) {
+ for (i = A._matA.begin (), i_idx = 0; i != A._matA.end (); ++i, ++i_idx) {
if (firstrow) {
os << "[";
firstrow =false;
@@ -395,7 +411,7 @@ namespace LinBox
//col_width = (int) ceil (log ((double) c) / M_LN10);
F.init (zero, 0);
- for (i = A._A.begin (), i_idx = 0; i != A._A.end (); i++, i_idx++) {
+ for (i = A._matA.begin (), i_idx = 0; i != A._matA.end (); i++, i_idx++) {
os << " [ ";
j = i->begin ();
@@ -442,7 +458,7 @@ namespace LinBox
// Avoid massive unneeded overhead in the case that this
// printing is disabled
- if (commentator.isNullStream (os))
+ if (commentator().isNullStream (os))
return os;
switch (format) {
@@ -451,7 +467,7 @@ namespace LinBox
//break//BB: unreachable;
case FORMAT_TURNER:
- for (i = A._A.begin (), i_idx = 0; i != A._A.end (); i++, i_idx++) {
+ for (i = A._matA.begin (), i_idx = 0; i != A._matA.end (); i++, i_idx++) {
for (j_idx = i->first.begin (), j_elt = i->second.begin ();
j_idx != i->first.end ();
++j_idx, ++j_elt)
@@ -465,7 +481,7 @@ namespace LinBox
break;
case FORMAT_ONE_BASED:
- for (i = A._A.begin (), i_idx = 0; i != A._A.end (); i++, i_idx++) {
+ for (i = A._matA.begin (), i_idx = 0; i != A._matA.end (); i++, i_idx++) {
for (j_idx = i->first.begin (), j_elt = i->second.begin ();
j_idx != i->first.end ();
++j_idx, ++j_elt)
@@ -481,7 +497,7 @@ namespace LinBox
case FORMAT_GUILLAUME:
os << A._m << ' ' << A._n << " M" << std::endl;
- for (i = A._A.begin (), i_idx = 0; i != A._A.end (); i++, i_idx++) {
+ for (i = A._matA.begin (), i_idx = 0; i != A._matA.end (); i++, i_idx++) {
for (j_idx = i->first.begin (), j_elt = i->second.begin ();
j_idx != i->first.end ();
++j_idx, ++j_elt)
@@ -502,7 +518,7 @@ namespace LinBox
os << "[";
- for (i = A._A.begin (), i_idx = 0; i != A._A.end (); i++, i_idx++) {
+ for (i = A._matA.begin (), i_idx = 0; i != A._matA.end (); i++, i_idx++) {
if (firstrow) {
os << "[";
firstrow =false;
@@ -538,7 +554,7 @@ namespace LinBox
os << "[";
- for (i = A._A.begin (), i_idx = 0; i != A._A.end (); i++, i_idx++) {
+ for (i = A._matA.begin (), i_idx = 0; i != A._matA.end (); i++, i_idx++) {
j_idx = i->first.begin ();
j_elt = i->second.begin ();
@@ -567,7 +583,7 @@ namespace LinBox
//col_width = (int) ceil (log ((double) c) / M_LN10);
F.init (zero, 0);
- for (i = A._A.begin (), i_idx = 0; i != A._A.end (); i++, i_idx++) {
+ for (i = A._matA.begin (), i_idx = 0; i != A._matA.end (); i++, i_idx++) {
os << " [ ";
j_idx = i->first.begin ();
@@ -601,14 +617,14 @@ namespace LinBox
template <class Element, class Row, class Tag>
template <class Field>
SparseMatrixBase<Element,Row,Tag> ::SparseMatrixBase( MatrixStream<Field>& ms ) :
- _A(0), _m(0), _n(0)
+ _matA(0), _m(0), _n(0)
{
Element val;
size_t i, j;
while( ms.nextTriple(i,j,val) ) {
if( i >= _m ) {
_m = i + 1;
- _A.resize( _m );
+ _matA.resize( _m );
}
if( j >= _n ) _n = j + 1;
setEntry(i,j,val);
@@ -619,21 +635,21 @@ namespace LinBox
throw ms.reportError(__func__,__LINE__);
if( i > _m ) {
_m = i;
- _A.resize(_m);
+ _matA.resize(_m);
}
}
template <class Element, class Row>
template <class Field>
SparseMatrixBase<Element,Row,VectorCategories::SparseSequenceVectorTag> ::SparseMatrixBase( MatrixStream<Field>& ms ) :
- _A(0), _m(0), _n(0)
+ _matA(0), _m(0), _n(0)
{
Element val;
size_t i, j;
while( ms.nextTriple(i,j,val) ) {
if( i >= _m ) {
_m = i + 1;
- _A.resize( _m );
+ _matA.resize( _m );
}
if( j >= _n ) _n = j + 1;
setEntry(i,j,val);
@@ -644,21 +660,21 @@ namespace LinBox
throw ms.reportError(__func__,__LINE__);
if( i > _m ) {
_m = i;
- _A.resize(_m);
+ _matA.resize(_m);
}
}
template <class Element, class Row>
template <class Field>
SparseMatrixBase<Element,Row,VectorCategories::SparseAssociativeVectorTag> ::SparseMatrixBase( MatrixStream<Field>& ms ) :
- _A(0), _m(0), _n(0)
+ _matA(0), _m(0), _n(0)
{
Element val;
size_t i, j;
while( ms.nextTriple(i,j,val) ) {
if( i >= _m ) {
_m = i + 1;
- _A.resize( _m );
+ _matA.resize( _m );
}
if( j >= _n ) _n = j + 1;
setEntry(i,j,val);
@@ -669,21 +685,21 @@ namespace LinBox
throw ms.reportError(__func__,__LINE__);
if( i > _m ) {
_m = i;
- _A.resize(_m);
+ _matA.resize(_m);
}
}
template <class Element, class Row>
template <class Field>
SparseMatrixBase<Element,Row,VectorCategories::SparseParallelVectorTag> ::SparseMatrixBase( MatrixStream<Field>& ms ) :
- _A(0), _m(0), _n(0)
+ _matA(0), _m(0), _n(0)
{
Element val;
size_t i, j;
while( ms.nextTriple(i,j,val) ) {
if( i >= _m ) {
_m = i + 1;
- _A.resize( _m );
+ _matA.resize( _m );
}
if( j >= _n ) _n = j + 1;
setEntry(i,j,val);
@@ -694,7 +710,7 @@ namespace LinBox
throw ms.reportError(__func__,__LINE__);
if( i > _m ) {
_m = i;
- _A.resize(_m);
+ _matA.resize(_m);
}
}
@@ -702,17 +718,17 @@ namespace LinBox
void SparseMatrixBase<Element, Row, VectorCategories::SparseSequenceVectorTag > ::setEntry (size_t i, size_t j, const Element &value)
{
typedef typename Row::value_type value_type;
- Row &v = _A[i];
+ Row &v = _matA[i];
typename Row::iterator iter;
if (v.size () == 0) {
- v.push_back ( value_type(j, value));
+ v.push_back ( value_type((unsigned)j, value));
}
else {
iter = std::lower_bound (v.begin (), v.end (), j, VectorWrapper::CompareSparseEntries<Element> ());
if (iter == v.end () || iter->first != j)
- iter = v.insert (iter, value_type(j, value));
+ iter = v.insert (iter, value_type((unsigned)j, value));
else
iter->second = value;
}
@@ -723,7 +739,7 @@ namespace LinBox
{
static Element zero;
- Row &v = _A[i];
+ Row &v = _matA[i];
typename Row::iterator iter;
if (v.size () == 0) {
@@ -745,7 +761,7 @@ namespace LinBox
{
static Element zero;
- const Row &v = _A[i];
+ const Row &v = _matA[i];
typename Row::const_iterator iter;
if (v.size () == 0)
@@ -765,7 +781,7 @@ namespace LinBox
{
static Element zero;
- const Row &v = _A[i];
+ const Row &v = _matA[i];
typename Row::const_iterator iter;
if (v.size () == 0)
@@ -783,10 +799,10 @@ namespace LinBox
template <class Element, class Row>
void SparseMatrixBase<Element, Row, VectorCategories::SparseParallelVectorTag > ::setEntry (size_t i, size_t j, const Element &value)
{
- while (_A.size() < i + 1) _A.push_back(Row());
- _m = _A.size();
+ while (_matA.size() < i + 1) _matA.push_back(Row());
+ _m = _matA.size();
- Row &v = _A[i];
+ Row &v = _matA[i];
typename Row::first_type::iterator iter;
if (v.first.size () == 0) {
@@ -810,7 +826,7 @@ namespace LinBox
{
static Element zero;
- Row &v = _A[i];
+ Row &v = _matA[i];
typename Row::first_type::iterator iter;
typename Row::second_type::iterator iter_elt;
@@ -838,7 +854,7 @@ namespace LinBox
{
static Element zero;
- const Row &v = _A[i];
+ const Row &v = _matA[i];
typename Row::first_type::const_iterator iter;
if (v.first.size () == 0)
@@ -911,7 +927,7 @@ namespace LinBox
typename Row::const_iterator j = i.begin ();
for (; j != i->begin (); ++j)
- AT._A[j->first].push_back (std::pair<size_t, Element> (row, j->second));
+ AT._matA[j->first].push_back (std::pair<size_t, Element> (row, j->second));
}
return AT;
@@ -927,7 +943,7 @@ namespace LinBox
typename Row::const_iterator j = i.begin ();
for (; j != i->begin (); ++j)
- AT._A[j->first][row] = j->second;
+ AT._matA[j->first][row] = j->second;
}
return AT;
@@ -944,8 +960,8 @@ namespace LinBox
typename Row::second_type::const_iterator j_elt = i->second.begin ();
for (; j_idx != i->first.end (); ++j_idx, ++j_elt) {
- AT._A[*j_idx].first.push_back (row);
- AT._A[*j_idx].second.push_back (*j_elt);
+ AT._matA[*j_idx].first.push_back (row);
+ AT._matA[*j_idx].second.push_back (*j_elt);
}
}
@@ -956,3 +972,12 @@ namespace LinBox
#endif // __LINBOX_matrix_sparse_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/matrix/transpose-matrix.h b/linbox/matrix/transpose-matrix.h
index 13f2b82..2e9c89e 100644
--- a/linbox/matrix/transpose-matrix.h
+++ b/linbox/matrix/transpose-matrix.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/matrix/transpose.h
* Copyright (C) 2002 Bradford Hovinen,
*
@@ -13,7 +11,25 @@
* Move from blackbox/transpose-matrix.h to matrix/transpose.h
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
#ifndef __LINBOX_matrix_transpose_INL
@@ -28,14 +44,12 @@
#include "linbox/vector/stream.h"
#include "linbox/matrix/matrix-domain.h"
-#undef _A
-
namespace LinBox
{
- /** @brief Matrix transpose
+ /** @brief Matrix transpose.
*
- * This class takes a matrix meeting the @ref DenseMatrixBase archetype
+ * This class takes a matrix meeting the @ref BlasMatrix archetype
* and switches the row and column iterators, giving the transpose of
* the original matrix. It is generic with respect to the matrix given.
*
@@ -69,12 +83,12 @@ namespace LinBox
typedef typename Matrix::ColIterator RowIterator;
typedef typename Matrix::RowIterator ColIterator;
- typedef typename Matrix::RawIterator RawIterator;
- typedef typename Matrix::RawIndexedIterator RawIndexedIterator;
+ typedef typename Matrix::Iterator Iterator;
+ typedef typename Matrix::IndexedIterator IndexedIterator;
typedef typename Matrix::ConstColIterator ConstRowIterator;
typedef typename Matrix::ConstRowIterator ConstColIterator;
- typedef typename Matrix::ConstRawIterator ConstRawIterator;
- typedef typename Matrix::ConstRawIndexedIterator ConstRawIndexedIterator;
+ typedef typename Matrix::ConstIterator ConstIterator;
+ typedef typename Matrix::ConstIndexedIterator ConstIndexedIterator;
typedef typename Matrix::Row Column;
typedef typename Matrix::Row Col;
@@ -84,13 +98,13 @@ namespace LinBox
* @param A Underlying matrix of which to construct the transpose
*/
TransposeMatrix (Matrix &A) :
- _A (A)
+ _Mat (A)
{}
/** Copy constructor
*/
- TransposeMatrix (const TransposeMatrix &M) :
- _A (M._A)
+ TransposeMatrix (const TransposeMatrix &Mat) :
+ _Mat (Mat._Mat)
{}
/** Get the number of rows in the matrix
@@ -98,7 +112,7 @@ namespace LinBox
*/
inline size_t rowdim () const
{
- return _A.coldim ();
+ return _Mat.coldim ();
}
/** Get the number of columns in the matrix
@@ -106,7 +120,7 @@ namespace LinBox
*/
inline size_t coldim () const
{
- return _A.rowdim ();
+ return _Mat.rowdim ();
}
/** @name Matrix I/O
@@ -116,13 +130,11 @@ namespace LinBox
/** Write a matrix to an output stream
* @param stream Stream to which to write the matrix
- * @param F
* @return Reference to stream
*/
- template <class Field>
- inline std::ostream &write (std::ostream &stream, const Field &F) const
+ inline std::ostream &write (std::ostream &stream) const
{
- return _A.write (stream, F);
+ return _Mat.write (stream);
}
//@} Matrix I/O
@@ -139,7 +151,7 @@ namespace LinBox
*/
void setEntry (size_t i, size_t j, const Element &a_ij)
{
- _A.setEntry (j, i, a_ij);
+ _Mat.setEntry (j, i, a_ij);
}
/** Get a writeable reference to the entry in the (i, j) position.
@@ -149,7 +161,7 @@ namespace LinBox
*/
Element &refEntry (size_t i, size_t j)
{
- return _A.refEntry (j, i);
+ return _Mat.refEntry (j, i);
}
/** Get a read-only reference to the entry in the (i, j) position.
@@ -159,7 +171,7 @@ namespace LinBox
*/
inline const Element &getEntry (size_t i, size_t j) const
{
- return _A.getEntry (j, i);
+ return _Mat.getEntry (j, i);
}
/** Copy the (i, j) entry into x, and return a reference to x.
@@ -172,7 +184,7 @@ namespace LinBox
*/
inline Element &getEntry (Element &x, size_t i, size_t j) const
{
- return _A.getEntry (x, j, i);
+ return _Mat.getEntry (x, j, i);
}
/** @name Column of rows iterator
@@ -183,19 +195,19 @@ namespace LinBox
inline RowIterator rowBegin ()
{
- return _A.colBegin ();
+ return _Mat.colBegin ();
}
inline RowIterator rowEnd ()
{
- return _A.colEnd ();
+ return _Mat.colEnd ();
}
inline ConstRowIterator rowBegin () const
{
- return _A.colBegin ();
+ return _Mat.colBegin ();
}
inline ConstRowIterator rowEnd () const
{
- return _A.colEnd ();
+ return _Mat.colEnd ();
}
/** @name Row of columns iterator
@@ -206,19 +218,19 @@ namespace LinBox
inline ColIterator colBegin ()
{
- return _A.rowBegin ();
+ return _Mat.rowBegin ();
}
inline ColIterator colEnd ()
{
- return _A.rowEnd ();
+ return _Mat.rowEnd ();
}
inline ConstColIterator colBegin () const
{
- return _A.rowBegin ();
+ return _Mat.rowBegin ();
}
inline ConstColIterator colEnd () const
{
- return _A.rowEnd ();
+ return _Mat.rowEnd ();
}
/** @name Raw iterator
@@ -229,21 +241,21 @@ namespace LinBox
* algorithm.
*/
- inline RawIterator rawBegin ()
+ inline Iterator Begin ()
{
- return _A.rawBegin ();
+ return _Mat.Begin ();
}
- inline RawIterator rawEnd ()
+ inline Iterator End ()
{
- return _A.rawEnd ();
+ return _Mat.End ();
}
- inline ConstRawIterator rawBegin () const
+ inline ConstIterator Begin () const
{
- return _A.rawBegin ();
+ return _Mat.Begin ();
}
- inline ConstRawIterator rawEnd () const
+ inline ConstIterator End () const
{
- return _A.rawEnd ();
+ return _Mat.End ();
}
/** @name Raw Indexed iterator.
@@ -255,28 +267,28 @@ namespace LinBox
* This is provided through it's rowIndex() and colIndex() functions.
*/
- inline RawIndexedIterator rawIndexedBegin()
+ inline IndexedIterator IndexedBegin()
{
- return _A.rawIndexedBegin ();
+ return _Mat.IndexedBegin ();
}
- inline RawIndexedIterator rawIndexedEnd()
+ inline IndexedIterator IndexedEnd()
{
- return _A.rawIndexedEnd ();
+ return _Mat.IndexedEnd ();
}
- inline ConstRawIndexedIterator rawIndexedBegin() const
+ inline ConstIndexedIterator IndexedBegin() const
{
- return _A.rawIndexedBegin ();
+ return _Mat.IndexedBegin ();
}
- inline ConstRawIndexedIterator rawIndexedEnd() const
+ inline ConstIndexedIterator IndexedEnd() const
{
- return _A.rawIndexedEnd ();
+ return _Mat.IndexedEnd ();
}
//@}
protected:
- Matrix &_A;
+ Matrix &_Mat;
};
// Specialization for matrices that have both row and column iterators
@@ -289,128 +301,127 @@ namespace LinBox
typedef typename Matrix::ColIterator RowIterator;
typedef typename Matrix::RowIterator ColIterator;
- typedef typename Matrix::RawIterator RawIterator;
- typedef typename Matrix::RawIndexedIterator RawIndexedIterator;
+ typedef typename Matrix::Iterator Iterator;
+ typedef typename Matrix::IndexedIterator IndexedIterator;
typedef typename Matrix::ConstColIterator ConstRowIterator;
typedef typename Matrix::ConstRowIterator ConstColIterator;
- typedef typename Matrix::ConstRawIterator ConstRawIterator;
- typedef typename Matrix::ConstRawIndexedIterator ConstRawIndexedIterator;
+ typedef typename Matrix::ConstIterator ConstIterator;
+ typedef typename Matrix::ConstIndexedIterator ConstIndexedIterator;
typedef typename Matrix::Row Column;
typedef typename Matrix::Row Col;
typedef typename Matrix::Col Row;
TransposeMatrix (Matrix &A) :
- _A (A)
+ _Mat (A)
{}
- TransposeMatrix (const TransposeMatrix &M) :
- _A (M._A)
+ TransposeMatrix (const TransposeMatrix &Mat) :
+ _Mat (Mat._Mat)
{}
inline size_t rowdim () const
{
- return _A.coldim ();
+ return _Mat.coldim ();
}
inline size_t coldim () const
{
- return _A.rowdim ();
+ return _Mat.rowdim ();
}
- template <class Field>
- inline std::ostream &write (std::ostream &stream, const Field &F) const
+ inline std::ostream &write (std::ostream &stream) const
{
- return _A.write (stream, F);
+ return _Mat.write (stream);
}
inline void setEntry (size_t i, size_t j, const Element &a_ij)
{
- _A.setEntry (j, i, a_ij);
+ _Mat.setEntry (j, i, a_ij);
}
inline Element &refEntry (size_t i, size_t j)
{
- return _A.refEntry (j, i);
+ return _Mat.refEntry (j, i);
}
inline const Element &getEntry (size_t i, size_t j) const
{
- return _A.getEntry (j, i);
+ return _Mat.getEntry (j, i);
}
inline Element &getEntry (Element &x, size_t i, size_t j) const
{
- return _A.getEntry (x, j, i);
+ return _Mat.getEntry (x, j, i);
}
inline RowIterator rowBegin ()
{
- return _A.colBegin ();
+ return _Mat.colBegin ();
}
inline RowIterator rowEnd ()
{
- return _A.colEnd ();
+ return _Mat.colEnd ();
}
inline ConstRowIterator rowBegin () const
{
- return _A.colBegin ();
+ return _Mat.colBegin ();
}
inline ConstRowIterator rowEnd () const
{
- return _A.colEnd ();
+ return _Mat.colEnd ();
}
inline ColIterator colBegin ()
{
- return _A.rowBegin ();
+ return _Mat.rowBegin ();
}
inline ColIterator colEnd ()
{
- return _A.rowEnd ();
+ return _Mat.rowEnd ();
}
inline ConstColIterator colBegin () const
{
- return _A.rowBegin ();
+ return _Mat.rowBegin ();
}
inline ConstColIterator colEnd () const
{
- return _A.rowEnd ();
+ return _Mat.rowEnd ();
}
- inline RawIterator rawBegin ()
+ inline Iterator Begin ()
{
- return _A.rawBegin ();
+ return _Mat.Begin ();
}
- inline RawIterator rawEnd ()
+ inline Iterator End ()
{
- return _A.rawEnd ();
+ return _Mat.End ();
}
- inline ConstRawIterator rawBegin () const
+ inline ConstIterator Begin () const
{
- return _A.rawBegin ();
+ return _Mat.Begin ();
}
- inline ConstRawIterator rawEnd () const
+ inline ConstIterator End () const
{
- return _A.rawEnd ();
+ return _Mat.End ();
}
- inline RawIndexedIterator rawIndexedBegin()
+ inline IndexedIterator IndexedBegin()
{
- return _A.rawIndexedBegin ();
+ return _Mat.IndexedBegin ();
}
- inline RawIndexedIterator rawIndexedEnd()
+ inline IndexedIterator IndexedEnd()
{
- return _A.rawIndexedEnd ();
+ return _Mat.IndexedEnd ();
}
- inline ConstRawIndexedIterator rawIndexedBegin() const
+ inline ConstIndexedIterator IndexedBegin() const
{
- return _A.rawIndexedBegin ();
+ return _Mat.IndexedBegin ();
}
- inline ConstRawIndexedIterator rawIndexedEnd() const
+ inline ConstIndexedIterator IndexedEnd() const
{
- return _A.rawIndexedEnd ();
+ return _Mat.IndexedEnd ();
}
protected:
- Matrix &_A;
+ Matrix &_Mat;
};
// Specialization for matrices that have only row iterators
@@ -422,11 +433,11 @@ namespace LinBox
typedef typename Matrix::Element Element;
typedef typename Matrix::RowIterator ColIterator;
- typedef typename Matrix::RawIterator RawIterator;
- typedef typename Matrix::RawIndexedIterator RawIndexedIterator;
+ typedef typename Matrix::Iterator Iterator;
+ typedef typename Matrix::IndexedIterator IndexedIterator;
typedef typename Matrix::ConstRowIterator ConstColIterator;
- typedef typename Matrix::ConstRawIterator ConstRawIterator;
- typedef typename Matrix::ConstRawIndexedIterator ConstRawIndexedIterator;
+ typedef typename Matrix::ConstIterator ConstIterator;
+ typedef typename Matrix::ConstIndexedIterator ConstIndexedIterator;
typedef typename Matrix::Row Column;
typedef typename Matrix::Row Col;
@@ -434,98 +445,97 @@ namespace LinBox
// TransposeMatrix () {}
TransposeMatrix (Matrix &A) :
- _A (A)
+ _Mat (A)
{}
- TransposeMatrix (const TransposeMatrix &M) :
- _A (M._A)
+ TransposeMatrix (const TransposeMatrix &Mat) :
+ _Mat (Mat._Mat)
{}
inline size_t rowdim () const
{
- return _A.coldim ();
+ return _Mat.coldim ();
}
inline size_t coldim () const
{
- return _A.rowdim ();
+ return _Mat.rowdim ();
}
- template <class Field>
- inline std::ostream &write (std::ostream &stream, const Field &F) const
+ inline std::ostream &write (std::ostream &stream) const
{
- return _A.write (stream, F);
+ return _Mat.write (stream);
}
inline void setEntry (size_t i, size_t j, const Element &a_ij)
{
- _A.setEntry (j, i, a_ij);
+ _Mat.setEntry (j, i, a_ij);
}
inline Element &refEntry (size_t i, size_t j)
{
- return _A.refEntry (j, i);
+ return _Mat.refEntry (j, i);
}
inline const Element &getEntry (size_t i, size_t j) const
{
- return _A.getEntry (j, i);
+ return _Mat.getEntry (j, i);
}
inline Element &getEntry (Element &x, size_t i, size_t j) const
{
- return _A.getEntry (x, j, i);
+ return _Mat.getEntry (x, j, i);
}
inline ColIterator colBegin ()
{
- return _A.rowBegin ();
+ return _Mat.rowBegin ();
}
inline ColIterator colEnd ()
{
- return _A.rowEnd ();
+ return _Mat.rowEnd ();
}
inline ConstColIterator colBegin () const
{
- return _A.rowBegin ();
+ return _Mat.rowBegin ();
}
inline ConstColIterator colEnd () const
{
- return _A.rowEnd ();
+ return _Mat.rowEnd ();
}
- inline RawIterator rawBegin ()
+ inline Iterator Begin ()
{
- return _A.rawBegin ();
+ return _Mat.Begin ();
}
- inline RawIterator rawEnd ()
+ inline Iterator End ()
{
- return _A.rawEnd ();
+ return _Mat.End ();
}
- inline ConstRawIterator rawBegin () const
+ inline ConstIterator Begin () const
{
- return _A.rawBegin ();
+ return _Mat.Begin ();
}
- inline ConstRawIterator rawEnd () const
+ inline ConstIterator End () const
{
- return _A.rawEnd ();
+ return _Mat.End ();
}
- inline RawIndexedIterator rawIndexedBegin()
+ inline IndexedIterator IndexedBegin()
{
- return _A.rawIndexedBegin ();
+ return _Mat.IndexedBegin ();
}
- inline RawIndexedIterator rawIndexedEnd()
+ inline IndexedIterator IndexedEnd()
{
- return _A.rawIndexedEnd ();
+ return _Mat.IndexedEnd ();
}
- inline ConstRawIndexedIterator rawIndexedBegin() const
+ inline ConstIndexedIterator IndexedBegin() const
{
- return _A.rawIndexedBegin ();
+ return _Mat.IndexedBegin ();
}
- inline ConstRawIndexedIterator rawIndexedEnd() const
+ inline ConstIndexedIterator IndexedEnd() const
{
- return _A.rawIndexedEnd ();
+ return _Mat.IndexedEnd ();
}
protected:
- Matrix &_A;
+ Matrix &_Mat;
};
// Specialization for matrices that have only column iterators
@@ -537,107 +547,106 @@ namespace LinBox
typedef typename Matrix::Element Element;
typedef typename Matrix::ColIterator RowIterator;
- typedef typename Matrix::RawIterator RawIterator;
- typedef typename Matrix::RawIndexedIterator RawIndexedIterator;
+ typedef typename Matrix::Iterator Iterator;
+ typedef typename Matrix::IndexedIterator IndexedIterator;
typedef typename Matrix::ConstColIterator ConstRowIterator;
- typedef typename Matrix::ConstRawIterator ConstRawIterator;
- typedef typename Matrix::ConstRawIndexedIterator ConstRawIndexedIterator;
+ typedef typename Matrix::ConstIterator ConstIterator;
+ typedef typename Matrix::ConstIndexedIterator ConstIndexedIterator;
typedef typename Matrix::Col Row;
TransposeMatrix (Matrix &A) :
- _A (A)
+ _Mat (A)
{}
- TransposeMatrix (const TransposeMatrix &M) :
- _A (M._A)
+ TransposeMatrix (const TransposeMatrix &Mat) :
+ _Mat (Mat._Mat)
{}
inline size_t rowdim () const
{
- return _A.coldim ();
+ return _Mat.coldim ();
}
inline size_t coldim () const
{
- return _A.rowdim ();
+ return _Mat.rowdim ();
}
- template <class Field>
- inline std::ostream &write (std::ostream &stream, const Field &F) const
+ inline std::ostream &write (std::ostream &stream) const
{
- return _A.write (stream, F);
+ return _Mat.write (stream);
}
inline void setEntry (size_t i, size_t j, const Element &a_ij)
{
- _A.setEntry (j, i, a_ij);
+ _Mat.setEntry (j, i, a_ij);
}
inline Element &refEntry (size_t i, size_t j)
{
- return _A.refEntry (j, i);
+ return _Mat.refEntry (j, i);
}
inline const Element &getEntry (size_t i, size_t j) const
{
- return _A.getEntry (j, i);
+ return _Mat.getEntry (j, i);
}
inline Element &getEntry (Element &x, size_t i, size_t j) const
{
- return _A.getEntry (x, j, i);
+ return _Mat.getEntry (x, j, i);
}
inline RowIterator rowBegin ()
{
- return _A.colBegin ();
+ return _Mat.colBegin ();
}
inline RowIterator rowEnd ()
{
- return _A.colEnd ();
+ return _Mat.colEnd ();
}
inline ConstRowIterator rowBegin () const
{
- return _A.colBegin ();
+ return _Mat.colBegin ();
}
inline ConstRowIterator rowEnd () const
{
- return _A.colEnd ();
+ return _Mat.colEnd ();
}
- inline RawIterator rawBegin ()
+ inline Iterator Begin ()
{
- return _A.rawBegin ();
+ return _Mat.Begin ();
}
- inline RawIterator rawEnd ()
+ inline Iterator End ()
{
- return _A.rawEnd ();
+ return _Mat.End ();
}
- inline ConstRawIterator rawBegin () const
+ inline ConstIterator Begin () const
{
- return _A.rawBegin ();
+ return _Mat.Begin ();
}
- inline ConstRawIterator rawEnd () const
+ inline ConstIterator End () const
{
- return _A.rawEnd ();
+ return _Mat.End ();
}
- inline RawIndexedIterator rawIndexedBegin()
+ inline IndexedIterator IndexedBegin()
{
- return _A.rawIndexedBegin ();
+ return _Mat.IndexedBegin ();
}
- inline RawIndexedIterator rawIndexedEnd()
+ inline IndexedIterator IndexedEnd()
{
- return _A.rawIndexedEnd ();
+ return _Mat.IndexedEnd ();
}
- inline ConstRawIndexedIterator rawIndexedBegin() const
+ inline ConstIndexedIterator IndexedBegin() const
{
- return _A.rawIndexedBegin ();
+ return _Mat.IndexedBegin ();
}
- inline ConstRawIndexedIterator rawIndexedEnd() const
+ inline ConstIndexedIterator IndexedEnd() const
{
- return _A.rawIndexedEnd ();
+ return _Mat.IndexedEnd ();
}
protected:
- const Matrix &_A;
+ const Matrix &_Mat;
};
template <class Matrix>
@@ -680,3 +689,12 @@ namespace LinBox
#endif // __LINBOX_matrix_transpose_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/Makefile.am b/linbox/randiter/Makefile.am
index 8b35a9f..5ca624b 100644
--- a/linbox/randiter/Makefile.am
+++ b/linbox/randiter/Makefile.am
@@ -1,10 +1,28 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
AM_CPPFLAGS=-I$(top_srcdir)/linbox
pkgincludesubdir=$(pkgincludedir)/randiter
-AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(GIVARO_CFLAGS) $(FFLAFLAS_CFLAGS)
+AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(GIVARO_CFLAGS) $(FFLAS_FFPACK_CFLAGS)
BASIC_HDRS = \
abstract.h \
diff --git a/linbox/randiter/Makefile.in b/linbox/randiter/Makefile.in
index 2a66cf3..3112567 100644
--- a/linbox/randiter/Makefile.in
+++ b/linbox/randiter/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,48 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -42,12 +79,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -55,7 +95,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -64,6 +107,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libranditer_la_LIBADD =
am_libranditer_la_OBJECTS = mersenne-twister.lo
@@ -82,6 +126,11 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libranditer_la_SOURCES)
DIST_SOURCES = $(libranditer_la_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__pkgincludesub_HEADERS_DIST = abstract.h archetype.h envelope.h \
gmp-rational.h param-fuzzy.h modular.h modular-balanced.h \
modular-crooked.h unparametric.h gf2.h nonzero.h \
@@ -93,9 +142,29 @@ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
-pkgincludesubHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkgincludesub_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -107,6 +176,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -130,10 +200,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -154,10 +226,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -166,6 +243,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -182,6 +261,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -244,13 +324,9 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
AM_CPPFLAGS = -I$(top_srcdir)/linbox
pkgincludesubdir = $(pkgincludedir)/randiter
-AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(GIVARO_CFLAGS) $(FFLAFLAS_CFLAGS)
+AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR $(GMP_CFLAGS) $(NTL_CFLAGS) $(ATLAS_CFLAGS) $(GIVARO_CFLAGS) $(FFLAS_FFPACK_CFLAGS)
BASIC_HDRS = \
abstract.h \
archetype.h \
@@ -311,9 +387,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/randiter/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps linbox/randiter/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/randiter/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/randiter/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -331,6 +407,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -340,7 +417,7 @@ clean-noinstLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libranditer.la: $(libranditer_la_OBJECTS) $(libranditer_la_DEPENDENCIES)
+libranditer.la: $(libranditer_la_OBJECTS) $(libranditer_la_DEPENDENCIES) $(EXTRA_libranditer_la_DEPENDENCIES)
$(CXXLINK) $(libranditer_la_OBJECTS) $(libranditer_la_LIBADD) $(LIBS)
mostlyclean-compile:
@@ -365,21 +442,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludesubdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)"
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludesubHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- $(pkgincludesubHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
done
uninstall-pkgincludesubHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
- done
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -393,7 +474,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -401,29 +482,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -444,13 +530,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -471,16 +561,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -570,6 +666,7 @@ uninstall-am: uninstall-pkgincludesubHEADERS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/linbox/randiter/abstract.h b/linbox/randiter/abstract.h
index 120888d..7efc851 100644
--- a/linbox/randiter/abstract.h
+++ b/linbox/randiter/abstract.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/abstract.h
* Copyright (C) 1999-2001 William J Turner,
* 2002 Bradford Hovinen
@@ -7,10 +5,13 @@
* Written by William J Turner <wjturner at math.ncsu.edu>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,16 +19,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_randiter_abstract_H
#define __LINBOX_randiter_abstract_H
#include <iostream>
-#include <linbox/integer.h>
+#include "linbox/integer.h"
namespace LinBox
{
@@ -111,3 +112,12 @@ namespace LinBox
#endif // __LINBOX_randiter_abstract_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/archetype.doxy b/linbox/randiter/archetype.doxy
index 8cab1b9..234fbf2 100644
--- a/linbox/randiter/archetype.doxy
+++ b/linbox/randiter/archetype.doxy
@@ -1,3 +1,25 @@
+/* Copyright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+
/*! \page randomIGA Random Iterator Generator Archetype
The \ref LinBox random iterator generator archetype defines the random
diff --git a/linbox/randiter/archetype.h b/linbox/randiter/archetype.h
index 1b48bc0..e5a7e17 100644
--- a/linbox/randiter/archetype.h
+++ b/linbox/randiter/archetype.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/archetype.h
* Copyright (C) 1999-2001 William J Turner,
* 2002 Bradford Hovinen
@@ -7,10 +5,13 @@
* Written by William J Turner <wjturner at math.ncsu.edu>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*!@file randiter/archetype.h
@@ -229,3 +230,12 @@ namespace LinBox
#endif // __LINBOX_randiter_archetype_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/envelope.h b/linbox/randiter/envelope.h
index bebc651..5e2441f 100644
--- a/linbox/randiter/envelope.h
+++ b/linbox/randiter/envelope.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/envelope.h
* Copyright (C) 1999-2001 William J Turner,
* 2002 Bradford Hovinen
@@ -7,10 +5,13 @@
* Written by William J Turner <wjturner at math.ncsu.edu>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_randiter_envelope_H
@@ -167,3 +168,12 @@ namespace LinBox
#endif // __LINBOX_randiter_envelope_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/gf2.h b/linbox/randiter/gf2.h
index c6fc968..a4d9568 100644
--- a/linbox/randiter/gf2.h
+++ b/linbox/randiter/gf2.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/gf2.h
* Copyright (C) 2003 Bradford Hovinen
*
@@ -7,7 +5,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_randiter_gf2_H
@@ -16,25 +32,15 @@
#include <iostream>
#include <vector>
-#include "time.h"
+#include <time.h>
+#include "linbox/linbox-config.h"
#include "linbox/integer.h"
-#include "linbox/field/modular.h"
+// #include "linbox/field/modular.h"
#include "linbox/element/abstract.h"
#include "linbox/element/envelope.h"
#include "linbox/util/commentator.h"
#include "linbox/randiter/mersenne-twister.h"
#include "linbox/vector/bit-vector.h"
-#include "linbox/linbox-config.h"
-
-#ifdef __LINBOX_XMLENABLED
-
-#include "linbox/util/xml/linbox-reader.h"
-#include "linbox/util/xml/linbox-writer.h"
-
-#include <iostream>
-#include <string>
-
-#endif
namespace LinBox
{
@@ -63,7 +69,7 @@ namespace LinBox
long _seed = seed;
if (_seed == 0) _seed = time (NULL);
- MT.setSeed (_seed);
+ MT.setSeed ((uint32_t)_seed);
}
/// constructor
@@ -88,7 +94,9 @@ namespace LinBox
* @return reference to random field element
*/
bool &random (bool &a) const
- { return a = MT.randomIntRange (0, 2); }
+ {
+ return a = MT.randomIntRange (0, 2);
+ }
/** Random field element creator.
* This returns a random field element from the information supplied
@@ -106,7 +114,7 @@ namespace LinBox
* Required by abstract base class.
* @return reference to random field element
*/
- std::_Bit_reference random (std::_Bit_reference a) const
+ stdBitReference random (stdBitReference a) const
{ return a = MT.randomIntRange (0, 2); }
/** Random field element creator.
@@ -138,5 +146,39 @@ namespace LinBox
} // namespace LinBox
+namespace LinBox
+{
+
+ template<size_t bitsize>
+ struct MTrandomInt {
+ template<typename M32Twister>
+ uint32_t operator() (M32Twister& MT) const
+ {
+ return MT.randomInt();
+ }
+ };
+
+ template<>
+ struct MTrandomInt<64> {
+ template<typename M32Twister>
+ uint64_t operator() (M32Twister& MT) const
+ {
+ uint64_t tmp = MT.randomInt();
+ tmp <<=32;
+ return tmp += MT.randomInt();
+ }
+ };
+
+} // namespace LinBox
+
#endif // __LINBOX_randiter_gf2_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/gmp-random-prime.h b/linbox/randiter/gmp-random-prime.h
index f3a3e93..ad4717a 100644
--- a/linbox/randiter/gmp-random-prime.h
+++ b/linbox/randiter/gmp-random-prime.h
@@ -1,12 +1,13 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +15,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#error "deprecated and not tested"
@@ -24,7 +25,7 @@
#ifndef __LINBOX_gmp_random_prime_H
#define __LINBOX_gmp_random_prime_H
-#include <linbox/integer.h>
+#include "linbox/integer.h"
namespace LinBox
{
@@ -69,3 +70,12 @@ namespace LinBox
#endif //__LINBOX_gmp_random_prime_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/gmp-rational.h b/linbox/randiter/gmp-rational.h
index 8421473..b854f9e 100644
--- a/linbox/randiter/gmp-rational.h
+++ b/linbox/randiter/gmp-rational.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/gmp-rational.h
* Copyright (C) 2001-2002 Bradford Hovinen
*
* Written by William J Turner <wjturner at acm.org>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file randiter/gmp-rational.h
@@ -60,7 +61,7 @@ namespace LinBox
GMPRationalRandIter (const GMPRationalField &F,
const integer &size = 0,
const integer &seed = 0) :
- _F (F), _size (size), _seed (seed)
+ _field (F), _size (size), _seed (seed)
{
if (seed == 0)
_seed = time (NULL);
@@ -71,26 +72,9 @@ namespace LinBox
/// Copy constructor
/// @param R Random iterator to copy.
GMPRationalRandIter (const GMPRationalRandIter& R) :
- _F (R._F), _size (R._size), _seed (R._seed)
+ _field (R._field), _size (R._size), _seed (R._seed)
{}
-
-#ifdef __LINBOX_XMLENABLED
- GMPRationalRandIter(LinBox::Reader &R) :
- _F(R.Down(1))
- {
- R.Up(1);
- if(!R.expectTagName("randiter")) return;
- if(!R.expectAttributeNum("seed", _seed) || !R.expectAttributeNum("size", _size)) return;
-
- if(_seed == 0) _seed = time( NULL);
-
- return;
-
- }
-#endif
-
-
/// Destructor.
~GMPRationalRandIter()
{}
@@ -102,7 +86,7 @@ namespace LinBox
GMPRationalRandIter& operator=(const GMPRationalRandIter& R)
{
if (this != &R) { // guard against self-assignment
- _F = R._F;
+ _field = R._field;
_seed = R._seed;
_size = R._size;
}
@@ -114,10 +98,10 @@ namespace LinBox
*/
Element &random (Element &a) const
{
- unsigned int s;
int value = 0;
if (_size == 0) {
+ unsigned int s;
s = _seed;
value = rand_r (&s);
@@ -139,7 +123,7 @@ namespace LinBox
num = rand_r (&s);
if (_size > 0) {
- unsigned long tmp = _size;
+ int tmp = (int)_size;
num %= tmp;
den = 1L;
}
@@ -175,7 +159,7 @@ namespace LinBox
private:
- GMPRationalField _F; //!< @internal rational field
+ GMPRationalField _field; //!< @internal rational field
integer _size; //!< @internal ??
integer _seed; //!< @internal seed
@@ -185,3 +169,12 @@ namespace LinBox
#endif // __LINBOX_randiter_gmp_random_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/lidia-gfq.h b/linbox/randiter/lidia-gfq.h
index 351aa86..0db3b46 100644
--- a/linbox/randiter/lidia-gfq.h
+++ b/linbox/randiter/lidia-gfq.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by Pascal Giorgi
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/* File: src/wrapper/by_scope/field/LIDIA_randiter.h
@@ -33,16 +34,6 @@
#include "linbox/integer.h"
#include "linbox/linbox-config.h"
-#ifdef __LINBOX_XMLENABLED
-
-#include "linbox/util/xml/linbox-reader.h"
-#include "linbox/util/xml/linbox-writer.h"
-
-#include <iostream>
-#include <string>
-
-#endif
-
namespace LinBox
{
@@ -152,3 +143,12 @@ namespace LinBox
#endif // __LINBOX_lidia_randiter_gfq_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/lidia.h b/linbox/randiter/lidia.h
index 03b596d..a6e954b 100644
--- a/linbox/randiter/lidia.h
+++ b/linbox/randiter/lidia.h
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/lidia.h
* Copyright (C) 2002 Pascal Giorgi
*
* Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_randiter_lidia_H
@@ -15,3 +31,12 @@
#endif // __LINBOX_randiter_lidia_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/mersenne-twister.C b/linbox/randiter/mersenne-twister.C
index 25aecf8..3ba48d5 100644
--- a/linbox/randiter/mersenne-twister.C
+++ b/linbox/randiter/mersenne-twister.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/mersenne-twister.C
* Copyright (C) 1997 Makoto Matsumoto and Takuji Nishimura,
@@ -10,8 +8,25 @@
*
* ------------------------------------
*
- * This file is part of LinBox, licensed under the GNU Lesser General Public
- * License. See COPYING for more information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
*
* NB: This file is derived from a source file that is licensed under the
* LGPL. Thus this file *must not* be made into a header file of any kind!
@@ -38,9 +53,9 @@ namespace LinBox
/* transform [0..2^32] -> [0..1] */
static const double doubleTransform = 2.3283064365386962890625e-10;
- static const int N = 624; // length of state vector
- static const int M = 397; // a period parameter
- static const uint32_t K = 0x9908B0DFU; // a magic constant
+ static const int Nlen = 624; // length of state vector
+ static const int Mper = 397; // a period parameter
+ static const uint32_t Kmag = 0x9908B0DFU; // a magic constant
static inline uint32_t hiBit (uint32_t u) // mask all but highest bit of u
{ return (u) & 0x80000000U; }
@@ -52,7 +67,7 @@ namespace LinBox
{ return hiBit (u) | loBits(v); }
MersenneTwister::MersenneTwister (uint32_t seed) :
- _state (N + 1), _left (-1)
+ _state (Nlen + 1), _left (-1)
{
setSeed (seed);
}
@@ -61,22 +76,22 @@ namespace LinBox
{
std::vector<uint32_t>::iterator p0 = _state.begin ();
std::vector<uint32_t>::iterator p2 = _state.begin () + 2;
- std::vector<uint32_t>::iterator pM = _state.begin () + M;
+ std::vector<uint32_t>::iterator pM = _state.begin () + Mper;
uint32_t s0, s1;
int j;
if (_left < -1)
setSeed (4357U);
- _left = N - 1, _next = _state.begin () + 1;
+ _left = Nlen - 1, _next = _state.begin () + 1;
- for(s0 = _state[0], s1 = _state[1], j = N - M + 1; --j; s0 = s1, s1 = *p2++)
- *p0++ = *pM++ ^ (mixBits (s0, s1) >> 1) ^ (loBit (s1) ? K : 0U);
+ for(s0 = _state[0], s1 = _state[1], j = Nlen - Mper + 1; --j; s0 = s1, s1 = *p2++)
+ *p0++ = *pM++ ^ (mixBits (s0, s1) >> 1) ^ (loBit (s1) ? Kmag : 0U);
- for(pM = _state.begin (), j = M; --j; s0 = s1, s1 = *p2++)
- *p0++ = *pM++ ^ (mixBits (s0, s1) >> 1) ^ (loBit (s1) ? K : 0U);
+ for(pM = _state.begin (), j = Mper; --j; s0 = s1, s1 = *p2++)
+ *p0++ = *pM++ ^ (mixBits (s0, s1) >> 1) ^ (loBit (s1) ? Kmag : 0U);
- s1 = _state[0], *p0 = *pM ^ (mixBits (s0, s1) >> 1) ^ (loBit (s1) ? K : 0U);
+ s1 = _state[0], *p0 = *pM ^ (mixBits (s0, s1) >> 1) ^ (loBit (s1) ? Kmag : 0U);
s1 ^= (s1 >> 11);
s1 ^= (s1 << 7) & 0x9D2C5680U;
s1 ^= (s1 << 15) & 0xEFC60000U;
@@ -206,7 +221,16 @@ namespace LinBox
std::vector<uint32_t>::iterator s = _state.begin ();
int j;
- for (_left = 0, *s++ = x, j = N; --j; *s++ = (x *= 69069U) & 0xFFFFFFFFU) ;
+ for (_left = 0, *s++ = x, j = Nlen; --j; *s++ = (x *= 69069U) & 0xFFFFFFFFU) ;
}
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/mersenne-twister.h b/linbox/randiter/mersenne-twister.h
index 252881d..8932fc0 100644
--- a/linbox/randiter/mersenne-twister.h
+++ b/linbox/randiter/mersenne-twister.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/mersenne-twister.h
* Copyright (C) 2002 Bradford Hovinen
*
@@ -7,9 +5,24 @@
*
* ------------------------------------
*
- * This file is part of LinBox, licensed under the GNU Lesser General Public
- * License. See COPYING for more information.
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
* ------------------------------------
*
* Header file for implementation of the Mersenne twister pseudo-random number
@@ -38,19 +51,23 @@ namespace LinBox
public:
MersenneTwister (uint32_t seed = 0);
- uint32_t reload ();
+ uint32_t reload (); // public?
+ // random in [0..2^32) ?
uint32_t randomInt ();
uint32_t randomInt () const
{ return const_cast<MersenneTwister&>(*this).randomInt();}
+ // random in [start..end).
uint32_t randomIntRange (uint32_t start, uint32_t end);
uint32_t randomIntRange (uint32_t start, uint32_t end) const
{ return const_cast<MersenneTwister&>(*this).randomIntRange(start,end); }
+ // random in [0..1] in some sense ?
double randomDouble ();
double randomDouble () const
{ return const_cast<MersenneTwister&>(*this).randomDouble(); }
+ // random in [start..end] in some sense ?
double randomDoubleRange (double start, double end)
{ return randomDouble () * (end - start) + start; }
double randomDoubleRange (double start, double end) const
@@ -67,7 +84,16 @@ namespace LinBox
}
#ifdef LinBoxSrcOnly
-#include <linbox/randiter/mersenne-twister.C>
+#include "linbox/randiter/mersenne-twister.C"
#endif
#endif // __LINBOX_mersenne_twister_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/modular-balanced.h b/linbox/randiter/modular-balanced.h
index eb71a16..9b2a1f0 100644
--- a/linbox/randiter/modular-balanced.h
+++ b/linbox/randiter/modular-balanced.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/modular-balanced.h
* Copyright (C) 1999-2005 William J Turner,
@@ -27,7 +25,25 @@
* Removed using declarations.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_randiter_modular_balanced_H
@@ -82,7 +98,7 @@ namespace LinBox
ModularBalancedRandIter (const ModularBalanced<Element> &F,
const integer &size = 0,
const integer &seed = 0) :
- _F (F), _size (size), _seed (seed)
+ _field (F), _size (size), _seed (seed)
{
if (_seed == 0) _seed = time (NULL);
@@ -93,12 +109,12 @@ namespace LinBox
if ((_size == 0) || (_size > cardinality))
_size = cardinality;
- commentator.report (10, INTERNAL_DESCRIPTION)
+ commentator().report (10, INTERNAL_DESCRIPTION)
<< "Created random generator with size " << _size
<< " and seed " << _seed << std::endl;
// Seed random number generator
- srand (_seed);
+ srand ((unsigned)_seed);
}
/** Copy constructor.
@@ -109,7 +125,7 @@ namespace LinBox
* @param R ModularBalancedRandIter object.
*/
ModularBalancedRandIter (const ModularBalancedRandIter<Element> &R) :
- _F (R._F), _size (R._size), _seed (R._seed)
+ _field (R._field), _size (R._size), _seed (R._seed)
{}
/** Destructor.
@@ -138,7 +154,8 @@ namespace LinBox
* @return reference to random field element
*/
Element &random (Element &a) const
- { return _F.init(a,rand()); }
+ {
+ return _field.init(a,rand()); }
/** Random field element creator.
* This returns a random field element from the information supplied
@@ -156,7 +173,7 @@ namespace LinBox
private:
/// Field in which arithmetic is done
- ModularBalanced<Element> _F;
+ ModularBalanced<Element> _field;
/// Sampling size
integer _size;
@@ -170,3 +187,12 @@ namespace LinBox
#endif //__LINBOX_randiter_modular_balanced_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/modular-crooked.h b/linbox/randiter/modular-crooked.h
index 5b819e2..65f861d 100644
--- a/linbox/randiter/modular-crooked.h
+++ b/linbox/randiter/modular-crooked.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/modular-crooked.h
* Copyright (C) 2010 LinBox
@@ -7,7 +5,25 @@
* Adapted from randiter/modular-dense.h
* by Brice Boyer <brice.boyer at imag.fr>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_randiter_modular_crooked_H
@@ -62,7 +78,7 @@ namespace LinBox
ModularCrookedRandIter (const ModularCrooked<Element> &F,
const integer &size = 0,
const integer &seed = 0) :
- _F (F), _size (size), _seed (seed)
+ _field (F), _size (size), _seed (seed)
{
if (_seed == 0) _seed = time (NULL);
@@ -73,12 +89,12 @@ namespace LinBox
if ((_size == 0) || (_size > cardinality))
_size = cardinality;
- commentator.report (10, INTERNAL_DESCRIPTION)
+ commentator().report (10, INTERNAL_DESCRIPTION)
<< "Created random generator with size " << _size
<< " and seed " << _seed << std::endl;
// Seed random number generator
- srand (_seed);
+ srand ((unsigned int)_seed);
}
/** Copy constructor.
@@ -89,7 +105,7 @@ namespace LinBox
* @param R ModularCrookedRandIter object.
*/
ModularCrookedRandIter (const ModularCrookedRandIter<Element> &R) :
- _F (R._F), _size (R._size), _seed (R._seed)
+ _field (R._field), _size (R._size), _seed (R._seed)
{}
/** Destructor.
@@ -118,7 +134,7 @@ namespace LinBox
* @return reference to random field element
*/
Element &random (Element &a) const
- { return _F.init(a,rand()); }
+ { return _field.init(a,rand()); }
/** Random field element creator.
* This returns a random field element from the information supplied
@@ -136,7 +152,7 @@ namespace LinBox
private:
/// Field in which arithmetic is done
- ModularCrooked<Element> _F;
+ ModularCrooked<Element> _field;
/// Sampling size
integer _size;
@@ -150,3 +166,12 @@ namespace LinBox
#endif //__LINBOX_randiter_modular_crooked_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/modular.h b/linbox/randiter/modular.h
index 11eb4c1..2f67e47 100644
--- a/linbox/randiter/modular.h
+++ b/linbox/randiter/modular.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/modular.h
* Copyright (C) 1999-2005 William J Turner,
* 2002 Bradford Hovinen
@@ -26,7 +24,25 @@
* Removed using declarations.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_randiter_modular_H
@@ -34,6 +50,7 @@
#include <iostream>
#include <vector>
+#include <cstdlib>
#include "time.h"
#include "linbox/integer.h"
@@ -79,7 +96,7 @@ namespace LinBox
ModularRandIter (const Modular<Element> &F,
const integer &size = 0,
const integer &seed = 0) :
- _F (F), _size (size), _seed (seed)
+ _field (F), _size (size), _seed (seed)
{
if (_seed == 0) _seed = time (NULL);
@@ -90,12 +107,13 @@ namespace LinBox
if ((_size == 0) || (_size > cardinality))
_size = cardinality;
- commentator.report (10, INTERNAL_DESCRIPTION)
+ /*commentator().report (10, INTERNAL_DESCRIPTION)
<< "Created random generator with size " << _size
<< " and seed " << _seed << std::endl;
+ */
// Seed random number generator
- srand (_seed);
+ srandom ((unsigned)_seed);
}
/** Copy constructor.
@@ -106,7 +124,7 @@ namespace LinBox
* @param R ModularRandIter object.
*/
ModularRandIter (const ModularRandIter<Element> &R) :
- _F (R._F), _size (R._size), _seed (R._seed)
+ _field (R._field), _size (R._size), _seed (R._seed)
{}
/** Destructor.
@@ -135,7 +153,9 @@ namespace LinBox
* @return reference to random field element
*/
Element &random (Element &a) const
- { return _F.init(a,rand()); }
+ {
+ return _field.init(a, ::random()); // need init from long int
+ }
/** Random field element creator.
* This returns a random field element from the information supplied
@@ -145,10 +165,10 @@ namespace LinBox
*/
Element &nonzerorandom (Element &a) const
{
- //return a = rand() % (_F.modulus -1) + 1;
+ //return a = random() % (_field.modulus -1) + 1;
- // CPernet: stupidly slow, but now way to get _F.modulus without changing the interface
- while (_F.isZero (random(a))) ;
+ // CPernet: stupidly slow, but now way to get _field.modulus without changing the interface
+ while (_field.isZero (random(a))) ;
return a;
}
@@ -169,7 +189,7 @@ namespace LinBox
private:
/// Field in which arithmetic is done
- Modular<Element> _F;
+ Modular<Element> _field;
/// Sampling size
integer _size;
@@ -193,11 +213,18 @@ namespace LinBox
~RandIter () {}
RandIter &operator= (const RandIter &r)
- { _r = r._r; return *this; }
+ {
+ _r = r._r;
+ return *this;
+ }
Element &random (Element &a) const
- { return _r.random (a); }
+ {
+ return _r.random (a);
+ }
ElementAbstract &random (ElementAbstract &a) const
- { return _r.random (a); }
+ {
+ return _r.random (a);
+ }
};
@@ -226,7 +253,7 @@ namespace LinBox
if ((_size == 0) || (_size > double (c)))
_size = c;
- _r.setSeed (_seed);
+ _r.setSeed ((uint32_t)_seed);
}
RandIter (const ModularBase<Element>::RandIter &r) :
@@ -244,8 +271,10 @@ namespace LinBox
return a = (Element)_r.randomIntRange (0, _size);
}
ElementAbstract &random (ElementAbstract &a) const
- { return a = ElementEnvelope <Modular<Element> >
- (_r.randomIntRange (0, _size)); }
+ {
+ return a = ElementEnvelope <Modular<Element> >
+ ((Element)_r.randomIntRange (0, _size));
+ }
};
@@ -274,7 +303,7 @@ namespace LinBox
if ((_size == 0) || (_size > double (c)))
_size = c;
- _r.setSeed (_seed);
+ _r.setSeed ((uint32_t)_seed);
}
RandIter (const ModularBase<Element>::RandIter &r) :
@@ -283,12 +312,19 @@ namespace LinBox
~RandIter () {}
RandIter &operator= (const RandIter &r)
- { _r = r._r; return *this; }
+ {
+ _r = r._r;
+ return *this;
+ }
Element &random (Element &a) const
- { return a = _r.randomIntRange (0, _size); }
+ {
+ return a = _r.randomIntRange (0, _size);
+ }
ElementAbstract &random (ElementAbstract &a) const
- { return a = ElementEnvelope <Modular<Element> >
- (_r.randomIntRange (0, _size)); }
+ {
+ return a = ElementEnvelope <Modular<Element> >
+ (_r.randomIntRange (0, _size));
+ }
};
@@ -317,7 +353,7 @@ namespace LinBox
if ((_size == 0) || (_size > double (c)))
_size = c;
- _r.setSeed (_seed);
+ _r.setSeed ((uint32_t)_seed);
}
RandIter (const ModularBase<Element>::RandIter &r) :
@@ -326,12 +362,19 @@ namespace LinBox
~RandIter () {}
RandIter &operator= (const RandIter &r)
- { _r = r._r; return *this; }
+ {
+ _r = r._r;
+ return *this;
+ }
Element &random (Element &a) const
- { return a = _r.randomIntRange (0, _size); }
+ {
+ return a = (Element)_r.randomIntRange (0, (uint32_t)_size);
+ }
ElementAbstract &random (ElementAbstract &a) const
- { return a = ElementEnvelope <Modular<Element> >
- (_r.randomIntRange (0, _size)); }
+ {
+ return a = ElementEnvelope <Modular<Element> >
+ ((Element)_r.randomIntRange (0, (uint32_t)_size));
+ }
};
@@ -339,3 +382,12 @@ namespace LinBox
#endif // __LINBOX_randiter_modular_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/multimod-randomprime.h b/linbox/randiter/multimod-randomprime.h
index 6508d84..62cb6b1 100644
--- a/linbox/randiter/multimod-randomprime.h
+++ b/linbox/randiter/multimod-randomprime.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/multimod-randomprime.h
* Copyright (C) 2005 Pascal Giorgi
*
@@ -7,15 +5,33 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_multimod_random_prime_H
#define __LINBOX_multimod_random_prime_H
-#include <linbox/integer.h>
-#include <linbox/util/timer.h>
+#include "linbox/integer.h"
+#include "linbox/util/timer.h"
#include <vector>
namespace LinBox
@@ -37,7 +53,7 @@ namespace LinBox
_shift = integer(1)<<_bits;
if (! seed)
- MultiModRandomPrime::setSeed( BaseTimer::seed() );
+ MultiModRandomPrime::setSeed( (unsigned long) BaseTimer::seed() );
else
MultiModRandomPrime::setSeed( seed );
}
@@ -57,7 +73,8 @@ namespace LinBox
integer::random(tmp[i],_bits-1);
tmp[i]= _shift-tmp[i];
nextprime(tmp[i],tmp[i]);
- } while (std::find(tmp.begin(), tmp.begin()+i, tmp[i]) != (tmp.begin()+i ));
+ }
+ while (std::find(tmp.begin(), tmp.begin()+(long)i, tmp[i]) != (tmp.begin()+(long)i ));
}
return tmp;
}
@@ -72,7 +89,8 @@ namespace LinBox
integer::random(p[i],_bits-1);
p[i]= _shift-p[i];
nextprime(p[i],p[i]);
- } while (std::find(p.begin(), p.begin()+i-1, p[i]) != (p.begin()+i-1 ));
+ }
+ while (std::find(p.begin(), p.begin()+(long)(i-1), p[i]) != (p.begin()+(long)(i-1) ));
}
return p;
}
@@ -108,3 +126,12 @@ namespace LinBox
#endif //__LINBOX_multimod_random_prime_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/nonzero.h b/linbox/randiter/nonzero.h
index fe3ce0a..ed122c5 100644
--- a/linbox/randiter/nonzero.h
+++ b/linbox/randiter/nonzero.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/nonzero.h
* Copyright (C) 2001-2002 Bradford Hovinen
*
@@ -8,7 +6,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_randiter_nonzero_H
@@ -24,15 +40,6 @@
#include <sys/time.h>
#include <stdlib.h>
-#ifdef __LINBOX_XMLENABLED
-
-#include "linbox/util/xml/linbox-reader.h"
-#include "linbox/util/xml/linbox-writer.h"
-
-#include <string>
-
-#endif
-
namespace LinBox
{
/** Random iterator for nonzero random numbers
@@ -47,11 +54,11 @@ namespace LinBox
typedef typename Field::Element Element;
NonzeroRandIter (const Field &F, const RandIter &r) :
- _F (F), _r (r)
+ _field (F), _r (r)
{}
NonzeroRandIter (const NonzeroRandIter& R) :
- _F (R._F), _r (R._r)
+ _field (R._field), _r (R._r)
{}
~NonzeroRandIter()
@@ -60,7 +67,7 @@ namespace LinBox
NonzeroRandIter& operator=(const NonzeroRandIter& R)
{
if (this != &R) { // guard against self-assignment
- _F = R._F;
+ _field = R._field;
_r = R._r;
}
@@ -70,7 +77,7 @@ namespace LinBox
template<class Elt>
Elt &random (Elt &a) const
{
- do _r.random (a); while (_F.isZero (a));
+ do _r.random (a); while (_field.isZero (a));
return a;
}
@@ -90,7 +97,7 @@ namespace LinBox
private:
- Field _F;
+ Field _field;
RandIter _r;
}; // class NonzeroRandIter
@@ -99,3 +106,12 @@ namespace LinBox
#endif // __LINBOX_randiter_nonzero_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/ntl-ZZ.h b/linbox/randiter/ntl-ZZ.h
index c10f024..acd2809 100644
--- a/linbox/randiter/ntl-ZZ.h
+++ b/linbox/randiter/ntl-ZZ.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by Zhendong Wan
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_randiter_ntl_zz_H
@@ -68,3 +69,12 @@ namespace LinBox
#endif // __LINBOX_randiter_ntl_zz_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/param-fuzzy.h b/linbox/randiter/param-fuzzy.h
index 6c27709..d1e0895 100644
--- a/linbox/randiter/param-fuzzy.h
+++ b/linbox/randiter/param-fuzzy.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/param-fuzzy.h
* Copyright (C) 1999-2001 William J Turner,
* 2002 Bradford Hovinen
@@ -8,10 +6,13 @@
* Bradford Hovinen <hovinen at cis.udel.edu>
*
* updated by bds 8/02
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +20,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_randiter_param_fuzzy_H
@@ -30,6 +31,7 @@
#include <iostream>
#include <vector>
#include <cstdlib>
+#include <time.h>
#include "linbox/integer.h"
#include "linbox/element/abstract.h"
@@ -48,7 +50,7 @@ namespace LinBox
ParamFuzzyRandIter (/*const ParamFuzzy &F, */
const integer &size = 0,
const integer &seed = 0) :
- /*_F (F),*/ _size (size), _seed (seed)
+ /*_field (F),*/ _size (size), _seed (seed)
{
/*if (_size == 0) F.cardinality (_size);*/
if (_seed == 0) _seed = time (NULL);
@@ -57,14 +59,14 @@ namespace LinBox
ParamFuzzyRandIter (const ParamFuzzy &F,
const integer &size = 0,
const integer &seed = 0) :
- _F (F), _size (size), _seed (seed)
+ _field (F), _size (size), _seed (seed)
{
if (_size == 0) F.cardinality (_size);
if (_seed == 0) _seed = time (NULL);
}
ParamFuzzyRandIter (const ParamFuzzyRandIter &R) :
- /*_F (R._F),*/ _size (R._size), _seed (R._seed)
+ /*_field (R._field),*/ _size (R._size), _seed (R._seed)
{}
~ParamFuzzyRandIter () {}
@@ -99,7 +101,7 @@ namespace LinBox
private:
/// Field in which arithmetic is done
- ParamFuzzy _F;
+ ParamFuzzy _field;
/// Sampling size
integer _size;
@@ -113,3 +115,12 @@ namespace LinBox
#endif // __LINBOX_randiter_param_fuzzy_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/randiter-wrappers.doxy b/linbox/randiter/randiter-wrappers.doxy
index dd87e90..9b2c86d 100644
--- a/linbox/randiter/randiter-wrappers.doxy
+++ b/linbox/randiter/randiter-wrappers.doxy
@@ -1,3 +1,25 @@
+/* Copyright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+
/** \page randomFEGW Random field element generator wrappers
@see \ref Fields
diff --git a/linbox/randiter/randiter.doxy b/linbox/randiter/randiter.doxy
index 1008350..51fef2c 100644
--- a/linbox/randiter/randiter.doxy
+++ b/linbox/randiter/randiter.doxy
@@ -1,4 +1,23 @@
// Copyright 2010 LinBox. See COPYING for lincence information.
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/**\ingroup linbox
\defgroup randiter randiter
diff --git a/linbox/randiter/random-fftprime.h b/linbox/randiter/random-fftprime.h
index 9facc05..d3b60d0 100644
--- a/linbox/randiter/random-fftprime.h
+++ b/linbox/randiter/random-fftprime.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/algorithms/
* Copyright (C) 2005 Pascal Giorgi
*
* Written by Pascal Giorgi <pgiorgi at uwaterloo.ca>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,17 +17,17 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_random_fftprime_H
#define __LINBOX_random_fftprime_H
-#include <linbox/integer.h>
-#include <linbox/util/timer.h>
+#include "linbox/integer.h"
+#include "linbox/util/timer.h"
namespace LinBox
{
@@ -40,7 +41,7 @@ namespace LinBox
_bits(bits)
{
if (! seed)
- RandomFFTPrime::setSeed( BaseTimer::seed() );
+ RandomFFTPrime::setSeed( (unsigned long)BaseTimer::seed() );
else
RandomFFTPrime::setSeed( seed );
}
@@ -58,12 +59,12 @@ namespace LinBox
size_t tresh;
do {
tresh = 1<<(cbits);
- size_t p = 1<<(_bits-cbits);
+ size_t p = 1<<((size_t)_bits-cbits);
do {
integer::random(tmp,cbits);
tmp = tmp*p+1;
tresh--;
- } while ((::Givaro::probab_prime(tmp)<2) && (tresh));
+ } while (( Givaro::probab_prime(tmp)<2) && (tresh));
cbits++;
}
while(tresh==0);
@@ -79,7 +80,7 @@ namespace LinBox
size_t tresh;
do {
tresh = 1<<(cbits);
- size_t p = 1<<(_bits-cbits);
+ size_t p = 1<<((size_t)_bits-cbits);
do {
integer::random(t,cbits);
t = t*p+1;
@@ -106,3 +107,12 @@ namespace LinBox
#endif //__LINBOX_random_fftprime_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/random-integer.h b/linbox/randiter/random-integer.h
index 873d7f7..e10fb96 100644
--- a/linbox/randiter/random-integer.h
+++ b/linbox/randiter/random-integer.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by <brice.boyer at imag.fr>
* (adapted form random-prime.h)
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file randiter/random-integer.h
@@ -193,3 +194,12 @@ namespace LinBox
#endif //__LINBOX_random_integer_iterator_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/random-prime.h b/linbox/randiter/random-prime.h
index 2969362..62534d4 100644
--- a/linbox/randiter/random-prime.h
+++ b/linbox/randiter/random-prime.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2007,2010 LinBox
* Written by <Jean-Guillaume.Dumas at imag.fr>
* Modified by <brice.boyer at imag.fr> (RandomPrimeIter)
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file randiter/random-prime.h
@@ -29,8 +30,8 @@
#ifndef __LINBOX_random_prime_iterator_H
#define __LINBOX_random_prime_iterator_H
-#include <linbox/integer.h>
-#include <linbox/util/timer.h>
+#include "linbox/integer.h"
+#include "linbox/util/timer.h"
#include "linbox/util/debug.h"
#include <cstdlib> // drand48, temporary
@@ -217,7 +218,7 @@ namespace LinBox
{
linbox_check(_low_bits < _bits);
// integer::random_exact(a,_bits);
- unsigned long ze_bits = _low_bits+(unsigned long)((_bits - _low_bits)*drand48()) ;
+ unsigned long ze_bits = (unsigned long)(_low_bits+(unsigned long)(double(_bits - _low_bits)*drand48())) ;
linbox_check (!(ze_bits<_low_bits) && !(ze_bits>_bits));
integer::random(a,ze_bits-1); //!@todo uses random_between when givaro is released.
a = (integer(1)<<ze_bits) - a;
@@ -251,3 +252,12 @@ namespace LinBox
#endif //__LINBOX_random_prime_iterator_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/randiter/unparametric.h b/linbox/randiter/unparametric.h
index 4ededb7..d05d9d7 100644
--- a/linbox/randiter/unparametric.h
+++ b/linbox/randiter/unparametric.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by William J Turner
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_randiter_unparametric_H
@@ -26,12 +27,18 @@
#include <ctime>
#include <vector>
+#include "linbox/field/unparametric.h"
+
+// #include <fflas-ffpack/field/unparametric.h>
// Namespace in which all LinBox library code resides
namespace LinBox
{
+ using Givaro::Caster;
+
// forward declarations
template <class K> class UnparametricField;
+ // using FFPACK::UnparametricField ;
/** Unparameterized random field element generator template.
* Implements LinBox random field element generator common object interface
@@ -101,7 +108,7 @@ namespace LinBox
#endif // TRACE
// Seed random number generator
- srand(static_cast<long>(_seed));
+ srand((unsigned)_seed);
} // UnparametricRandIter(const UnparametricField<K>&, const integer&, const integer&)
@@ -151,9 +158,9 @@ namespace LinBox
{
// Create new random elements
if (_size == 0)
- return x = rand();
+ return x = (Element) rand();
else
- return x = static_cast<integer>((double(rand())/RAND_MAX)*double(_size));
+ return Caster (x, (double(rand())/RAND_MAX)*double(_size));
} // element& operator() (void)
@@ -189,3 +196,12 @@ namespace LinBox
#endif // __LINBOX_randiter_unparametric_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/ring/Makefile.am b/linbox/ring/Makefile.am
index af29ba5..db8a61f 100644
--- a/linbox/ring/Makefile.am
+++ b/linbox/ring/Makefile.am
@@ -1,6 +1,24 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
pkgincludesubdir=$(pkgincludedir)/ring
BASIC_HDRS = \
diff --git a/linbox/ring/Makefile.in b/linbox/ring/Makefile.in
index 052b5d7..b919fc5 100644
--- a/linbox/ring/Makefile.in
+++ b/linbox/ring/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,10 +15,47 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -41,12 +78,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -54,7 +94,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -63,18 +106,44 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
-pkgincludesubHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkgincludesub_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -86,6 +155,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -109,10 +179,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -133,10 +205,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -145,6 +222,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -161,6 +240,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -223,10 +303,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
pkgincludesubdir = $(pkgincludedir)/ring
BASIC_HDRS = \
ring-interface.h \
@@ -255,9 +331,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/ring/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps linbox/ring/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/ring/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/ring/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -275,6 +351,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -283,21 +360,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludesubdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)"
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludesubHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- $(pkgincludesubHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
done
uninstall-pkgincludesubHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
- done
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -311,7 +392,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -319,29 +400,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -362,13 +448,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -389,16 +479,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -484,6 +580,7 @@ uninstall-am: uninstall-pkgincludesubHEADERS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/linbox/ring/abstract.h b/linbox/ring/abstract.h
index 8e1f96d..5fc9b6d 100644
--- a/linbox/ring/abstract.h
+++ b/linbox/ring/abstract.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/ring/abstract.h
* Copyright(C) LinBox
* Written by J-G Dumas <Jean-Guillaume.Dumas at imag.fr>,
* Clement Pernet <Clement.Pernet at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_ring_abstract_H
@@ -118,3 +119,12 @@ namespace LinBox
#endif // __LINBOX_ring_abstract_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/ring/archetype.h b/linbox/ring/archetype.h
index b14d982..99a3e34 100644
--- a/linbox/ring/archetype.h
+++ b/linbox/ring/archetype.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/ring/archetype.h
* Copyright(C) LinBox
* Written by J-G Dumas <Jean-Guillaume.Dumas at imag.fr>,
* Clement Pernet <Clement.Pernet at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*
*/
@@ -222,3 +223,12 @@ namespace LinBox
#endif // __LINBOX_ring_archetype_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/ring/envelope.h b/linbox/ring/envelope.h
index fb3d96f..67f1349 100644
--- a/linbox/ring/envelope.h
+++ b/linbox/ring/envelope.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/ring/envelope.h
* Copyright(C) LinBox
* Written by J-G Dumas <Jean-Guillaume.Dumas at imag.fr>,
* Clement Pernet <Clement.Pernet at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*
* ------------------------------------
*/
@@ -296,3 +297,12 @@ namespace LinBox
#endif // __LINBOX_ring_envelope_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/ring/givaro-polynomial.h b/linbox/ring/givaro-polynomial.h
index b33767b..a3ede28 100644
--- a/linbox/ring/givaro-polynomial.h
+++ b/linbox/ring/givaro-polynomial.h
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/ring/givaro-polynomial.h
* Copyright(C) LinBox
* Written by
* Clement Pernet
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file ring/givaro-polynomial.h
@@ -21,7 +37,7 @@
#include <givaro/givpoly1factor.h>
#include "linbox/integer.h"
#include "linbox/field/unparametric.h"
-#include "linbox/field/givaro-field.h"
+#include "linbox/field/givaro.h"
//#include "linbox/element/givaro-polynomial.h"
@@ -36,40 +52,52 @@ namespace LinBox
* @tparam Domain
* @tparam StorageTag
*/
- template <class Domain, class StorageTag=::Givaro::Dense>
- class GivPolynomialRing : public ::Givaro::Poly1Dom<GivaroField<Domain>,StorageTag> {
+ template <class Domain, class StorageTag= Givaro::Dense>
+ class GivPolynomialRing : public Givaro::Poly1FactorDom< GivaroField<Domain>,StorageTag> {
public:
- // using ::Givaro::Poly1Dom<Domain,StorageTag>::eval;
- typedef typename ::Givaro::Poly1Dom<Domain,StorageTag>::Element Element;
-
+ // using Givaro::Poly1FactorDom<Domain,StorageTag>::eval;
+ typedef typename Givaro::Poly1FactorDom<GivaroField<Domain>,StorageTag> Father_t;
+ typedef typename Father_t::Element Element;
typedef Element Polynomial;
GivPolynomialRing () {}
- GivPolynomialRing (const Domain& D) :
- ::Givaro::Poly1Dom<GivaroField<Domain>,StorageTag>(D, ::Givaro::Indeter())
+ GivPolynomialRing (const Domain& D) : Father_t( GivaroField<Domain>(D) )
{}
- GivPolynomialRing (const Domain& D, const ::Givaro::Indeter& I) :
- ::Givaro::Poly1Dom<GivaroField<Domain>,StorageTag>(D, I)
+ GivPolynomialRing (const Domain& D, const Givaro::Indeter& I) :
+ Father_t(GivaroField<Domain>(D), I)
{}
template<class PolyCont>
PolyCont& factor (PolyCont& factors,
std::vector<unsigned long>& exp,
- const Polynomial& P);
+ const Polynomial& P)
+ {
+
+ // JGD 02.03.2012 : to be refactored
+ // at least without pointers ...
+ std::vector<Polynomial> Lf;
+ CZfactor(Lf, exp, P); // Cantor-Zassenhaus factorization
+ factors.resize(Lf.size());
+ for(size_t i=0; i<Lf.size(); ++i)
+ factors[i] = new Polynomial(Lf[i]);
+
+ return factors;
+ }
+
};
#ifdef __LINBOX_HAVE_NTL
}
-#include "linbox/field/ntl-ZZ.h"
+#include "linbox/field/ntl.h"
#include "NTL/ZZXFactoring.h"
namespace LinBox
{
- typedef GivPolynomialRing<UnparametricField<integer>,::Givaro::Dense> GivPolIntDense;
+ typedef GivPolynomialRing<UnparametricField<integer>, Givaro::Dense> GivPolIntDense;
template <>
template <>
@@ -103,16 +131,16 @@ namespace LinBox
}
}
-#include <linbox/field/PID-integer.h>
+#include "linbox/field/PID-integer.h"
namespace LinBox
{
- typedef GivPolynomialRing<PID_integer,::Givaro::Dense> GivPolPIDIntDense;
+ typedef GivPolynomialRing<PID_integer, Givaro::Dense> GivPolPIDIntDense;
template <>
template <>
std::vector<GivPolPIDIntDense::Element* >&
GivPolPIDIntDense::factor<std::vector<GivPolPIDIntDense::Element* > > (std::vector<GivPolPIDIntDense::Element* >& factors,
- std::vector<unsigned long>& exp,
- const GivPolPIDIntDense::Element &P)
+ std::vector<unsigned long>& exp,
+ const GivPolPIDIntDense::Element &P)
{
NTL::ZZXFac_InitNumPrimes = 1;
NTL::ZZX f;
@@ -138,7 +166,7 @@ namespace LinBox
return factors;
}
- typedef GivPolynomialRing< NTL_ZZ , ::Givaro::Dense> GivPolZZDense;
+ typedef GivPolynomialRing< NTL_ZZ , Givaro::Dense> GivPolZZDense;
template <>
template <>
std::vector<GivPolZZDense::Element* >&
@@ -171,7 +199,8 @@ namespace LinBox
#endif
- typedef GivPolynomialRing<Modular<double>,::Givaro::Dense> GivPolMdDense;
+ typedef GivPolynomialRing<Modular<double>, Givaro::Dense> GivPolMdDense;
+
template <>
template <>
std::vector<GivPolMdDense::Element *>&
@@ -183,7 +212,7 @@ namespace LinBox
_domain.characteristic(charac);
double p = charac;
typedef GivaroField<Modular<double> > GivModDouble;
- typedef ::Givaro::Poly1FactorDom< GivModDouble,::Givaro::Dense, GivModDouble::RandIter> PolysDouble;
+ typedef Givaro::Poly1FactorDom< GivModDouble, Givaro::Dense, GivModDouble::RandIter> PolysDouble;
PolysDouble PFD(*this, GivModDouble::RandIter(_domain));
@@ -209,3 +238,12 @@ namespace LinBox
#endif // __LINBOX_givaropolynomial_H
+
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+
diff --git a/linbox/ring/polynomial.doxy b/linbox/ring/polynomial.doxy
index 2fbdd87..831ad93 100644
--- a/linbox/ring/polynomial.doxy
+++ b/linbox/ring/polynomial.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/*! @ingroup ring
* @defgroup polynomials Polynomials
diff --git a/linbox/ring/poweroftwomodular.h b/linbox/ring/poweroftwomodular.h
index bf99f5f..08e13a0 100644
--- a/linbox/ring/poweroftwomodular.h
+++ b/linbox/ring/poweroftwomodular.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/field/modular.h
* Copyright(C) LinBox
* Written by
@@ -7,7 +5,25 @@
* Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
*
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_poweroftwomodular_H
@@ -570,3 +586,12 @@ PowerOfTwoModular<int64_t>::gcd_poweroftwo (Element &x,const Element &y) const
#endif // __LINBOX_poweroftwomodular_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/ring/ring-interface.h b/linbox/ring/ring-interface.h
index 7ae0b0e..4c123b6 100644
--- a/linbox/ring/ring-interface.h
+++ b/linbox/ring/ring-interface.h
@@ -1,12 +1,26 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/ring/ring-interface.h
* Copyright(C) LinBox
* Written by
* Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
* Clément Pernet <Clement.Pernet at imag.fr>
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * For licensing information see COPYING
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
*/
#ifndef __LINBOX_ring_interface_H
@@ -65,3 +79,12 @@ namespace LinBox
#endif // __LINBOX_ring_interface_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/ring/ring.doxy b/linbox/ring/ring.doxy
index 78e4050..c3469fd 100644
--- a/linbox/ring/ring.doxy
+++ b/linbox/ring/ring.doxy
@@ -1,3 +1,25 @@
+/* Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+
/** \ingroup linbox
\defgroup ring ring
diff --git a/linbox/solutions/Makefile.am b/linbox/solutions/Makefile.am
index d6e35de..5584836 100644
--- a/linbox/solutions/Makefile.am
+++ b/linbox/solutions/Makefile.am
@@ -1,7 +1,24 @@
# Copyright (c) 2010 the LinBox group
# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
+
AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DLinBoxSrcOnly
pkgincludesubdir=$(pkgincludedir)/solutions
diff --git a/linbox/solutions/Makefile.in b/linbox/solutions/Makefile.in
index 8ba79ca..bf721e0 100644
--- a/linbox/solutions/Makefile.in
+++ b/linbox/solutions/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,10 +15,49 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# This file is part of LinBox
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#/
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -41,12 +80,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -54,7 +96,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -63,18 +108,44 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
-pkgincludesubHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkgincludesub_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -86,6 +157,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -109,10 +181,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -133,10 +207,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -145,6 +224,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -161,6 +242,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -223,11 +305,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
-#
AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DLinBoxSrcOnly
pkgincludesubdir = $(pkgincludedir)/solutions
pkgincludesub_HEADERS = \
@@ -267,9 +344,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/solutions/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps linbox/solutions/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/solutions/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/solutions/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -287,6 +364,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -295,21 +373,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludesubdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)"
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludesubHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- $(pkgincludesubHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
done
uninstall-pkgincludesubHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
- done
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -323,7 +405,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -331,29 +413,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -374,13 +461,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -401,16 +492,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -496,6 +593,7 @@ uninstall-am: uninstall-pkgincludesubHEADERS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/linbox/solutions/charpoly.doxy b/linbox/solutions/charpoly.doxy
index 30f617b..655de09 100644
--- a/linbox/solutions/charpoly.doxy
+++ b/linbox/solutions/charpoly.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** @ingroup solutions
@defgroup charpoly Characteristic polynomial
diff --git a/linbox/solutions/charpoly.h b/linbox/solutions/charpoly.h
index a91f42f..104e191 100644
--- a/linbox/solutions/charpoly.h
+++ b/linbox/solutions/charpoly.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/solutions/charpoly.h
* Copyright (C) 2005 Clement Pernet
*
* Written by Clement Pernet <clement.pernet at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_charpoly_H
@@ -29,7 +30,6 @@
#include "linbox/solutions/methods.h"
#include "linbox/util/debug.h"
#include "linbox/field/field-traits.h"
-#include "linbox/blackbox/blas-blackbox.h"
#include "linbox/matrix/blas-matrix.h"
#include "linbox/algorithms/blas-domain.h"
@@ -91,10 +91,10 @@ namespace LinBox
// The charpoly with Hybrid Method
template<class Polynomial, class Blackbox>
- Polynomial &charpoly (Polynomial &P,
- const Blackbox &A,
- const RingCategories::ModularTag &tag,
- const Method::Hybrid &M)
+ Polynomial &charpoly (Polynomial &P,
+ const Blackbox & A,
+ const RingCategories::ModularTag & tag,
+ const Method::Hybrid & M)
{
// not yet a hybrid
//return charpoly(P, A, tag, Method::Blackbox(M));
@@ -103,20 +103,21 @@ namespace LinBox
// The charpoly with Hybrid Method
template<class Polynomial, class Domain>
- Polynomial &charpoly (Polynomial &P,
- const SparseMatrix<Domain> &A,
- const RingCategories::ModularTag &tag,
- const Method::Hybrid &M)
+ Polynomial &charpoly (Polynomial &P,
+ const SparseMatrix<Domain> & A,
+ const RingCategories::ModularTag & tag,
+ const Method::Hybrid & M)
{
// not yet a hybrid
return charpoly(P, A, tag, Method::Blackbox(M));
}
+
// The charpoly with Hybrid Method
template<class Polynomial, class Domain>
- Polynomial &charpoly (Polynomial &P,
- const DenseMatrix<Domain> &A,
- const RingCategories::ModularTag &tag,
- const Method::Hybrid &M)
+ Polynomial &charpoly (Polynomial &P,
+ const BlasMatrix<Domain> & A,
+ const RingCategories::ModularTag & tag,
+ const Method::Hybrid & M)
{
// not yet a hybrid
return charpoly(P, A, tag, Method::BlasElimination(M));
@@ -124,10 +125,10 @@ namespace LinBox
// The charpoly with Elimination Method
template<class Polynomial, class Blackbox>
- Polynomial &charpoly (Polynomial &P,
- const Blackbox &A,
- const RingCategories::ModularTag &tag,
- const Method::Elimination &M)
+ Polynomial & charpoly (Polynomial & P,
+ const Blackbox & A,
+ const RingCategories::ModularTag & tag,
+ const Method::Elimination & M)
{
return charpoly(P, A, tag, Method::BlasElimination(M));
}
@@ -152,9 +153,9 @@ namespace LinBox
if (A.coldim() != A.rowdim())
throw LinboxError("LinBox ERROR: matrix must be square for characteristic polynomial computation\n");
- BlasBlackbox< typename Blackbox::Field > BBB (A);
+ BlasMatrix< typename Blackbox::Field > BBB (A);
BlasMatrixDomain< typename Blackbox::Field > BMD (BBB.field());
- return BMD.charpoly (P, static_cast<BlasMatrix<typename Blackbox::Field::Element> >(BBB));
+ return BMD.charpoly (P, static_cast<BlasMatrix<typename Blackbox::Field> >(BBB));
}
}
@@ -194,12 +195,12 @@ namespace LinBox
const RingCategories::IntegerTag & tag,
const Method::Hybrid & M)
{
- commentator.start ("Integer Charpoly", "Icharpoly");
+ commentator().start ("Integer Charpoly", "Icharpoly");
if ( (A.rowdim() < 1000) && (A.coldim() <1000) )
charpoly(P, A, tag, Method::BlasElimination(M) );
else
charpoly(P, A, tag, Method::Blackbox(M) );
- commentator.stop ("done", NULL, "Icharpoly");
+ commentator().stop ("done", NULL, "Icharpoly");
return P;
}
@@ -226,27 +227,30 @@ namespace LinBox
template < class IntRing, class Polynomial >
Polynomial& charpoly (Polynomial & P,
- const DenseMatrix<IntRing> & A,
+ const BlasMatrix<IntRing> & A,
const RingCategories::IntegerTag & tag,
const Method::Hybrid & M)
{
- commentator.start ("DenseMatrix Integer Charpoly", "Icharpoly");
+ commentator().start ("BlasMatrix Integer Charpoly", "Icharpoly");
charpoly(P, A, tag, Method::BlasElimination(M) );
- commentator.stop ("done", NULL, "Icharpoly");
+ commentator().stop ("done", NULL, "Icharpoly");
return P;
}
+
+#if 0
template < class IntRing, class Polynomial >
Polynomial& charpoly (Polynomial & P,
const BlasMatrix<IntRing> & A,
const RingCategories::IntegerTag & tag,
const Method::Hybrid & M)
{
- commentator.start ("BlasMatrix Integer Charpoly", "Icharpoly");
+ commentator().start ("BlasMatrix Integer Charpoly", "Icharpoly");
charpoly(P, A, tag, Method::BlasElimination(M) );
- commentator.stop ("done", NULL, "Icharpoly");
+ commentator().stop ("done", NULL, "Icharpoly");
return P;
}
+#endif
/** @brief Compute the characteristic polynomial over {\bf Z}
*
@@ -345,12 +349,12 @@ namespace LinBox
if (A.coldim() != A.rowdim())
throw LinboxError("LinBox ERROR: matrix must be square for characteristic polynomial computation\n");
- commentator.start ("Integer BlackBox Charpoly : No NTL installation -> chinese remaindering", "IbbCharpoly");
+ commentator().start ("Integer BlackBox Charpoly : No NTL installation -> chinese remaindering", "IbbCharpoly");
RandomPrimeIterator genprime( 26-(int)ceil(log((double)A.rowdim())*0.7213475205));
#if 0
- typename Blackbox::ConstRawIterator it = A.rawBegin();
- typename Blackbox::ConstRawIterator it_end = A.rawEnd();
+ typename Blackbox::ConstIterator it = A.Begin();
+ typename Blackbox::ConstIterator it_end = A.End();
integer max = 1,min=0;
while( it != it_end ){
// cerr<<"it="<<(*it)<<endl;
@@ -371,7 +375,7 @@ namespace LinBox
IntegerModularCharpoly<Blackbox,Method::Blackbox> iteration(A, M);
cra.operator() (P, iteration, genprime);
- commentator.stop ("done", NULL, "IbbCharpoly");
+ commentator().stop ("done", NULL, "IbbCharpoly");
return P;
}
@@ -385,12 +389,12 @@ namespace LinBox
if (A.coldim() != A.rowdim())
throw LinboxError("LinBox ERROR: matrix must be square for characteristic polynomial computation\n");
- commentator.start ("Integer Dense Charpoly : No NTL installation -> chinese remaindering", "IbbCharpoly");
+ commentator().start ("Integer Dense Charpoly : No NTL installation -> chinese remaindering", "IbbCharpoly");
RandomPrimeIterator genprime( 26-(int)ceil(log((double)A.rowdim())*0.7213475205));
#if 0
- typename Blackbox::ConstRawIterator it = A.rawBegin();
- typename Blackbox::ConstRawIterator it_end = A.rawEnd();
+ typename Blackbox::ConstIterator it = A.Begin();
+ typename Blackbox::ConstIterator it_end = A.End();
integer max = 1,min=0;
while( it != it_end ){
// cerr<<"it="<<(*it)<<endl;
@@ -411,7 +415,7 @@ namespace LinBox
ChineseRemainder< EarlyMultipCRA<Modular<double> > > cra(3UL);
IntegerModularCharpoly<Blackbox,Method::BlasElimination> iteration(A, M);
cra(P, iteration, genprime);
- commentator.stop ("done", NULL, "IbbCharpoly");
+ commentator().stop ("done", NULL, "IbbCharpoly");
return P;
}
@@ -449,7 +453,7 @@ namespace LinBox
Polynomial &charpoly (Polynomial& P, const Blackbox& A,
const RingCategories::RationalTag& tag, const MyMethod& M)
{
- commentator.start ("Rational Charpoly", "Rcharpoly");
+ commentator().start ("Rational Charpoly", "Rcharpoly");
RandomPrimeIterator genprime( 26-(int)ceil(log((double)A.rowdim())*0.7213475205));
RationalRemainder2< VarPrecEarlyMultipCRA<Modular<double> > > rra(3UL);
@@ -463,21 +467,20 @@ namespace LinBox
for (typename Polynomial::iterator it= P.begin(); it != P.end(); ++it, ++i)
A.field().init(*it, PP[i],den);
- commentator.stop ("done", NULL, "Rcharpoly");
+ commentator().stop ("done", NULL, "Rcharpoly");
return P;
}
- template < class Field, template <class> class Polynomial, class MyMethod>
- Polynomial<typename Field::Element> &charpoly (Polynomial<typename Field::Element>& P, const DenseMatrix<Field>& A,
- const RingCategories::RationalTag& tag, const MyMethod& M)
- {
- commentator.start ("Dense Rational Charpoly", "Rcharpoly");
- rational_charpoly(P,A,M);
-
- commentator.stop ("done", NULL, "Rcharpoly");
- return P;
- }
} // end of LinBox namespace
#endif // __LINBOX_charpoly_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/solutions/det.h b/linbox/solutions/det.h
index 7bd62c1..24bea55 100644
--- a/linbox/solutions/det.h
+++ b/linbox/solutions/det.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/solutions/det.h
* Copyright (C) 2001, 2002 LinBox
- * Time-stamp: <12 Jul 10 09:47:36 Jean-Guillaume.Dumas at imag.fr>
+ * Time-stamp: <04 Oct 11 16:42:52 Jean-Guillaume.Dumas at imag.fr>
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file solutions/det.h
@@ -33,9 +34,7 @@
#include "linbox/blackbox/compose.h"
#include "linbox/solutions/methods.h"
#include "linbox/solutions/getentry.h"
-#include "linbox/blackbox/dense.h"
-#include "linbox/blackbox/blas-blackbox.h"
#include "linbox/matrix/blas-matrix.h"
#include "linbox/algorithms/blackbox-container.h"
#include "linbox/algorithms/blackbox-container-symmetric.h"
@@ -69,7 +68,7 @@ namespace LinBox
typename Blackbox::Field::Element &det (typename Blackbox::Field::Element &d,
const Blackbox &A,
const DomainCategory &tag,
- const DetMethod &M);
+ const DetMethod &Meth);
// The det where A can be modified in place
// Default is to use the generic det (might copy)
@@ -77,9 +76,9 @@ namespace LinBox
typename Blackbox::Field::Element &detin (typename Blackbox::Field::Element &d,
Blackbox &A,
const DomainCategory &tag,
- const DetMethod &M)
+ const DetMethod &Meth)
{
- return det(d, A, tag, M);
+ return det(d, A, tag, Meth);
}
// The det with default Method
@@ -102,18 +101,18 @@ namespace LinBox
template <class Blackbox, class MyMethod>
typename Blackbox::Field::Element &det (typename Blackbox::Field::Element &d,
const Blackbox &A,
- const MyMethod &M)
+ const MyMethod &Meth)
{
- return det(d, A, typename FieldTraits<typename Blackbox::Field>::categoryTag(), M);
+ return det(d, A, typename FieldTraits<typename Blackbox::Field>::categoryTag(), Meth);
}
// The in place det with category specializer
template <class Blackbox, class MyMethod>
typename Blackbox::Field::Element &detin (typename Blackbox::Field::Element &d,
Blackbox &A,
- const MyMethod &M)
+ const MyMethod &Meth)
{
- return detin(d, A, typename FieldTraits<typename Blackbox::Field>::categoryTag(), M);
+ return detin(d, A, typename FieldTraits<typename Blackbox::Field>::categoryTag(), Meth);
}
// The det with Hybrid Method
@@ -121,48 +120,48 @@ namespace LinBox
typename Blackbox::Field::Element &det (typename Blackbox::Field::Element &d,
const Blackbox &A,
const RingCategories::ModularTag &tag,
- const Method::Hybrid &M)
+ const Method::Hybrid &Meth)
{
// not yet a hybrid
if (useBB(A))
- return det(d, A, tag, Method::Blackbox(M));
+ return det(d, A, tag, Method::Blackbox(Meth));
else
- return det(d, A, tag, Method::Elimination(M));
+ return det(d, A, tag, Method::Elimination(Meth));
}
template<class Blackbox>
typename Blackbox::Field::Element &detin (typename Blackbox::Field::Element &d,
Blackbox &A,
const RingCategories::ModularTag &tag,
- const Method::Hybrid &M)
+ const Method::Hybrid &Meth)
{
// not yet a hybrid
/*
if (useBB(A))
- return det(d, A, tag, Method::Blackbox(M));
+ return det(d, A, tag, Method::Blackbox(Meth));
else
*/
- return detin(d, A, tag, Method::Elimination(M));
+ return detin(d, A, tag, Method::Elimination(Meth));
}
- // The det with Hybrid Method on DenseMatrix
+ // The det with Hybrid Method on BlasMatrix
template<class Field>
typename Field::Element &det (typename Field::Element &d,
- const DenseMatrix<Field> &A,
+ const BlasMatrix<Field> &A,
const RingCategories::ModularTag &tag,
- const Method::Hybrid &M)
+ const Method::Hybrid &Meth)
{
- return det(d, A, tag, Method::Elimination(M));
+ return det(d, A, tag, Method::Elimination(Meth));
}
template<class Field>
typename Field::Element &detin (typename Field::Element &d,
- DenseMatrix<Field> &A,
+ BlasMatrix<Field> &A,
const RingCategories::ModularTag &tag,
- const Method::Hybrid &M)
+ const Method::Hybrid &Meth)
{
- return detin(d, A, tag, Method::Elimination(M));
+ return detin(d, A, tag, Method::Elimination(Meth));
}
// Forward declaration saves us from including blackbox/toeplitz.h
@@ -191,9 +190,9 @@ namespace LinBox
typename Blackbox::Field::Element &d,
const Blackbox &A,
const RingCategories::ModularTag &tag,
- const Method::Blackbox &M)
+ const Method::Blackbox &Meth)
{
- return det(d, A, tag, Method::Wiedemann(M));
+ return det(d, A, tag, Method::Wiedemann(Meth));
}
@@ -202,7 +201,7 @@ namespace LinBox
typename Blackbox::Field::Element &det (typename Blackbox::Field::Element &d,
const Blackbox &A,
const RingCategories::ModularTag &tag,
- const Method::Wiedemann &M)
+ const Method::Wiedemann &Meth)
{
if (A.coldim() != A.rowdim())
throw LinboxError("LinBox ERROR: matrix must be square for determinant computation\n");
@@ -211,8 +210,8 @@ namespace LinBox
typedef std::vector<typename Field::Element> Polynomial;
Field F = A.field();
- if(M.symmetric()) {
- commentator.start ("Symmetric Wiedemann Determinant", "sdet");
+ if(Meth.symmetric()) {
+ commentator().start ("Symmetric Wiedemann Determinant", "sdet");
linbox_check (A.coldim () == A.rowdim ());
Polynomial phi;
unsigned long deg;
@@ -242,7 +241,7 @@ namespace LinBox
BlackboxContainerSymmetric<Field, Blackbox1> TF (&B, F, iter);
- MasseyDomain<Field, BlackboxContainerSymmetric<Field, Blackbox1> > WD (&TF, M.earlyTermThreshold ());
+ MasseyDomain<Field, BlackboxContainerSymmetric<Field, Blackbox1> > WD (&TF, Meth.earlyTermThreshold ());
WD.minpoly (phi, deg);
// std::cout << "\tdet: iteration # " << iternum << "\tMinpoly deg= "
@@ -265,12 +264,12 @@ namespace LinBox
if ( (deg & 1) == 1)
F.negin (d);
- commentator.stop ("done", NULL, "sdet");
+ commentator().stop ("done", NULL, "sdet");
return d;
}
else {
- commentator.start ("Wiedemann Determinant", "wdet");
+ commentator().start ("Wiedemann Determinant", "wdet");
linbox_check (A.coldim () == A.rowdim ());
Polynomial phi;
@@ -299,7 +298,7 @@ namespace LinBox
BlackboxContainer<Field, Blackbox1> TF (&B, F, iter);
- MasseyDomain<Field, BlackboxContainer<Field, Blackbox1> > WD (&TF, M.earlyTermThreshold ());
+ MasseyDomain<Field, BlackboxContainer<Field, Blackbox1> > WD (&TF, Meth.earlyTermThreshold ());
WD.minpoly (phi, deg);
@@ -312,7 +311,7 @@ namespace LinBox
F.negin (d);
- commentator.stop ("done", NULL, "wdet");
+ commentator().stop ("done", NULL, "wdet");
return d;
}
@@ -325,7 +324,7 @@ namespace LinBox
typename Blackbox::Field::Element &det (typename Blackbox::Field::Element &d,
const Blackbox &A,
const RingCategories::ModularTag &tag,
- const Method::BlasElimination &M)
+ const Method::BlasElimination &Meth)
{
if (A.coldim() != A.rowdim())
throw LinboxError("LinBox ERROR: matrix must be square for determinant computation\n");
@@ -333,14 +332,14 @@ namespace LinBox
typedef typename Blackbox::Field Field;
Field F = A.field();
- commentator.start ("Blas Determinant", "blasdet");
+ commentator().start ("Blas Determinant", "blasdet");
linbox_check (A.coldim () == A.rowdim ());
- BlasMatrix<typename Field::Element> B(A);
+ BlasMatrix<Field> B(A);
BlasMatrixDomain<Field> BMD(F);
- d= BMD.det(B);
- commentator.stop ("done", NULL, "blasdet");
+ d= BMD.detin(B);
+ commentator().stop ("done", NULL, "blasdet");
return d;
}
@@ -349,13 +348,13 @@ namespace LinBox
typename Blackbox::Field::Element &det (typename Blackbox::Field::Element &d,
const Blackbox &A,
const RingCategories::ModularTag &tag,
- const Method::SparseElimination &M)
+ const Method::SparseElimination &Meth)
{
if (A.coldim() != A.rowdim())
throw LinboxError("LinBox ERROR: matrix must be square for determinant computation\n");
typedef typename Blackbox::Field Field;
- commentator.start ("Sparse Elimination Determinant", "SEDet");
+ commentator().start ("Sparse Elimination Determinant", "SEDet");
// We make a copy as these data will be destroyed
SparseMatrix<Field, typename LinBox::Vector<Field>::SparseSeq> A1 (A.field(), A.rowdim(), A.coldim());
typename Blackbox::Field::Element tmp;
@@ -363,8 +362,8 @@ namespace LinBox
for(size_t j = 0; j < A.coldim(); ++j)
A1.setEntry(i,j,getEntry(tmp, A, i, j));
GaussDomain<Field> GD ( A1.field() );
- GD.detin (d, A1, M.strategy ());
- commentator.stop ("done", NULL, "SEDet");
+ GD.detin (d, A1, Meth.strategy ());
+ commentator().stop ("done", NULL, "SEDet");
return d;
}
@@ -374,17 +373,16 @@ namespace LinBox
typename Field::Element &det (typename Field::Element &d,
const SparseMatrix<Field, Vector> &A,
const RingCategories::ModularTag &tag,
- const Method::SparseElimination &M)
+ const Method::SparseElimination &Meth)
{
if (A.coldim() != A.rowdim())
throw LinboxError("LinBox ERROR: matrix must be square for determinant computation\n");
-
- commentator.start ("Sparse Elimination Determinant", "SEDet");
+ commentator().start ("Sparse Elimination Determinant", "SEDet");
// We make a copy as these data will be destroyed
SparseMatrix<Field, typename LinBox::Vector<Field>::SparseSeq> A1 (A);
GaussDomain<Field> GD ( A.field() );
- GD.detin (d, A1, M.strategy ());
- commentator.stop ("done", NULL, "SEdet");
+ GD.detin (d, A1, Meth.strategy ());
+ commentator().stop ("done", NULL, "SEdet");
return d;
}
@@ -392,15 +390,14 @@ namespace LinBox
typename Field::Element &detin (typename Field::Element &d,
SparseMatrix<Field, typename LinBox::Vector<Field>::SparseSeq> &A,
const RingCategories::ModularTag &tag,
- const Method::SparseElimination &M)
+ const Method::SparseElimination &Meth)
{
if (A.coldim() != A.rowdim())
throw LinboxError("LinBox ERROR: matrix must be square for determinant computation\n");
-
- commentator.start ("Sparse Elimination Determinant in place", "SEDetin");
+ commentator().start ("Sparse Elimination Determinant in place", "SEDetin");
GaussDomain<Field> GD ( A.field() );
- GD.detin (d, A, M.strategy ());
- commentator.stop ("done", NULL, "SEdetin");
+ GD.detin (d, A, Meth.strategy ());
+ commentator().stop ("done", NULL, "SEdetin");
return d;
}
@@ -410,9 +407,9 @@ namespace LinBox
typename Field::Element &det (typename Field::Element &d,
const SparseMatrix<Field, Vector> &A,
const RingCategories::ModularTag &tag,
- const Method::Elimination &M)
+ const Method::Elimination &Meth)
{
- return det(d, A, tag, Method::SparseElimination(M));
+ return det(d, A, tag, Method::SparseElimination(Meth));
}
@@ -420,25 +417,25 @@ namespace LinBox
typename Field::Element &detin (typename Field::Element &d,
SparseMatrix<Field, typename LinBox::Vector<Field>::SparseSeq> &A,
const RingCategories::ModularTag &tag,
- const Method::Elimination &M)
+ const Method::Elimination &Meth)
{
- return detin(d, A, tag, Method::SparseElimination(M));
+ return detin(d, A, tag, Method::SparseElimination(Meth));
}
template<class Field, class Vector>
typename Field::Element &detin (typename Field::Element &d,
SparseMatrix<Field, Vector> &A,
const RingCategories::ModularTag &tag,
- const Method::Elimination &M)
+ const Method::Elimination &Meth)
{
// Matrix is not of type SparseMatrix<..SparseSeq> otherwise previous specialization would occur
// will copy A into SparseMatrix<..SparseSeq> or BlasMatrix
const Field& F = A.field();
integer c; F.characteristic(c);
if ((c < LinBox::BlasBound) && ((A.rowdim() < 300) || (A.coldim() < 300) || (A.size() > (A.coldim()*A.rowdim()/100))))
- return det(d, A, tag, Method::BlasElimination(M));
+ return det(d, A, tag, Method::BlasElimination(Meth));
else
- return det(d, A, tag, Method::SparseElimination(M));
+ return det(d, A, tag, Method::SparseElimination(Meth));
}
@@ -447,11 +444,11 @@ namespace LinBox
typename Blackbox::Field::Element &det (typename Blackbox::Field::Element &d,
const Blackbox &A,
const RingCategories::ModularTag &tag,
- const Method::Elimination &M)
+ const Method::Elimination &Meth)
{
// Matrix is not of type SparseMatrix otherwise previous specialization would occur
// will copy A into BlasMatrix
- return det(d, A, tag, Method::BlasElimination(M));
+ return det(d, A, tag, Method::BlasElimination(Meth));
}
@@ -459,38 +456,57 @@ namespace LinBox
typename Blackbox::Field::Element &detin (typename Blackbox::Field::Element &d,
Blackbox &A,
const RingCategories::ModularTag &tag,
- const Method::Elimination &M)
+ const Method::Elimination &Meth)
{
- // Matrix is not of type SparseMatrix otherwise previous specialization would occur
+ // Matrix is not of type SparseMatrix not of type BlasMatrix
+ // otherwise previous specialization would occur
// will copy A into BlasMatrix
- return det(d, A, tag, Method::BlasElimination(M));
+ return det(d, A, tag, Method::BlasElimination(Meth));
}
+ template<class Field>
+ typename Field::Element &detin (typename Field::Element &d,
+ BlasMatrix<Field> &A,
+ const RingCategories::ModularTag &tag,
+ const Method::Elimination &Meth)
+ {
+ return detin(d, A);
+ }
+
+ template<class Field>
+ typename Field::Element &detin (typename Field::Element &d,
+ BlasMatrix<Field> &A,
+ const RingCategories::ModularTag &tag,
+ const Method::BlasElimination &Meth)
+ {
+ return detin(d, A);
+ }
- // This should work for a DenseMatrix too ?
+
+ // This should work for a BlasMatrix too ?
/** Rank of Blackbox \p A.
* \ingroup solutions
* A will be modified.
* \param[out] d determinant of \p A.
- * \param A this BlasBlackbox matrix will be modified in place in the process.
+ * \param A this BlasMatrix matrix will be modified in place in the process.
* \return \p d
*/
template <class Field>
typename Field::Element &detin (typename Field::Element &d,
- BlasBlackbox<Field> &A)
+ BlasMatrix<Field> &A)
{
if (A.coldim() != A.rowdim())
throw LinboxError("LinBox ERROR: matrix must be square for determinant computation\n");
Field F = A.field();
- commentator.start ("Determinant", "detin");
+ commentator().start ("Determinant", "detin");
linbox_check (A.coldim () == A.rowdim ());
BlasMatrixDomain<Field> BMD(F);
- d= BMD.detin(static_cast<BlasMatrix<typename Field::Element>& > (A));
- commentator.stop ("done", NULL, "detin");
+ d= BMD.detin(static_cast<BlasMatrix<Field>& > (A));
+ commentator().stop ("done", NULL, "detin");
return d;
}
@@ -512,7 +528,7 @@ namespace LinBox
#include "linbox/algorithms/cra-early-single.h"
#include "linbox/randiter/random-prime.h"
#include "linbox/algorithms/matrix-hom.h"
-
+#include <typeinfo>
namespace LinBox
{
@@ -531,7 +547,7 @@ namespace LinBox
{
typedef typename Blackbox::template rebind<Field>::other FBlackbox;
FBlackbox Ap(A, F);
- detin( d, Ap, M);
+ detin( d, Ap, RingCategories::ModularTag(), M);
return d;
}
};
@@ -541,7 +557,7 @@ namespace LinBox
typename Blackbox::Field::Element &cra_det (typename Blackbox::Field::Element &d,
const Blackbox &A,
const RingCategories::IntegerTag &tag,
- const MyMethod &M
+ const MyMethod &Meth
#ifdef __LINBOX_HAVE_MPI
,Communicator *C = NULL
#endif
@@ -552,9 +568,9 @@ namespace LinBox
#ifdef __LINBOX_HAVE_MPI
if(!C || C->rank() == 0)
#endif
- commentator.start ("Integer Determinant", "idet");
+ commentator().start ("Integer Determinant", "idet");
// 0.7213475205 is an upper approximation of 1/(2log(2))
- IntegerModularDet<Blackbox, MyMethod> iteration(A, M);
+ IntegerModularDet<Blackbox, MyMethod> iteration(A, Meth);
RandomPrimeIterator genprime( 26-(int)ceil(log((double)A.rowdim())*0.7213475205));
integer dd; // use of integer due to non genericity of cra. PG 2005-08-04
@@ -564,13 +580,13 @@ namespace LinBox
cra(dd, iteration, genprime);
if(!C || C->rank() == 0){
A.field().init(d, dd); // convert the result from integer to original type
- commentator.stop ("done", NULL, "det");
+ commentator().stop ("done", NULL, "det");
}
#else
ChineseRemainder< EarlySingleCRA< Modular<double> > > cra(4UL);
cra(dd, iteration, genprime);
A.field().init(d, dd); // convert the result from integer to original type
- commentator.stop ("done", NULL, "idet");
+ commentator().stop ("done", NULL, "idet");
#endif
return d;
@@ -596,27 +612,27 @@ namespace LinBox
typename Blackbox::Field::Element &det (typename Blackbox::Field::Element &d,
const Blackbox &A,
const RingCategories::IntegerTag &tag,
- const MyMethod &M)
+ const MyMethod &Meth)
{
if (A.coldim() != A.rowdim())
throw LinboxError("LinBox ERROR: matrix must be square for determinant computation\n");
- return SOLUTION_CRA_DET(d, A, tag, M);
+ return SOLUTION_CRA_DET(d, A, tag, Meth);
}
template< class Blackbox, class MyMethod>
typename Blackbox::Field::Element &det (typename Blackbox::Field::Element &d,
const Blackbox &A,
const RingCategories::RationalTag &tag,
- const MyMethod &M)
+ const MyMethod &Meth)
{
if (A.coldim() != A.rowdim())
throw LinboxError("LinBox ERROR: matrix must be square for determinant computation\n");
- commentator.start ("Rational Determinant", "rdet");
+ commentator().start ("Rational Determinant", "rdet");
Integer num,den;
- IntegerModularDet<Blackbox, MyMethod> iteration(A, M);
+ IntegerModularDet<Blackbox, MyMethod> iteration(A, Meth);
RandomPrimeIterator genprime( 26-(int)ceil(log((double)A.rowdim())*0.7213475205));
RationalRemainder2< VarPrecEarlySingleCRA< Modular<double> > > rra(4UL);
@@ -624,24 +640,24 @@ namespace LinBox
A.field().init(d, num,den); // convert the result from integer to original type
- commentator.stop ("done", NULL, "rdet");
+ commentator().stop ("done", NULL, "rdet");
return d;
}
template<class Field, class MyMethod>
typename Field::Element &det (typename Field::Element &d,
- const DenseMatrix<Field> &A,
+ const BlasMatrix<Field> &A,
const RingCategories::RationalTag &tag,
- const MyMethod &M)
+ const MyMethod &Meth)
{
if (A.coldim() != A.rowdim())
throw LinboxError("LinBox ERROR: matrix must be square for determinant computation\n");
- commentator.start ("Dense Rational Determinant", "rdet");
+ commentator().start ("Dense Rational Determinant", "rdet");
- rational_det(d,A,M);
+ rational_det(d,A,Meth);
- commentator.stop ("done", NULL, "rdet");
+ commentator().stop ("done", NULL, "rdet");
return d;
}
@@ -663,3 +679,12 @@ namespace LinBox
#endif // __LINBOX_det_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/solutions/determinant.doxy b/linbox/solutions/determinant.doxy
index 03f9484..aea5d99 100644
--- a/linbox/solutions/determinant.doxy
+++ b/linbox/solutions/determinant.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** @ingroup solutions
@defgroup determin Determinant
diff --git a/linbox/solutions/getentry.h b/linbox/solutions/getentry.h
index 93474b8..e2fd4c2 100644
--- a/linbox/solutions/getentry.h
+++ b/linbox/solutions/getentry.h
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/solutions/getentry.h
* Copyright(C) LinBox
* Evolved from an earlier one by Bradford Hovinen <hovinen at cis.udel.edu>
* -bds
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_getentry_H
@@ -15,7 +31,7 @@
#include "linbox/util/debug.h"
#include "linbox/vector/vector-domain.h"
-#include "linbox/blackbox/dense.h"
+#include "linbox/matrix/blas-matrix.h"
#include "linbox/blackbox/sparse.h"
#include "linbox/blackbox/scalar-matrix.h"
#include "linbox/blackbox/compose.h"
@@ -27,9 +43,12 @@ namespace LinBox
/// limited doc so far.
namespace GetEntryTags
- { struct GenericBB{}; struct Local{};
- struct SpecialCDB{}; struct SpecialCBD{}; struct SpecialCDD{};
- }; // namespace GetEntryTags
+ { struct GenericBB{};
+ struct Local{};
+ struct SpecialCDB{};
+ struct SpecialCBD{};
+ struct SpecialCDD{};
+ } // namespace GetEntryTags
template<class BB> struct GetEntryCategory { typedef GetEntryTags::GenericBB Tag; };
@@ -68,7 +87,6 @@ namespace LinBox
}
// BBs that offer a local getEntry.
- template<class Field> struct GetEntryCategory<DenseMatrix<Field> > { typedef GetEntryTags::Local Tag; };
template<class A, class B> struct GetEntryCategory<SparseMatrix<A,B> > { typedef GetEntryTags::Local Tag; };
template<class A, class B, class C> struct GetEntryCategory<SparseMatrixBase<A,B,C> > { typedef GetEntryTags::Local Tag; };
template<class Field, class Trait> struct GetEntryCategory<Diagonal<Field, Trait> > { typedef GetEntryTags::Local Tag; };
@@ -125,3 +143,12 @@ namespace LinBox
}
#endif // __LINBOX_getentry_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/solutions/is-positive-definite.h b/linbox/solutions/is-positive-definite.h
index 3a14239..85d4557 100644
--- a/linbox/solutions/is-positive-definite.h
+++ b/linbox/solutions/is-positive-definite.h
@@ -1,12 +1,13 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,16 +15,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_is_positive_definite_H
#define __LINBOX_is_positive_definite_H
#include "linbox/util/error.h"
-#include <linbox/algorithms/matrix-hom.h>
+#include "linbox/algorithms/matrix-hom.h"
#include "linbox/algorithms/signature.h"
namespace LinBox
@@ -130,15 +131,14 @@ namespace LinBox
const Method::BlasElimination &M)
{
// call BlasElimination code
- DenseMatrix<typename Blackbox::Field> DA(A.field(), A.rowdim(), A.coldim());
+ BlasMatrix<typename Blackbox::Field> DA(A.field(), A.rowdim(), A.coldim());
MatrixHom::map(DA, A, A. field());
return Signature::isPosDef(DA, Signature::BLAS_LPM_Method() );
}
- // the isPositiveDefinite with Blas, DenseMatrix
template <class Ring>
bool isPositiveDefinite (
- const DenseMatrix<Ring> &A,
+ const BlasMatrix<Ring> &A,
const RingCategories::IntegerTag &tag,
const Method::BlasElimination &M)
{
@@ -146,7 +146,17 @@ namespace LinBox
return Signature::isPosDef(A, Signature::BLAS_LPM_Method() );
}
+
} // end of LinBox namespace
#endif // __LINBOX_is_positive_definite_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/solutions/is-positive-semidefinite.h b/linbox/solutions/is-positive-semidefinite.h
index ac99182..be0df0c 100644
--- a/linbox/solutions/is-positive-semidefinite.h
+++ b/linbox/solutions/is-positive-semidefinite.h
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,16 +16,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_is_positive_semidefinite_H
#define __LINBOX_is_positive_semidefinite_H
#include "linbox/util/error.h"
-#include <linbox/algorithms/matrix-hom.h>
+#include "linbox/algorithms/matrix-hom.h"
#include "linbox/algorithms/signature.h"
namespace LinBox
@@ -131,15 +132,15 @@ namespace LinBox
const Method::BlasElimination &M)
{
// call BlasElimination code
- DenseMatrix<typename Blackbox::Field> DA(A.field(), A.rowdim(), A.coldim());
+ BlasMatrix<typename Blackbox::Field> DA(A.field(), A.rowdim(), A.coldim());
MatrixHom::map(DA, A, A. field());
return Signature::isPosSemiDef(DA, Signature::BLAS_LPM_Method() );
}
- // the isPositiveSemiDefinite with Blas, DenseMatrix
+ // the isPositiveSemiDefinite with Blas, BlasMatrix
template <class Ring>
bool isPositiveSemiDefinite (
- const DenseMatrix<Ring> &A,
+ const BlasMatrix<Ring> &A,
const RingCategories::IntegerTag &tag,
const Method::BlasElimination &M)
{
@@ -150,3 +151,12 @@ namespace LinBox
} // end of LinBox namespace
#endif // __LINBOX_is_positive_semidefinite_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/solutions/methods.h b/linbox/solutions/methods.h
index 47acc17..8b4c0e1 100644
--- a/linbox/solutions/methods.h
+++ b/linbox/solutions/methods.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/solutions/methods.h
* Copyright (C) 1999, 2001 Jean-Guillaume Dumas, Bradford Hovinen
*
@@ -22,7 +20,25 @@
*
* Added method traits for elimination and lanczos
* ------------------------------------
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file solutions/methods.h
@@ -33,11 +49,12 @@
#ifndef __LINBOX_method_H
#define __LINBOX_method_H
+#include <string> // size_t
+
#ifndef DEFAULT_EARLY_TERM_THRESHOLD
# define DEFAULT_EARLY_TERM_THRESHOLD 20
#endif
-#include "linbox/blackbox/dense.h"
#ifdef __LINBOX_HAVE_MPI
#include "linbox/util/mpicpp.h"
#endif
@@ -206,7 +223,7 @@ namespace LinBox
void maxTries (unsigned long n) { _maxTries = n; }
void earlyTermThreshold (unsigned long e) { _ett = e; }
void blockingFactor (unsigned long b) { _blockingFactor = b; }
- void strategy (PivotStrategy strategy) { _strategy = strategy; }
+ void strategy (PivotStrategy Strategy) { _strategy = Strategy; }
void shape (Shape s) { _shape = s; }
void trustability (double p) { _provensuccessprobability = p; }
void checkResult (bool s) { _checkResult = s; }
@@ -262,6 +279,14 @@ namespace LinBox
{};
};
+ /// CRASpecifier
+ struct CRASpecifier : public Specifier {
+ CRASpecifier () {};
+ CRASpecifier (const Specifier &m) :
+ Specifier(m)
+ {};
+ };
+
///
struct WiedemannTraits : public Specifier {
/** Constructora.
@@ -289,24 +314,25 @@ namespace LinBox
* @param checkResult
*/
WiedemannTraits (
- bool symmetric = NON_SYMMETRIC,
- unsigned long thres = DEFAULT_EARLY_TERM_THRESHOLD,
- size_t rank = RANK_UNKNOWN,
- Preconditioner preconditioner = SPARSE,
- SingularState singular = SINGULARITY_UNKNOWN,
- bool certificate = CERTIFY,
- unsigned long maxTries = 100,
- bool checkResult = true
+ bool Symmetric = NON_SYMMETRIC,
+ unsigned long Thres = DEFAULT_EARLY_TERM_THRESHOLD,
+ size_t Rank = RANK_UNKNOWN,
+ Preconditioner Precond = SPARSE,
+ SingularState Singular = SINGULARITY_UNKNOWN,
+ bool Certificate = CERTIFY,
+ unsigned long MaxTries = 100,
+ bool CheckResult = true
)
- { Specifier::_preconditioner = preconditioner;
- Specifier::_rank =(rank);
- Specifier::_singular =(singular);
- Specifier::_symmetric =(symmetric);
- Specifier::_certificate =(certificate);
- Specifier::_maxTries =(maxTries);
- Specifier::_ett =(thres);
- Specifier::_checkResult = (checkResult);
+ {
+ Specifier::_preconditioner = Precond;
+ Specifier::_rank = (Rank);
+ Specifier::_singular = (Singular);
+ Specifier::_symmetric = (Symmetric);
+ Specifier::_certificate = (Certificate);
+ Specifier::_maxTries = (MaxTries);
+ Specifier::_ett = (Thres);
+ Specifier::_checkResult = (CheckResult);
}
WiedemannTraits( const Specifier& S) :
@@ -317,16 +343,17 @@ namespace LinBox
///
struct WiedemannExtensionTraits : public WiedemannTraits {
WiedemannExtensionTraits (
- bool symmetric = NON_SYMMETRIC,
- unsigned long thres = DEFAULT_EARLY_TERM_THRESHOLD,
- size_t rank = RANK_UNKNOWN,
- Preconditioner preconditioner = SPARSE,
- SingularState singular = SINGULARITY_UNKNOWN,
- bool certificate = CERTIFY,
- unsigned long maxTries = 100,
- bool checkResult = true
+ bool Symmetric = NON_SYMMETRIC,
+ unsigned long Thres = DEFAULT_EARLY_TERM_THRESHOLD,
+ size_t Rank = RANK_UNKNOWN,
+ Preconditioner Precond = SPARSE,
+ SingularState Singular = SINGULARITY_UNKNOWN,
+ bool Certificate = CERTIFY,
+ unsigned long MaxTries = 100,
+ bool CheckResult = true
) :
- WiedemannTraits(symmetric,thres,rank,preconditioner,singular,certificate,maxTries,checkResult)
+ WiedemannTraits(Symmetric,Thres,Rank,Precond,Singular,
+ Certificate,MaxTries,CheckResult)
{}
WiedemannExtensionTraits( const Specifier& S) :
WiedemannTraits(S)
@@ -341,11 +368,11 @@ namespace LinBox
* @param maxTries Maximum number of trials before giving up and
* returning a failure; default is 100
*/
- LanczosTraits (Preconditioner preconditioner = FULL_DIAGONAL,
- unsigned long maxTries = 100)
+ LanczosTraits (Preconditioner Precond = FULL_DIAGONAL,
+ unsigned long MaxTries = 100)
{
- Specifier::_preconditioner =(preconditioner);
- Specifier::_maxTries =(maxTries);
+ Specifier::_preconditioner =(Precond);
+ Specifier::_maxTries =(MaxTries);
}
LanczosTraits( const Specifier& S) :
Specifier(S)
@@ -361,15 +388,13 @@ namespace LinBox
* returning a failure; default is 100
* @param blockingFactor Blocking factor to use
*/
- BlockLanczosTraits (Preconditioner preconditioner = FULL_DIAGONAL,
- unsigned long maxTries = 100,
- int blockingFactor = 16)
+ BlockLanczosTraits (Preconditioner Precond = FULL_DIAGONAL,
+ unsigned long MaxTries = 100,
+ int BlockingFactor = 16)
{
- Specifier::_preconditioner =(preconditioner);
-
- Specifier::_maxTries = (maxTries);
-
- Specifier::_blockingFactor = (blockingFactor);
+ Specifier::_preconditioner = (Precond);
+ Specifier::_maxTries = (MaxTries);
+ Specifier::_blockingFactor = (unsigned long) (BlockingFactor);
}
BlockLanczosTraits( const Specifier& S) :
@@ -383,9 +408,9 @@ namespace LinBox
*
* @param strategy Pivoting strategy to use
*/
- SparseEliminationTraits (PivotStrategy strategy = PIVOT_LINEAR)
+ SparseEliminationTraits (PivotStrategy Strategy = PIVOT_LINEAR)
{
- Specifier::_strategy = (strategy) ;
+ Specifier::_strategy = (Strategy) ;
}
SparseEliminationTraits( const EliminationSpecifier& S) :
Specifier(S)
@@ -399,19 +424,19 @@ namespace LinBox
DETERMINIST, RANDOM, DIOPHANTINE
};
- DixonTraits ( SolutionType solution = DETERMINIST,
- SingularState singular = SINGULARITY_UNKNOWN,
- bool certificate = DONT_CERTIFY,
- int maxTries = 10,
- Preconditioner preconditioner = DENSE,
- size_t rank = RANK_UNKNOWN)
+ DixonTraits ( SolutionType Solution = DETERMINIST,
+ SingularState Singular = SINGULARITY_UNKNOWN,
+ bool Certificate = DONT_CERTIFY,
+ int MaxTries = 10,
+ Preconditioner Precond = DENSE,
+ size_t Rank = RANK_UNKNOWN)
{
- _solution= (solution);
- Specifier::_singular= (singular);
- Specifier::_certificate= (certificate);
- Specifier::_maxTries= (maxTries);
- Specifier::_preconditioner=(preconditioner);
- Specifier::_rank=(rank);
+ _solution = (Solution);
+ Specifier::_singular = (Singular);
+ Specifier::_certificate = (Certificate);
+ Specifier::_maxTries = (unsigned long) (MaxTries);
+ Specifier::_preconditioner = (Precond);
+ Specifier::_rank = (Rank);
}
DixonTraits( const Specifier& S) :
@@ -428,29 +453,30 @@ namespace LinBox
SolutionType _solution;
};
+
///
struct BlockWiedemannTraits : public Specifier {
- BlockWiedemannTraits ( Preconditioner preconditioner = NO_PRECONDITIONER,
- size_t rank = RANK_UNKNOWN)
+ BlockWiedemannTraits ( Preconditioner Precond= NO_PRECONDITIONER,
+ size_t Rank = RANK_UNKNOWN)
{
- Specifier::_preconditioner = preconditioner;
- Specifier::_rank=rank;
+ Specifier::_preconditioner = Precond;
+ Specifier::_rank = Rank;
}
BlockWiedemannTraits( const Specifier& S) :
Specifier(S)
{}
};
+
//Using Wan's numeric/symbolic method to solve linear systems.
//based on a preprinted article, submitted to JSC 2004
struct WanTraits : public Specifier
{
- WanTraits ( Preconditioner preconditioner = NO_PRECONDITIONER,
- size_t rank = RANK_UNKNOWN)
+ WanTraits ( Preconditioner Precond= NO_PRECONDITIONER,
+ size_t Rank = RANK_UNKNOWN)
{
- Specifier::_preconditioner=(preconditioner);
-
- Specifier::_rank=(rank) ;
+ Specifier::_preconditioner = (Precond);
+ Specifier::_rank = (Rank) ;
}
WanTraits( const Specifier& S) :
Specifier(S)
@@ -460,12 +486,11 @@ namespace LinBox
//Using numerical methods to symbolically solve linear systems.
struct NumericalTraits : public Specifier
{
- NumericalTraits ( Preconditioner preconditioner = NO_PRECONDITIONER,
- size_t rank = RANK_UNKNOWN)
+ NumericalTraits ( Preconditioner Precond= NO_PRECONDITIONER,
+ size_t Rank = RANK_UNKNOWN)
{
- Specifier::_preconditioner=(preconditioner);
-
- Specifier::_rank=(rank) ;
+ Specifier::_preconditioner = (Precond);
+ Specifier::_rank = (Rank) ;
}
NumericalTraits( const Specifier& S) :
Specifier(S)
@@ -474,11 +499,11 @@ namespace LinBox
///
struct BlockHankelTraits : public Specifier {
- BlockHankelTraits ( Preconditioner preconditioner = NO_PRECONDITIONER,
- size_t rank = RANK_UNKNOWN)
+ BlockHankelTraits ( Preconditioner Precond= NO_PRECONDITIONER,
+ size_t Rank = RANK_UNKNOWN)
{
- Specifier::_preconditioner = preconditioner;
- Specifier::_rank=rank;
+ Specifier::_preconditioner = Precond;
+ Specifier::_rank = Rank;
}
BlockHankelTraits( const Specifier& S) :
Specifier(S)
@@ -516,33 +541,121 @@ namespace LinBox
};
+ struct IMLNonSing {} ;
+ struct IMLCertSolv {} ;
+ /*! IML wrapper.
+ * IML proposes 2 system solving kinds:
+ * - (1) non singular where one can solve AX=B or XA=B for B a set of
+ * vectors and A non singular.
+ * - (2) certified system solving where we get a certificate for the
+ * rectangular cases : no solution, the smallest one
+ * .
+ *
+ * @todo enable multi-vectors.
+ * @todo enable right/left solving.
+ * @todo be input aware (long/Integer)
+ */
+ struct IMLTraits : public Specifier {
+ bool _computeRNS ;
+ bool _reduce ;
+ unsigned int _nullcol ;
+ int _imlroutine;
+ /*! Constructor.
+ *
+ * @param imlroutine \c 1 -> non singular ; \c 2 -> certified
+ * @param withRNS computre RNS
+ * @todo make the special flags available in \c Specifier.
+ */
+ IMLTraits ( const IMLNonSing & imlroutine, // routine 1
+ bool withRNS = false) :
+ _computeRNS(withRNS),
+ _imlroutine(1)
+ {
+ singular(NONSINGULAR);
+ }
+
+ /*! Constructor.
+ *
+ * @param imlroutine2 \c 2 -> certified
+ * @param certify
+ * @param reduce reduce the result ?
+ * @param nullcolred look at IML doc.
+ */
+
+ IMLTraits ( const IMLCertSolv & imlroutine2, // routine 2
+ bool certify = DONT_CERTIFY,
+ bool reduce = false ,
+ unsigned int nullcolred = 10 /* IML default */) :
+ _reduce(reduce),
+ _nullcol(nullcolred),
+ _imlroutine(2)
+ {
+ certificate(certify);
+ }
+
+
+ //!@bug not complete
+ IMLTraits ( const Specifier & S) :
+ Specifier(S)
+ {}
+
+ int routine() const { return _imlroutine; }
+ bool reduced () const { return _reduce ; }
+ bool computeRNS() const { return _computeRNS ; }
+ unsigned int nullcol() const { return _nullcol ; }
+ } ;
+
+ struct CRATraits ;
+
/// Method specifiers for controlling algorithm choice
struct Method {
- typedef HybridSpecifier Hybrid; //!< Method::Hybrid : no doc
- typedef BlackboxSpecifier Blackbox; //!< Method::Blackbox : no doc
- typedef EliminationSpecifier Elimination; //!< Method::Elimination : no doc
- typedef WiedemannTraits Wiedemann; //!< Method::Wiedemann : no doc
- typedef WiedemannExtensionTraits ExtensionWiedemann; //!< Method::ExtensionWiedemann : no doc
- typedef LanczosTraits Lanczos; //!< Method::Lanczos : no doc.
- typedef BlockLanczosTraits BlockLanczos; //!< Method::BlockLanczos : no doc.
- typedef SparseEliminationTraits SparseElimination; //!< Method::SparseElimination : no doc
- typedef NumericalTraits Numerical; //!< Method::Numerical : no doc.
- typedef BlasEliminationTraits BlasElimination; //!< Method::BlasElimination : no doc
- typedef BlasExtensionTraits ExtensionBlasElimination;//!< Method::ExtensionBlasElimination : no doc
- typedef NonBlasEliminationTraits NonBlasElimination; //!< Method::NonBlasElimination : no doc.
- typedef DixonTraits Dixon; //!< Method::Dixon : no doc
- typedef BlockHankelTraits BlockHankel; //!< Method::BlockHankel : no doc
+ typedef HybridSpecifier Hybrid; //!< Method::Hybrid : no doc
+ typedef BlackboxSpecifier Blackbox; //!< Method::Blackbox : no doc
+ typedef EliminationSpecifier Elimination; //!< Method::Elimination : no doc
+ typedef CRATraits CRA ; //!< Use CRA for solving Integer systems.
+ typedef WiedemannTraits Wiedemann; //!< Method::Wiedemann : no doc
+ typedef WiedemannExtensionTraits ExtensionWiedemann; //!< Method::ExtensionWiedemann : no doc
+ typedef LanczosTraits Lanczos; //!< Method::Lanczos : no doc.
+ typedef BlockLanczosTraits BlockLanczos; //!< Method::BlockLanczos : no doc.
+ typedef SparseEliminationTraits SparseElimination; //!< Method::SparseElimination : no doc
+ typedef NumericalTraits Numerical; //!< Method::Numerical : no doc.
+ typedef WanTraits NumericalWan; //!< Method::Numerical : no doc.
+ typedef BlasEliminationTraits BlasElimination; //!< Method::BlasElimination : no doc
+ typedef BlasExtensionTraits ExtensionBlasElimination;//!< Method::ExtensionBlasElimination : no doc
+ typedef NonBlasEliminationTraits NonBlasElimination; //!< Method::NonBlasElimination : no doc.
+ typedef DixonTraits Dixon; //!< Method::Dixon : no doc
+ typedef BlockHankelTraits BlockHankel; //!< Method::BlockHankel : no doc
+ typedef IMLTraits IML; //!< Use IML for solving Dense Integer systems.
Method(){}
};
+ /// Solve using CRA (iterations uses SolveMethod)
+ struct CRATraits {
+ protected:
+ Specifier & _solveMethod ;
+ public:
+ CRATraits( Specifier & m) :
+ _solveMethod(m) {}
+
+ Specifier & iterationMethod() const {
+ return _solveMethod;
+ }
+ };
+
+
template<class BB>
bool useBB(const BB& A)
{
return (A.coldim() > 1000) && (A.rowdim() > 1000);
}
+
+ template<class _Field>
+ class BlasMatrix ; // forward declaration...
+
template<class Field>
- bool useBB(const DenseMatrix<Field>& A) { return false; }
+ bool useBB(const BlasMatrix<Field>& A) { return false; }
+
/** Solver traits.
*
@@ -551,12 +664,13 @@ namespace LinBox
struct SolverTraits : public Specifier {
/** Constructor.
*
- * @param checkResult True if and only if the solution should be checked
+ * @param CheckResult True if and only if the solution should be checked
* for correctness after it is computed (very much recommended for the
* randomized algorithms Wiedemann and Lanczos); default is true
*/
- SolverTraits (bool checkResult = true)
- { Specifier::_checkResult = checkResult;
+ SolverTraits (bool CheckResult = true)
+ {
+ Specifier::_checkResult = CheckResult;
}
/** Constructor from a MethodTraits structure
@@ -594,3 +708,12 @@ namespace LinBox
#endif // __LINBOX_method_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/solutions/minpoly.doxy b/linbox/solutions/minpoly.doxy
index ef65dc0..b45b0e7 100644
--- a/linbox/solutions/minpoly.doxy
+++ b/linbox/solutions/minpoly.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** @ingroup solutions
@defgroup minpoly Minimal polynomial
diff --git a/linbox/solutions/minpoly.h b/linbox/solutions/minpoly.h
index c1fa017..0a0993a 100644
--- a/linbox/solutions/minpoly.h
+++ b/linbox/solutions/minpoly.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/solutions/minpoly.h
* Copyright (C) 1999, 2001 Jean-Guillaume Dumas
*
* Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,14 +17,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_minpoly_H
#define __LINBOX_minpoly_H
+#include <string>
+#include "linbox/linbox-config.h"
#include "linbox/solutions/methods.h"
#include "linbox/util/commentator.h"
@@ -42,15 +45,16 @@
namespace LinBox
{
- /*- @brief Minimal polynomial of a blackbox linear operator A.
+ /*! @internal
+ * @brief Minimal polynomial of a blackbox linear operator A.
* The resulting polynomial is a vector of coefficients.
* Somewhere we should document our handling of polys.
*/
template < class Blackbox, class Polynomial, class DomainCategory, class MyMethod>
- Polynomial &minpoly (Polynomial& P,
- const Blackbox& A,
- const DomainCategory& tag,
- const MyMethod& M);
+ Polynomial &minpoly (Polynomial & P,
+ const Blackbox & A,
+ const DomainCategory & tag,
+ const MyMethod & M);
/*
template < class Blackbox, class Polynomial, class MyMethod>
@@ -63,29 +67,30 @@ namespace LinBox
}
*/
- /** \brief ...using an optional Method parameter
- \param P - the output minimal polynomial. If the polynomial is
- of degree d, this random access container has size d+1, the 0-th entry is
- the constant coefficient and the d-th is 1 since the minpoly is monic.
- \param A - a blackbox matrix
- Optional \param M - the method object. Generally, the default
- object suffices and the algorithm used is determined by the class of M.
- Basic methods are Method::Blackbox, Method::Elimination, and Method::Hybrid
- (the default).
- See methods.h for more options.
- \return a reference to P.
+ /** @internal
+ * \brief ...using an optional Method parameter
+ * \param P the output minimal polynomial. If the polynomial is
+ * of degree d, this random access container has size d+1, the 0-th entry is
+ * the constant coefficient and the d-th is 1 since the minpoly is monic.
+ * \param A a blackbox matrix
+ * \param M the method object. Generally, the default
+ * object suffices and the algorithm used is determined by the class of M.
+ * Basic methods are Method::Blackbox, Method::Elimination, and Method::Hybrid
+ * (the default).
+ * See methods.h for more options.
+ * \return a reference to P.
*/
template < class Blackbox, class Polynomial, class MyMethod>
- Polynomial &minpoly (Polynomial& P,
- const Blackbox& A,
- const MyMethod& M)
+ Polynomial &minpoly (Polynomial & P,
+ const Blackbox & A,
+ const MyMethod & M)
{
return minpoly (P, A, typename FieldTraits<typename Blackbox::Field>::categoryTag(), M);
}
/// \brief ...using default Method
template<class Polynomial, class Blackbox>
- Polynomial &minpoly (Polynomial &P,
+ Polynomial &minpoly (Polynomial &P,
const Blackbox &A)
{
return minpoly (P, A, Method::Hybrid());
@@ -93,85 +98,74 @@ namespace LinBox
- // The minpoly with Hybrid Method
+ //! @internal The minpoly with Hybrid Method
template<class Polynomial, class Blackbox>
Polynomial &minpoly (
- Polynomial &P,
- const Blackbox &A,
- const RingCategories::ModularTag &tag,
- const Method::Hybrid& M)
+ Polynomial & P,
+ const Blackbox & A,
+ const RingCategories::ModularTag & tag,
+ const Method::Hybrid & M)
{
// not yet a hybrid
return minpoly(P, A, tag, Method::Blackbox(M));
}
- // The minpoly with Hybrid Method on DenseMatrix
- template<class Polynomial, class Field>
- Polynomial &minpoly (
- Polynomial &P,
- const DenseMatrix<Field> &A,
- const RingCategories::ModularTag &tag,
- const Method::Hybrid& M)
- {
- return minpoly(P, A, tag, Method::Elimination(M));
- }
-
- // The minpoly with Hybrid Method on BlasBlackbox
+ //! @internal The minpoly with Hybrid Method on BlasMatrix
template<class Polynomial, class Field>
Polynomial &minpoly (
- Polynomial &P,
- const BlasBlackbox<Field> &A,
- const RingCategories::ModularTag &tag,
- const Method::Hybrid& M)
+ Polynomial & P,
+ const BlasMatrix<Field> & A,
+ const RingCategories::ModularTag & tag,
+ const Method::Hybrid & M)
{
return minpoly(P, A, tag, Method::Elimination(M));
}
- // The minpoly with Elimination Method
+ //! @internal The minpoly with Elimination Method
template<class Polynomial, class Blackbox>
Polynomial &minpoly (
- Polynomial &P,
- const Blackbox &A,
- const RingCategories::ModularTag &tag,
- const Method::Elimination& M)
+ Polynomial & P,
+ const Blackbox & A,
+ const RingCategories::ModularTag & tag,
+ const Method::Elimination & M)
{
return minpoly(P, A, tag, Method::BlasElimination(M));
}
- // The minpoly with BlasElimination Method
+ //! @internal The minpoly with BlasElimination Method
template<class Polynomial, class Blackbox>
Polynomial &minpoly (
- Polynomial &P,
- const Blackbox &A,
- const RingCategories::ModularTag &tag,
- const Method::BlasElimination& M)
+ Polynomial & P,
+ const Blackbox & A,
+ const RingCategories::ModularTag & tag,
+ const Method::BlasElimination & M)
{
- commentator.start ("Convertion to BLAS Minimal polynomial", "blasconvert");
+ commentator().start ("Convertion to BLAS Minimal polynomial", "blasconvert");
if (A.coldim() != A.rowdim()) {
- commentator.report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "Squarize matrix" << std::endl;
+ commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) << "Squarize matrix" << std::endl;
Squarize<Blackbox> B(&A);
- BlasBlackbox< typename Blackbox::Field > BBB (B);
+ BlasMatrix< typename Blackbox::Field > BBB (B);
BlasMatrixDomain< typename Blackbox::Field > BMD (BBB.field());
- commentator.stop ("done", NULL, "blasconvert");
+ commentator().stop ("done", NULL, "blasconvert");
- return BMD.minpoly (P, static_cast<const BlasMatrix<typename Blackbox::Field::Element>& >(BBB));
+ return BMD.minpoly (P, static_cast<const BlasMatrix<typename Blackbox::Field>& >(BBB));
}
else {
- BlasBlackbox< typename Blackbox::Field > BBB (A);
+ BlasMatrix< typename Blackbox::Field > BBB (A);
BlasMatrixDomain< typename Blackbox::Field > BMD (BBB.field());
- commentator.stop ("done", NULL, "blasconvert");
- return BMD.minpoly (P, static_cast<const BlasMatrix<typename Blackbox::Field::Element>& >(BBB));
+ commentator().stop ("done", NULL, "blasconvert");
+ return BMD.minpoly (P, static_cast<const BlasMatrix<typename Blackbox::Field>& >(BBB));
}
}
- // The minpoly with BlackBox Method
+ //! @internal The minpoly with BlackBox Method
template<class Polynomial, class Blackbox>
Polynomial &minpoly (
- Polynomial &P,
- const Blackbox &A,
- const RingCategories::ModularTag &tag,
- const Method::Blackbox& M)
+ Polynomial & P,
+ const Blackbox & A,
+ const RingCategories::ModularTag & tag,
+ const Method::Blackbox & M)
{
if (M.certificate()) {
// Will make a word size extension
@@ -190,7 +184,7 @@ namespace LinBox
// Chinese Remaindering generic wrappers for integer minpoly
// ---------------------------------------------------------
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
#include "linbox/algorithms/cra-domain.h"
#include "linbox/randiter/random-prime.h"
#include "linbox/algorithms/matrix-hom.h"
@@ -235,14 +229,14 @@ namespace LinBox
#ifdef __LINBOX_HAVE_MPI
Communicator *c = M.communicatorp();
if(!c || c->rank() == 0)
- commentator.start ("Integer Minpoly", "Iminpoly");
+ commentator().start ("Integer Minpoly", "Iminpoly");
else{
- //commentator.setMaxDepth(0);
- //commentator.setMaxDetailLevel(0);
- //commentator.setPrintParameters(0, 0, 0);
+ //commentator().setMaxDepth(0);
+ //commentator().setMaxDetailLevel(0);
+ //commentator().setPrintParameters(0, 0, 0);
}
#else
- commentator.start ("Integer Minpoly", "Iminpoly");
+ commentator().start ("Integer Minpoly", "Iminpoly");
#endif
// 0.7213475205 is an upper approximation of 1/(2log(2))
RandomPrimeIterator genprime( 26-(int)ceil(log((double)A.rowdim())*0.7213475205));
@@ -263,15 +257,17 @@ namespace LinBox
#ifdef __LINBOX_HAVE_MPI
if(c || c->rank() == 0)
#endif
- commentator.stop ("done", NULL, "Iminpoly");
+ commentator().stop ("done", NULL, "Iminpoly");
return P;
}
template < class Blackbox, class Polynomial, class MyMethod>
- Polynomial &minpoly (Polynomial& P, const Blackbox& A,
- const RingCategories::RationalTag& tag, const MyMethod& M)
+ Polynomial &minpoly (Polynomial & P,
+ const Blackbox & A,
+ const RingCategories::RationalTag & tag,
+ const MyMethod & M)
{
- commentator.start ("Rational Minpoly", "Rminpoly");
+ commentator().start ("Rational Minpoly", "Rminpoly");
RandomPrimeIterator genprime( 26-(int)ceil(log((double)A.rowdim())*0.7213475205));
RationalRemainder2< VarPrecEarlyMultipCRA<Modular<double> > > rra(3UL);
@@ -285,20 +281,32 @@ namespace LinBox
for (typename Polynomial::iterator it= P.begin(); it != P.end(); ++it, ++i)
A.field().init(*it, PP[i],den);
- commentator.stop ("done", NULL, "Rminpoly");
+ commentator().stop ("done", NULL, "Rminpoly");
return P;
}
template < class Field, template<class> class Polynomial, class MyMethod>
- Polynomial<typename Field::Element> &minpoly (Polynomial<typename Field::Element>& P, const DenseMatrix<Field>& A,
- const RingCategories::RationalTag& tag, const MyMethod& M)
+ Polynomial<typename Field::Element> &minpoly (Polynomial<typename Field::Element>& P,
+ const BlasMatrix<Field> & A,
+ const RingCategories::RationalTag & tag,
+ const MyMethod & M)
{
- commentator.start ("Dense Rational Minpoly", "Rminpoly");
+ commentator().start ("Dense Rational Minpoly", "Rminpoly");
rational_minpoly(P,A,M);
return P;
}
+
} // end of LinBox namespace
#endif // __LINBOX_minpoly_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/solutions/nullspace.doxy b/linbox/solutions/nullspace.doxy
index ed8750f..8895fea 100644
--- a/linbox/solutions/nullspace.doxy
+++ b/linbox/solutions/nullspace.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** @ingroup solutions
@defgroup nullsp Nullspace
diff --git a/linbox/solutions/nullspace.h b/linbox/solutions/nullspace.h
index 88fe5fa..43df301 100644
--- a/linbox/solutions/nullspace.h
+++ b/linbox/solutions/nullspace.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2009 LinBox
* Written by <brice.boyer at imag.fr>
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_nullspace_H
@@ -39,3 +40,12 @@ namespace LinBox
#endif // __LINBOX_modulardense_nullspace_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/solutions/rank.doxy b/linbox/solutions/rank.doxy
index ebb485e..dcb31e1 100644
--- a/linbox/solutions/rank.doxy
+++ b/linbox/solutions/rank.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** @ingroup solutions
@defgroup rk Rank
diff --git a/linbox/solutions/rank.h b/linbox/solutions/rank.h
index d17e51b..c40addb 100644
--- a/linbox/solutions/rank.h
+++ b/linbox/solutions/rank.h
@@ -1,9 +1,25 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/solutions/rank.h
* Copyright(C) LinBox
* ------------------------------------
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_rank_H
@@ -15,10 +31,10 @@
#include "linbox/algorithms/matrix-hom.h"
#include "linbox/blackbox/sparse.h"
#include "linbox/blackbox/diagonal.h"
+#include "linbox/blackbox/diagonal-gf2.h"
#include "linbox/blackbox/compose.h"
#include "linbox/blackbox/permutation.h"
#include "linbox/blackbox/transpose.h"
-#include "linbox/blackbox/blas-blackbox.h"
#include "linbox/algorithms/blackbox-container-symmetrize.h"
#include "linbox/algorithms/blackbox-container-symmetric.h"
#include "linbox/algorithms/blackbox-container.h"
@@ -68,11 +84,12 @@ namespace LinBox
inline unsigned long &rank (unsigned long &r,
const Blackbox &A,
const RingCategories::RationalTag &tag,
- const Method &M){
- commentator.start ("Rational Rank", "Rrank");
+ const Method &M)
+ {
+ commentator().start ("Rational Rank", "Rrank");
// Same mapping as the integer one
rank(r, A, RingCategories::IntegerTag(), M);
- commentator.stop ("done", NULL, "Rrank");
+ commentator().stop ("done", NULL, "Rrank");
return r;
}
@@ -191,7 +208,7 @@ namespace LinBox
typename Field::RandIter iter (F);
if (M.symmetric()) {
- commentator.start ("Symmetric Rank", "srank");
+ commentator().start ("Symmetric Rank", "srank");
std::vector<typename Field::Element> d1;
@@ -203,29 +220,27 @@ namespace LinBox
do iter.random (d1[i]); while (F.isZero (d1[i]));
- Diagonal<Field> D1 (F, d1);
-
-
- Compose<Diagonal<Field>,Blackbox > B1 (&D1, &A);
typedef Compose<Compose<Diagonal<Field>,Blackbox >, Diagonal<Field> > BlackBox1;
- BlackBox1 B (&B1, &D1);
+ Diagonal<Field> D0 (F, d1);
+ Compose<Diagonal<Field>,Blackbox > B0 (&D0, &A);
+ BlackBox1 B (&B0, &D0);
BlackboxContainerSymmetric<Field, BlackBox1> TF (&B, F, iter);
MasseyDomain<Field, BlackboxContainerSymmetric<Field, BlackBox1> > WD (&TF, M.earlyTermThreshold ());
std::vector<typename Field::Element> phi;
WD.pseudo_minpoly (phi, res);
- commentator.report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Pseudo Minpoly degree: " << res << std::endl;
+ commentator().report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Pseudo Minpoly degree: " << res << std::endl;
- commentator.start ("Monte Carlo certification (1)", "trace");
+ commentator().start ("Monte Carlo certification (1)", "trace");
typename Field::Element t, p2; F.init(p2, 0UL);
trace(t, B);
if (phi.size() >= 2) F.neg(p2, phi[ phi.size()-2]);
int nbperm = 0; unsigned long rk;
- int logn = 2*(unsigned long)floor( log( (double)A.rowdim() ) );
+ int logn = (int)(2*(unsigned long)floor( log( (double)A.rowdim() ) ));
bool tryagain = (! F.areEqual( t, p2 ));
while( tryagain ) {
- commentator.stop ("fail", NULL, "trace");
+ commentator().stop ("fail", NULL, "trace");
#if 0
Permutation<Field> P(A.rowdim(), F);
@@ -252,17 +267,17 @@ namespace LinBox
do iter.random (d1[i]); while (F.isZero (d1[i]));
Diagonal<Field> D1 (F, d1);
Compose<Diagonal<Field>,Blackbox > B1 (&D1, &A);
- BlackBox1 B (&B1, &D1);
+ BlackBox1 B2 (&B1, &D1);
- BlackboxContainerSymmetric<Field, BlackBox1> TF (&B, F, iter);
- MasseyDomain<Field, BlackboxContainerSymmetric<Field, BlackBox1> > WD (&TF, M.earlyTermThreshold ());
+ BlackboxContainerSymmetric<Field, BlackBox1> TF1 (&B2, F, iter);
+ MasseyDomain<Field, BlackboxContainerSymmetric<Field, BlackBox1> > WD1 (&TF1, M.earlyTermThreshold ());
- WD.pseudo_minpoly (phi, rk);
- commentator.report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Permuted pseudo Minpoly degree: " << res << std::endl;
- commentator.start ("Monte Carlo certification (2)", "trace");
+ WD1.pseudo_minpoly (phi, rk);
+ commentator().report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Permuted pseudo Minpoly degree: " << res << std::endl;
+ commentator().start ("Monte Carlo certification (2)", "trace");
if (phi.size() >= 2) F.neg(p2, phi[ phi.size()-2]);
- trace(t, B);
+ trace(t, B2);
tryagain = (! F.areEqual( t, p2 ));
if (res > rk)
@@ -271,11 +286,11 @@ namespace LinBox
res = rk;
if( ++nbperm > logn) break;
}
- commentator.report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "symm permutations : " << nbperm << std::endl;
+ commentator().report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "symm permutations : " << nbperm << std::endl;
nbperm = 0;
while(tryagain) {
- commentator.stop ("fail", NULL, "trace");
- // F.write( F.write( commentator.report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION)
+ commentator().stop ("fail", NULL, "trace");
+ // F.write( F.write( commentator().report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION)
// << "end trace: ", t) << ", p2: ", p2) << std::endl;
typename Field::RandIter r (F);
typename CekstvSwitch<Field>::Factory factory (r);
@@ -294,12 +309,12 @@ namespace LinBox
typedef Compose< Compose< ButD, Blackbox > , Transpose< ButD > > BlackBoxBAB;
BlackBoxBAB PAP(&B1, &TP);
- BlackboxContainerSymmetric<Field, BlackBoxBAB> TF (&PAP, F, iter);
- MasseyDomain<Field, BlackboxContainerSymmetric<Field, BlackBoxBAB> > WD (&TF, M.earlyTermThreshold ());
+ BlackboxContainerSymmetric<Field, BlackBoxBAB> TF1 (&PAP, F, iter);
+ MasseyDomain<Field, BlackboxContainerSymmetric<Field, BlackBoxBAB> > WD1 (&TF1, M.earlyTermThreshold ());
- WD.pseudo_minpoly (phi, rk);
- commentator.report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Butterfly pseudo Minpoly degree: " << res << std::endl;
- commentator.start ("Monte Carlo certification (3)", "trace");
+ WD1.pseudo_minpoly (phi, rk);
+ commentator().report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Butterfly pseudo Minpoly degree: " << res << std::endl;
+ commentator().start ("Monte Carlo certification (3)", "trace");
if (phi.size() >= 2) F.neg(p2, phi[ phi.size()-2]);
trace(t, PAP);
@@ -312,19 +327,19 @@ namespace LinBox
++nbperm;
}
- // F.write( F.write( commentator.report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION)
+ // F.write( F.write( commentator().report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION)
// << "end trace: ", t) << ", p2: ", p2) << std::endl;
- commentator.report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "butterflies : " << nbperm << std::endl;
+ commentator().report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "butterflies : " << nbperm << std::endl;
- commentator.stop ("success", NULL, "trace");
- commentator.stop ("done", NULL, "srank");
+ commentator().stop ("success", NULL, "trace");
+ commentator().stop ("done", NULL, "srank");
return res;
}
else {
- commentator.start ("Rank", "wrank");
+ commentator().start ("Rank", "wrank");
std::vector<typename Field::Element> d1, d2;
size_t i;
@@ -338,37 +353,37 @@ namespace LinBox
for (i = 0; i < A.rowdim (); i++)
do iter.random (d2[i]); while (F.isZero (d2[i]));
- Diagonal<Field> D1 (F, d1), D2 (F, d2);
- Transpose<Blackbox> AT (&A);
+ Diagonal<Field> D1_i (F, d1), D2_i (F, d2);
+ Transpose<Blackbox> AT_i (&A);
- Compose<Diagonal<Field>,Transpose<Blackbox> > B1 (&D1, &AT);
- Compose<Compose<Diagonal<Field>,Transpose<Blackbox> >, Diagonal<Field> > B2 (&B1, &D2);
- Compose<Compose<Compose<Diagonal<Field>,Transpose<Blackbox> >, Diagonal<Field> >, Blackbox> B3 (&B2, &A);
+ Compose<Diagonal<Field>,Transpose<Blackbox> > B1_i (&D1_i, &AT_i);
+ Compose<Compose<Diagonal<Field>,Transpose<Blackbox> >, Diagonal<Field> > B2_i (&B1_i, &D2_i);
+ Compose<Compose<Compose<Diagonal<Field>,Transpose<Blackbox> >, Diagonal<Field> >, Blackbox> B3_i (&B2_i, &A);
// Here there is an extra diagonal computation
// The probability of success is also divided by two, as
- // D2^2 contains only squares and squares are half the total elements
- typedef Compose<Compose<Compose<Compose<Diagonal<Field>,Transpose<Blackbox> >, Diagonal<Field> >, Blackbox>, Diagonal<Field> > Blackbox1;
- Blackbox1 B (&B3, &D1);
+ // D2_i^2 contains only squares and squares are half the total elements
+ typedef Compose<Compose<Compose<Compose<Diagonal<Field>,Transpose<Blackbox> >, Diagonal<Field> >, Blackbox>, Diagonal<Field> > Blackbox0;
+ Blackbox0 B_i (&B3_i, &D1_i);
- BlackboxContainerSymmetric<Field, Blackbox1> TF (&B, F, iter);
- MasseyDomain<Field, BlackboxContainerSymmetric<Field, Blackbox1> > WD (&TF, M.earlyTermThreshold ());
+ BlackboxContainerSymmetric<Field, Blackbox0> TF_i (&B_i, F, iter);
+ MasseyDomain<Field, BlackboxContainerSymmetric<Field, Blackbox0> > WD (&TF_i, M.earlyTermThreshold ());
std::vector<typename Field::Element> phi;
WD.pseudo_minpoly (phi, res);
- commentator.report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Pseudo Minpoly degree: " << res << std::endl;
- commentator.start ("Monte Carlo certification (4)", "trace");
+ commentator().report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Pseudo Minpoly degree: " << res << std::endl;
+ commentator().start ("Monte Carlo certification (4)", "trace");
typename Field::Element t, p2; F.init(p2, 0UL);
- // trace(t, B);
- WhisartTraceTranspose(t, F, D1, A, D2);
+ // trace(t, B_i);
+ WhisartTraceTranspose(t, F, D1_i, A, D2_i);
if (phi.size() >= 2) F.neg(p2, phi[ phi.size()-2]);
int nbperm = 0; unsigned long rk;
- int logn = 2*(unsigned long)floor( log( (double)A.rowdim() ) );
+ int logn = (int)(2*(unsigned long)floor( log( (double)A.rowdim() ) ));
bool tryagain = (! F.areEqual( t, p2 ));
while( tryagain ) {
- commentator.stop ("fail", NULL, "trace");
- Permutation<Field> P(A.rowdim(), F);
+ commentator().stop ("fail", NULL, "trace");
+ Permutation<Field> P((int)A.rowdim(), F);
for (i = 0; i < A.rowdim (); ++i)
P.permute( rand() % A.rowdim() , rand() % A.rowdim() );
for (i = 0; i < A.rowdim (); ++i)
@@ -396,8 +411,8 @@ namespace LinBox
MasseyDomain<Field, BlackboxContainerSymmetric<Field, Blackbox1> > MD (&TF, M.earlyTermThreshold ());
MD.pseudo_minpoly (phi, rk);
- commentator.report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Permuted pseudo Minpoly degree: " << rk << std::endl;
- commentator.start ("Monte Carlo certification (5)", "trace");
+ commentator().report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Permuted pseudo Minpoly degree: " << rk << std::endl;
+ commentator().start ("Monte Carlo certification (5)", "trace");
if (phi.size() >= 2) F.neg(p2, phi[ phi.size()-2]);
// trace(t, B);
@@ -409,10 +424,10 @@ namespace LinBox
res = rk;
if( ++nbperm > logn) break;
}
- commentator.report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "permutations : " << nbperm << std::endl;
+ commentator().report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "permutations : " << nbperm << std::endl;
nbperm = 0;
while(tryagain) {
- commentator.stop ("fail", NULL, "trace");
+ commentator().stop ("fail", NULL, "trace");
typename Field::RandIter r (F);
typename CekstvSwitch<Field>::Factory factory (r);
typedef Butterfly<Field, CekstvSwitch<Field> > ButterflyP;
@@ -440,8 +455,8 @@ namespace LinBox
MasseyDomain<Field, BlackboxContainerSymmetric<Field, Blackbox1> > MD (&TF, M.earlyTermThreshold ());
MD.pseudo_minpoly (phi, rk);
- commentator.report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Butterfly pseudo Minpoly degree: " << rk << std::endl;
- commentator.start ("Monte Carlo certification (6)", "trace");
+ commentator().report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Butterfly pseudo Minpoly degree: " << rk << std::endl;
+ commentator().start ("Monte Carlo certification (6)", "trace");
if (phi.size() >= 2) F.neg(p2, phi[ phi.size()-2]);
// trace(t, B);
@@ -453,9 +468,9 @@ namespace LinBox
res = rk;
++nbperm;
}
- commentator.report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "butterflies : " << nbperm << std::endl;
- commentator.stop ("success", NULL, "trace");
- commentator.stop ("done", NULL, "wrank");
+ commentator().report(Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "butterflies : " << nbperm << std::endl;
+ commentator().stop ("success", NULL, "trace");
+ commentator().stop ("done", NULL, "wrank");
return res;
}
@@ -489,7 +504,7 @@ namespace LinBox
const RingCategories::IntegerTag &tag,
const Method::SparseElimination &M)
{
- commentator.start ("Integer Rank inplace", "irank");
+ commentator().start ("Integer Rank inplace", "irank");
typedef Modular<double> Field;
integer mmodulus;
FieldTraits<Field>::maxModulus(mmodulus);
@@ -498,9 +513,9 @@ namespace LinBox
typedef typename Blackbox::template rebind< Field >::other FBlackbox;
Field Fp(*genprime);
FBlackbox Ap(A, Fp);
- commentator.report (Commentator::LEVEL_ALWAYS,INTERNAL_WARNING) << "Integer Rank is done modulo " << *genprime << std::endl;
+ commentator().report (Commentator::LEVEL_ALWAYS,INTERNAL_WARNING) << "Integer Rank is done modulo " << *genprime << std::endl;
rankin(r, Ap, RingCategories::ModularTag(), M);
- commentator.stop ("done", NULL, "irank");
+ commentator().stop ("done", NULL, "irank");
return r;
}
@@ -510,10 +525,10 @@ namespace LinBox
const RingCategories::ModularTag &tag,
const Method::SparseElimination &M)
{
- commentator.start ("Sparse Elimination Rank", "serank");
+ commentator().start ("Sparse Elimination Rank", "serank");
GaussDomain<Field> GD ( A.field() );
GD.rankin (r, A, M.strategy ());
- commentator.stop ("done", NULL, "serank");
+ commentator().stop ("done", NULL, "serank");
return r;
}
@@ -522,10 +537,10 @@ namespace LinBox
GaussDomain<GF2>::Matrix &A,
const Method::SparseElimination &)//M
{
- commentator.start ("Sparse Elimination Rank over GF2", "serankmod2");
+ commentator().start ("Sparse Elimination Rank over GF2", "serankmod2");
GaussDomain<GF2> GD ( A.field() );
GD.rankin (r, A, Specifier::PIVOT_LINEAR);
- commentator.stop ("done", NULL, "serankmod2");
+ commentator().stop ("done", NULL, "serankmod2");
return r;
}
@@ -560,16 +575,16 @@ namespace LinBox
const Method::BlasElimination &M)
{
- commentator.start ("Blas Rank", "blasrank");
+ commentator().start ("Blas Rank", "blasrank");
typedef typename Blackbox::Field Field;
const Field F = A.field();
integer a, b; F.characteristic(a); F.cardinality(b);
linbox_check( a == b );
linbox_check( a < LinBox::BlasBound);
- BlasMatrix<typename Field::Element> B(A);
+ BlasMatrix<Field> B(A);
BlasMatrixDomain<Field> D(F);
r = D.rank(B);
- commentator.stop ("done", NULL, "blasrank");
+ commentator().stop ("done", NULL, "blasrank");
return r;
}
@@ -592,16 +607,16 @@ namespace LinBox
/// A is modified.
template <class Field>
inline unsigned long &rankin (unsigned long &r,
- BlasBlackbox<Field> &A,
+ BlasMatrix<Field> &A,
const RingCategories::ModularTag &tag,
const Method::BlasElimination &M)
{
- commentator.start ("BlasBB Rank", "blasbbrank");
+ commentator().start ("BlasBB Rank", "blasbbrank");
const Field F = A.field();
BlasMatrixDomain<Field> D(F);
- r = D.rankin(static_cast< BlasMatrix<typename Field::Element>& >(A));
- commentator.stop ("done", NULL, "blasbbrank");
+ r = D.rankin(static_cast< BlasMatrix<Field>& >(A));
+ commentator().stop ("done", NULL, "blasbbrank");
return r;
}
@@ -611,19 +626,19 @@ namespace LinBox
const RingCategories::IntegerTag &tag,
const MyMethod &M)
{
- commentator.start ("Integer Rank", "iirank");
+ commentator().start ("Integer Rank", "iirank");
typedef Modular<double> Field;
integer mmodulus;
FieldTraits<Field>::maxModulus(mmodulus);
- RandomPrimeIterator genprime( (long) floor (log((double)mmodulus) ) );
+ RandomPrimeIterator genprime( (unsigned) floor (log((double)mmodulus) ) );
++genprime;
typedef typename Blackbox::template rebind< Field >::other FBlackbox;
Field Fp(*genprime);
FBlackbox Ap(A, Fp );
- commentator.report (Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Integer Rank is done modulo " << *genprime << std::endl;
+ commentator().report (Commentator::LEVEL_ALWAYS,INTERNAL_DESCRIPTION) << "Integer Rank is done modulo " << *genprime << std::endl;
rank(r, Ap, RingCategories::ModularTag(), M);
- commentator.stop ("done", NULL, "iirank");
+ commentator().stop ("done", NULL, "iirank");
return r;
}
} // LinBox
@@ -634,7 +649,7 @@ namespace LinBox
#define LINBOX_EXTENSION_DEGREE_MAX 19
#endif
-#include "linbox/field/givaro-extension.h"
+#include "linbox/field/givaro.h"
namespace LinBox
{
template <class Blackbox>
@@ -643,15 +658,15 @@ namespace LinBox
const RingCategories::ModularTag &tag,
const Method::Blackbox & m)
{
- commentator.start ("BB Rank", "extend");
+ commentator().start ("BB Rank", "extend");
if (m.certificate()) {
typedef typename Blackbox::Field Field;
const Field& F = A.field();
integer a,c; F.cardinality(a); F.characteristic(c);
if (a != c) {
- unsigned long extend = (unsigned long)FF_EXPONENT_MAX(a,(integer)LINBOX_EXTENSION_DEGREE_MAX);
+ unsigned long extend = (unsigned long)Givaro::FF_EXPONENT_MAX(a,(integer)LINBOX_EXTENSION_DEGREE_MAX);
if (extend > 1) {
- commentator.report (Commentator::LEVEL_ALWAYS,INTERNAL_WARNING) << "Extension of degree " << extend << std::endl;
+ commentator().report (Commentator::LEVEL_ALWAYS,INTERNAL_WARNING) << "Extension of degree " << extend << std::endl;
GivaroExtension<Field> EF( F, extend);
typedef typename Blackbox::template rebind< GivaroExtension<Field> >::other FBlackbox;
FBlackbox Ap(A, EF);
@@ -661,9 +676,9 @@ namespace LinBox
rank(r, A, tag, Method::Wiedemann(m));
}
else {
- unsigned long extend = (unsigned long)FF_EXPONENT_MAX(c,(integer)LINBOX_EXTENSION_DEGREE_MAX);
+ unsigned long extend = (unsigned long)Givaro::FF_EXPONENT_MAX(c,(integer)LINBOX_EXTENSION_DEGREE_MAX);
if (extend > 1) {
- commentator.report (Commentator::LEVEL_ALWAYS,INTERNAL_WARNING) << "Word size extension : " << extend << std::endl;
+ commentator().report (Commentator::LEVEL_ALWAYS,INTERNAL_WARNING) << "Word size extension : " << extend << std::endl;
GivaroGfq EF( (unsigned long)c, extend);
typedef typename Blackbox::template rebind< GivaroGfq >::other FBlackbox;
FBlackbox Ap(A, EF);
@@ -675,7 +690,7 @@ namespace LinBox
}
else
rank(r, A, tag, Method::Wiedemann(m));
- commentator.stop ("done", NULL, "extend");
+ commentator().stop ("done", NULL, "extend");
return r;
}
}
@@ -697,3 +712,12 @@ namespace LinBox
#endif // __LINBOX_rank_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/solutions/reducedforms.doxy b/linbox/solutions/reducedforms.doxy
index 4a7ee73..511165b 100644
--- a/linbox/solutions/reducedforms.doxy
+++ b/linbox/solutions/reducedforms.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** @ingroup solutions
@defgroup reducedforms Recuded forms
diff --git a/linbox/solutions/smith-form.h b/linbox/solutions/smith-form.h
index bedc6be..e4d4b88 100644
--- a/linbox/solutions/smith-form.h
+++ b/linbox/solutions/smith-form.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
*
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_smith_form_H
@@ -26,14 +27,14 @@
#include <list>
#include <vector>
-#include <linbox/util/error.h>
-#include <linbox/algorithms/matrix-hom.h>
+#include "linbox/util/error.h"
+#include "linbox/algorithms/matrix-hom.h"
#ifdef __LINBOX_HAVE_NTL
-#include <linbox/algorithms/smith-form-adaptive.h>
+#include "linbox/algorithms/smith-form-adaptive.h"
#endif
-#include <linbox/field/PID-integer.h>
-//#include <linbox/algorithms/smith-form.h>
-//#include <linbox/algorithms/smith-form-local.h>
+#include "linbox/field/PID-integer.h"
+//#include "linbox/algorithms/smith-form.h"
+//#include "linbox/algorithms/smith-form-local.h"
namespace LinBox
{
@@ -87,7 +88,7 @@ namespace LinBox
const DomainCategory &tag,
const SmithMethod &M)
{
- throw LinBoxError( "Smith form solution implemented only for DenseMatrix<PID_integer>.\n Please reconfigure LinBox with NTL enabled.");
+ throw LinBoxError( "Smith form solution implemented only for NTL.\n Please reconfigure LinBox with NTL enabled.");
}
// The smithForm with default Method
@@ -146,12 +147,13 @@ namespace LinBox
#endif
#ifdef __LINBOX_HAVE_NTL
- // The smithForm with Hybrid Method
+
template<>
- std::list<std::pair<integer, size_t> > &smithForm(std::list<std::pair<integer, size_t> >& S,
- const DenseMatrix<PID_integer> &A,
- const RingCategories::IntegerTag &tag,
- const Method::Hybrid& M)
+ std::list<std::pair<integer, size_t> > &
+ smithForm(std::list<std::pair<integer, size_t> >& S,
+ const BlasMatrix<PID_integer> &A,
+ const RingCategories::IntegerTag &tag,
+ const Method::Hybrid & M)
{
std::vector<integer> v (A.rowdim() < A.coldim() ? A.rowdim() : A.coldim());
SmithFormAdaptive::smithForm(v, A);
@@ -159,36 +161,7 @@ namespace LinBox
return S;
}
-#endif
-#if 0
- // The smithForm with Elimination Method
- template<class Output, class Ring>
- Output &smithForm(Output & S,
- const DenseMatrix<Ring> &A,
- const RingCategories::IntegerTag &tag,
- const Method::Elimination& M)
- {
- typename Ring::Element d;
- det(d, A, tag, M); // or just use default hybrid? What does elim mean?
- integer D;
- A.field().convert(D, d);
- if (D < Modular<int>::MaxModulus)
- { typedef Modular<int> Ring2;
- Ring2 R2(D);
- MatrixHom::map(B, A, R2);
- IliolopousElimination::smithIn(B);
- //return diagonal of B in Output object.
- }
- else
- { typedef Modular<integer> Ring2;
- Ring2 R2(D);
- MatrixHom::map(B, A, R2);
- IliolopousElimination::smithIn(B);
- //return diagonal of B in Output object.
- }
-
- }
#endif
#if 0
@@ -207,3 +180,12 @@ namespace LinBox
} // end of LinBox namespace
#endif // __LINBOX_smith_form_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/solutions/solutions.doxy b/linbox/solutions/solutions.doxy
index 2e446a0..6185f57 100644
--- a/linbox/solutions/solutions.doxy
+++ b/linbox/solutions/solutions.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** \ingroup linbox
\defgroup solutions solutions
diff --git a/linbox/solutions/solve.h b/linbox/solutions/solve.h
index bdf3558..a8df961 100644
--- a/linbox/solutions/solve.h
+++ b/linbox/solutions/solve.h
@@ -1,15 +1,37 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/solutions/solve.h
* Copyright(C) LinBox
* Evolved from an earlier one by Bradford Hovinen <hovinen at cis.udel.edu>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_solve_H
#define __LINBOX_solve_H
+/*! @file linbox/solutions/solve.h
+ * @ingroup solutions
+ * @brief System Solving.
+ * @details NO DOC
+ */
+
#include <vector>
#include <algorithm>
@@ -19,7 +41,6 @@
#include "linbox/algorithms/wiedemann.h"
#include "linbox/algorithms/rational-solver.h"
#include "linbox/algorithms/diophantine-solver.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/matrix/factorized-matrix.h"
#include "linbox/util/debug.h"
#include "linbox/util/error.h"
@@ -30,6 +51,10 @@
#include "linbox/algorithms/rational-cra2.h"
#include "linbox/algorithms/varprec-cra-early-multip.h"
+#ifdef __LINBOX_HAVE_IML
+#include "linbox/util/iml_wrapper.h"
+#endif
+
namespace LinBox
{
@@ -40,31 +65,38 @@ namespace LinBox
const Vector & b,
const DomainCategory & tag,
const SolveMethod & M);
- // SolveStatus * s = 0);
/** \brief Solve Ax = b, for x.
*
- * Vector x such that Ax = b is returned.
- In the case of a singular matrix A, if the system is consistent, a random
- solution is returned by default. The method parameter may contain
- an indication that an arbitrary element of the solution space is
- acceptable, which can be faster to compute.
- If the system is inconsistent the zero vector is returned.
-
- \ingroup solutions
+ * Vector x such that Ax = b is returned. In the case of a singular
+ * matrix A, if the system is consistent, a random solution is returned
+ * by default. The method parameter may contain an indication that an
+ * arbitrary element of the solution space is acceptable, which can be
+ * faster to compute. If the system is inconsistent the zero vector is
+ * returned.
+ *
+ * @warning no doc for when using what method
+ *
+ * @param [out] x solution
+ * @param [in] A matrix
+ * @param [in] b target
+ * @param [in] M method to use (\see solutions/method.h)
+ * @return reference to \p x
*/
+ // * \ingroup solutions
//and the SolveStatus, if non-null, is set to indicate inconsistency.
template< class Vector, class Blackbox, class SolveMethod>
Vector & solve (Vector & x,
const Blackbox & A,
const Vector & b,
const SolveMethod & M)
- // SolveStatus * s = 0)
{
return solve(x, A, b, typename FieldTraits<typename Blackbox::Field>::categoryTag(), M);
}
- // the solve with default method
+ /*!
+ * the solve with default method.
+ */
template< class Vector, class Blackbox>
Vector& solve(Vector& x, const Blackbox& A, const Vector& b)
{
@@ -74,7 +106,7 @@ namespace LinBox
// in methods.h FoobarMethod and Method::Foobar are the same class.
// in methods.h template<BB> bool useBB(const BB& A) is defined.
- // specialize this on blackboxes which have local methods
+ //! @internal specialize this on blackboxes which have local methods
template <class Vector, class BB>
Vector& solve(Vector& x, const BB& A, const Vector& b,
const Method::Hybrid& m)
@@ -83,6 +115,7 @@ namespace LinBox
else return solve(x, A, b, Method::Elimination(m));
}
+ /** @internal Blackbox method specialisation */
template <class Vector, class BB>
Vector& solve(Vector& x, const BB& A, const Vector& b,
const Method::Blackbox& m)
@@ -93,9 +126,10 @@ namespace LinBox
return solve(x, A, b, Method::Wiedemann(m));
}
- //! @todo temporary - fix this
-//#define inBlasRange(p) true
+ //x @todo temporary - fix this
+ //#define inBlasRange(p) true
+ /** @internal Elimination method specialisation */
template <class Vector, class BB>
Vector& solve(Vector& x, const BB& A, const Vector& b,
const Method::Elimination& m)
@@ -113,18 +147,29 @@ namespace LinBox
// Method::NonBlasElimination(m));
}
+ //! @internal inplace Sparse Elimination.
template <class Vector, class Field>
Vector& solvein(Vector& x, SparseMatrix<Field, typename LinBox::Vector<Field>::SparseSeq>& A, const Vector& b, const Method::SparseElimination& m)
{
- commentator.start ("Sparse Elimination Solve In Place", "sesolvein");
+ commentator().start ("Sparse Elimination Solve In Place", "sesolvein");
GaussDomain<Field> GD ( A.field() );
GD.solvein(x, A, b);
- commentator.stop ("done", NULL, "sesolvein");
+ commentator().stop ("done", NULL, "sesolvein");
return x;
}
+ template <class Vector, class Field, class Random>
+ Vector& solvein(Vector& x, SparseMatrix<Field, typename LinBox::Vector<Field>::SparseSeq>& A, const Vector& b, const Method::SparseElimination& m, Random& generator)
+ {
+ commentator().start ("Sparse Elimination Solve In Place with random solution", "sesolvein");
+ GaussDomain<Field> GD ( A.field() );
+ GD.solvein(x, A, b, generator);
+ commentator().stop ("done", NULL, "sesolvein");
+ return x;
+ }
- // Change of representation to be able to call the sparse elimination
+
+ //! @internal Change of representation to be able to call the sparse elimination
template <class Vector, class Blackbox>
Vector& solve(Vector& x, const Blackbox& A, const Vector& b,
const Method::SparseElimination& m)
@@ -136,18 +181,45 @@ namespace LinBox
return solvein(x, SpA, b, m);
}
+ template <class Vector, class Blackbox, class Random>
+ Vector& solve(Vector& x, const Blackbox& A, const Vector& b,
+ const Method::SparseElimination& m, Random& generator)
+ {
+ typedef typename Blackbox::Field Field;
+ typedef SparseMatrix<Field, typename LinBox::Vector<Field>::SparseSeq> SparseBB;
+ SparseBB SpA(A.field(), A.rowdim(), A.coldim());
+ MatrixHom::map(SpA, A, A.field());
+ return solvein(x, SpA, b, generator);
+ }
+
+ //! @internal specialisation for inplace SparseElimination on GF2
template <class Vector>
Vector& solvein(Vector& x,
GaussDomain<GF2>::Matrix &A,
const Vector& b,
const Method::SparseElimination& m)
{
- commentator.start ("Sparse Elimination Solve In Place over GF2", "GF2sesolvein");
+ commentator().start ("Sparse Elimination Solve In Place over GF2", "GF2sesolvein");
GaussDomain<GF2> GD ( A.field() );
GD.solvein(x, A, b);
- commentator.stop ("done", NULL, "GF2sesolvein");
+ commentator().stop ("done", NULL, "GF2sesolvein");
return x;
}
+ template <class Vector, class Random>
+ Vector& solvein(Vector& x,
+ GaussDomain<GF2>::Matrix &A,
+ const Vector& b,
+ const Method::SparseElimination& m,
+ Random& generator)
+ {
+ commentator().start ("Sparse Elimination Solve In Place over GF2", "GF2sesolvein");
+ GaussDomain<GF2> GD ( A.field() );
+ GD.solvein(x, A, b, generator);
+ commentator().stop ("done", NULL, "GF2sesolvein");
+ return x;
+ }
+
+ //! @internal specialisation for SparseElimination on GF2
template <class Vector>
Vector& solve(Vector& x,
GaussDomain<GF2>::Matrix &A,
@@ -156,10 +228,23 @@ namespace LinBox
{
// We make a copy
GaussDomain<GF2>::Matrix SpA(A.field(), A.rowdim(), A.coldim());
- MatrixHom::map(SpA, A, A.field());
+ MatrixHom::map(SpA, A );
return solvein(x, SpA, b, m);
}
+ template <class Vector, class Random>
+ Vector& solve(Vector& x,
+ GaussDomain<GF2>::Matrix &A,
+ const Vector& b,
+ const Method::SparseElimination& m,
+ Random& generator)
+ {
+ // We make a copy
+ GaussDomain<GF2>::Matrix SpA(A.field(), A.rowdim(), A.coldim());
+ MatrixHom::map(SpA, A );
+ return solvein(x, SpA, b, m, generator);
+ }
+ //! @internal Generic Elimination for SparseMatrix
template <class Vector, class Field>
Vector& solve(Vector& x, const SparseMatrix<Field>& A, const Vector& b,
const Method::Elimination& m)
@@ -182,24 +267,26 @@ namespace LinBox
}
// BlasElimination section ///////////////////
+ //! @internal Generic Elimination on Z/pZ (convert A to DenseMatrix)
template <class Vector, class BB>
Vector& solve(Vector& x, const BB& A, const Vector& b,
const RingCategories::ModularTag & tag,
const Method::BlasElimination& m)
{
- BlasBlackbox<typename BB::Field> B(A); // copy A into a BlasBlackbox
+ BlasMatrix<typename BB::Field> B(A); // copy A into a BlasMatrix
return solve(x, B, b, tag, m);
}
+ //! @internal Generic Elimination for DenseMatrix on Z/pZ
template <class Vector, class Field>
- Vector& solve(Vector& x, const BlasBlackbox<Field>& A, const Vector& b,
+ Vector& solve(Vector& x, const BlasMatrix<Field>& A, const Vector& b,
const RingCategories::ModularTag & tag,
const Method::BlasElimination& m)
{
if ((A.coldim() != x.size()) || (A.rowdim() != b.size()))
throw LinboxError("LinBox ERROR: dimension of data are not compatible in system solving (solving impossible)");
- commentator.start ("Solving linear system (FFLAS LQUP)", "LQUP::left_solve");
+ commentator().start ("Solving linear system (FFLAS LQUP)", "LQUP::left_solve");
//bool consistent = false;
LQUPMatrix<Field> LQUP(A);
//FactorizedMatrix<Field> LQUP(A);
@@ -215,10 +302,17 @@ namespace LinBox
*i = zero;
}
#endif
- commentator.stop ("done", NULL, "LQUP::left_solve");
+ commentator().stop ("done", NULL, "LQUP::left_solve");
return x;
}
+ template <class Vector, class Field>
+ Vector& solve(Vector& x, const BlasMatrix<Field>& A, const Vector& b,
+ const RingCategories::ModularTag & tag,
+ const Method::Dixon & m)
+ {
+ throw LinBoxFailure("You cannot do this");
+ }
/* Integer tag Specialization for Dixon method:
* 2 interfaces:
@@ -228,6 +322,7 @@ namespace LinBox
// error handler for bad use of the integer solver API
+ //! @internal Generic Elimination for Integer matrices
template <class Vector, class BB>
Vector& solve(Vector& x, const BB& A, const Vector& b,
const RingCategories::IntegerTag & tag,
@@ -250,7 +345,7 @@ namespace LinBox
if ((A.coldim() != x.size()) || (A.rowdim() != b.size()))
throw LinboxError("LinBox ERROR: dimension of data are not compatible in system solving (solving impossible)");
- commentator.start ("Rational CRA Solve", "Rsolve");
+ commentator().start ("Rational CRA Solve", "Rsolve");
size_t bits = 26 -(int)ceil(log((double)A.rowdim())*0.7213475205);
RandomPrimeIterator genprime( bits);
@@ -269,7 +364,7 @@ namespace LinBox
*it_x = typename RatVector::value_type(*it_num/g, den/g);
}
- commentator.stop ("done", NULL, "Rsolve");
+ commentator().stop ("done", NULL, "Rsolve");
return x;
}
#endif
@@ -299,7 +394,8 @@ namespace LinBox
// API with Hybrid method
template<class RatVector, class Vector, class BB>
- RatVector& solve(RatVector& x, const BB &A, const Vector &b, const Method::Hybrid &m)
+ RatVector& solve(RatVector& x, const BB &A, const Vector &b,
+ const Method::Hybrid &m)
{
if (useBB(A))
return solve(x, A, b, Method::Blackbox(m));
@@ -333,19 +429,19 @@ namespace LinBox
/* Specializations for BlasElimination over the integers
*/
- // input matrix is generic (copying it into a BlasBlackbox)
+ // input matrix is generic (copying it into a BlasMatrix)
template <class RatVector, class Vector, class BB>
RatVector& solve(RatVector& x, const BB& A, const Vector& b,
const RingCategories::IntegerTag & tag,
const Method::BlasElimination& m)
{
- BlasBlackbox<typename BB::Field> B(A); // copy A into a BlasBlackbox
+ BlasMatrix<typename BB::Field> B(A); // copy A into a BlasMatrix
return solve(x, B, b, tag, m);
}
- // input matrix is a BlasBlackbox (no copy)
+ // input matrix is a BlasMatrix (no copy)
template <class RatVector, class Vector, class Ring>
- RatVector& solve(RatVector& x, const BlasBlackbox<Ring>& A, const Vector& b,
+ RatVector& solve(RatVector& x, const BlasMatrix<Ring>& A, const Vector& b,
const RingCategories::IntegerTag & tag,
const Method::BlasElimination& m)
{
@@ -367,34 +463,14 @@ namespace LinBox
return x;
}
- // input matrix is a DenseMatrix (no copy)
- template <class RatVector, class Vector, class Ring>
- RatVector& solve(RatVector& x, const DenseMatrix<Ring>& A, const Vector& b,
- const RingCategories::IntegerTag & tag,
- const Method::BlasElimination& m)
- {
- Method::Dixon mDixon(m);
- typename Ring::Element d;
- std::vector< typename Ring::Element> num(A.coldim());
- solve (num, d, A, b, tag, mDixon);
- typename RatVector::iterator it_x= x.begin();
- typename std::vector< typename Ring::Element>::const_iterator it_num= num.begin();
- integer n,den;
- A.field().convert(den,d);
- for (; it_x != x.end(); ++it_x, ++it_num){
- A.field().convert(n, *it_num);
- *it_x = typename RatVector::value_type(n, den);
- }
-
- return x;
- }
-
- /*
+ /*!
* 2nd integer solver API :
* solution is a formed by a common denominator and a vector of integer numerator
* solution is num/d
+ * BB: why not a struct RatVector2 { IntVector _n ; Int _d } ; ?
*/
+ //@{
// default API (method is BlasElimination)
template< class Vector, class BB>
@@ -413,34 +489,24 @@ namespace LinBox
/* Specialization for BlasElimination over the integers
*/
- // input matrix is generic (copying it into a BlasBlackbox)
+ // input matrix is generic (copying it into a BlasMatrix)
template <class Vector, class BB>
Vector& solve(Vector& x, typename BB::Field::Element &d, const BB& A, const Vector& b,
const RingCategories::IntegerTag & tag,
const Method::BlasElimination& m)
{
- BlasBlackbox<typename BB::Field> B(A); // copy A into a BlasBlackbox
+ BlasMatrix<typename BB::Field> B(A); // copy A into a BlasMatrix
return solve(x, d, B, b, tag, m);
}
- // input matrix is a BlasBlackbox (no copy)
+ // input matrix is a BlasMatrix (no copy)
template <class Vector, class Ring>
Vector& solve(Vector& x, typename Ring::Element &d,
- const BlasBlackbox<Ring>& A, const Vector& b,
- const RingCategories::IntegerTag & tag,
- const Method::BlasElimination& m)
- {
- Method::Dixon mDixon(m);
- return solve(x, d, A, b, tag, mDixon);
- }
-
- // input matrix is a DenseMatrix (no copy)
- template <class Vector, class Ring>
- Vector& solve(Vector& x, typename Ring::Element &d,
- const DenseMatrix<Ring>& A, const Vector& b,
+ const BlasMatrix<Ring>& A, const Vector& b,
const RingCategories::IntegerTag & tag,
const Method::BlasElimination& m)
{
+ //!@bug check we don't copy
Method::Dixon mDixon(m);
return solve(x, d, A, b, tag, mDixon);
}
@@ -462,13 +528,15 @@ namespace LinBox
/** \brief solver specialization with the 2nd API and DixonTraits over integer (no copying)
*/
template <class Vector, class Ring>
- Vector& solve(Vector& x, typename Ring::Element &d, const BlasBlackbox<Ring>& A, const Vector& b,
+ Vector& solve(Vector& x, typename Ring::Element &d,
+ const BlasMatrix<Ring>& A,
+ const Vector& b,
const RingCategories::IntegerTag tag, Method::Dixon& m)
{
if ((A.coldim() != x.size()) || (A.rowdim() != b.size()))
throw LinboxError("LinBox ERROR: dimension of data are not compatible in system solving (solving impossible)");
- commentator.start ("Padic Integer Blas-based Solving", "solving");
+ commentator().start ("Padic Integer Blas-based Solving", "solving");
typedef Modular<double> Field;
// 0.7213475205 is an upper approximation of 1/(2log(2))
@@ -480,24 +548,24 @@ namespace LinBox
switch ( m.singular() ) {
case Specifier::SINGULARITY_UNKNOWN:
switch (A.rowdim() == A.coldim() ?
- status=rsolve.solveNonsingular(x, d, A, b, false ,m.maxTries()) : SS_SINGULAR) {
+ status=rsolve.solveNonsingular(x, d, A, b, false ,(int)m.maxTries()) : SS_SINGULAR) {
case SS_OK:
m.singular(Specifier::NONSINGULAR);
break;
case SS_SINGULAR:
switch (m.solution()){
case DixonTraits::DETERMINIST:
- status= rsolve.monolithicSolve(x, d, A, b, false, false, m.maxTries(),
+ status= rsolve.monolithicSolve(x, d, A, b, false, false, (int)m.maxTries(),
(m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
break;
case DixonTraits::RANDOM:
- status= rsolve.monolithicSolve(x, d, A, b, false, true, m.maxTries(),
+ status= rsolve.monolithicSolve(x, d, A, b, false, true, (int)m.maxTries(),
(m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
break;
case DixonTraits::DIOPHANTINE:
{
DiophantineSolver<RationalSolver<Ring,Field,RandomPrimeIterator, DixonTraits> > dsolve(rsolve);
- status= dsolve.diophantineSolve(x, d, A, b, m.maxTries(),
+ status= dsolve.diophantineSolve(x, d, A, b, (int)m.maxTries(),
(m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
}
break;
@@ -511,27 +579,27 @@ namespace LinBox
break;
case Specifier::NONSINGULAR:
- rsolve.solveNonsingular(x, d, A, b, false ,m.maxTries());
+ rsolve.solveNonsingular(x, d, A, b, false ,(int)m.maxTries());
break;
case Specifier::SINGULAR:
switch (m.solution()){
case DixonTraits::DETERMINIST:
status= rsolve.monolithicSolve(x, d, A, b,
- false, false, m.maxTries(),
+ false, false, (int)m.maxTries(),
(m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
break;
case DixonTraits::RANDOM:
status= rsolve.monolithicSolve(x, d, A, b,
- false, true, m.maxTries(),
+ false, true, (int)m.maxTries(),
(m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
break;
case DixonTraits::DIOPHANTINE:
{
DiophantineSolver<RationalSolver<Ring,Field,RandomPrimeIterator, DixonTraits> > dsolve(rsolve);
- status= dsolve.diophantineSolve(x, d, A, b, m.maxTries(),
+ status= dsolve.diophantineSolve(x, d, A, b, (int)m.maxTries(),
(m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
}
break;
@@ -543,7 +611,7 @@ namespace LinBox
break;
}
- commentator.stop("done", NULL, "solving");
+ commentator().stop("done", NULL, "solving");
if ( status == SS_INCONSISTENT ) {
throw LinboxMathInconsistentSystem("Linear system is inconsistent");
@@ -555,93 +623,6 @@ namespace LinBox
/** \brief solver specialization with the 2nd API and DixonTraits over integer (no copying)
*/
- template <class Vector, class Ring>
- Vector& solve(Vector& x, typename Ring::Element &d, const DenseMatrix<Ring>& A, const Vector& b,
- const RingCategories::IntegerTag tag, Method::Dixon& m)
- {
- if ((A.coldim() != x.size()) || (A.rowdim() != b.size()))
- throw LinboxError("LinBox ERROR: dimension of data are not compatible in system solving (solving impossible)");
-
- commentator.start ("Padic Integer Blas-based Solving", "solving");
-
- typedef Modular<double> Field;
- // 0.7213475205 is an upper approximation of 1/(2log(2))
- RandomPrimeIterator genprime( 26-(int)ceil(log((double)A.rowdim())*0.7213475205));
- RationalSolver<Ring, Field, RandomPrimeIterator, DixonTraits> rsolve(A.field(), genprime);
- SolverReturnStatus status = SS_OK;
- // if singularity unknown and matrix is square, we try nonsingular solver
- switch ( m.singular() ) {
- case Specifier::SINGULARITY_UNKNOWN:
- switch (A.rowdim() == A.coldim() ?
- status=rsolve.solveNonsingular(x, d, A, b, false ,m.maxTries()) : SS_SINGULAR) {
- case SS_OK:
- m.singular(Specifier::NONSINGULAR);
- break;
- case SS_SINGULAR:
- switch (m.solution()){
- case DixonTraits::DETERMINIST:
- status= rsolve.monolithicSolve(x, d, A, b, false, false, m.maxTries(),
- (m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
- break;
- case DixonTraits::RANDOM:
- status= rsolve.monolithicSolve(x, d, A, b, false, true, m.maxTries(),
- (m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
- break;
- case DixonTraits::DIOPHANTINE:
- DiophantineSolver<RationalSolver<Ring,Field,RandomPrimeIterator, DixonTraits> > dsolve(rsolve);
- status= dsolve.diophantineSolve(x, d, A, b, m.maxTries(),
- (m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
- break;
- //default:
- // break;
- }
- break;
- }
-
- case Specifier::NONSINGULAR:
- rsolve.solveNonsingular(x, d, A, b, false ,m.maxTries());
- break;
-
- case Specifier::SINGULAR:
- switch (m.solution()){
- case DixonTraits::DETERMINIST:
- status= rsolve.monolithicSolve(x, d, A, b,
- false, false, m.maxTries(),
- (m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
- break;
-
- case DixonTraits::RANDOM:
- status= rsolve.monolithicSolve(x, d, A, b,
- false, true, m.maxTries(),
- (m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
- break;
-
- case DixonTraits::DIOPHANTINE:
- DiophantineSolver<RationalSolver<Ring,Field,RandomPrimeIterator, DixonTraits> > dsolve(rsolve);
- status= dsolve.diophantineSolve(x, d, A, b, m.maxTries(),
- (m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
- break;
-
- //default:
- // break;
- }
- default:
- break;
- }
-
- commentator.stop("done", NULL, "solving");
- if ( status == SS_INCONSISTENT ) {
- throw LinboxMathInconsistentSystem("Linear system is inconsistent");
- // typename Ring::Element zero; A.field().init(zero, 0);
- // for (typename Vector::iterator i = x.begin(); i != x.end(); ++i) *i = zero;
- }
- return x;
- }
-
-
-
- /** \brief solver specialization with the 2nd API and DixonTraits over integer (no copying)
- */
template <class Vect, class Ring>
Vect& solve(Vect& x, typename Ring::Element &d,
const SparseMatrix<Ring, typename Vector<Ring>::SparseSeq> & A,
@@ -652,7 +633,7 @@ namespace LinBox
if ((A.coldim() != x.size()) || (A.rowdim() != b.size()))
throw LinboxError("LinBox ERROR: dimension of data are not compatible in system solving (solving impossible)");
- commentator.start ("Padic Integer Sparse Elimination Solving", "solving");
+ commentator().start ("Padic Integer Sparse Elimination Solving", "solving");
typedef Modular<double> Field;
// 0.7213475205 is an upper approximation of 1/(2log(2))
@@ -664,7 +645,7 @@ namespace LinBox
switch ( m.singular() ) {
case Specifier::SINGULARITY_UNKNOWN:
switch (A.rowdim() == A.coldim() ?
- status=rsolve.solveNonsingular(x, d, A, b,m.maxTries()) : SS_SINGULAR) {
+ status=rsolve.solveNonsingular(x, d, A, b,(int)m.maxTries()) : SS_SINGULAR) {
case SS_OK:
m.singular(Specifier::NONSINGULAR);
break;
@@ -672,17 +653,17 @@ namespace LinBox
case SS_SINGULAR:
switch (m.solution()){
case DixonTraits::DETERMINIST:
- status= rsolve.monolithicSolve(x, d, A, b, false, false, m.maxTries(),
+ status= rsolve.monolithicSolve(x, d, A, b, false, false, (int)m.maxTries(),
(m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
break;
case DixonTraits::RANDOM:
- status= rsolve.monolithicSolve(x, d, A, b, false, true, m.maxTries(),
+ status= rsolve.monolithicSolve(x, d, A, b, false, true, (int)m.maxTries(),
(m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
break;
case DixonTraits::DIOPHANTINE:
{
DiophantineSolver<RationalSolver<Ring,Field,RandomPrimeIterator, DixonTraits> > dsolve(rsolve);
- status= dsolve.diophantineSolve(x, d, A, b, m.maxTries(),
+ status= dsolve.diophantineSolve(x, d, A, b, (int)m.maxTries(),
(m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
}
break;
@@ -697,7 +678,7 @@ namespace LinBox
break;
case Specifier::NONSINGULAR:
- rsolve.solveNonsingular(x, d, A, b, m.maxTries());
+ rsolve.solveNonsingular(x, d, A, b, (int)m.maxTries());
break;
case Specifier::SINGULAR:
@@ -705,20 +686,20 @@ namespace LinBox
switch (m.solution()){
case DixonTraits::DETERMINIST:
status= rsolve.monolithicSolve(x, d, A, b,
- false, false, m.maxTries(),
+ false, false, (int)m.maxTries(),
(m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
break;
case DixonTraits::RANDOM:
status= rsolve.monolithicSolve(x, d, A, b,
- false, true, m.maxTries(),
+ false, true, (int)m.maxTries(),
(m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
break;
case DixonTraits::DIOPHANTINE:
{
DiophantineSolver<RationalSolver<Ring,Field,RandomPrimeIterator, DixonTraits> > dsolve(rsolve);
- status= dsolve.diophantineSolve(x, d, A, b, m.maxTries(),
+ status= dsolve.diophantineSolve(x, d, A, b, (int)m.maxTries(),
(m.certificate()? SL_LASVEGAS: SL_MONTECARLO));
}
break;
@@ -731,7 +712,7 @@ namespace LinBox
break;
}
- commentator.stop("done", NULL, "solving");
+ commentator().stop("done", NULL, "solving");
if ( status == SS_INCONSISTENT ) {
throw LinboxMathInconsistentSystem("Linear system is inconsistent");
@@ -741,23 +722,7 @@ namespace LinBox
return x;
}
-
-
-#if 0
- struct BlasEliminationCRASpecifier;
- // Extra case put in (1) for timing comparison or (2) for parallelism or
- // (3) as an example of how we might leave an abandoned choice around in a
- // callable state for future reference
- template <class Vector, class Field>
- Vector& solve(Vector& x, const DenseMatrix<Field>& A, const Vector& b,
- const RingCategories::IntegerTag & tag,
- const BlasEliminationCRASpecifier & m)
- { // (low priority) J-G puts in code using CRA object CRA and solve(x, A, b, ModularTag, Method::BlasElimination)
- typename Field::Element zero; A.field().init(zero, 0);
- for (typename Vector::iterator i = x.begin(); i != x.end(); ++i) *i = zero;
- return x;
- }
-#endif
+ //@}
// NonBlasElimination section ////////////////
@@ -765,52 +730,15 @@ namespace LinBox
Vector& solve(Vector& x, const BB& A, const Vector& b,
const RingCategories::ModularTag & tag,
const Method::NonBlasElimination& m)
- { DenseMatrix<typename BB::Field> B(A); // copy
+ {
+ BlasMatrix<typename BB::Field> B(A); // copy
return solve(x, B, b, tag, m);
}
- // specialization when no need to copy
- template <class Vector, class Field>
- Vector& solve(Vector& x, const DenseMatrix<Field>& A, const Vector& b,
- const RingCategories::ModularTag & tag,
- const Method::NonBlasElimination& m)
- { //Do we have a non blas elimination? There was not one in the original solve.h (now algorithms/bbsolve.h).
- return x;
- }
-
// note: no need for NonBlasElimination when RingCategory is integer
// Lanczos ////////////////
// may throw SolverFailed or InconsistentSystem
-#if 0
-
- template <class Vector, class BB>
- Vector& solve(Vector& x, const BB& A, const Vector& b,
- const RingCategories::ModularTag & tag,
- const Method::Lanczos& m)
- {
- solve(A, x, b, A.field(), m);
- return x;
- }
-
-
-
- template <class Vector, class BB>
- Vector& solve(Vector& x, const BB& A, const Vector& b,
- const RingCategories::ModularTag & tag,
- const Method::BlockLanczos& m)
- {
- try {
- solve(A, x, b, A.field(), m);
- } catch (SolveFailed) {
- typename BB::Field::Element zero; A.field().init(zero, 0);
- for (typename Vector::iterator i = x.begin();
- i != x.end(); ++i)
- *i = zero;
- }
- return x;
- }
-#endif
// Wiedemann section ////////////////
@@ -846,7 +774,7 @@ namespace LinBox
#include "linbox/vector/vector-traits.h"
namespace LinBox
-{
+{ /* Integer */
template <class Blackbox, class Vector, class MyMethod>
@@ -880,16 +808,17 @@ namespace LinBox
}
};
- // may throw SolverFailed or InconsistentSystem
+
+ //BB: How come I have to change the name so it works when directly called ?
template <class Vector, class BB, class MyMethod>
- Vector& solve(Vector& x, typename BB::Field::Element& d, const BB& A, const Vector& b,
+ Vector& solveCRA(Vector& x, typename BB::Field::Element& d, const BB& A, const Vector& b,
const RingCategories::IntegerTag & tag,
const MyMethod& M)
{
if ((A.coldim() != x.size()) || (A.rowdim() != b.size()))
throw LinboxError("LinBox ERROR: dimension of data are not compatible in system solving (solving impossible)");
- commentator.start ("Integer CRA Solve", "Isolve");
+ commentator().start ("Integer CRA Solve", "Isolve");
RandomPrimeIterator genprime( 26 -(int)ceil(log((double)A.rowdim())*0.7213475205));
// RationalRemainder< Modular<double> > rra((double)
@@ -912,10 +841,137 @@ namespace LinBox
A.field().init(*it_x, *it_num);
A.field().init(d, den);
- commentator.stop ("done", NULL, "Isolve");
+ commentator().stop ("done", NULL, "Isolve");
return x;
}
+ //BB: How come SparseElimination needs this ?
+ // may throw SolverFailed or InconsistentSystem
+ template <class Vector, class BB, class MyMethod>
+ Vector& solve(Vector& x, typename BB::Field::Element& d, const BB& A, const Vector& b,
+ const RingCategories::IntegerTag & tag,
+ const MyMethod& M)
+ {
+ return solveCRA(x,d,A,b,tag,M);
+ }
+
+
+#if 0 /* not working */
+ template <class Vector, class Field>
+ Vector& solve(Vector& x, typename Field::Element& d, const BlasMatrix<Field>& A, const Vector& b,
+ const RingCategories::IntegerTag & tag,
+ const Method::CRA & M)
+ {
+ return solve(x,d,A,b,tag,M.iterationMethod());
+ }
+
+ template <class Vector, class BB>
+ Vector& solve(Vector& x, typename BB::Field::Element& d, const BB& A, const Vector& b,
+ const RingCategories::ModularTag & tag,
+ const Method::CRA& m)
+ {
+ return solve(x, d, A, b, tag, m.iterationMethod());
+ }
+#endif
+
+#ifdef __LINBOX_HAVE_IML
+ //! IML wrapper.
+ //! @bug not recognised as template spec...
+ std::vector<PID_integer::Element>&
+ solveIML(std::vector<PID_integer::Element>& x, PID_integer::Element & d,
+ const BlasMatrix<PID_integer>& B, const std::vector<PID_integer::Element>& b,
+ const Method::IML& m)
+ {
+ THIS_CODE_COMPILES_BUT_IS_NOT_TESTED; // NOT MUCH
+ switch (m.routine()) {
+ case(1) : { /* non singular */
+ linbox_check(B.rowdim()==B.coldim());
+ mpz_t * mp_A = REINTERP_IML_CONST(B.getPointer()) ;
+ // reinterpret_cast<mpz_t*>(const_cast<PID_integer::Element*>((B.getPointer())));
+ //B.getConstPointer() ?
+ mpz_t * mp_B = REINTERP_IML_CONST(&b[0]);
+ mpz_t * mp_N = REINTERP_IML(&x[0]);
+ mpz_t mp_D ;
+ mpz_init(mp_D);
+ if (!m.computeRNS()) {
+ IML::nonsingSolvLlhsMM(IML::RightSolu,B.rowdim(),1,
+ mp_A, mp_B, mp_N, mp_D);
+ }
+ else {
+ long n = B.coldim();
+ long basislen = 1;
+ mpz_t mp_alpha, mp_maxInter;
+ IML::FiniteField qh;
+ IML::FiniteField *basis, **basiscmb;
+ IML::Double ** ARNS ;
+ mpz_init(mp_alpha);
+ IML::maxMagnMP(mp_A, n, n, n, mp_alpha);
+ mpz_init_set_ui(mp_maxInter, 1);
+ mpz_addmul_ui(mp_maxInter, mp_alpha, 2);
+ qh = IML::RNSbound(n);
+ basiscmb = IML::findRNS(qh, mp_maxInter, &basislen);
+ basis = basiscmb[0];
+ mpz_clear(mp_maxInter);
+ mpz_clear(mp_alpha);
+ /* CRNS[i] = [A_11, A_12] mod basis[i] */
+ ARNS = IML_XMALLOC(IML::Double *, basislen);
+ for (long i = 0; i < basislen; ++i)
+ {
+ ARNS[i] = IML_XMALLOC(IML::Double, n*n);
+ for (long j = 0; j < n; ++j)
+ for (long l = 0; l < n; l++)
+ ARNS[i][j*n+l] = (IML::Double) mpz_fdiv_ui(mp_A[j * n + l], basis[i]);
+ }
+ IML::nonsingSolvRNSMM(IML::RightSolu, n, 1, basislen,
+ basis, ARNS, mp_B, mp_N, mp_D);
+
+ }
+ mpz_set(d.get_mpz(),mp_D);
+ mpz_clear(mp_D);
+
+ }
+ //!@todo wrap nonsingSolvRNSMM too
+ break;
+ case (2) : { /* certified */
+ mpz_t * mp_A = REINTERP_IML_CONST(B.getPointer()) ;
+ // reinterpret_cast<mpz_t*>(const_cast<PID_integer::Element*>((B.getPointer())));
+ //B.getConstPointer() ?
+ mpz_t * mp_b = REINTERP_IML_CONST(&b[0]);
+ mpz_t * mp_N = REINTERP_IML(&x[0]);
+ mpz_t mp_D ;
+ mpz_init(mp_D);
+ mpz_t * mp_NZ = NULL;
+ mpz_t mp_DZ ;
+ if (m.certificate()) {
+ mp_NZ = IML_XMALLOC(mpz_t,x.size());
+ for (size_t i = 0; i < x.size(); ++i) { mpz_init(mp_NZ[i]); }
+ mpz_init(mp_DZ);
+ }
+ if ( !m.reduced() ) {
+ IML::certSolveMP(m.certificate(),
+ B.rowdim(),B.coldim(),
+ mp_A, mp_b, mp_N, mp_D,
+ mp_NZ, mp_DZ);
+ }
+ else {
+ IML::certSolveRedMP(m.certificate(),
+ m.nullcol() //NULLSPACE_COLUMN
+ ,B.rowdim(),B.coldim(),
+ mp_A, mp_b, mp_N, mp_D,
+ mp_NZ, mp_DZ);
+
+ }
+ mpz_set(d.get_mpz(),mp_D);
+ mpz_clear(mp_D);
+ }
+ break;
+ default :
+ throw LinBoxError("unknownn routine from IML (choice 1/2). Got XXX");
+ }
+ return x;
+ }
+#endif
+
template <class RatVector, class Vector, class BB, class MyMethod>
RatVector& solve(RatVector& x, const BB& A, const Vector& b,
const RingCategories::IntegerTag & tag,
@@ -924,7 +980,7 @@ namespace LinBox
if ((A.coldim() != x.size()) || (A.rowdim() != b.size()))
throw LinboxError("LinBox ERROR: dimension of data are not compatible in system solving (solving impossible)");
- commentator.start ("Rational CRA Solve", "Rsolve");
+ commentator().start ("Rational CRA Solve", "Rsolve");
typename BB::Field::Element den;
std::vector<typename BB::Field::Element > num(A.coldim());
solve (num, den, A, b, tag, M);
@@ -936,7 +992,7 @@ namespace LinBox
A.field().convert(n, *it_num);
*it_x = typename RatVector::value_type(n, d);
}
- commentator.stop ("done", NULL, "Rsolve");
+ commentator().stop ("done", NULL, "Rsolve");
return x;
}
@@ -947,9 +1003,9 @@ namespace LinBox
{
if ((A.coldim() != x.size()) || (A.rowdim() != b.size()))
throw LinboxError("LinBox ERROR: dimension of data are not compatible in system solving (solving impossible)");
- commentator.start ("Rational CRA Solve", "Rsolve");
+ commentator().start ("Rational CRA Solve", "Rsolve");
size_t bits = 26 -(int)ceil(log((double)A.rowdim())*0.7213475205);
- RandomPrimeIterator genprime( bits);
+ RandomPrimeIterator genprime( (unsigned) bits);
RationalRemainder2< VarPrecEarlyMultipCRA< Modular<double> > > rra(3UL);//using default RR method
IntegerModularSolve<BB,Vector,MethodTraits > iteration(A, b, m);
integer den;
@@ -961,7 +1017,7 @@ namespace LinBox
integer g = gcd( *it_num, den);
*it_x = typename RatVector::value_type(*it_num/g, den/g);
}
- commentator.stop ("done", NULL, "Rsolve");
+ commentator().stop ("done", NULL, "Rsolve");
return x;
}
@@ -972,9 +1028,9 @@ namespace LinBox
{
if ((A.coldim() != x.size()) || (A.rowdim() != b.size()))
throw LinboxError("LinBox ERROR: dimension of data are not compatible in system solving (solving impossible)");
- commentator.start ("Rational CRA Solve", "Rsolve");
+ commentator().start ("Rational CRA Solve", "Rsolve");
size_t bits = 26 -(int)ceil(log((double)A.rowdim())*0.7213475205);
- RandomPrimeIterator genprime( bits);
+ RandomPrimeIterator genprime((unsigned) bits);
RationalRemainder2< VarPrecEarlyMultipCRA< Modular<double> > > rra(3UL);//using default RR method
IntegerModularSolve<BB,RatVector,MethodTraits > iteration(A, b, m);
integer den;
@@ -986,15 +1042,69 @@ namespace LinBox
integer g = gcd( *it_num, den);
*it_x = typename RatVector::value_type(*it_num/g, den/g);
}
- commentator.stop ("done", NULL, "Rsolve");
+ commentator().stop ("done", NULL, "Rsolve");
return x;
}
} // LinBox
+#include "linbox/config-blas.h"
+#ifdef __LINBOX_HAVE_LAPACK
+#include "linbox/algorithms/numeric-solver-lapack.h"
+#include "linbox/algorithms/rational-solver-sn.h"
+namespace LinBox {
+ std::vector<PID_integer::Element>&
+ solveNum(std::vector<PID_integer::Element>& x, PID_integer::Element & d,
+ const BlasMatrix<PID_integer>& B, const std::vector<PID_integer::Element>& b,
+ const Method::Numerical & m)
+ {
+ THIS_CODE_COMPILES_BUT_IS_NOT_TESTED; // NOT MUCH
+
+ typedef ParamFuzzy Field ;
+ typedef BlasMatrix<Field> FMatrix;
+
+ typedef LPS<FMatrix > NumSolver;
+ NumSolver numSolver;
+ bool e = false ;
+ RationalSolverSN<PID_integer, NumSolver > rsolver(PID_integer(), numSolver, e);
+
+ int status = rsolver.solve(x, d, B, b);
+ if (status)
+ throw LinBoxError("fail") ;
+ return x;
+ }
+}
+#endif
+
+namespace LinBox {
+ std::vector<PID_integer::Element>&
+ solveNum(std::vector<PID_integer::Element>& x, PID_integer::Element & d,
+ const BlasMatrix<PID_integer>& B, const std::vector<PID_integer::Element>& b,
+ const Method::NumericalWan & m)
+ {
+ THIS_CODE_COMPILES_BUT_IS_NOT_TESTED; // NOT MUCH
+ typedef Modular<int32_t> ZField;
+ // typedef Modular<double> ZField;
+ PID_integer ZZ ;
+ RationalSolver<PID_integer, ZField, RandomPrimeIterator, WanTraits> rsolver(ZZ);
+ int status = rsolver.solve(x, d, B, b);
+ if (status)
+ throw "fail" ;
+ return x;
+ }
+}
#endif // __LINBOX_solve_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/solutions/systemsolving.doxy b/linbox/solutions/systemsolving.doxy
index 922c387..da83ff3 100644
--- a/linbox/solutions/systemsolving.doxy
+++ b/linbox/solutions/systemsolving.doxy
@@ -1,4 +1,23 @@
// Copyright (C) 2010 LinBox, GNU LGPL, see COPYING for licence information
+/*
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
/** @ingroup solutions
@defgroup systemsolving System solving
diff --git a/linbox/solutions/trace.h b/linbox/solutions/trace.h
index 30be1fd..cdf5b04 100644
--- a/linbox/solutions/trace.h
+++ b/linbox/solutions/trace.h
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/solutions/trace.h
* Copyright(C) LinBox
* Evolved from an earlier one by Bradford Hovinen <hovinen at cis.udel.edu>
* -bds
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_trace_H
@@ -28,7 +44,7 @@ namespace LinBox
{
struct Generic{};
struct Local{};
- };
+ }
template<class BB> struct TraceCategory { typedef TraceTags::Generic Tag; };
@@ -78,7 +94,16 @@ namespace LinBox
typename BB::Field::Element & trace(typename BB::Field::Element & t, const BB& A, TraceTags::Local tt)
{ return A.trace(t); }
-}; // namespace LinBox
+} // namespace LinBox
#endif // __LINBOX_trace_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/solutions/valence.h b/linbox/solutions/valence.h
index 30c3f17..fa55a86 100644
--- a/linbox/solutions/valence.h
+++ b/linbox/solutions/valence.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 1999 LinBox
* Written by <Jean-Guillaume.Dumas at imag.fr>
* Modified by Z. Wan to fit in linbox
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -29,9 +30,9 @@
#define __LINBOX_valence_H
#include <vector>
-#include <linbox/blackbox/transpose.h>
+#include "linbox/blackbox/transpose.h"
-#include <linbox/solutions/minpoly.h>
+#include "linbox/solutions/minpoly.h"
namespace LinBox
{
@@ -95,8 +96,8 @@ namespace LinBox
}
-#include "linbox/field/modular-double.h"
-#include "linbox/field/givaro-zpz.h"
+#include "linbox/field/modular.h"
+#include "linbox/field/givaro.h"
#include "linbox/algorithms/cra-domain.h"
#include "linbox/algorithms/cra-early-single.h"
#include "linbox/randiter/random-prime.h"
@@ -119,8 +120,8 @@ namespace LinBox
template<typename Field>
typename Field::Element& operator()(typename Field::Element& v, const Field& F) const
{
- commentator.start ("Modular Valence", "Mvalence");
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ commentator().start ("Modular Valence", "Mvalence");
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
F.write(report) << std::endl;
typedef typename Blackbox::template rebind<Field>::other FBlackbox;
report << typeid(A).name() << ", A is: " << A.rowdim() << 'x' << A.coldim() << std::endl;
@@ -131,7 +132,7 @@ namespace LinBox
valence( v, Ap, M);
F.write( F.write(report << "one valence: ", v) << " mod " ) << std::endl;;
- commentator.stop ("done", NULL, "Mvalence");
+ commentator().stop ("done", NULL, "Mvalence");
return v;
}
};
@@ -142,17 +143,17 @@ namespace LinBox
const RingCategories::IntegerTag &tag,
const MyMethod &M)
{
- commentator.start ("Integer Valence", "Ivalence");
+ commentator().start ("Integer Valence", "Ivalence");
#if __LINBOX_SIZEOF_LONG == 8
RandomPrimeIterator genprime( 31 );
- ChineseRemainder< EarlySingleCRA< GivaroZpz< ::Givaro::Std64> > > cra(3UL);
+ ChineseRemainder< EarlySingleCRA< GivaroZpz< Givaro::Std64> > > cra(3UL);
#else
RandomPrimeIterator genprime( 26 );
ChineseRemainder< EarlySingleCRA< Modular<double> > > cra(3UL);
#endif
IntegerModularValence<Blackbox,MyMethod> iteration(A, M);
cra(V, iteration, genprime);
- commentator.stop ("done", NULL, "Ivalence");
+ commentator().stop ("done", NULL, "Ivalence");
return V;
}
@@ -172,7 +173,7 @@ namespace LinBox
template <class Blackbox>
static integer& cassini (integer& r, const Blackbox& A)
{
- //commentator.start ("Cassini bound", "cassini");
+ //commentator().start ("Cassini bound", "cassini");
integer _aat_diag, _aat_radius, _aat_radius1;
typedef typename Blackbox::Field Ring;
_aat_diag = 0; _aat_radius = 0, _aat_radius1 = 0;
@@ -222,9 +223,9 @@ namespace LinBox
}
r = _aat_diag + (integer)sqrt( _aat_radius * _aat_radius1 );
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
//std::cout << "Cassini bound (AAT) =: " << r << std::endl;
- //commentator. stop ("done", NULL, "cassini");
+ //commentator().stop ("done", NULL, "cassini");
return r;
}
@@ -232,7 +233,7 @@ namespace LinBox
template <class Blackbox>
static void one_valence(typename Blackbox::Element& v, unsigned long& r, const Blackbox& A)
{
- //commentator.start ("One valence", "one valence");
+ //commentator().start ("One valence", "one valence");
typedef std::vector<typename Blackbox::Element> Poly; Poly poly;
typename Blackbox::Field F(A. field());
Transpose<Blackbox> AT (&A);
@@ -249,12 +250,12 @@ namespace LinBox
}
r = poly. size() -1;
- std::ostream& report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream& report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
// std::ostream& report = std::cout;
report << "one valence =: " << v << " over ";
A. field(). write(report); report << std::endl;
- //commentator. stop ("done", NULL, "one valence");
+ //commentator().stop ("done", NULL, "one valence");
return;
}
@@ -262,22 +263,23 @@ namespace LinBox
template <class Blackbox>
static void valence(Integer& val, const Blackbox& A)
{
- commentator. start ("Valence (AAT)", "Valence");
+ commentator().start ("Valence (AAT)", "Valence");
typedef Modular<int32_t> Field;
typedef typename MatrixHomTrait<Blackbox, Field>::value_type FBlackbox;
double log_max_mod = log((double)FieldTraits<Field>::maxModulus()) ;
int n_bit = (int)(log_max_mod / M_LN2 - 2);
unsigned long d;
RandomPrimeIterator g(n_bit); Field::Element v;
- ++g; Field F(*g);
+ ++g;
+ Field F((int32_t)*g);
FBlackbox Ap(A, F);
one_valence(v, d, Ap);
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
//std::cout<<"degree of minpoly of AAT: " << d << std::endl;
valence (val, d, A);
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Integer valence =: " << val << std::endl;
- commentator. stop ("done", NULL, "Valence");
+ commentator().stop ("done", NULL, "Valence");
return;
}
@@ -297,12 +299,12 @@ namespace LinBox
unsigned long d1; Field::Element v; integer im = 1;
//compute an upper bound for val.
integer bound; cassini (bound, A); bound = pow (bound, d); bound *= 2;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Bound for valence: " << bound << std::endl;
do {
++rg;
- Field F(*rg);
+ Field F((unsigned long)*rg);
FBlackbox Ap(A, F);
one_valence(v, d1, Ap);
if (d1 == d) {
@@ -332,3 +334,12 @@ namespace LinBox
} //End of LinBox
#endif //__LINBOX_valence_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/switch/Makefile.am b/linbox/switch/Makefile.am
index fc68875..b1e7f9c 100644
--- a/linbox/switch/Makefile.am
+++ b/linbox/switch/Makefile.am
@@ -1,8 +1,27 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
pkgincludesubdir=$(pkgincludedir)/switch
pkgincludesub_HEADERS= \
boolean.h \
- cekstv.h
+ cekstv.h \
+ cekstv-gf2.h
diff --git a/linbox/switch/Makefile.in b/linbox/switch/Makefile.in
index b0c97b9..984cfde 100644
--- a/linbox/switch/Makefile.in
+++ b/linbox/switch/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,10 +15,47 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -41,12 +78,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -54,7 +94,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -63,18 +106,44 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
-pkgincludesubHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkgincludesub_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -86,6 +155,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -109,10 +179,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -133,10 +205,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -145,6 +222,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -161,6 +240,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -223,14 +303,11 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
pkgincludesubdir = $(pkgincludedir)/switch
pkgincludesub_HEADERS = \
boolean.h \
- cekstv.h
+ cekstv.h \
+ cekstv-gf2.h
all: all-am
@@ -244,9 +321,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/switch/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps linbox/switch/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/switch/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/switch/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -264,6 +341,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -272,21 +350,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludesubdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)"
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludesubHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- $(pkgincludesubHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
done
uninstall-pkgincludesubHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
- done
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -300,7 +382,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -308,29 +390,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -351,13 +438,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -378,16 +469,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -473,6 +570,7 @@ uninstall-am: uninstall-pkgincludesubHEADERS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/linbox/switch/boolean.h b/linbox/switch/boolean.h
index 455081b..a780b49 100644
--- a/linbox/switch/boolean.h
+++ b/linbox/switch/boolean.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/switch/boolean.h
* Copyright (C) 1999-2001 William J Turner
*
@@ -27,7 +25,25 @@
* - Reindent
* -----------------------------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_boolean_H
@@ -168,3 +184,12 @@ namespace LinBox
#endif // __LINBOX_boolean_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/switch/cekstv-gf2.h b/linbox/switch/cekstv-gf2.h
new file mode 100644
index 0000000..6d35027
--- /dev/null
+++ b/linbox/switch/cekstv-gf2.h
@@ -0,0 +1,142 @@
+/* linbox/switch/cekstv.h
+ * Copyright (C) 1999-2001 William J Turner
+ *
+ * Written by William J Turner <wjturner at math.ncsu.edu>
+ *
+ * -----------------------------------------------------------
+ * 2002-09-26 Bradford Hovinen <bghovinen at math.uwaterloo.ca>
+ *
+ * Refactoring: The switch object now contains only the information for one 2x2
+ * block. A vector of switches is maintained by the butterfly preconditioner
+ * instead of the switch object. Since there will be many switch objects, they
+ * should be kept very lightweight, so the field is not maintained in the object
+ * itself, but instead passed to apply and applyTranspose. Since those methods
+ * are inline, this does not create overhead. apply and applyTranspose now take
+ * four field elements: the source elements and destination elements. This
+ * eliminates the need to keep an additional temporary in the class, and
+ * eliminates the need for copying in the butterfly.
+ *
+ * -----------------------------------------------------------
+ * 2002-08-20 Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * Brought this file into the current Linbox framework:
+ * - Renamed file as cekstv.h
+ * - Renamed class cekstv_switch as CekstvSwitch
+ * - Reindent
+ * -----------------------------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+#ifndef __LINBOX_cekstv_gf2_H
+#define __LINBOX_cekstv_gf2_H
+
+#include <vector>
+
+#include "linbox/field/gf2.h"
+#include "linbox/switch/cekstv.h"
+
+
+namespace LinBox
+{
+ // Specialization of Butterfly switch object
+ template <>
+ class CekstvSwitch<GF2>
+ {
+ public:
+ typedef GF2 Field;
+ /// Typedef
+ typedef Field::Element Element;
+ typedef CekstvSwitch<Field> Self_t;
+ typedef CekstvSwitchFactory<Field> Factory;
+
+ /** Constructor from a field and a field element.
+ * @param F field in which arithmetic is done
+ * @param switches vector of switches
+ */
+ CekstvSwitch (const Field::Element &a) :
+ _a (a)
+ {}
+
+ ~CekstvSwitch () {}
+
+ bool apply (const Field &F, Element &x, Element &y) const
+ {
+ F.axpyin (x, _a, y);
+ F.addin (y, x);
+ return true;
+ }
+
+ bool applyTranspose (const Field &F, Element &x, Element &y) const
+ {
+ F.addin (x, y);
+ F.axpyin (y, _a, x);
+ return true;
+ }
+
+ bool apply (const Field &F, stdBitReference x, stdBitReference y) const
+ {
+ F.axpyin (x, _a, y);
+ F.addin (y, x);
+ return true;
+ }
+
+ bool applyTranspose (const Field &F, stdBitReference x, stdBitReference y) const
+ {
+ F.addin (x, y);
+ F.axpyin (y, _a, x);
+ return true;
+ }
+
+ template<typename _Tp1>
+ struct rebind
+ {
+ typedef CekstvSwitch<_Tp1> other;
+
+ // special rebind operator() with two fields,
+ // indeed local field is not stored in the switch
+ void operator() (other *& Ap, const Self_t& A, const _Tp1& T, const Field& F) {
+ typename _Tp1::Element u;
+ Hom<Field, _Tp1>(F,T).image(u, A._a);
+ Ap = new other(u);
+ }
+ };
+
+
+ private:
+
+ // Parameter of this 2x2 block
+ Field::Element _a;
+ };
+
+
+} // namespace LinBox
+
+#endif // __LINBOX_cekstv_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/switch/cekstv.h b/linbox/switch/cekstv.h
index 1e03a65..aa154f8 100644
--- a/linbox/switch/cekstv.h
+++ b/linbox/switch/cekstv.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/switch/cekstv.h
* Copyright (C) 1999-2001 William J Turner
*
@@ -27,7 +25,25 @@
* - Reindent
* -----------------------------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_cekstv_H
@@ -171,4 +187,14 @@ namespace LinBox
}
+#include "linbox/switch/cekstv-gf2.h"
#endif // __LINBOX_cekstv_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/Makefile.am b/linbox/util/Makefile.am
index 01718cf..682a7ef 100644
--- a/linbox/util/Makefile.am
+++ b/linbox/util/Makefile.am
@@ -1,11 +1,28 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
-#we now need to include givaro headers for timer ? (oupa ? plus moche que ça tu meurs)
-AM_CPPFLAGS=-I$(top_srcdir) -I$(top_srcdir)/linbox $(FFLAFLAS_CFLAGS) $(GIVARO_CFLAGS)
-LIBS=-lgivaro
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+#we now need to include givaro headers for timer ? (oupa ? plus moche que ça tu meurs)
+AM_CPPFLAGS=-I$(top_srcdir) -I$(top_srcdir)/linbox $(FFLAS_FFPACK_CFLAGS) $(GIVARO_CFLAGS)
+
+LIBS=$(GIVARO_LIBS)
AM_CXXFLAGS=@DEFAULT_CFLAGS@
@@ -18,9 +35,10 @@ noinst_LTLIBRARIES=libutil.la
libutil_la_SOURCES= \
error.C \
- commentator.C \
debug.C
+libutil_la_LDFLAGS=$(GIVARO_LIBS) $(LDFLAGS)
+
#libutil_la_LIBADD= \
# gmp++/libgmpxx.la
@@ -29,6 +47,7 @@ pkgincludesub_HEADERS= \
timer.h \
error.h \
commentator.h \
+ commentator.inl \
contracts.h \
prime-stream.h \
iml_wrapper.h \
diff --git a/linbox/util/Makefile.in b/linbox/util/Makefile.in
index a6a8f26..91d5364 100644
--- a/linbox/util/Makefile.in
+++ b/linbox/util/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,48 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -42,12 +79,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -55,7 +95,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -64,10 +107,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libutil_la_LIBADD =
-am_libutil_la_OBJECTS = error.lo commentator.lo debug.lo
+am_libutil_la_OBJECTS = error.lo debug.lo
libutil_la_OBJECTS = $(am_libutil_la_OBJECTS)
+libutil_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(libutil_la_LDFLAGS) $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -89,21 +136,74 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
-pkgincludesubHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkgincludesub_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -111,6 +211,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -134,10 +235,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -154,14 +257,19 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
-LIBS = -lgivaro
+LIBS = $(GIVARO_LIBS)
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -170,6 +278,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -186,6 +296,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -249,20 +360,17 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
#we now need to include givaro headers for timer ? (oupa ? plus moche que ça tu meurs)
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/linbox $(FFLAFLAS_CFLAGS) $(GIVARO_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/linbox $(FFLAS_FFPACK_CFLAGS) $(GIVARO_CFLAGS)
AM_CXXFLAGS = @DEFAULT_CFLAGS@
SUBDIRS = formats
pkgincludesubdir = $(pkgincludedir)/util
noinst_LTLIBRARIES = libutil.la
libutil_la_SOURCES = \
error.C \
- commentator.C \
debug.C
+libutil_la_LDFLAGS = $(GIVARO_LIBS) $(LDFLAGS)
#libutil_la_LIBADD= \
# gmp++/libgmpxx.la
@@ -271,6 +379,7 @@ pkgincludesub_HEADERS = \
timer.h \
error.h \
commentator.h \
+ commentator.inl \
contracts.h \
prime-stream.h \
iml_wrapper.h \
@@ -294,9 +403,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/util/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps linbox/util/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/util/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/util/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -314,6 +423,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@@ -323,8 +433,8 @@ clean-noinstLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libutil.la: $(libutil_la_OBJECTS) $(libutil_la_DEPENDENCIES)
- $(CXXLINK) $(libutil_la_OBJECTS) $(libutil_la_LIBADD) $(LIBS)
+libutil.la: $(libutil_la_OBJECTS) $(libutil_la_DEPENDENCIES) $(EXTRA_libutil_la_DEPENDENCIES)
+ $(libutil_la_LINK) $(libutil_la_OBJECTS) $(libutil_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -348,21 +458,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludesubdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)"
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludesubHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- $(pkgincludesubHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
done
uninstall-pkgincludesubHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
- done
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -388,7 +502,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -422,16 +536,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -446,7 +560,7 @@ tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -458,7 +572,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -467,29 +581,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -510,29 +629,41 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -555,16 +686,22 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -638,8 +775,8 @@ ps-am:
uninstall-am: uninstall-pkgincludesubHEADERS
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -657,6 +794,7 @@ uninstall-am: uninstall-pkgincludesubHEADERS
tags tags-recursive uninstall uninstall-am \
uninstall-pkgincludesubHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/linbox/util/commentator.C b/linbox/util/commentator.C
deleted file mode 100644
index 3ed68ab..0000000
--- a/linbox/util/commentator.C
+++ /dev/null
@@ -1,755 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-
-/* linbox/util/commentator.C
- * Copyright (C) 1999 B. David Saunders,
- * Jean-Guillaume Dumas
- * Copyright (C) 2002 Bradford Hovinen
- *
- * Written by B. David Saunders <saunders at cis.udel.edu>,
- * Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>,
- * Bradford Hovinen <hovinen at cis.udel.edu>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * This file implements the C++ interface to commentators (for
- * providing runtime commentary to the user)
- */
-
-/*! @internal
- * @file util/commentator.C
- * @brief implementation of LinBox::Commentator.
- */
-
-#include "linbox/linbox-config.h"
-
-#include <string>
-#include <sstream>
-#include <cmath>
-#include <cstring>
-#include <cstdlib>
-
-#include "linbox/util/commentator.h"
-#include "linbox/util/debug.h"
-
-
-namespace LinBox
-{
- // -----------------------------------------------------
- // Mathematical routines
- // -----------------------------------------------------
- double nroot (double a, long r, double precision)
- {
- long rm = r - 1 ;
- double c1 = double (rm) / double (r), c2 = a / double (r);
- double g = 1, pgr = 1, err = a - 1;
-
- while (err > precision) {
- g = g * c1 + c2 / pgr;
- pgr = pow (g, (double) rm);
- err = a - pgr * g;
- if (err < 0)
- err = -err;
- }
-
- return g;
- }
-
- long isnpower (long& l, long a)
- {
- long r = 2;
- double g;
-
- while ((g = nroot ((double)a, r, 0.1)) >= 2) {
- l = (long) floor (g);
- if (g-double (l) > 0.1)
- ++l;
- if (pow ((double) l, (double) r) == a)
- return r;
- ++r;
- }
-
- return 0;
- }
-
-#ifndef DISABLE_COMMENTATOR
- Commentator::Commentator () :
- // cnull (new nullstreambuf)
- cnull ("/dev/null")
- , _estimationMethod (BEST_ESTIMATE), _format (OUTPUT_CONSOLE),
- _show_timing (true), _show_progress (true), _show_est_time (true)
- {
- //registerMessageClass (BRIEF_REPORT, std::clog, 1, LEVEL_IMPORTANT);
- registerMessageClass (BRIEF_REPORT, _report, 1, LEVEL_IMPORTANT);
- registerMessageClass (PROGRESS_REPORT, _report);
- registerMessageClass (TIMING_MEASURE, _report);
- registerMessageClass (TIMING_ESTIMATE, _report);
- registerMessageClass (PARTIAL_RESULT, _report);
- registerMessageClass (INTERNAL_WARNING, _report, 10, LEVEL_NORMAL);
- registerMessageClass (INTERNAL_ERROR, _report, 10, LEVEL_NORMAL);
- registerMessageClass (INTERNAL_DESCRIPTION, _report);
- }
- Commentator::Commentator (std::ostream& out) :
- // cnull (new nullstreambuf)
- cnull ("/dev/null")
- , _estimationMethod (BEST_ESTIMATE), _format (OUTPUT_CONSOLE),
- _show_timing (true), _show_progress (true), _show_est_time (true)
- {
- //registerMessageClass (BRIEF_REPORT, out, 1, LEVEL_IMPORTANT);
- registerMessageClass (BRIEF_REPORT, out, 1, LEVEL_IMPORTANT);
- registerMessageClass (PROGRESS_REPORT, _report);
- registerMessageClass (TIMING_MEASURE, _report);
- registerMessageClass (TIMING_ESTIMATE, _report);
- registerMessageClass (PARTIAL_RESULT, _report);
- registerMessageClass (INTERNAL_WARNING, _report, 10, LEVEL_NORMAL);
- registerMessageClass (INTERNAL_ERROR, _report, 10, LEVEL_NORMAL);
- registerMessageClass (INTERNAL_DESCRIPTION, _report);
- }
-
- Commentator::~Commentator()
- {
- std::map <const char *, MessageClass *, C_str_Less >::iterator i;
- for (i = _messageClasses.begin (); i != _messageClasses.end (); ++i)
- delete i->second;
- while (!_activities.empty()){
- delete _activities.top();
- _activities.pop();
- }
- }
-
- void Commentator::start (const char *description, const char *fn, unsigned long len)
- {
- if (fn == (const char *) 0 && _activities.size () > 0)
- fn = _activities.top ()->_fn;
-
- if (isPrinted (_activities.size () + 1, LEVEL_IMPORTANT, INTERNAL_DESCRIPTION, fn))
- report (LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) //<< "Starting activity: "
- << description << std::endl;
-
- Activity *new_act = new Activity (description, fn, len);
-
- if (isPrinted (_activities.size (), LEVEL_IMPORTANT, BRIEF_REPORT, fn))
- printActivityReport (*new_act);
-
- _activities.push (new_act);
-
- new_act->_timer.start ();
- }
-
- void Commentator::startIteration (unsigned int iter, unsigned long len)
- {
- std::ostringstream str;
-
- str << "Iteration " << iter << std::ends;
-
- _iteration_str = str.str ();
- start (_iteration_str.c_str (), (const char *) 0, len);
- }
-
- void Commentator::stop (const char *msg, const char *long_msg, const char *fn)
- {
- double realtime, usertime, systime;
- Activity *top_act;
-
- linbox_check (_activities.top () != (Activity *) 0);
- linbox_check (msg != (const char *) 0);
-
- if (long_msg == (const char *) 0)
- long_msg = msg;
-
- top_act = _activities.top ();
-
- top_act->_timer.stop ();
-
- realtime = top_act->_timer.realtime ();
- usertime = top_act->_timer.usertime ();
- systime = top_act->_timer.systime ();
-
- if (realtime < 0) realtime = 0;
- if (usertime < 0) usertime = 0;
- if (systime < 0) systime = 0;
-
- if (fn != (const char *) 0 &&
- _activities.size () > 0 &&
- top_act->_fn != (const char *) 0 &&
- strcmp (fn, top_act->_fn) != 0)
- {
- report (LEVEL_IMPORTANT, INTERNAL_WARNING)
- << "Activity report mismatch. Check that start () and stop () calls are paired correctly." << std::endl;
- }
-
- fn = top_act->_fn;
-
- _activities.pop ();
-
- if (isPrinted (_activities.size (), LEVEL_IMPORTANT, BRIEF_REPORT, fn))
- {
- finishActivityReport (*top_act, msg);
- }
-
- if (isPrinted (_activities.size () + 1, LEVEL_IMPORTANT, INTERNAL_DESCRIPTION, fn)) {
- std::ostream &output = report (LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
- output.precision (4);
- output << "Finished activity (rea: " << realtime << "s, cpu: ";
- output.precision (4);
- output << usertime << "s, sys: ";
- output.precision (4);
- output << systime << "s): " << long_msg << std::endl;
- }
- else if (isPrinted (_activities.size (), LEVEL_IMPORTANT, INTERNAL_DESCRIPTION, fn)) {
- std::ostream &output = report (LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
- output.precision (4);
- output << "Completed activity: " << top_act->_desc << " (r: " << realtime << "s, u: ";
- output.precision (4);
- output << usertime << "s, s: ";
- output.precision (4);
- output << systime << "s) " << long_msg << std::endl;
- }
-
- delete top_act;
- }
-
- void Commentator::progress (long k, long len)
- {
- linbox_check (_activities.top () != (Activity *) 0);
-
- Activity *act = _activities.top ();
- ::Givaro::Timer tmp = act->_timer;
- act->_timer.stop ();
-
- if (k == -1)
- act->_progress++;
- else
- act->_progress = k;
-
- if (len != -1)
- act->_len = len;
-
- if (act->_progress > act->_len)
- act->_len = act->_progress;
-
- std::ostream &rep = report (LEVEL_IMPORTANT, PROGRESS_REPORT);
- rep.precision (3);
- rep.setf (std::ios::fixed);
- rep << "Progress: " << act->_progress << " out of " << act->_len
- << " (" << act->_timer.realtime () << "s elapsed)" << std::endl;
-
- if (_show_progress && isPrinted (_activities.size () - 1, LEVEL_IMPORTANT, BRIEF_REPORT, act->_fn))
- updateActivityReport (*act);
- act->_timer = tmp;
- }
-
- std::ostream &Commentator::report (long level, const char *msg_class)
- {
- linbox_check (msg_class != (const char *) 0);
-
- if (!isPrinted (_activities.size (), level, msg_class,
- (_activities.size () > 0) ? _activities.top ()->_fn : (const char *) 0))
- return cnull;
-
- MessageClass &messageClass = getMessageClass (msg_class);
-
- return messageClass._stream;
- }
-
- void Commentator::indent (std::ostream &stream) const
- {
- unsigned int i;
-
- for (i = 0; i < _activities.size (); i++)
- stream << " ";
- }
-
- void Commentator::restoreActivityState (ActivityState state)
- {
- std::stack<Activity *> backup;
-
- while (!_activities.empty () && _activities.top () != state._act) {
- backup.push (_activities.top ());
- _activities.pop ();
- }
-
- if (_activities.empty ()) {
- // Uh oh -- the state didn't give a valid activity
-
- while (!backup.empty ()) {
- _activities.push (backup.top ());
- backup.pop ();
- }
- }
- }
-
- void Commentator::setMaxDepth (long depth)
- {
- MessageClass &briefReportClass = getMessageClass (BRIEF_REPORT);
- std::map <const char *, MessageClass *, C_str_Less>::iterator i;
-
- for (i = _messageClasses.begin (); i != _messageClasses.end (); ++i)
- if (i->second != &briefReportClass)
- i->second->setMaxDepth (depth);
- }
-
- void Commentator::setMaxDetailLevel (long level)
- {
- MessageClass &briefReportClass = getMessageClass (BRIEF_REPORT);
- std::map <const char *, MessageClass *, C_str_Less>::iterator i;
-
- for (i = _messageClasses.begin (); i != _messageClasses.end (); ++i)
- if (i->second != &briefReportClass)
- i->second->setMaxDetailLevel (level);
- }
-
- MessageClass &Commentator::registerMessageClass (const char *msg_class, std::ostream &stream, unsigned long max_depth, unsigned long max_level)
- {
- linbox_check (msg_class != (const char *) 0);
-
- MessageClass *new_obj = new MessageClass (*this, msg_class, stream, max_depth, max_level);
- _messageClasses[msg_class] = new_obj;
- return *new_obj;
- }
-
- MessageClass &Commentator::cloneMessageClass (const char *new_msg_class, const char *msg_class)
- {
- linbox_check (new_msg_class != (const char *) 0);
- linbox_check (msg_class != (const char *) 0);
-
- MessageClass *new_obj = new MessageClass (getMessageClass (msg_class));
- new_obj->_msg_class = new_msg_class;
- _messageClasses[new_msg_class] = new_obj;
- return *new_obj;
- }
-
- MessageClass &Commentator::cloneMessageClass (const char *new_msg_class, const char *msg_class, std::ostream &stream)
- {
- linbox_check (new_msg_class != (const char *) 0);
- linbox_check (msg_class != (const char *) 0);
-
- MessageClass &old_obj = getMessageClass (msg_class);
- MessageClass *new_obj = new MessageClass (*this, new_msg_class, stream, old_obj._configuration);
- _messageClasses[new_msg_class] = new_obj;
- return *new_obj;
- }
-
- MessageClass &Commentator::getMessageClass (const char *msg_class)
- { return *_messageClasses[msg_class]; }
-
- void Commentator::setPrintParameters (unsigned long depth, unsigned long level, const char *fn)
- {
- MessageClass &briefReportClass = getMessageClass (BRIEF_REPORT);
- std::map <const char *, MessageClass *, C_str_Less>::iterator i;
-
- for (i = _messageClasses.begin (); i != _messageClasses.end (); ++i)
- if (i->second != &briefReportClass)
- i->second->setPrintParameters (depth, level, fn);
- }
-
- void Commentator::setBriefReportParameters (OutputFormat format, bool show_timing, bool show_progress, bool show_est_time)
- {
- _format = format;
- _show_timing = show_timing;
- _show_progress = show_progress;
- _show_est_time = show_est_time;
- }
-
- bool Commentator::isPrinted (unsigned long depth, unsigned long level, const char *msg_class, const char *fn)
- {
- if (_messageClasses.find (msg_class) == _messageClasses.end ())
- return false;
-
- MessageClass &messageClass = getMessageClass (msg_class);
-
- return messageClass.isPrinted (depth, level, fn);
- }
-
- void Commentator::setBriefReportStream (std::ostream &stream)
- { setMessageClassStream (BRIEF_REPORT, stream); }
-
- void Commentator::setReportStream (std::ostream &stream)
- {
- setMessageClassStream (BRIEF_REPORT, stream);
- setMessageClassStream (PROGRESS_REPORT, stream);
- setMessageClassStream (TIMING_MEASURE, stream);
- setMessageClassStream (TIMING_ESTIMATE, stream);
- setMessageClassStream (PARTIAL_RESULT, stream);
- setMessageClassStream (INTERNAL_ERROR, stream);
- setMessageClassStream (INTERNAL_WARNING, stream);
- setMessageClassStream (INTERNAL_DESCRIPTION, stream);
-
- if (stream == getMessageClass (BRIEF_REPORT)._stream)
- getMessageClass (BRIEF_REPORT).setMaxDepth (0);
- }
-
- void Commentator::setMessageClassStream (const char *msg_class, std::ostream &stream)
- {
- //temporarily fixed the bug in test-commentator, left memory leaking.
- MessageClass *old_msg_class = _messageClasses[msg_class];
- cloneMessageClass (msg_class, msg_class, stream);
- delete old_msg_class;
-
- }
-
- void Commentator::setDefaultReportFile (const char *filename)
- {
- _report.open (filename);
- }
-
- void Commentator::printActivityReport (Activity &activity)
- {
- MessageClass &messageClass = getMessageClass (BRIEF_REPORT);
-
- if (_format == OUTPUT_CONSOLE) {
- messageClass._stream << activity._desc << "...";
-
- if (messageClass.isPrinted (_activities.size () + 1, LEVEL_IMPORTANT, activity._fn))
- messageClass._stream << std::endl;
- else if (_show_progress && activity._len > 0) {
- messageClass._stream << " 0%";
- _last_line_len = strlen (" 0%");
- }
- else
- _last_line_len = 0;
-
- messageClass._smart_streambuf.stream ().flush ();
- }
- else if (_format == OUTPUT_PIPE &&
- (((_show_progress || _show_est_time) && activity._len > 0) ||
- messageClass.isPrinted (_activities.size () + 1, LEVEL_IMPORTANT, activity._fn)))
- {
- messageClass._stream << activity._desc << "...";
-
- if (_show_progress)
- messageClass._stream << std::endl;
- }
- }
-
- void Commentator::updateActivityReport (Activity &activity)
- {
- MessageClass &messageClass = getMessageClass (BRIEF_REPORT);
- unsigned int i, old_len;
- std::ostringstream str;
- double percent = (double) activity._progress / (double) activity._len * 100.0;
-
- if (_format == OUTPUT_CONSOLE) {
- if (!messageClass.isPrinted (_activities.size (), LEVEL_IMPORTANT, activity._fn)) {
- if (_show_progress) {
- for (i = 0; i < _last_line_len; i++)
- messageClass._stream << '\b';
- str.width (3);
- str << floor (percent + 0.5) << '%' << std::ends;
- old_len = _last_line_len;
- _last_line_len = strlen (str.str ().c_str ());
- messageClass._stream << str.str ();
- for (int i = 0; i < (int) (old_len - _last_line_len); i++)
- messageClass._stream << ' ';
- }
- }
- else if (messageClass.isPrinted (_activities.size () - 1, LEVEL_UNIMPORTANT, activity._fn)) {
-#if 0
- if (_show_est_time)
- messageClass._stream << activity._estimate.front ()._time
- << " remaining" << std::endl;
-#endif
- }
-
- messageClass._smart_streambuf.stream ().flush ();
- }
- else if (_format == OUTPUT_PIPE) {
- if (_show_progress) {
- messageClass._stream << floor (percent + 0.5) << "% done";
-#if 0
- if (_show_est_time)
- messageClass._stream << " (" << activity._estimate.front ()._time
- << " remaining)";
-#endif
- messageClass._stream << std::endl;
- }
-#if 0
- else if (_show_est_time)
- messageClass._stream << activity._estimate.front ()._time
- << " remaining" << std::endl;
-#endif
- }
- }
-
- void Commentator::finishActivityReport (Activity &activity, const char *msg)
- {
- MessageClass &messageClass = getMessageClass (BRIEF_REPORT);
- unsigned int i;
-
- if (_format == OUTPUT_CONSOLE) {
- if (!messageClass.isPrinted (_activities.size () + 1, LEVEL_UNIMPORTANT, activity._fn)) {
- if (_show_progress)
- for (i = 0; i < _last_line_len; i++)
- messageClass._stream << '\b';
-
- messageClass._stream << msg;
-
- if (_show_timing)
- messageClass._stream << " (" << activity._timer.usertime () << " s)" << std::endl;
- else
- messageClass._stream << std::endl;
- }
- else if (messageClass.isPrinted (_activities.size (), LEVEL_UNIMPORTANT, activity._fn)) {
- for (i = 0; i < _activities.size (); i++)
- messageClass._stream << " ";
-
- messageClass._stream << msg;
- //messageClass._stream << "Done: " << msg;
-
- if (_show_timing)
- messageClass._stream << " (" << activity._timer.usertime () << " s)" << std::endl;
- else
- messageClass._stream << std::endl;
- }
-
- messageClass._smart_streambuf.stream ().flush ();
- }
- else if (_format == OUTPUT_PIPE) {
- for (i = 0; i < _activities.size (); i++)
- messageClass._stream << " ";
-
- if (((_show_progress || _show_est_time) && activity._len > 0) ||
- messageClass.isPrinted (_activities.size () + 1, LEVEL_IMPORTANT, activity._fn))
- messageClass._stream << "Done: " << msg << std::endl;
- else
- messageClass._stream << activity._desc << ": " << msg << std::endl;
- }
- }
-
- MessageClass::MessageClass (const Commentator &comm,
- const char *msg_class,
- std::ostream &stream,
- unsigned long max_depth,
- unsigned long max_level) :
- _msg_class (msg_class),
- _smart_streambuf (comm, stream),
- _stream (&_smart_streambuf),
- _max_level (max_level),
- _max_depth (max_depth)
- {
- fixDefaultConfig ();
- }
-
- void MessageClass::setMaxDepth (long depth)
- {
- _max_depth = (unsigned long) depth;
- fixDefaultConfig ();
- }
-
- void MessageClass::setMaxDetailLevel (long level)
- {
- _max_level = (unsigned long) level;
- fixDefaultConfig ();
- }
-
- void MessageClass::setPrintParameters (unsigned long depth, unsigned long level, const char *fn)
- {
- if (fn == (const char *) 0)
- fn = "";
-
- std::list <std::pair <unsigned long, unsigned long> > &config = _configuration[fn];
- std::list <std::pair <unsigned long, unsigned long> >::iterator i, j;
-
- i = config.begin ();
-
- // Iterate through preceeding elements in the std::list and remove
- // any that specify a lower level than we are using
- while (i != config.end () && i->first <= depth) {
- if (i->second <= level) {
- j = i++;
- config.erase (j);
- }
- else {
- ++i;
- }
- }
-
- // Insert our new directive into the std::list
- if (i == config.end () || i->second != level)
- config.insert (i, std::pair <unsigned long, unsigned long> (depth, level));
-
- // Iterate through following elements in the std::list and remove any
- // that specify a higher level than we are using
- while (i != config.end ()) {
- if (i->second > level) {
- j = i++;
- config.erase (j);
- }
- else {
- ++i;
- }
- }
-
- // End result: The std::list should be monotonically increasing in
- // the first parameter and decreasing in the second
- }
-
- bool MessageClass::isPrinted (unsigned long depth, unsigned long level, const char *fn)
- {
- return
- checkConfig (_configuration[""], depth, level)
- ||
- ( fn != (const char *) 0
- &&
- checkConfig (_configuration[fn], depth, level)
- );
-#if 0
-
- if (checkConfig (_configuration[""], depth, level))
- return true;
- else if (fn != (const char *) 0)
- //return checkConfig (_configuration[fn], depth, level);
- { bool ans = checkConfig (_configuration[fn], depth, level);
- if (ans)
- { //std::cerr << " fn=" << fn << ", d " << depth << ", l " << level << " true" << std::endl;
- return true;
- }
- else
- { //std::cerr << " fn=" << fn << ", d " << depth << ", l " << level << " false" << std::endl;
- return false;
- }
- }
-
- else
- { //std::cerr << " fn=0, d " << depth << ", l " << level << " false" << std::endl;
- return false;
- }
-
-#endif
- }
-
- MessageClass::MessageClass (const Commentator &comm,
- const char *msg_class,
- std::ostream &stream,
- Configuration configuration) :
- _msg_class (msg_class),
- _smart_streambuf (comm, stream),
- _stream (&_smart_streambuf),
- _configuration (configuration)
- {}
-
- void MessageClass::fixDefaultConfig ()
- {
- std::list <std::pair <unsigned long, unsigned long> > &config = _configuration[""];
-
- config.clear ();
- config.push_back (std::pair <unsigned long, unsigned long> (_max_depth, _max_level));
- config.push_back (std::pair <unsigned long, unsigned long> ((unsigned long) -1, Commentator::LEVEL_ALWAYS));
- }
-
- bool MessageClass::checkConfig (std::list <std::pair <unsigned long, unsigned long> > &config,
- unsigned long depth,
- unsigned long ) //lvl
- {
- std::list <std::pair <unsigned long, unsigned long> >::iterator i;
-
- for ( i = config.begin (); i != config.end (); ++i) {
- if (depth < i->first) {
-#if 0
- // uninitialized value error goes away if we ignore level.
- if (level <= i->second)
- return true;
- else
- return false;
-#endif
- return true;
- }
- }
-
- return false;
- }
-
- void MessageClass::dumpConfig () const
- {
- Configuration::const_iterator i;
- std::list <std::pair <unsigned long, unsigned long> >::const_iterator j;
-
- for (i = _configuration.begin (); i != _configuration.end (); i++) {
- std::cerr << "Configuration (" << (*i).first << "):" << std::endl;
-
- for (j = (*i).second.begin (); j != (*i).second.end (); j++)
- std::cerr << " Depth: " << (*j).first << ", Level: " << (*j).second << std::endl;
-
- std::cerr << std::endl;
- }
- }
-
- int MessageClass::smartStreambuf::sync ()
- {
- std::streamsize n = pptr () - pbase ();
- return (n && writeData (pbase (), n) != n) ? EOF : 0;
- }
-
- int MessageClass::smartStreambuf::overflow (int ch)
- {
- std::streamsize n = pptr () - pbase ();
-
- if (n && sync ())
- return EOF;
-
- if (ch != EOF) {
- char cbuf[1];
- cbuf[0] = (char)ch;
- if (writeData (cbuf, 1) != 1)
- return EOF;
- }
-
- pbump (-n);
- return 0;
- }
-
- std::streamsize MessageClass::smartStreambuf::xsputn (const char *text, std::streamsize n)
- {
- return (sync () == EOF) ? 0 : writeData (text, n);
- }
-
- int MessageClass::smartStreambuf::writeData (const char *text, std::streamsize n)
- {
- std::streamsize idx;
- std::streamsize m = n;
-
- if (_indent_next) {
- _comm.indent (_stream);
- _indent_next = false;
- }
-
- for (idx = 0; (idx < m) &&(text[idx] != '\n') ; ++idx) ;
-
- while (idx < m) {
- _stream.write (text, idx + 1);
- m -= idx + 1;
-
- if (m > 0)
- _comm.indent (_stream);
- else
- _indent_next = true;
-
- text += idx + 1;
- for (idx = 0; idx != '\n' && idx < m; ++idx) ;
- }
-
- _stream.write (text, m);
-
- _stream.flush ();
-
- return n;
- }
-
-#endif
- // Default global commentator
- Commentator commentator ;
-}
-
diff --git a/linbox/util/commentator.h b/linbox/util/commentator.h
index e45e321..2f6c941 100644
--- a/linbox/util/commentator.h
+++ b/linbox/util/commentator.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/util/commentator.h
* Copyright (C) 1999 B. David Saunders,
* Jean-Guillaume Dumas
@@ -9,10 +7,13 @@
* Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +21,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*
* This file implements the C++ interface to commentators (for
* providing runtime commentary to the user)
@@ -70,17 +71,6 @@
#define MSG_STATUS(ret) (ret ? MSG_PASSED : MSG_FAILED)
-// Legacy definitions -- please do not use
-#define PRINT_EVERYTHING 100000
-#define PRINT_NOTHING 0
-
-#define LVL_ALWAYS = 1,
-#define LVL_IMP = 2,
-#define LVL_NORMAL = 3,
-#define LVL_UNIMP = 4,
-#define LVL_BLABLA = 10,
-#define LVL_NEVER = (2*PRINT_EVERYTHING)
-
#ifndef DISABLE_COMMENTATOR
namespace LinBox
@@ -123,28 +113,28 @@ namespace LinBox
\code
void myFunction ()
{
- commentator.start ("Doing important work", "myFunction", 100);
+ commentator().start ("Doing important work", "myFunction", 100);
for (int i = 0; i < 100; i++) {
...
- commentator.progress ();
+ commentator().progress ();
}
- commentator.stop (MSG_DONE, "Task completed successfully");
+ commentator().stop (MSG_DONE, "Task completed successfully");
}
\endcode
*
- * In the above example, the call to commentator.start () informs the
+ * In the above example, the call to commentator().start () informs the
* commentator that some new activity has begun. This may be invoked
* recursively, an the commentator keeps track of nested activities. The
* user may elect to disable the reporting of any activities below a
- * certain depth of nesting. The call to commentator.stop () informs the
+ * certain depth of nesting. The call to commentator().stop () informs the
* commentator that the activity started above is finished.
*
- * The call to commentator.progress () indicates that one step of the
+ * The call to commentator().progress () indicates that one step of the
* activity is complete. The commentator may then output data to the
* console to that effect. This allows the easy implementation of
* progress bars and other reporting tools.
*
- * In addition, commentator.report () allows reporting general messages,
+ * In addition, commentator().report () allows reporting general messages,
* such as warnings, errors, and descriptions of internal progress.
*
* By default, there are two reports: a brief report that outputs to
@@ -634,7 +624,7 @@ namespace LinBox
const char *_fn;
unsigned long _len;
unsigned long _progress;
- ::Givaro::Timer _timer;
+ Givaro::Timer _timer;
Estimator _estimate;
};
@@ -763,8 +753,8 @@ namespace LinBox
bool _indent_next;
public:
- smartStreambuf (const Commentator &comm, std::ostream &stream) :
- _comm (comm), _stream (stream), _indent_next (true)
+ smartStreambuf (const Commentator &Comm, std::ostream & Stream) :
+ _comm (Comm), _stream (Stream), _indent_next (true)
{}
int sync ();
@@ -799,16 +789,24 @@ namespace LinBox
void dumpConfig () const; // Dump the contents of configuration to stderr
};
- // Default global commentator
- extern Commentator commentator;
+ // Default static commentator is now common to enabled or disabled
+// extern Commentator commentator;
}
-#ifdef LinBoxSrcOnly
-#include <linbox/util/commentator.C>
-#endif
+// #ifdef LinBoxSrcOnly
+// #include "linbox/util/commentator.C"
+// #endif
+#include "linbox/util/commentator.inl"
+
+#define aside commentator().report(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTON)
+// Usage: "aside << stuff" or "ostream& report = aside; report << stuff"
#else //DISABLE_COMMENTATOR
+#define aside NoStream()
+struct NoStream {};
+template<typename T>
+NoStream & operator<< (NoStream& o, const T & x) { return o; }
#if 0
# define Commentator CommentatorDisabled
# define MessageClass MessageClassDisabled
@@ -851,10 +849,13 @@ namespace LinBox
inline Commentator () :
cnull (new nullstreambuf)
{}
-#endif
inline Commentator () :
cnull ("/dev/null")
{}
+#endif
+ inline Commentator (std::ostream& out = std::cerr) :
+ cnull (0)
+ {}
inline ~Commentator ()
{}
inline void start (const char *, const char * = (const char *) 0, unsigned long = 0)
@@ -985,11 +986,62 @@ namespace LinBox
MessageClass _msgcls;
};
- // Default global commentator
- extern Commentator commentator;
- //static Commentator commentator;
+// // Default global commentator
+// extern Commentator commentator;
+// //static Commentator commentator;
}
#endif // DISABLE_COMMENTATOR
+namespace LinBox
+{
+ // Default static commentator
+ Commentator& commentator() {
+ static Commentator internal_static_commentator;
+ return internal_static_commentator;
+ }
+ Commentator& commentator(std::ostream& stream) {
+ static Commentator internal_static_commentator(stream);
+ return internal_static_commentator;
+ }
+}
+
+
+
+
+#include "fflas-ffpack/utils/args-parser.h"
+namespace LinBox
+{
+ void parseArguments (int argc, char **argv, Argument *args, bool printDefaults = true) {
+ for (int i = 1; i < argc; ++i) {
+ if (argv[i][0] == '-') {
+ if (argv[i][1] == 0) {
+ LinBox::commentator().setReportStream (std::cout);
+ LinBox::commentator().setBriefReportStream (std::cout);
+ } else {
+ // Skip the argument next to "-xxx"
+ // except if next argument is a switch
+ if ( ((i+1) < argc) &&
+ (argv[i+1][0] != '-') ) {
+ ++i;
+ }
+ }
+ } else {
+ LinBox::commentator().setDefaultReportFile (argv[i]);
+ LinBox::commentator().setBriefReportStream(std::cout);
+ }
+ }
+ FFLAS::parseArguments(argc,argv,args,printDefaults);
+ }
+}
+
#endif // __LINBOX_commentator_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/commentator.inl b/linbox/util/commentator.inl
new file mode 100644
index 0000000..fe300f8
--- /dev/null
+++ b/linbox/util/commentator.inl
@@ -0,0 +1,765 @@
+/* linbox/util/commentator.C
+ * Copyright (C) 1999 B. David Saunders,
+ * Jean-Guillaume Dumas
+ * Copyright (C) 2002 Bradford Hovinen
+ *
+ * Written by B. David Saunders <saunders at cis.udel.edu>,
+ * Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>,
+ * Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ * This file implements the C++ interface to commentators (for
+ * providing runtime commentary to the user)
+ */
+
+/*! @internal
+ * @file util/commentator.C
+ * @brief implementation of LinBox::Commentator.
+ */
+
+#include "linbox/linbox-config.h"
+
+#include <string>
+#include <sstream>
+#include <cmath>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
+
+#include "linbox/util/commentator.h"
+#include "linbox/util/debug.h"
+
+
+namespace LinBox
+{
+ // -----------------------------------------------------
+ // Mathematical routines
+ // -----------------------------------------------------
+ double nroot (double a, long r, double precision)
+ {
+ long rm = r - 1 ;
+ double c1 = double (rm) / double (r), c2 = a / double (r);
+ double g = 1, pgr = 1, err = a - 1;
+
+ while (err > precision) {
+ g = g * c1 + c2 / pgr;
+ pgr = pow (g, (double) rm);
+ err = a - pgr * g;
+ if (err < 0)
+ err = -err;
+ }
+
+ return g;
+ }
+
+ long isnpower (long& l, long a)
+ {
+ long r = 2;
+ double g;
+
+ while ((g = nroot ((double)a, r, 0.1)) >= 2) {
+ l = (long) floor (g);
+ if (g-double (l) > 0.1)
+ ++l;
+ if (pow ((double) l, (double) r) == a)
+ return r;
+ ++r;
+ }
+
+ return 0;
+ }
+
+ Commentator::Commentator () :
+ // cnull (new nullstreambuf)
+// cnull ("/dev/null")
+ cnull (0)
+ , _estimationMethod (BEST_ESTIMATE), _format (OUTPUT_CONSOLE),
+ _show_timing (true), _show_progress (true), _show_est_time (true)
+ {
+ //registerMessageClass (BRIEF_REPORT, std::clog, 1, LEVEL_IMPORTANT);
+ registerMessageClass (BRIEF_REPORT, _report, 1, LEVEL_IMPORTANT);
+ registerMessageClass (PROGRESS_REPORT, _report);
+ registerMessageClass (TIMING_MEASURE, _report);
+ registerMessageClass (TIMING_ESTIMATE, _report);
+ registerMessageClass (PARTIAL_RESULT, _report);
+ registerMessageClass (INTERNAL_WARNING, _report, 10, LEVEL_NORMAL);
+ registerMessageClass (INTERNAL_ERROR, _report, 10, LEVEL_NORMAL);
+ registerMessageClass (INTERNAL_DESCRIPTION, _report);
+ }
+ Commentator::Commentator (std::ostream& out) :
+ // cnull (new nullstreambuf)
+// cnull ("/dev/null")
+ cnull (0)
+ , _estimationMethod (BEST_ESTIMATE), _format (OUTPUT_CONSOLE),
+ _show_timing (true), _show_progress (true), _show_est_time (true)
+ {
+ //registerMessageClass (BRIEF_REPORT, out, 1, LEVEL_IMPORTANT);
+ registerMessageClass (BRIEF_REPORT, out, 1, LEVEL_IMPORTANT);
+ registerMessageClass (PROGRESS_REPORT, _report);
+ registerMessageClass (TIMING_MEASURE, _report);
+ registerMessageClass (TIMING_ESTIMATE, _report);
+ registerMessageClass (PARTIAL_RESULT, _report);
+ registerMessageClass (INTERNAL_WARNING, _report, 10, LEVEL_NORMAL);
+ registerMessageClass (INTERNAL_ERROR, _report, 10, LEVEL_NORMAL);
+ registerMessageClass (INTERNAL_DESCRIPTION, _report);
+ }
+
+ Commentator::~Commentator()
+ {
+ std::map <const char *, MessageClass *, C_str_Less >::iterator i;
+ for (i = _messageClasses.begin (); i != _messageClasses.end (); ++i)
+ delete i->second;
+ while (!_activities.empty()){
+ delete _activities.top();
+ _activities.pop();
+ }
+ }
+
+ void Commentator::start (const char *description, const char *fn, unsigned long len)
+ {
+ if (fn == (const char *) 0 && _activities.size () > 0)
+ fn = _activities.top ()->_fn;
+
+ if (isPrinted (_activities.size () + 1, LEVEL_IMPORTANT, INTERNAL_DESCRIPTION, fn))
+ report (LEVEL_IMPORTANT, INTERNAL_DESCRIPTION) //<< "Starting activity: "
+ << description << std::endl;
+
+ Activity *new_act = new Activity (description, fn, len);
+
+ if (isPrinted (_activities.size (), LEVEL_IMPORTANT, BRIEF_REPORT, fn))
+ printActivityReport (*new_act);
+
+ _activities.push (new_act);
+
+ new_act->_timer.start ();
+ }
+
+ void Commentator::startIteration (unsigned int iter, unsigned long len)
+ {
+ std::ostringstream str;
+
+ str << "Iteration " << iter << std::ends;
+
+ _iteration_str = str.str ();
+ start (_iteration_str.c_str (), (const char *) 0, len);
+ }
+
+ void Commentator::stop (const char *msg, const char *long_msg, const char *fn)
+ {
+ double realtime, usertime, systime;
+ Activity *top_act;
+
+ linbox_check (_activities.top () != (Activity *) 0);
+ linbox_check (msg != (const char *) 0);
+
+ if (long_msg == (const char *) 0)
+ long_msg = msg;
+
+ top_act = _activities.top ();
+
+ top_act->_timer.stop ();
+
+ realtime = top_act->_timer.realtime ();
+ usertime = top_act->_timer.usertime ();
+ systime = top_act->_timer.systime ();
+
+ if (realtime < 0) realtime = 0;
+ if (usertime < 0) usertime = 0;
+ if (systime < 0) systime = 0;
+
+ if (fn != (const char *) 0 &&
+ _activities.size () > 0 &&
+ top_act->_fn != (const char *) 0 &&
+ strcmp (fn, top_act->_fn) != 0)
+ {
+ report (LEVEL_IMPORTANT, INTERNAL_WARNING)
+ << "Activity report mismatch. Check that start () and stop () calls are paired correctly." << std::endl;
+ }
+
+ fn = top_act->_fn;
+
+ _activities.pop ();
+
+ if (isPrinted (_activities.size (), LEVEL_IMPORTANT, BRIEF_REPORT, fn))
+ {
+ finishActivityReport (*top_act, msg);
+ }
+
+ if (isPrinted (_activities.size () + 1, LEVEL_IMPORTANT, INTERNAL_DESCRIPTION, fn)) {
+ std::ostream &output = report (LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ output.precision (4);
+ output << "Finished activity (rea: " << realtime << "s, cpu: ";
+ output.precision (4);
+ output << usertime << "s, sys: ";
+ output.precision (4);
+ output << systime << "s): " << long_msg << std::endl;
+ }
+ else if (isPrinted (_activities.size (), LEVEL_IMPORTANT, INTERNAL_DESCRIPTION, fn)) {
+ std::ostream &output = report (LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ output.precision (4);
+ output << "Completed activity: " << top_act->_desc << " (r: " << realtime << "s, u: ";
+ output.precision (4);
+ output << usertime << "s, s: ";
+ output.precision (4);
+ output << systime << "s) " << long_msg << std::endl;
+ }
+
+ delete top_act;
+ }
+
+ void Commentator::progress (long k, long len)
+ {
+ linbox_check (_activities.top () != (Activity *) 0);
+
+ Activity *act = _activities.top ();
+ Givaro::Timer tmp = act->_timer;
+ act->_timer.stop ();
+
+ if (k == -1)
+ act->_progress++;
+ else
+ act->_progress = k;
+
+ if (len != -1)
+ act->_len = len;
+
+ if (act->_progress > act->_len)
+ act->_len = act->_progress;
+
+ std::ostream &rep = report (LEVEL_IMPORTANT, PROGRESS_REPORT);
+ rep.precision (3);
+ rep.setf (std::ios::fixed);
+ rep << "Progress: " << act->_progress << " out of " << act->_len
+ << " (" << act->_timer.realtime () << "s elapsed)" << std::endl;
+
+ if (_show_progress && isPrinted (_activities.size () - 1, LEVEL_IMPORTANT, BRIEF_REPORT, act->_fn))
+ updateActivityReport (*act);
+ act->_timer = tmp;
+ }
+
+ std::ostream &Commentator::report (long level, const char *msg_class)
+ {
+ linbox_check (msg_class != (const char *) 0);
+
+ if (!isPrinted (_activities.size (), level, msg_class,
+ (_activities.size () > 0) ? _activities.top ()->_fn : (const char *) 0))
+ return cnull;
+
+ MessageClass &messageClass = getMessageClass (msg_class);
+
+ return messageClass._stream;
+ }
+
+ void Commentator::indent (std::ostream &stream) const
+ {
+ unsigned int i;
+
+ for (i = 0; i < _activities.size (); i++)
+ stream << " ";
+ }
+
+ void Commentator::restoreActivityState (ActivityState state)
+ {
+ std::stack<Activity *> backup;
+
+ while (!_activities.empty () && _activities.top () != state._act) {
+ backup.push (_activities.top ());
+ _activities.pop ();
+ }
+
+ if (_activities.empty ()) {
+ // Uh oh -- the state didn't give a valid activity
+
+ while (!backup.empty ()) {
+ _activities.push (backup.top ());
+ backup.pop ();
+ }
+ }
+ }
+
+ void Commentator::setMaxDepth (long depth)
+ {
+ MessageClass &briefReportClass = getMessageClass (BRIEF_REPORT);
+ std::map <const char *, MessageClass *, C_str_Less>::iterator i;
+
+ for (i = _messageClasses.begin (); i != _messageClasses.end (); ++i)
+ if (i->second != &briefReportClass)
+ i->second->setMaxDepth (depth);
+ }
+
+ void Commentator::setMaxDetailLevel (long level)
+ {
+ MessageClass &briefReportClass = getMessageClass (BRIEF_REPORT);
+ std::map <const char *, MessageClass *, C_str_Less>::iterator i;
+
+ for (i = _messageClasses.begin (); i != _messageClasses.end (); ++i)
+ if (i->second != &briefReportClass)
+ i->second->setMaxDetailLevel (level);
+ }
+
+ MessageClass &Commentator::registerMessageClass (const char *msg_class, std::ostream &stream, unsigned long max_depth, unsigned long max_level)
+ {
+ linbox_check (msg_class != (const char *) 0);
+
+ MessageClass *new_obj = new MessageClass (*this, msg_class, stream, max_depth, max_level);
+ _messageClasses[msg_class] = new_obj;
+ return *new_obj;
+ }
+
+ MessageClass &Commentator::cloneMessageClass (const char *new_msg_class, const char *msg_class)
+ {
+ linbox_check (new_msg_class != (const char *) 0);
+ linbox_check (msg_class != (const char *) 0);
+
+ MessageClass *new_obj = new MessageClass (getMessageClass (msg_class));
+ new_obj->_msg_class = new_msg_class;
+ _messageClasses[new_msg_class] = new_obj;
+ return *new_obj;
+ }
+
+ MessageClass &Commentator::cloneMessageClass (const char *new_msg_class, const char *msg_class, std::ostream &stream)
+ {
+ linbox_check (new_msg_class != (const char *) 0);
+ linbox_check (msg_class != (const char *) 0);
+
+ MessageClass &old_obj = getMessageClass (msg_class);
+ MessageClass *new_obj = new MessageClass (*this, new_msg_class, stream, old_obj._configuration);
+ _messageClasses[new_msg_class] = new_obj;
+ return *new_obj;
+ }
+
+ MessageClass &Commentator::getMessageClass (const char *msg_class)
+ { return *_messageClasses[msg_class]; }
+
+ void Commentator::setPrintParameters (unsigned long depth, unsigned long level, const char *fn)
+ {
+ MessageClass &briefReportClass = getMessageClass (BRIEF_REPORT);
+ std::map <const char *, MessageClass *, C_str_Less>::iterator i;
+
+ for (i = _messageClasses.begin (); i != _messageClasses.end (); ++i)
+ if (i->second != &briefReportClass)
+ i->second->setPrintParameters (depth, level, fn);
+ }
+
+ void Commentator::setBriefReportParameters (OutputFormat format, bool show_timing, bool show_progress, bool show_est_time)
+ {
+ _format = format;
+ _show_timing = show_timing;
+ _show_progress = show_progress;
+ _show_est_time = show_est_time;
+ }
+
+ bool Commentator::isPrinted (unsigned long depth, unsigned long level, const char *msg_class, const char *fn)
+ {
+ if (_messageClasses.find (msg_class) == _messageClasses.end ())
+ return false;
+
+ MessageClass &messageClass = getMessageClass (msg_class);
+
+ return messageClass.isPrinted (depth, level, fn);
+ }
+
+ void Commentator::setBriefReportStream (std::ostream &stream)
+ { setMessageClassStream (BRIEF_REPORT, stream); }
+
+ void Commentator::setReportStream (std::ostream &stream)
+ {
+ setMessageClassStream (BRIEF_REPORT, stream);
+ setMessageClassStream (PROGRESS_REPORT, stream);
+ setMessageClassStream (TIMING_MEASURE, stream);
+ setMessageClassStream (TIMING_ESTIMATE, stream);
+ setMessageClassStream (PARTIAL_RESULT, stream);
+ setMessageClassStream (INTERNAL_ERROR, stream);
+ setMessageClassStream (INTERNAL_WARNING, stream);
+ setMessageClassStream (INTERNAL_DESCRIPTION, stream);
+
+ if (stream == getMessageClass (BRIEF_REPORT)._stream)
+ getMessageClass (BRIEF_REPORT).setMaxDepth (0);
+ }
+
+ void Commentator::setMessageClassStream (const char *msg_class, std::ostream &stream)
+ {
+ //temporarily fixed the bug in test-commentator, left memory leaking.
+ MessageClass *old_msg_class = _messageClasses[msg_class];
+ cloneMessageClass (msg_class, msg_class, stream);
+ delete old_msg_class;
+
+ }
+
+ void Commentator::setDefaultReportFile (const char *filename)
+ {
+ _report.open (filename);
+ }
+
+ void Commentator::printActivityReport (Activity &activity)
+ {
+ MessageClass &messageClass = getMessageClass (BRIEF_REPORT);
+
+ if (_format == OUTPUT_CONSOLE) {
+ messageClass._stream << activity._desc << "...";
+
+ if (messageClass.isPrinted (_activities.size () + 1, LEVEL_IMPORTANT, activity._fn))
+ messageClass._stream << std::endl;
+ else if (_show_progress && activity._len > 0) {
+ messageClass._stream << " 0%";
+ _last_line_len = (int)strlen (" 0%");
+ }
+ else
+ _last_line_len = 0;
+
+ messageClass._smart_streambuf.stream ().flush ();
+ }
+ else if (_format == OUTPUT_PIPE &&
+ (((_show_progress || _show_est_time) && activity._len > 0) ||
+ messageClass.isPrinted (_activities.size () + 1, LEVEL_IMPORTANT, activity._fn)))
+ {
+ messageClass._stream << activity._desc << "...";
+
+ if (_show_progress)
+ messageClass._stream << std::endl;
+ }
+ }
+
+ void Commentator::updateActivityReport (Activity &activity)
+ {
+ MessageClass &messageClass = getMessageClass (BRIEF_REPORT);
+ unsigned int i, old_len;
+ std::ostringstream str;
+ double percent = (double) activity._progress / (double) activity._len * 100.0;
+
+ if (_format == OUTPUT_CONSOLE) {
+ if (!messageClass.isPrinted (_activities.size (), LEVEL_IMPORTANT, activity._fn)) {
+ if (_show_progress) {
+ for (i = 0; i < _last_line_len; i++)
+ messageClass._stream << '\b';
+ str.width (3);
+ str << floor (percent + 0.5) << '%' << std::ends;
+ old_len = _last_line_len;
+ _last_line_len = (int)strlen (str.str ().c_str ());
+ messageClass._stream << str.str ();
+ for (int ii = 0; ii < (int) (old_len - _last_line_len); ii++)
+ messageClass._stream << ' ';
+ }
+ }
+ else if (messageClass.isPrinted (_activities.size () - 1, LEVEL_UNIMPORTANT, activity._fn)) {
+#if 0
+ if (_show_est_time)
+ messageClass._stream << activity._estimate.front ()._time
+ << " remaining" << std::endl;
+#endif
+ }
+
+ messageClass._smart_streambuf.stream ().flush ();
+ }
+ else if (_format == OUTPUT_PIPE) {
+ if (_show_progress) {
+ messageClass._stream << floor (percent + 0.5) << "% done";
+#if 0
+ if (_show_est_time)
+ messageClass._stream << " (" << activity._estimate.front ()._time
+ << " remaining)";
+#endif
+ messageClass._stream << std::endl;
+ }
+#if 0
+ else if (_show_est_time)
+ messageClass._stream << activity._estimate.front ()._time
+ << " remaining" << std::endl;
+#endif
+ }
+ }
+
+ void Commentator::finishActivityReport (Activity &activity, const char *msg)
+ {
+ MessageClass &messageClass = getMessageClass (BRIEF_REPORT);
+ unsigned int i;
+
+ if (_format == OUTPUT_CONSOLE) {
+ if (!messageClass.isPrinted (_activities.size () + 1, LEVEL_UNIMPORTANT, activity._fn)) {
+ if (_show_progress)
+ for (i = 0; i < _last_line_len; i++)
+ messageClass._stream << '\b';
+
+ messageClass._stream << msg;
+
+ if (_show_timing)
+ messageClass._stream << " (" << activity._timer.usertime () << " s)" << std::endl;
+ else
+ messageClass._stream << std::endl;
+ }
+ else if (messageClass.isPrinted (_activities.size (), LEVEL_UNIMPORTANT, activity._fn)) {
+ for (i = 0; i < _activities.size (); i++)
+ messageClass._stream << " ";
+
+ messageClass._stream << msg;
+ //messageClass._stream << "Done: " << msg;
+
+ if (_show_timing)
+ messageClass._stream << " (" << activity._timer.usertime () << " s)" << std::endl;
+ else
+ messageClass._stream << std::endl;
+ }
+
+ messageClass._smart_streambuf.stream ().flush ();
+ }
+ else if (_format == OUTPUT_PIPE) {
+ for (i = 0; i < _activities.size (); i++)
+ messageClass._stream << " ";
+
+ if (((_show_progress || _show_est_time) && activity._len > 0) ||
+ messageClass.isPrinted (_activities.size () + 1, LEVEL_IMPORTANT, activity._fn))
+ messageClass._stream << "Done: " << msg << std::endl;
+ else
+ messageClass._stream << activity._desc << ": " << msg << std::endl;
+ }
+ }
+
+ MessageClass::MessageClass (const Commentator &comm,
+ const char *msg_class,
+ std::ostream &stream,
+ unsigned long max_depth,
+ unsigned long max_level) :
+ _msg_class (msg_class),
+ _smart_streambuf (comm, stream),
+ _stream (&_smart_streambuf),
+ _max_level (max_level),
+ _max_depth (max_depth)
+ {
+ fixDefaultConfig ();
+ }
+
+ void MessageClass::setMaxDepth (long depth)
+ {
+ _max_depth = (unsigned long) depth;
+ fixDefaultConfig ();
+ }
+
+ void MessageClass::setMaxDetailLevel (long level)
+ {
+ _max_level = (unsigned long) level;
+ fixDefaultConfig ();
+ }
+
+ void MessageClass::setPrintParameters (unsigned long depth, unsigned long level, const char *fn)
+ {
+ if (fn == (const char *) 0)
+ fn = "";
+
+ std::list <std::pair <unsigned long, unsigned long> > &config = _configuration[fn];
+ std::list <std::pair <unsigned long, unsigned long> >::iterator i, j;
+
+ i = config.begin ();
+
+ // Iterate through preceeding elements in the std::list and remove
+ // any that specify a lower level than we are using
+ while (i != config.end () && i->first <= depth) {
+ if (i->second <= level) {
+ j = i++;
+ config.erase (j);
+ }
+ else {
+ ++i;
+ }
+ }
+
+ // Insert our new directive into the std::list
+ if (i == config.end () || i->second != level)
+ config.insert (i, std::pair <unsigned long, unsigned long> (depth, level));
+
+ // Iterate through following elements in the std::list and remove any
+ // that specify a higher level than we are using
+ while (i != config.end ()) {
+ if (i->second > level) {
+ j = i++;
+ config.erase (j);
+ }
+ else {
+ ++i;
+ }
+ }
+
+ // End result: The std::list should be monotonically increasing in
+ // the first parameter and decreasing in the second
+ }
+
+ bool MessageClass::isPrinted (unsigned long depth, unsigned long level, const char *fn)
+ {
+ return
+ checkConfig (_configuration[""], depth, level)
+ ||
+ ( fn != (const char *) 0
+ &&
+ checkConfig (_configuration[fn], depth, level)
+ );
+#if 0
+
+ if (checkConfig (_configuration[""], depth, level))
+ return true;
+ else if (fn != (const char *) 0)
+ //return checkConfig (_configuration[fn], depth, level);
+ { bool ans = checkConfig (_configuration[fn], depth, level);
+ if (ans)
+ { //std::cerr << " fn=" << fn << ", d " << depth << ", l " << level << " true" << std::endl;
+ return true;
+ }
+ else
+ { //std::cerr << " fn=" << fn << ", d " << depth << ", l " << level << " false" << std::endl;
+ return false;
+ }
+ }
+
+ else
+ { //std::cerr << " fn=0, d " << depth << ", l " << level << " false" << std::endl;
+ return false;
+ }
+
+#endif
+ }
+
+ MessageClass::MessageClass (const Commentator &comm,
+ const char *msg_class,
+ std::ostream &stream,
+ Configuration configuration) :
+ _msg_class (msg_class),
+ _smart_streambuf (comm, stream),
+ _stream (&_smart_streambuf),
+ _configuration (configuration)
+ {}
+
+ void MessageClass::fixDefaultConfig ()
+ {
+ std::list <std::pair <unsigned long, unsigned long> > &config = _configuration[""];
+
+ config.clear ();
+ config.push_back (std::pair <unsigned long, unsigned long> (_max_depth, _max_level));
+ config.push_back (std::pair <unsigned long, unsigned long> ((unsigned long) -1, Commentator::LEVEL_ALWAYS));
+ }
+
+ bool MessageClass::checkConfig (std::list <std::pair <unsigned long, unsigned long> > &config,
+ unsigned long depth,
+ unsigned long ) //lvl
+ {
+ std::list <std::pair <unsigned long, unsigned long> >::iterator i;
+
+ for ( i = config.begin (); i != config.end (); ++i) {
+ if (depth < i->first) {
+#if 0
+ // uninitialized value error goes away if we ignore level.
+ if (level <= i->second)
+ return true;
+ else
+ return false;
+#endif
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ void MessageClass::dumpConfig () const
+ {
+ Configuration::const_iterator i;
+ std::list <std::pair <unsigned long, unsigned long> >::const_iterator j;
+
+ for (i = _configuration.begin (); i != _configuration.end (); i++) {
+ std::cerr << "Configuration (" << (*i).first << "):" << std::endl;
+
+ for (j = (*i).second.begin (); j != (*i).second.end (); j++)
+ std::cerr << " Depth: " << (*j).first << ", Level: " << (*j).second << std::endl;
+
+ std::cerr << std::endl;
+ }
+ }
+
+ int MessageClass::smartStreambuf::sync ()
+ {
+ std::streamsize n = pptr () - pbase ();
+ return (n && writeData (pbase (), n) != n) ? EOF : 0;
+ }
+
+ int MessageClass::smartStreambuf::overflow (int ch)
+ {
+ std::streamsize n = pptr () - pbase ();
+
+ if (n && sync ())
+ return EOF;
+
+ if (ch != EOF) {
+ char cbuf[1];
+ cbuf[0] = (char)ch;
+ if (writeData (cbuf, 1) != 1)
+ return EOF;
+ }
+
+ pbump((int)-n);
+ return 0;
+ }
+
+ std::streamsize MessageClass::smartStreambuf::xsputn (const char *text, std::streamsize n)
+ {
+ return (sync () == EOF) ? 0 : writeData (text, n);
+ }
+
+ int MessageClass::smartStreambuf::writeData (const char *text, std::streamsize n)
+ {
+ std::streamsize idx;
+ std::streamsize m = n;
+
+ if (_indent_next) {
+ _comm.indent (_stream);
+ _indent_next = false;
+ }
+
+ for (idx = 0; (idx < m) &&(text[idx] != '\n') ; ++idx) ;
+
+ while (idx < m) {
+ _stream.write (text, idx + 1);
+ m -= idx + 1;
+
+ if (m > 0)
+ _comm.indent (_stream);
+ else
+ _indent_next = true;
+
+ text += idx + 1;
+ for (idx = 0; idx != '\n' && idx < m; ++idx) ;
+ }
+
+ _stream.write (text, m);
+
+ _stream.flush ();
+
+ return int(n);
+ }
+
+// // Default global commentator
+// Commentator commentator ;
+}
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/contracts.h b/linbox/util/contracts.h
index 5b5fb79..307f0e9 100644
--- a/linbox/util/contracts.h
+++ b/linbox/util/contracts.h
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_util_contracts_H
@@ -73,3 +74,12 @@ public:
#endif
#endif //__LINBOX_util_contracts_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/debug.C b/linbox/util/debug.C
index 03a0413..f7a272b 100644
--- a/linbox/util/debug.C
+++ b/linbox/util/debug.C
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/util/debug.C
* Copyright (C) 2001 Bradford Hovinen
*
* Written by Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#include "linbox/linbox-config.h"
@@ -39,3 +40,12 @@ namespace LinBox
std::ostream *NotImplementedYet::_errorStream ;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/debug.h b/linbox/util/debug.h
index fbb899d..c671abb 100644
--- a/linbox/util/debug.h
+++ b/linbox/util/debug.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/util/debug.h
*
* Copyright (C) 2001,2010 LinBox
@@ -9,10 +7,13 @@
* Modified by BB.
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +21,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*
*/
@@ -46,7 +47,7 @@
* In REALEASE mode, nothing is checked.
* @param check assertion to be checked.
*/
-#ifndef DEBUG
+#ifdef NDEBUG // Ã la assert.
# define linbox_check(check)
#else
# ifdef __GNUC__
@@ -60,9 +61,15 @@
# endif
#endif
+#define THIS_CODE_COMPILES_BUT_IS_NOT_TESTED \
+ std::cout << "*** Warning *** " << std::endl << __func__ << " in " << __FILE__ << ':' << __LINE__ << " is not tested" << std::endl;
+
+#define THIS_CODE_MAY_NOT_COMPILE_AND_IS_NOT_TESTED \
+" *** Warning *** this piece of code is not compiled by default and may not work"
+
namespace LinBox
-{
- /*! A precondtion failed.
+{ /* Preconditions,Error,Failure,NotImplementedYet */
+ /*! A precondition failed.
* @ingroup util
* The \c throw mechanism is usually used here as in
\code
@@ -143,6 +150,17 @@ namespace LinBox
*/
NotImplementedYet() {}
+ NotImplementedYet( const char * why)
+ {
+ if (_errorStream == (std::ostream *) 0)
+ _errorStream = &std::cerr;
+
+ (*_errorStream) << std::endl << std::endl;
+ (*_errorStream) << "*** ERROR ***" << std::endl;
+ (*_errorStream) << " This function is not implemented yet " ;
+ (*_errorStream) << " (" << why << ")" <<std::endl;
+ }
+
NotImplementedYet(const char * function,
const char* file,
int line,
@@ -152,7 +170,7 @@ namespace LinBox
_errorStream = &std::cerr;
(*_errorStream) << std::endl << std::endl;
- (*_errorStream) << "ERROR (at " << function << " in " << file << ':' << line << "): " << std::endl;
+ (*_errorStream) << " *** ERROR *** (at " << function << " in " << file << ':' << line << "): " << std::endl;
(*_errorStream) << " This function is not implemented yet" ;
if (why)
(*_errorStream) << " (" << why << ")" <<std::endl;
@@ -237,12 +255,87 @@ namespace LinBox
};
}
+
+namespace LinBox
+{ /* Exceptions. */
+
+ /*! @defgroup exceptions Exceptions.
+ * @brief Exceptions in LinBox (proposal, example in \c algorithms/hermite.h).
+ * If the algorithms cannot return as expected, then an exception is
+ * thrown. Hopefully it is catched later on. Execptions, when thrown,
+ * don't write to any stream except in debug mode. However, they can
+ * explain what they are for with the
+ * <code>const char *what(void)</code> member.
+ *
+ * Any exception derives from the \c LinBox::Exception class.
+ */
+
+ /*! This is the exception class in LinBox.
+ * Any LinBox exception can derive from it.
+ */
+ class Exception {
+ // public:
+ // Exception() {};
+ } ;
+
+ /*! Algorithmic exception.
+ */
+ class algoException : public Exception {
+ // public:
+ // algoException() {};
+ };
+
+ /*! Not implemented yet.
+ * This piece of code is not fully implemented.
+ */
+ class NotImplementedYetException : public Exception {
+ };
+
+ /*! Something bad an unexpected happened.
+ */
+ class IrrecuperableException : public Exception {
+ };
+
+ /*! The input is not as expected.
+ */
+ class BadInputException : public Exception {
+ };
+}
+
+#define CONC(a,b) a ## b
+
+#define LINBOX_SILENT_EXCEPTION(name) \
+ throw CONC(name,Exception) ()
+
+#ifndef DEBUG
+#define LINBOX_RAISE_EXCEPTION(name,why) \
+ throw CONC(name,Exception) ()
+#else
+#define LINBOX_RAISE_EXCEPTION(name,why) \
+ do { \
+ std::cerr << " *** EXCEPTION *** (at " << __func__ << " in " << __FILE__ << ':' << __LINE__ << ") " << std::endl; \
+ std::cerr << " " << why << std::endl; \
+ throw CONC(name,Exception) () ; \
+ } while(0)
+#endif
+
+
+
#ifdef LinBoxSrcOnly
// for all-source compilation
-#include <linbox/util/debug.C>
+#include "linbox/util/debug.C"
#endif
#include <fflas-ffpack/utils/print-utils.h>
#endif // __LINBOX_util_debug_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/error.C b/linbox/util/error.C
index 9496423..f0c588e 100644
--- a/linbox/util/error.C
+++ b/linbox/util/error.C
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/util/error.C
* Copyright (C) 1994-1997 Givaro Team
*
* Written by T. Gautier
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#include "linbox/linbox-config.h"
@@ -35,3 +36,12 @@ namespace LinBox
}
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/error.h b/linbox/util/error.h
index 447fb81..54f2492 100644
--- a/linbox/util/error.h
+++ b/linbox/util/error.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/util/error.h
* Copyright (C) 1994-1997 Givaro Team
*
* Written by T. Gautier
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_util_error_H
@@ -31,7 +32,7 @@ namespace LinBox
{
// ------------------------------- LinboxError
- /** base class for execption handling in Givaro.
+ /** base class for execption handling in LinBox
\ingroup util
*/
class LinboxError {
@@ -92,8 +93,17 @@ namespace LinBox
}
#ifdef LinBoxSrcOnly // for all-source compilation
-# include <linbox/util/error.C>
+#include "linbox/util/error.C"
#endif
#endif // __LINBOX_util_error_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/field-axpy.h b/linbox/util/field-axpy.h
index d497540..5dc9719 100644
--- a/linbox/util/field-axpy.h
+++ b/linbox/util/field-axpy.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/util/field-axpy.h
* Copyright (C) 1999-2001 William J Turner,
* 2001 Bradford Hovinen
@@ -7,10 +5,13 @@
* Written by William J Turner <wjturner at math.ncsu.edu>,
* Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_util_field_axpy_H
@@ -60,14 +61,14 @@ namespace LinBox
* @param F field F in which arithmetic is done
*/
FieldAXPY (const Field &F) :
- _F (F)
- { _F.init (_y, 0); }
+ _field (F)
+ { _field.init (_y, 0); }
/** Copy constructor.
* @param faxpy
*/
FieldAXPY (const FieldAXPY<Field> &faxpy) :
- _F (faxpy._F), _y (faxpy._y)
+ _field (faxpy._field), _y (faxpy._y)
{}
/** Assignment operator
@@ -82,10 +83,10 @@ namespace LinBox
* @param x constant reference to element x
*/
inline Element& mulacc (const Element &a, const Element &x)
- { return _F.axpyin (_y, a, x); }
+ { return _field.axpyin (_y, a, x); }
inline Element& accumulate (const Element &t)
- { return _F.addin (_y, t); }
+ { return _field.addin (_y, t); }
/** Retrieve y
*
@@ -105,14 +106,14 @@ namespace LinBox
}
inline void reset() {
- _F.init(_y,0);
+ _field.init(_y,0);
}
protected:
/// Field in which arithmetic is done
/// Not sure why it must be mutable, but the compiler complains otherwise
- Field _F;
+ Field _field;
/// Field element for arithmetic
Element _y;
@@ -123,3 +124,12 @@ namespace LinBox
#endif // __LINBOX_util_field_axpy_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/formats/Makefile.am b/linbox/util/formats/Makefile.am
index e95456e..ae57193 100644
--- a/linbox/util/formats/Makefile.am
+++ b/linbox/util/formats/Makefile.am
@@ -1,6 +1,24 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
pkgincludesubdir=$(pkgincludedir)/util/formats
pkgincludesub_HEADERS= \
@@ -9,6 +27,6 @@ pkgincludesub_HEADERS= \
matrix-market.h \
sms.h \
matrix-stream-readers.h \
- sparse-row.h
+ sparse-row.h
diff --git a/linbox/util/formats/Makefile.in b/linbox/util/formats/Makefile.in
index e9cb5d3..c71e2aa 100644
--- a/linbox/util/formats/Makefile.in
+++ b/linbox/util/formats/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,10 +15,47 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -41,12 +78,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -54,7 +94,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -63,18 +106,44 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
-pkgincludesubHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkgincludesub_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -86,6 +155,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -109,10 +179,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -133,10 +205,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -145,6 +222,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -161,6 +240,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -223,10 +303,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
pkgincludesubdir = $(pkgincludedir)/util/formats
pkgincludesub_HEADERS = \
generic-dense.h \
@@ -234,7 +310,7 @@ pkgincludesub_HEADERS = \
matrix-market.h \
sms.h \
matrix-stream-readers.h \
- sparse-row.h
+ sparse-row.h
all: all-am
@@ -248,9 +324,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/util/formats/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps linbox/util/formats/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/util/formats/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/util/formats/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -268,6 +344,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -276,21 +353,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludesubdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)"
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludesubHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- $(pkgincludesubHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
done
uninstall-pkgincludesubHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
- done
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -304,7 +385,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -312,29 +393,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -355,13 +441,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -382,16 +472,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -477,6 +573,7 @@ uninstall-am: uninstall-pkgincludesubHEADERS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/linbox/util/formats/generic-dense.h b/linbox/util/formats/generic-dense.h
index ac583e7..de39f9a 100644
--- a/linbox/util/formats/generic-dense.h
+++ b/linbox/util/formats/generic-dense.h
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -57,13 +58,13 @@ namespace LinBox
this->_m = strtoul(firstLine,&restLine,0);
if( this->_m == 0 && restLine == firstLine )
return NO_FORMAT;
- i = restLine - firstLine;
+ i = int(restLine - firstLine);
// Read n
this->_n = strtoul(firstLine+i,&restLine,0);
if( this->_n == 0 && restLine == (firstLine+i) )
return NO_FORMAT;
- i = restLine - firstLine;
+ i = int(restLine - firstLine);
// Check whitespace for rest of line
++i;
@@ -112,3 +113,12 @@ namespace LinBox
#endif // __LINBOX_format_dense_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/formats/maple.h b/linbox/util/formats/maple.h
index a84c61f..80b3eff 100644
--- a/linbox/util/formats/maple.h
+++ b/linbox/util/formats/maple.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2005 LinBox
* Written by Dan Roche
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_format_maple_H
@@ -38,7 +39,7 @@
#include <string>
#include <sstream>
-#include <linbox/util/matrix-stream.h>
+#include "linbox/util/matrix-stream.h"
#if 0
namespace LinBox__FORMAT_MAPLE_H
@@ -101,7 +102,7 @@ namespace LinBox
return BAD_FORMAT;
this->knowM = true;
currentCol = 2;
- i = pastNum - cand;
+ i = int(pastNum - cand);
}
else {
currentCol = i;
@@ -123,7 +124,7 @@ namespace LinBox
return BAD_FORMAT;
this->knowN = true;
currentCol = 4;
- i = pastNum - cand;
+ i = int(pastNum - cand);
}
else {
currentCol = i;
@@ -381,7 +382,7 @@ namespace LinBox
if( candidate ) {
lineend = currentCol <= 5;
- i = currentCol;
+ i = int(currentCol);
if( !lineend ) currentCol = 5;
while( !lineend && currentCol < 7 ) {
while( candidate[i] && isspace(candidate[i]) )
@@ -466,3 +467,12 @@ namespace LinBox
#endif // __LINBOX_format_maple_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/formats/matrix-market.h b/linbox/util/formats/matrix-market.h
index ee20438..125ee81 100644
--- a/linbox/util/formats/matrix-market.h
+++ b/linbox/util/formats/matrix-market.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2005 LinBox
* Written by Dan Roche
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_format_matrix_market_H
@@ -31,7 +32,7 @@
#include <string>
#include <sstream>
-#include <linbox/util/matrix-stream.h>
+#include "linbox/util/matrix-stream.h"
#if 0
namespace LinBox__FORMAT_MATRIX_MARKET_H
@@ -48,16 +49,21 @@ namespace LinBox
class integer;
#endif
- static bool equalCaseInsensitive(const std::string s1, const char* s2) {
- int len = s1.size();
+#if 1 /* Unused */
+ bool equalCaseInsensitive(const std::string s1, const char* s2)
+ {
+ int len = int(s1.size());
int counter = 0;
while( counter < len && s2[counter] != '\0' &&
- toupper(s1[counter]) == toupper(s2[counter]) ) ++counter;
+ toupper(s1[(size_t)counter]) == toupper(s2[counter]) ) {
+ ++counter;
+ }
return( counter == len && s2[counter] == '\0' );
}
+#endif
template<class Field>
- class MatrixMarketReader :public MatrixStreamReader<Field> {
+ class MatrixMarketReader : public MatrixStreamReader<Field> {
public:
typedef typename MatrixStreamReader<Field>::Element Element;
private:
@@ -67,7 +73,8 @@ namespace LinBox
bool pattern;
bool symmetric;
- MatrixStreamError readHeader() {
+ MatrixStreamError readHeader()
+ {
//Skip comments
this->ms->readWhiteSpace();
while( !this->sin->eof() && this->sin->peek() == '%' ) {
@@ -106,7 +113,8 @@ namespace LinBox
}
protected:
- MatrixStreamError nextTripleImpl( size_t& i, size_t& j, Element& v ) {
+ MatrixStreamError nextTripleImpl( size_t& i, size_t& j, Element& v )
+ {
if( currentCol == 0 && currentRow == 0 ) {
MatrixStreamError mse = readHeader();
if( mse != GOOD ) return mse;
@@ -147,12 +155,14 @@ namespace LinBox
--j;
if( i >= this->_m || j >= this->_n )
return BAD_FORMAT;
- if( symmetric && (i != j) ) saveTriple(j,i,v);
+ if( symmetric && (i != j) ) this->saveTriple(j,i,v);
return GOOD;
}
- MatrixStreamError initImpl( const char* firstLine ) {
+#if 1 /* Unused */
+ MatrixStreamError initImpl( const char* firstLine )
+ {
std::string st(firstLine);
std::stringstream stin(st);
@@ -194,23 +204,41 @@ namespace LinBox
return GOOD;
}
+#endif
public:
- MatrixMarketReader() {
+ MatrixMarketReader()
+ {
entriesLeft = -1;
currentCol = currentRow = 0;
}
- bool isSparse() const { return !array; }
+ bool isSparse() const
+ {
+ return !array;
+ }
const char* getName() const
- { return "Matrix Market Format"; }// LinBox__FORMAT_MATRIX_MARKET_H::name;
+ {
+ return "Matrix Market Format";
+ }// LinBox__FORMAT_MATRIX_MARKET_H::name;
const char* shortName() const
- { return "mm"; }// LinBox__FORMAT_MATRIX_MARKET_H::shortname;
+ {
+ return "mm"; // LinBox__FORMAT_MATRIX_MARKET_H::shortname;
+ }
};
}
#endif //__LINBOX_format_matrix_market_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/formats/matrix-stream-readers.h b/linbox/util/formats/matrix-stream-readers.h
index a3c4cd7..bc4381d 100644
--- a/linbox/util/formats/matrix-stream-readers.h
+++ b/linbox/util/formats/matrix-stream-readers.h
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_matrix_stream_readers_H
@@ -32,15 +33,9 @@
* a line of this macro should read: addReader( new MyReaderType() );
*
* Second, so those statements actually compile, the file containing each format
- * reader should be included with a line of the form: #include "my-reader.h"
+ * reader should be included with a line of the form: \verbatim #include "my-reader.h" \endverbatim
*/
-#define __MATRIX_STREAM_READERDEFS \
- addReader( new SMSReader<Field>() ); \
- addReader( new SparseRowReader<Field>() ); \
- addReader( new MatrixMarketReader<Field>() ); \
- addReader( new MapleReader<Field>() ); \
- addReader( new DenseReader<Field>() );
#include "sms.h"
#include "sparse-row.h"
@@ -48,4 +43,20 @@
#include "matrix-market.h"
#include "maple.h"
+#define __MATRIX_STREAM_READERDEFS \
+ addReader( new SMSReader<Field>() ); \
+ addReader( new SparseRowReader<Field>() ); \
+ addReader( new MatrixMarketReader<Field>() ); \
+ addReader( new MapleReader<Field>() ); \
+ addReader( new DenseReader<Field>() );
+
#endif //__LINBOX_matrix_stream_readers_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/formats/sms.h b/linbox/util/formats/sms.h
index 3a1ea5b..bc91af7 100644
--- a/linbox/util/formats/sms.h
+++ b/linbox/util/formats/sms.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2005 LinBox
* Written by Dan Roche
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file util/formats/sms.h
@@ -44,7 +45,7 @@ namespace LinBox
{
template<class Field>
- class SMSReader :public MatrixStreamReader<Field> {
+ class SMSReader : public MatrixStreamReader<Field> {
public:
typedef typename MatrixStreamReader<Field>::Element Element;
private:
@@ -60,13 +61,13 @@ namespace LinBox
this->_m = strtoul(firstLine,&restLine,0);
if( this->_m == 0 && restLine == firstLine )
return NO_FORMAT;
- i = restLine - firstLine;
+ i = int(restLine - firstLine);
// Read n
this->_n = strtoul(firstLine+i,&restLine,0);
if( this->_n == 0 && restLine == firstLine+i )
return NO_FORMAT;
- i = restLine - firstLine;
+ i = int(restLine - firstLine);
// Read "M" or "R" or "P" or "I"
while( firstLine[i] && isspace(firstLine[i]) )
@@ -136,3 +137,12 @@ namespace LinBox
#endif // __LINBOX_sms_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/formats/sparse-row.h b/linbox/util/formats/sparse-row.h
index 9e28417..a545e1b 100644
--- a/linbox/util/formats/sparse-row.h
+++ b/linbox/util/formats/sparse-row.h
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_format_sparse_row_H
@@ -61,13 +62,13 @@ namespace LinBox
this->_m = strtoul(firstLine,&restLine,0);
if( this->_m == 0 && restLine == firstLine )
return NO_FORMAT;
- i = restLine - firstLine;
+ i = int(restLine - firstLine);
// Read n
this->_n = strtoul(firstLine+i,&restLine,0);
if( this->_n == 0 && restLine == firstLine+i )
return NO_FORMAT;
- i = restLine - firstLine;
+ i = int(restLine - firstLine);
// Read "S"
while( firstLine[i] && isspace(firstLine[i]) )
@@ -135,3 +136,12 @@ namespace LinBox
#endif // __LINBOX_format_sparse_row_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/iml_wrapper.h b/linbox/util/iml_wrapper.h
index cf43978..ac1cd48 100644
--- a/linbox/util/iml_wrapper.h
+++ b/linbox/util/iml_wrapper.h
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2011 LinBox
* Written by BB <brice.boyer at imag.fr>
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file util/iml_wrapper.h
@@ -42,12 +43,22 @@ namespace IML {
extern "C" {
#include "iml.h"
+ /* basisop.c */
+ void
+ maxMagnMP (mpz_t *mp_A, const long n, const long m, const long lda, \
+ mpz_t mp_max) ;
+ /* RNSop.c */
+ FiniteField RNSbound (const long n) ;
+
FiniteField **
findRNS (const FiniteField RNS_bound, const mpz_t mp_maxInter, long *length) ;
+
FiniteField *
repBound (const long len, const FiniteField *basis, const FiniteField *cmbasis) ;
+
void
basisProd (const long len, const FiniteField *basis, mpz_t mp_prod) ;
+
void
ChineseRemainder (const long len, const mpz_t mp_prod, \
const FiniteField *basis, const FiniteField *cmbasis, \
@@ -56,6 +67,7 @@ namespace IML {
ChineseRemainderPos (const long len, const FiniteField *basis, \
const FiniteField *cmbasis, Double *Ac, mpz_t mp_Ac);
+
}
// #include <stdlib.h>
#ifndef XMALLOC
@@ -82,9 +94,23 @@ namespace IML {
}
+#define REINTERP_IML_CONST(GivMat) \
+ reinterpret_cast<mpz_t*>(const_cast<PID_integer::Element*>((GivMat)))
+#define REINTERP_IML(GivMat) \
+ reinterpret_cast<mpz_t*>((GivMat))
+
}
#else
#error "you are using IML wrapper without IML available in LinBox."
#endif
#endif // __LINBOX_util_iml_wrapper_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/matrix-stream.h b/linbox/util/matrix-stream.h
index ea996a8..e1d16a2 100644
--- a/linbox/util/matrix-stream.h
+++ b/linbox/util/matrix-stream.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2005 LinBox
* Written by Dan Roche
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_matrix_stream_H
@@ -325,3 +326,12 @@ class MatrixStream {
#endif // __LINBOX_matrix_stream_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/matrix-stream.inl b/linbox/util/matrix-stream.inl
index ad263aa..96759e0 100644
--- a/linbox/util/matrix-stream.inl
+++ b/linbox/util/matrix-stream.inl
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_matrix_stream_INL
@@ -329,3 +330,12 @@ namespace LinBox
} // end of namespace LinBox
#endif // __LINBOX_matrix_stream_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/mpicpp.h b/linbox/util/mpicpp.h
index c100bd8..936195c 100644
--- a/linbox/util/mpicpp.h
+++ b/linbox/util/mpicpp.h
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
#ifndef __LINBOX_mpicpp_H
@@ -125,3 +126,12 @@ namespace LinBox
#endif // __LINBOX_HAVE_MPI
#endif // __LINBOX_mpicpp_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/mpicpp.inl b/linbox/util/mpicpp.inl
index 15db547..54c906d 100644
--- a/linbox/util/mpicpp.inl
+++ b/linbox/util/mpicpp.inl
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -192,3 +193,12 @@ namespace LinBox
} // namespace LinBox
#endif // __LINBOX_mpicpp_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/prime-stream.h b/linbox/util/prime-stream.h
index cf8393b..8a46af7 100644
--- a/linbox/util/prime-stream.h
+++ b/linbox/util/prime-stream.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/randiter/primes.h
* Copyright (C) 2002 Bradford Hovinen
*
@@ -7,7 +5,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*
* Stream of prime numbers
*/
@@ -90,3 +106,12 @@ namespace LinBox
#endif // __LINBOX_prime_stream_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/timer.h b/linbox/util/timer.h
index 1f02562..ab71498 100644
--- a/linbox/util/timer.h
+++ b/linbox/util/timer.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/util/timer.h
* Copyright (C) 1994-1997 Givaro Team
*
@@ -13,7 +11,25 @@
* get elapsed times.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*
*/
@@ -25,13 +41,23 @@
#ifndef __LINBOX_timer_H
#define __LINBOX_timer_H
+#include <time.h>
#include <givaro/givtimer.h>
namespace LinBox {
-typedef ::Givaro::Timer Timer ;
-typedef ::Givaro::BaseTimer BaseTimer ;
-typedef ::Givaro::UserTimer UserTimer ;
-typedef ::Givaro::SysTimer SysTimer ;
+typedef Givaro::Timer Timer ;
+typedef Givaro::BaseTimer BaseTimer ;
+typedef Givaro::UserTimer UserTimer ;
+typedef Givaro::SysTimer SysTimer ;
}
#endif //__LINBOX_timer_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/util/util.doxy b/linbox/util/util.doxy
index c5a475f..8032b98 100644
--- a/linbox/util/util.doxy
+++ b/linbox/util/util.doxy
@@ -1,3 +1,25 @@
+/* Copyright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+
/** \ingroup linbox
\defgroup util util
diff --git a/linbox/vector/Makefile.am b/linbox/vector/Makefile.am
index 16881a4..afaef51 100644
--- a/linbox/vector/Makefile.am
+++ b/linbox/vector/Makefile.am
@@ -1,6 +1,24 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
pkgincludesubdir=$(pkgincludedir)/vector
EXTRA_DIST= \
@@ -8,7 +26,7 @@ EXTRA_DIST= \
pkgincludesub_HEADERS= \
pair.h \
- light_container.h \
+ light_container.h \
sparse.h \
vector-traits.h \
subvector.h \
@@ -16,7 +34,10 @@ pkgincludesub_HEADERS= \
reverse.h \
random.h \
stream.h \
+ stream-gf2.h \
bit-vector.h \
bit-vector.inl \
vector-domain.h \
- vector-domain.inl
+ vector-domain-gf2.h \
+ vector-domain.inl \
+ vector-domain-gf2.inl
diff --git a/linbox/vector/Makefile.in b/linbox/vector/Makefile.in
index 3e282a1..e02a917 100644
--- a/linbox/vector/Makefile.in
+++ b/linbox/vector/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,10 +15,47 @@
@SET_MAKE@
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -41,12 +78,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -54,7 +94,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -63,18 +106,44 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludesubdir)"
-pkgincludesubHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(pkgincludesub_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -86,6 +155,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -109,10 +179,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -133,10 +205,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -145,6 +222,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -161,6 +240,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -223,17 +303,13 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
pkgincludesubdir = $(pkgincludedir)/vector
EXTRA_DIST = \
vector.doxy
pkgincludesub_HEADERS = \
pair.h \
- light_container.h \
+ light_container.h \
sparse.h \
vector-traits.h \
subvector.h \
@@ -241,10 +317,13 @@ pkgincludesub_HEADERS = \
reverse.h \
random.h \
stream.h \
+ stream-gf2.h \
bit-vector.h \
bit-vector.inl \
vector-domain.h \
- vector-domain.inl
+ vector-domain-gf2.h \
+ vector-domain.inl \
+ vector-domain-gf2.inl
all: all-am
@@ -258,9 +337,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/vector/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps linbox/vector/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps linbox/vector/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps linbox/vector/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -278,6 +357,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -286,21 +366,25 @@ clean-libtool:
-rm -rf .libs _libs
install-pkgincludesubHEADERS: $(pkgincludesub_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(pkgincludesubdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)"
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgincludesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgincludesubHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- $(pkgincludesubHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludesubdir)" || exit $$?; \
done
uninstall-pkgincludesubHEADERS:
@$(NORMAL_UNINSTALL)
- @list='$(pkgincludesub_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgincludesubdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgincludesubdir)/$$f"; \
- done
+ @list='$(pkgincludesub_HEADERS)'; test -n "$(pkgincludesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgincludesubdir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -314,7 +398,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -322,29 +406,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -365,13 +454,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -392,16 +485,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -487,6 +586,7 @@ uninstall-am: uninstall-pkgincludesubHEADERS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-pkgincludesubHEADERS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/linbox/vector/bit-vector.h b/linbox/vector/bit-vector.h
index 3c066ba..38a8464 100644
--- a/linbox/vector/bit-vector.h
+++ b/linbox/vector/bit-vector.h
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/vector/bit-vector.h
* Copyright (C) 2003 Bradford Hovinen
*
* -------------------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_bit_vector_H
@@ -37,8 +53,7 @@ namespace LinBox
t &= 0xf;
return bool( (0x6996 >> t) & 0x1);
}
-#endif
-#if (__LINBOX_SIZEOF_LONG == 8)
+#elif (__LINBOX_SIZEOF_LONG == 8)
#define __LINBOX_BITSOF_LONG 64
#define __LINBOX_BITSOF_LONG_MUN 63
#define __LINBOX_LOGOF_SIZE 6
@@ -54,6 +69,8 @@ namespace LinBox
t &= 0xf;
return bool( (0x6996 >> t) & 0x1);
}
+#else
+#pragma message "error SIZEOF_LONG not defined !"
#endif
/** A vector of boolean 0-1 values, stored compactly to save space.
@@ -166,7 +183,30 @@ namespace LinBox
} // namespace LinBox
+// RawVector for GF2
+namespace LinBox
+{
+ template <>
+ struct RawVector<bool> {
+ public:
+ typedef BitVector Dense;
+ typedef std::vector<size_t> Sparse;
+ typedef std::vector<size_t> SparseSeq;
+ typedef std::vector<size_t> SparseMap;
+ typedef std::vector<size_t> SparsePar;
+ };
+
+}
#include "linbox/vector/bit-vector.inl"
#endif // __LINBOX_bit_vector_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/bit-vector.inl b/linbox/vector/bit-vector.inl
index ae8efc5..8100ba8 100644
--- a/linbox/vector/bit-vector.inl
+++ b/linbox/vector/bit-vector.inl
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/vector/bit-vector.inl
* Copyright (C) 2003 Bradford Hovinen
*
* -------------------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_bit_vector_INL
@@ -13,10 +29,13 @@
#include <stdexcept>
#include <vector>
+// #ifdef __PATHCC__
+// #include <bits/stl_bvector.h> // does not exist
+// #endif
-#include "linbox/vector/vector-traits.h"
-#include "linbox/vector/bit-vector.h"
+// #include "linbox/vector/vector-traits.h"
+// #include "linbox/vector/bit-vector.h"
namespace std
{
@@ -173,7 +192,8 @@ namespace LinBox
}
// class BitVector::iterator : public std::iterator <std::random_access_iterator_tag, bool>
- class BitVector::iterator : public std::_Bit_iterator {
+ // class BitVector::iterator : public std::_Bit_iterator {
+ class BitVector::iterator : public std::vector<bool>::iterator {
public:
typedef std::iterator_traits<iterator>::iterator_category iterator_category;
@@ -189,7 +209,7 @@ namespace LinBox
_ref (word, position)
{}
iterator (const iterator &i) :
- std::_Bit_iterator(),_ref (i._ref._word, i._ref._pos)
+ std::vector<bool>::iterator(),_ref (i._ref._word, i._ref._pos)
{}
iterator &operator = (const iterator &i)
@@ -219,13 +239,13 @@ namespace LinBox
iterator operator + (difference_type i) const
{
std::vector<unsigned long>::iterator new_word = _ref._word + (i >> __LINBOX_LOGOF_SIZE);
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:2259)
-#endif
- uint8_t new_pos = _ref._pos + (uint8_t) (i & __LINBOX_POS_ALL_ONES);
-#ifdef __INTEL_COMPILER
-#pragma warning(enable:2259)
-#endif
+// #ifdef __INTEL_COMPILER
+// #pragma warning(disable:2259)
+// #endif
+ uint8_t new_pos = (uint8_t) ((int)_ref._pos + (i & __LINBOX_POS_ALL_ONES));
+// #ifdef __INTEL_COMPILER
+// #pragma warning(enable:2259)
+// #endif
new_word += new_pos >> __LINBOX_LOGOF_SIZE;
new_pos &= __LINBOX_POS_ALL_ONES;
@@ -241,13 +261,7 @@ namespace LinBox
iterator &operator += (difference_type i)
{
_ref._word += i >> __LINBOX_LOGOF_SIZE;
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:2259)
-#endif
- _ref._pos += (uint8_t) (i & __LINBOX_POS_ALL_ONES);
-#ifdef __INTEL_COMPILER
-#pragma warning(enable:2259)
-#endif
+ _ref._pos = (uint8_t) ( (int32_t) _ref._pos + (i & __LINBOX_POS_ALL_ONES) );
_ref._word += _ref._pos >> __LINBOX_LOGOF_SIZE;
_ref._pos &= __LINBOX_POS_ALL_ONES;
return *this;
@@ -370,13 +384,13 @@ namespace LinBox
const_iterator operator + (long i) const
{
std::vector<unsigned long>::const_iterator new_word = _ref._word + (i >> __LINBOX_LOGOF_SIZE);
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:2259)
-#endif
- uint8_t new_pos = _ref._pos + (uint8_t) (i & __LINBOX_POS_ALL_ONES);
-#ifdef __INTEL_COMPILER
-#pragma warning(enable:2259)
-#endif
+// #ifdef __INTEL_COMPILER
+// #pragma warning(disable:2259)
+// #endif
+ uint8_t new_pos = (uint8_t) ((int)_ref._pos + (i & __LINBOX_POS_ALL_ONES));
+// #ifdef __INTEL_COMPILER
+// #pragma warning(enable:2259)
+// #endif
new_word += new_pos >> __LINBOX_LOGOF_SIZE;
new_pos &= __LINBOX_POS_ALL_ONES;
@@ -386,13 +400,13 @@ namespace LinBox
const_iterator &operator += (long i)
{
_ref._word += i >> __LINBOX_LOGOF_SIZE;
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:2259)
-#endif
- _ref._pos += (uint8_t) (i & __LINBOX_POS_ALL_ONES);
-#ifdef __INTEL_COMPILER
-#pragma warning(enable:2259)
-#endif
+// #ifdef __INTEL_COMPILER
+// #pragma warning(disable:2259)
+// #endif
+ _ref._pos = (uint8_t) ((int) _ref._pos + (i & __LINBOX_POS_ALL_ONES));
+// #ifdef __INTEL_COMPILER
+// #pragma warning(enable:2259)
+// #endif
_ref._word += _ref._pos >> __LINBOX_LOGOF_SIZE;
_ref._pos &= __LINBOX_POS_ALL_ONES;
return *this;
@@ -513,12 +527,12 @@ namespace LinBox
inline BitVector::reference BitVector::operator[] (BitVector::size_type n)
{
- return *(begin () + n);
+ return *(begin () + (difference_type) n);
}
inline BitVector::const_reference BitVector::operator[] (BitVector::size_type n) const
{
- return *(begin () + n);
+ return *(begin () + (difference_type) n);
}
inline BitVector::reference BitVector::at (BitVector::size_type n)
@@ -644,3 +658,12 @@ namespace LinBox
#endif // __LINBOX_bit_vector_INL
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/light_container.h b/linbox/vector/light_container.h
index 0316877..a84acd3 100644
--- a/linbox/vector/light_container.h
+++ b/linbox/vector/light_container.h
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by JG Dumas <Jean-Guillaume.Dumas at imag.fr>
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -169,16 +170,16 @@ namespace LinBox
return newpos;
}
- iterator insert(iterator pos, const_iterator beg, const_iterator end)
+ iterator insert(iterator pos, const_iterator Beg, const_iterator End)
{
REQUIRE( (pos-begin()) <= (end()-begin()) );
REQUIRE( (pos-begin()) >= 0 );
if (pos == _finish) {
- for(const_iterator iter=beg; iter != end; ++iter)
+ for(const_iterator iter=Beg; iter != End; ++iter)
push_back(*iter);
}
else {
- for(const_iterator iter=beg; iter != end; ++iter)
+ for(const_iterator iter=Beg; iter != End; ++iter)
insert(pos, *iter);
}
ENSURE( allocated >= size() );
@@ -339,3 +340,12 @@ namespace LinBox
#endif //__LINBOX_light_vector_container_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/pair.h b/linbox/vector/pair.h
index 9839430..ebc1237 100644
--- a/linbox/vector/pair.h
+++ b/linbox/vector/pair.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
* Written by JG Dumas <Jean-Guillaume.Dumas at imag.fr>
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
// Pair of I and T : struct { column index, value }
@@ -102,3 +103,12 @@ public:
#endif // __LINBOX_pair_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/random.h b/linbox/vector/random.h
index 813fc6b..5204070 100644
--- a/linbox/vector/random.h
+++ b/linbox/vector/random.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-sparse0.C (Formerly test-sparse-matrix.C)
* Copyright (C) 2002 William J. Turner
*
@@ -12,8 +10,24 @@
* vector-traits.h for more details.
*
* ------------------------------------
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * See COPYING for lincense information.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
*/
#ifndef __LINBOX_vector_random_H
@@ -188,3 +202,12 @@ namespace LinBox
#endif // __LINBOX_vector_random_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/reverse.h b/linbox/vector/reverse.h
index 76d2674..94394f8 100644
--- a/linbox/vector/reverse.h
+++ b/linbox/vector/reverse.h
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/vector/reverse.h
* Copyright (C) 2002 Bradford Hovinen
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_reverse_H
@@ -139,3 +155,12 @@ namespace LinBox
} // namespace LinBox
#endif //__LINBOX_reverse_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/sparse.h b/linbox/vector/sparse.h
index 31e01b5..e73fa2a 100644
--- a/linbox/vector/sparse.h
+++ b/linbox/vector/sparse.h
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/solutions/minpoly.h
* Copyright (C) 2000, 2010 Jean-Guillaume Dumas
*
* Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
// =======================================================================
@@ -28,7 +29,7 @@
#define __LINBOX_sparse_vector_H
#include <iostream>
-#include <linbox/vector/vector-traits.h>
+#include "linbox/vector/vector-traits.h"
// ---------------------------------------------------
//
@@ -101,3 +102,12 @@ namespace LinBox
} //end of namespace LinBox
#endif // __LINBOX_sparse_vector_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/stream-gf2.h b/linbox/vector/stream-gf2.h
new file mode 100644
index 0000000..9d16a01
--- /dev/null
+++ b/linbox/vector/stream-gf2.h
@@ -0,0 +1,213 @@
+/* linbox/vector/stream.h
+ * Copyright (C) 2002 Bradford Hovinen
+ *
+ * Written by Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * ------------------------------------
+ * 2003-02-03 Bradford Hovinen <bghovinen at math.uwaterloo.ca>
+ *
+ * RandomSparseStream::RandomSparseStream: put probability parameter before
+ * vector dimension
+ * ------------------------------------
+ * 2002-09-05 Bradford Hovinen <bghovine at math.uwaterloo.ca>
+ *
+ * - Renamed to stream.h and moved to linbox/vector
+ * - VectorFactory is now called VectorStream, which fits its purpose
+ * somewhat better
+ * - The interface is now closer to the interface for istream
+ * - RandomDenseVectorFactory, et al. are refactored into classes
+ * parameterized on the vector type and specialized appropriately. This
+ * allows, e.g. construction of a random dense vector in sparse
+ * representation and so on.
+ * - New constructor interface for RandomSparseStream accepts proportion of
+ * nonzero entries; removed existing constructors
+ * - Reindented, since the other changes are so numerous that diffs aren't a
+ * big deal anyway
+ *
+ * ------------------------------------
+ * 2002-05-18 Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * Refactor: Create one class StandardBasisFactory, parameterized by vector
+ * type, with specializations for dense, sparse map, and sparse associative
+ * vectors.
+ *
+ * ------------------------------------
+ * Modified by Dmitriy Morozov <linbox at foxcub.org>. May 27, 2002.
+ *
+ * Added parametrization of the VectorCategroy tags by VectorTraits (see
+ * vector-traits.h for more details).
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/**
+ * @file vector/stream.h
+ *
+ * @brief Generation of sequences of random vectors.
+ *
+ * Random, sparse, basis vectors,...
+ */
+
+#ifndef __LINBOX_vector_stream_gf2_H
+#define __LINBOX_vector_stream_gf2_H
+
+#include <vector>
+#include <cmath>
+
+#include "linbox/field/gf2.h"
+#include "linbox/vector/stream.h"
+
+namespace LinBox
+{ /* RandomDenseStream */
+ class RandomDenseStreamGF2 : public VectorStream<BitVector> {
+ public:
+ typedef BitVector Vector;
+
+ RandomDenseStreamGF2 (const GF2 &, uint32_t seed, size_t nn, size_t mm = 0) :
+ MT (seed), _n (nn), _m (mm), _j (0)
+ {}
+
+ Vector &get (Vector &v)
+ {
+ Vector::word_iterator i;
+
+ if (_m > 0 && _j++ >= _m)
+ return v;
+
+ for (i = v.wordBegin (); i != v.wordEnd (); i++)
+ *i = MTrandomInt<__LINBOX_BITSOF_LONG>()(MT);
+
+ const size_t zeroing = __LINBOX_BITSOF_LONG - (v.size() % __LINBOX_BITSOF_LONG);
+ *(v.wordRbegin()) <<= zeroing;
+ *(v.wordRbegin()) >>= zeroing;
+ return v;
+ }
+
+ size_t size () const
+ { return _m; }
+ size_t pos () const
+ { return _j; }
+ size_t dim () const
+ { return _n; }
+ operator bool () const
+ { return _m == 0 || _j < _m; }
+ void reset () { _j = 0; }
+
+ private:
+ MersenneTwister MT;
+ size_t _n;
+ size_t _m;
+ size_t _j;
+ };
+}
+
+// Specialization of RandomSparseStream
+namespace LinBox
+{ /* RandomSparseStream */
+
+ template <class _Vector = Vector<GF2>::Sparse>
+ class RandomSparseStreamGF2 : public VectorStream<_Vector> {
+ public:
+ typedef GF2 Field;
+ typedef _Vector Vector;
+
+ RandomSparseStreamGF2 (const GF2 &, uint32_t seed, double p, size_t N, size_t M = 0) :
+ MT (seed), _n (N), _m (M), _j (0)
+ { setP (p); }
+
+ RandomSparseStreamGF2 (const GF2 &F, const GF2RandIter& r, double p, size_t N, size_t M = 0) :
+ MT (r.getMT()), _n (N), _m (M), _j (0)
+ { setP (p); }
+
+ Vector &get (Vector &v);
+
+ size_t size () const
+ { return _m; }
+ size_t pos () const
+ { return _j; }
+ size_t dim () const
+ { return _n; }
+ operator bool () const
+ { return _m == 0 || _j < _m; }
+ void reset () { _j = 0; }
+
+ void setP (double p)
+ {
+ linbox_check ((p >= 0.0) && (p <= 1.0));
+ _p = p;
+ _1_log_1mp = 1 / log (1 - _p);
+ }
+
+ private:
+ MersenneTwister MT;
+ size_t _n;
+ double _p;
+ double _1_log_1mp;
+ size_t _m;
+ size_t _j;
+ };
+
+ template <class _Vector>
+ _Vector &RandomSparseStreamGF2<_Vector>::get (_Vector &v)
+ {
+ size_t i = (size_t) -1;
+ double val;
+ int skip;
+
+ if (_m > 0 && _j++ >= _m)
+ return v;
+
+ v.clear ();
+
+ while (1) {
+ val = (double) MT.randomDouble ();
+ skip = (int) (ceil (log (val) * _1_log_1mp));
+
+ if (skip <= 0)
+ i++;
+ else
+ i += (size_t) skip;
+
+ if (i >= _n) break;
+
+ v.push_back (i);
+ }
+
+ return v;
+ }
+
+}
+
+
+#endif // __LINBOX_vector_stream_H
+
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/stream.h b/linbox/vector/stream.h
index fcf3b8c..76d1fa7 100644
--- a/linbox/vector/stream.h
+++ b/linbox/vector/stream.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/vector/stream.h
* Copyright (C) 2002 Bradford Hovinen
*
@@ -41,7 +39,33 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+/**
+ * @file vector/stream.h
+ *
+ * @brief Generation of sequences of random vectors.
+ *
+ * Random, sparse, basis vectors,...
*/
#ifndef __LINBOX_vector_stream_H
@@ -50,19 +74,13 @@
#include <vector>
#include <cmath>
-#include "linbox/vector/vector-traits.h"
#include "linbox/util/debug.h"
+#include "linbox/vector/vector-traits.h"
#include "linbox/randiter/nonzero.h"
#include "linbox/randiter/mersenne-twister.h"
-/**
- * @file vector/stream.h
- *
- * @brief Generation of sequences of random vectors.
- *
- * Random, sparse, basis vectors,...
- */
+// stream
namespace LinBox
{
@@ -185,7 +203,11 @@ namespace LinBox
size_t _m;
size_t _j;
};
+}
+// Dense
+namespace LinBox
+{
/** @brief Random dense vector stream.
* Generates a sequence of random dense vectors over a given field
*/
@@ -250,12 +272,12 @@ namespace LinBox
typedef _Vector Vector;
typedef RandomDenseStream<Field, Vector, RandIter, VectorCategories::DenseVectorTag > Self_t;
- RandomDenseStream (const Field &F, size_t n, size_t m = 0) :
- _F (F), _r (F), _n (n), _m (m), _j (0)
+ RandomDenseStream (const Field &F, size_t nn, size_t mm = 0) :
+ _field (F), _r (F), _n (nn), _m (mm), _j (0)
{}
- RandomDenseStream (const Field &F, const RandIter &r, size_t n, size_t m = 0) :
- _F (F), _r (r), _n (n), _m (m), _j (0)
+ RandomDenseStream (const Field &F, const RandIter &r, size_t nn, size_t mm = 0) :
+ _field (F), _r (r), _n (nn), _m (mm), _j (0)
{}
Vector &get (Vector &v)
@@ -282,13 +304,18 @@ namespace LinBox
void reset () { _j = 0; }
private:
- const Field &_F;
+ const Field &_field;
RandIter _r;
size_t _n;
size_t _m;
size_t _j;
};
+}
+
+//Sparse
+namespace LinBox
+{
/** @brief Random sparse vector stream.
* Generates a sequence of random sparse vectors over a given field
*/
@@ -316,7 +343,7 @@ namespace LinBox
* @param m Number of vectors to return (0 for unlimited)
* @param seed
*/
- RandomSparseStream (const Field &F, const RandIter &r, double p, size_t n, size_t m = 0, int seed=time (NULL));
+ RandomSparseStream (const Field &F, const RandIter &r, double p, size_t n, size_t m = 0, int seed=(int)time (NULL));
/** Get next element
* @param v Vector into which to generate random vector
@@ -360,16 +387,22 @@ namespace LinBox
typedef _Vector Vector;
typedef RandomSparseStream<Field, Vector, RandIter, VectorCategories::DenseVectorTag > Self_t;
- RandomSparseStream (const Field &F, double p, size_t n, size_t m = 0) :
- _F (F), _r1 (F), _r (F, _r1),
- _n (n), _p (p), _m (m), _j (0),
- MT (time (NULL))
- { linbox_check ((p >= 0.0) && (p <= 1.0)); _F.init (_zero, 0); }
+ RandomSparseStream (const Field &F, double p, size_t N, size_t M = 0) :
+ _field (F), _r1 (F), _r (F, _r1),
+ _n (N), _p (p), _m (M), _j (0),
+ MT ((uint32_t)time (NULL))
+ {
+ linbox_check ((p >= 0.0) && (p <= 1.0));
+ _field.init (_zero, 0);
+ }
- RandomSparseStream (const Field &F, const RandIter &r, double p, size_t n, size_t m = 0, int seed=time (NULL)) :
- _F (F), _r1 (r), _r (F, _r1), _n (n), _p (p), _m (m), _j (0),
- MT (seed)
- { linbox_check ((p >= 0.0) && (p <= 1.0)); _F.init (_zero, 0); }
+ RandomSparseStream (const Field &F, const RandIter &r, double p, size_t n, size_t m = 0, int seed=(int)time (NULL)) :
+ _field (F), _r1 (r), _r (F, _r1), _n (n), _p (p), _m (m), _j (0),
+ MT ((uint32_t)seed)
+ {
+ linbox_check ((p >= 0.0) && (p <= 1.0));
+ _field.init (_zero, 0);
+ }
Vector &get (Vector &v)
{
@@ -384,7 +417,7 @@ namespace LinBox
if (val < _p)
_r.random (*i);
else
- _F.assign (*i, _zero);
+ _field.assign (*i, _zero);
}
return v;
@@ -402,7 +435,7 @@ namespace LinBox
void setP (double p) { linbox_check ((p >= 0.0) && (p <= 1.0)); _p = p; }
private:
- const Field &_F;
+ const Field &_field;
typename Field::Element _zero;
RandIter _r1;
NonzeroRandIter<Field, RandIter> _r;
@@ -420,14 +453,15 @@ namespace LinBox
typedef _Vector Vector;
typedef RandomSparseStream<Field, Vector, RandIter, VectorCategories::SparseSequenceVectorTag > Self_t;
- RandomSparseStream (const Field &F, double p, size_t n, size_t m = 0) :
- _F (F), _r1 (F), _r (F, _r1), _n (n), _m (m), _j (0),
- MT (time (NULL))
+ RandomSparseStream (const Field &F, double p, size_t N, size_t M = 0) :
+ _field (F), _r1 (F), _r (F, _r1), _n (N), _m (M), _j (0),
+ MT ((uint32_t)time (NULL))
{ setP (p); }
- RandomSparseStream (const Field &F, const RandIter &r, double p, size_t n, size_t m = 0, int seed=time (NULL)) :
- _F (F), _r1 (r), _r (F, _r1), _n (n), _p (p), _m (m), _j (0),
- MT (seed)
+ RandomSparseStream (const Field &F, const RandIter &r, double p,
+ size_t N, size_t M = 0, int seed=(int)time (NULL)) :
+ _field (F), _r1 (r), _r (F, _r1), _n (N), _p (p), _m (M), _j (0),
+ MT ((uint32_t)seed)
{ setP (p); }
Vector &get (Vector &v)
@@ -449,7 +483,7 @@ namespace LinBox
if (skip <= 0)
++i;
else
- i += skip;
+ i += (size_t)skip;
if (i >= _n) break;
@@ -478,7 +512,7 @@ namespace LinBox
}
private:
- const Field &_F;
+ const Field &_field;
RandIter _r1;
NonzeroRandIter<Field, RandIter> _r;
size_t _n;
@@ -496,15 +530,16 @@ namespace LinBox
typedef _Vector Vector;
typedef RandomSparseStream<Field, Vector, RandIter, VectorCategories::SparseAssociativeVectorTag > Self_t;
- RandomSparseStream (const Field &F, double p, size_t n, size_t m = 0) :
- _F (F), _r1 (F), _r (F, _r1),
- _n (n), _k ((long) (p * n)), _j (0), _m (m),
- MT (time (NULL))
+ RandomSparseStream (const Field &F, double p, size_t N, size_t M = 0) :
+ _field (F), _r1 (F), _r (F, _r1),
+ _n (N), _k ((long) (p * (double)N)), _j (0), _m (M),
+ MT ((uint32_t)time (NULL))
{}
- RandomSparseStream (const Field &F, const RandIter &r, double p, size_t n, size_t m = 0, int seed=time (NULL)) :
- _F (F), _r1 (F), _r (F, _r1), _n (n), _k ((long) (p * n)), _j (0), _m (m),
- MT (seed)
+ RandomSparseStream (const Field &F, const RandIter &r, double p, size_t N,
+ size_t M = 0, int seed=(int)time (NULL)) :
+ _field (F), _r1 (F), _r (F, _r1), _n (N), _k ((long) (p * N)), _j (0), _m (M),
+ MT ((uint32_t) seed)
{}
Vector &get (Vector &v)
@@ -519,7 +554,7 @@ namespace LinBox
for (i = 0; i < _k; i++) {
_r.random (x);
- while (!_F.isZero (v[idx = MT.randomIntRange (0, _n)])) ;
+ while (!_field.isZero (v[idx = MT.randomIntRange (0, (uint32_t)_n)])) ;
v[idx] = x;
}
@@ -538,7 +573,7 @@ namespace LinBox
void setP (double p) { _k = (long) (p * _n); }
private:
- const Field &_F;
+ const Field &_field;
RandIter _r1;
NonzeroRandIter<Field, RandIter> _r;
size_t _n;
@@ -555,14 +590,14 @@ namespace LinBox
typedef _Vector Vector;
typedef RandomSparseStream<Field, Vector, RandIter, VectorCategories::SparseParallelVectorTag > Self_t;
- RandomSparseStream (const Field &F, double p, size_t n, size_t m = 0) :
- _F (F), _r1 (F), _r (F, _r1), _n (n), _m (m), _j (0),
- MT (time (NULL))
+ RandomSparseStream (const Field &F, double p, size_t nn, size_t mm = 0) :
+ _field (F), _r1 (F), _r (F, _r1), _n (nn), _m (mm), _j (0),
+ MT ((uint32_t)time (NULL))
{ setP (p); }
- RandomSparseStream (const Field &F, const RandIter &r, double p, size_t n, size_t m = 0, int seed=time (NULL)) :
- _F (F), _r1 (r), _r (F, _r1), _n (n), _m (m), _j (0),
- MT (seed)
+ RandomSparseStream (const Field &F, const RandIter &r, double p, size_t nn, size_t mm = 0, int seed=(int)time (NULL)) :
+ _field (F), _r1 (r), _r (F, _r1), _n (nn), _m (mm), _j (0),
+ MT ((uint32_t)seed)
{ setP (p); }
Vector &get (Vector &v)
@@ -585,7 +620,7 @@ namespace LinBox
if (skip <= 0)
i++;
else
- i += skip;
+ i += (size_t) skip;
if (i >= _n) break;
@@ -616,7 +651,7 @@ namespace LinBox
}
private:
- const Field &_F;
+ const Field &_field;
RandIter _r1;
NonzeroRandIter<Field, RandIter> _r;
size_t _n;
@@ -626,7 +661,11 @@ namespace LinBox
size_t _j;
MersenneTwister MT;
};
+}
+// standard basis
+namespace LinBox
+{
/** @brief Stream for \f$e_1,\cdots,e_n\f$.
* Generates the sequence (e_1,...,e_n) over a given field
*
@@ -677,7 +716,7 @@ namespace LinBox
void reset ();
private:
- const Field &_F;
+ const Field &_field;
size_t _n;
size_t _j;
};
@@ -689,8 +728,8 @@ namespace LinBox
typedef _Vector Vector;
typedef StandardBasisStream<Field, Vector, VectorCategories::DenseVectorTag > Self_t;
- StandardBasisStream (const Field &F, size_t n) :
- _F (F), _n (n), _j (0)
+ StandardBasisStream (const Field &F, size_t N) :
+ _field (F), _n (N), _j (0)
{}
Vector &get (Vector &v)
@@ -701,9 +740,9 @@ namespace LinBox
for (i = v.begin (), idx = 0; i != v.end (); i++, idx++) {
if (idx == _j)
- _F.init (*i, 1);
+ _field.init (*i, 1);
else
- _F.assign (*i, zero);
+ _field.assign (*i, zero);
}
_j++;
@@ -722,7 +761,7 @@ namespace LinBox
void reset () { _j = 0; }
private:
- const Field &_F;
+ const Field &_field;
size_t _n;
size_t _j;
};
@@ -734,9 +773,9 @@ namespace LinBox
typedef _Vector Vector;
typedef StandardBasisStream<Field, Vector, VectorCategories::SparseSequenceVectorTag > Self_t;
- StandardBasisStream (Field &F, size_t n) :
- _F (F), _n (n), _j (0)
- { _F.init (_one, 1); }
+ StandardBasisStream (Field &F, size_t N) :
+ _field (F), _n (N), _j (0)
+ { _field.init (_one, 1); }
Vector &get (Vector &v)
{
@@ -759,7 +798,7 @@ namespace LinBox
void reset () { _j = 0; }
private:
- const Field &_F;
+ const Field &_field;
size_t _n;
size_t _j;
typename Field::Element _one;
@@ -772,9 +811,9 @@ namespace LinBox
typedef _Vector Vector;
typedef StandardBasisStream<Field, Vector, VectorCategories::SparseAssociativeVectorTag > Self_t;
- StandardBasisStream (Field &F, size_t n) :
- _F (F), _n (n), _j (0)
- { _F.init (_one, 1); }
+ StandardBasisStream (Field &F, size_t N) :
+ _field (F), _n (N), _j (0)
+ { _field.init (_one, 1); }
Vector &get (Vector &v)
{
@@ -797,7 +836,7 @@ namespace LinBox
void reset () { _j = 0; }
private:
- const Field &_F;
+ const Field &_field;
size_t _n;
size_t _j;
typename Field::Element _one;
@@ -810,9 +849,9 @@ namespace LinBox
typedef _Vector Vector;
typedef StandardBasisStream<Field, Vector, VectorCategories::SparseParallelVectorTag> Self_t;
- StandardBasisStream (Field &F, size_t n) :
- _F (F), _n (n), _j (0)
- { _F.init (_one, 1); }
+ StandardBasisStream (Field &F, size_t N) :
+ _field (F), _n (N), _j (0)
+ { _field.init (_one, 1); }
Vector &get (Vector &v)
{
@@ -838,7 +877,7 @@ namespace LinBox
void reset () { _j = 0; }
private:
- const Field &_F;
+ const Field &_field;
size_t _n;
size_t _j;
typename Field::Element _one;
@@ -846,5 +885,17 @@ namespace LinBox
} // namespace LinBox
+#include "linbox/vector/stream-gf2.h"
+
#endif // __LINBOX_vector_stream_H
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/subiterator.h b/linbox/vector/subiterator.h
index 2b2b00e..483544b 100644
--- a/linbox/vector/subiterator.h
+++ b/linbox/vector/subiterator.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/vector/subiterator.h
* Copyright (C) 2002 William J. Turner
*
@@ -7,7 +5,25 @@
* Mods by -bds
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_subiterator_H
@@ -143,3 +159,12 @@ namespace LinBox
#endif // __LINBOX_subiterator_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/subvector.h b/linbox/vector/subvector.h
index 65b76e3..141d131 100644
--- a/linbox/vector/subvector.h
+++ b/linbox/vector/subvector.h
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/vector/subvector.h
* Copyright (C) 2002 William J. Turner
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*
* Written by William J. Turner <wjturner at acm.org>
* Mods by -bds
@@ -16,9 +32,9 @@
#ifndef __LINBOX_subvector_H
#define __LINBOX_subvector_H
-#include <linbox/vector/subiterator.h>
+#include "linbox/vector/subiterator.h"
#include <iterator>
-#include <linbox/vector/vector-traits.h>
+#include "linbox/vector/vector-traits.h"
#include <stdexcept>
namespace LinBox
@@ -70,12 +86,12 @@ namespace LinBox
_end (iterator (v.begin() + start + (stride * length), stride))
{}
- Subvector(iterator begin, iterator end) :
- _begin(begin), _end(end)
+ Subvector(iterator Begin, iterator End) :
+ _begin(Begin), _end(End)
{}
- Subvector(iterator begin, size_type length) :
- _begin(begin), _end(begin + length)
+ Subvector(iterator Begin, size_type length) :
+ _begin(Begin), _end(Begin + length)
{}
//copy constructor
@@ -218,8 +234,19 @@ namespace LinBox
namespace std
{
- template<class TP>
- void swap (TP&, TP&);
+ template<class _Tp>
+ void swap (_Tp&, _Tp&)
+#ifdef __GNUC__
+#if (__GNUC__ == 4 && __GNUC_MINOR__ == 7)
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ noexcept(__and_<is_nothrow_move_constructible<_Tp>,
+ is_nothrow_move_assignable<_Tp>>::value)
+#endif
+#endif
+#endif
+ ;
+
+
template<class Iterator, class ConstIterator>
@@ -235,3 +262,12 @@ namespace std
#endif //__LINBOX_subvector_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/vector-domain-gf2.h b/linbox/vector/vector-domain-gf2.h
new file mode 100644
index 0000000..0743951
--- /dev/null
+++ b/linbox/vector/vector-domain-gf2.h
@@ -0,0 +1,548 @@
+/* linbox/vector/vector-domain.h
+ * Copyright (C) 2001-2002 Bradford Hovinen
+ *
+ * Written by Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * ------------------------------------
+ * 2002-04-10 Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * There are now two vector domain types: VectorDomainBase and
+ * VectorDomain. VectorDomainBase, which in principle can be used independently,
+ * contains all functions that require only one vector type (such as axpy, mul,
+ * read, and write). VectorDomain inherits VectorDomainBase and implements
+ * dotprod, which requires two vector types.
+ *
+ * ------------------------------------
+ * Modified by Dmitriy Morozov <linbox at foxcub.org>. May 27, 2002.
+ *
+ * Added the modifications for categories and vector traits that were designed
+ * at the Rootbeer meeting. Added parametrization of VectorTags by VectorTraits.
+ *
+ * ------------------------------------
+ * 2002-06-04 Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * Reverted change of 2002-04-10, reintegrating VectorDomain and
+ * VectorDomainBase. Now using template specialization on the functions, now
+ * that I know how to do it.
+ *
+ * ------------------------------------
+ * 2002-06-21 Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * Added methods add, addin, sub, subin, areEqual, isZero, and copy.
+ *
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+#ifndef __LINBOX_field_vector_domain_gf2_H
+#define __LINBOX_field_vector_domain_gf2_H
+
+#include "linbox/field/gf2.h"
+#include "linbox/vector/vector-domain.h"
+
+// DotProduct
+namespace LinBox
+{
+ // Specialization of DotProductDomain for GF2
+
+
+ template<>
+ class DotProductDomain<GF2> : private virtual VectorDomainBase<GF2> {
+ public:
+
+ typedef bool Element;
+
+ DotProductDomain (const GF2 &F) :
+ VectorDomainBase<GF2> (F)
+ {}
+
+ protected:
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDD (Element &res, const Vector1 &v1, const Vector2 &v2) const;
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecializedDSP (Element &res, const Vector1 &v1, const Vector2 &v2) const;
+
+ template <class Vector1, class Vector2>
+ inline BitVector::reference dotSpecializedDD (BitVector::reference res, const Vector1 &v1, const Vector2 &v2) const;
+
+ template <class Vector1, class Vector2>
+ inline BitVector::reference dotSpecializedDSP (BitVector::reference res, const Vector1 &v1, const Vector2 &v2) const;
+ };
+
+
+}
+
+
+// Specialization of vector domain
+namespace LinBox
+{
+
+ template <>
+ class VectorDomain<GF2> : private virtual VectorDomainBase<GF2>, private virtual DotProductDomain<GF2> {
+ public:
+ typedef bool Element;
+
+ VectorDomain (const VectorDomain &VD) :
+ VectorDomainBase<GF2> (VD._field), DotProductDomain<GF2> (VD._field)
+ {}
+
+ VectorDomain &operator = (const VectorDomain &) { return *this; }
+
+ const GF2 &field () const
+ {
+ return _field;
+ }
+
+ template <class Vector>
+ inline std::ostream &write (std::ostream &os, const Vector &x) const
+ {
+ return writeSpecialized (os, x, typename VectorTraits<Vector>::VectorCategory ());
+ }
+
+ template <class Vector>
+ inline std::istream &read (std::istream &is, Vector &x) const
+ {
+ return readSpecialized (is, x, typename VectorTraits<Vector>::VectorCategory ());
+ }
+
+ template <class Vector1, class Vector2>
+ inline Vector1 © (Vector1 &res, const Vector2 &v) const
+ {
+ return copySpecialized (res, v,
+ typename VectorTraits<Vector1>::VectorCategory (),
+ typename VectorTraits<Vector2>::VectorCategory ());
+ }
+
+ template <class Vector1, class Vector2>
+ inline Vector1 © (Vector1 &res, const Vector2 &v, size_t i, size_t len = 0) const
+ {
+ return copySpecialized (res, v, i, len,
+ typename VectorTraits<Vector1>::VectorCategory ());
+ }
+
+ template <class Vector1, class Vector2>
+ inline bool areEqual (const Vector1 &v1, const Vector2 &v2) const
+ {
+ return areEqualSpecialized (v1, v2,
+ typename VectorTraits<Vector1>::VectorCategory (),
+ typename VectorTraits<Vector2>::VectorCategory ());
+ }
+
+ template <class Vector>
+ inline bool isZero (const Vector &v) const
+ {
+ return isZeroSpecialized (v, typename VectorTraits<Vector>::VectorCategory ());
+ }
+
+ template <class Vector1, class Vector2>
+ inline Element &dot (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ return dotSpecialized (res, v1, v2,
+ typename VectorTraits<Vector1>::VectorCategory (),
+ typename VectorTraits<Vector2>::VectorCategory ());
+ }
+
+ template <class Vector1, class Vector2>
+ inline BitVector::reference dot (BitVector::reference res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ return dotSpecialized (res, v1, v2,
+ typename VectorTraits<Vector1>::VectorCategory (),
+ typename VectorTraits<Vector2>::VectorCategory ());
+ }
+
+ template <class Vector1, class Vector2>
+ inline Element &dotprod (Element &res, const Vector1 &v1, const Vector2 &v2) const
+ {
+ return dot (res, v1, v2);
+ }
+
+ template <class Vector1, class Vector2, class Vector3>
+ inline Vector1 &add (Vector1 &res, const Vector2 &y, const Vector3 &x) const
+ {
+ return addSpecialized (res, y, x,
+ typename VectorTraits<Vector1>::VectorCategory (),
+ typename VectorTraits<Vector2>::VectorCategory (),
+ typename VectorTraits<Vector3>::VectorCategory ());
+ }
+
+ template <class Vector1, class Vector2>
+ inline Vector1 &addin (Vector1 &y, const Vector2 &x) const
+ {
+ return addinSpecialized (y, x,
+ typename VectorTraits<Vector1>::VectorCategory (),
+ typename VectorTraits<Vector2>::VectorCategory ());
+ }
+
+ template <class Vector1, class Vector2, class Vector3>
+ inline Vector1 &sub (Vector1 &res, const Vector2 &y, const Vector3 &x) const
+ {
+ return addSpecialized (res, y, x,
+ typename VectorTraits<Vector1>::VectorCategory (),
+ typename VectorTraits<Vector2>::VectorCategory (),
+ typename VectorTraits<Vector3>::VectorCategory ());
+ }
+
+ template <class Vector1, class Vector2>
+ inline Vector1 &subin (Vector1 &y, const Vector2 &x) const
+ {
+ return addinSpecialized (y, x,
+ typename VectorTraits<Vector1>::VectorCategory (),
+ typename VectorTraits<Vector2>::VectorCategory ());
+ }
+
+ template <class Vector1, class Vector2>
+ inline Vector1 &neg (Vector1 &res, const Vector2 &x) const
+ {
+ copy (res, x);
+ return res;
+ }
+
+ template <class Vector>
+ inline Vector &negin (Vector &y) const
+ {
+ return y;
+ }
+
+ template <class Vector1, class Vector2>
+ inline Vector1 &mul (Vector1 &res, const Vector2 &x, const Element a) const
+ {
+ return mulSpecialized (res, x, a, typename VectorTraits<Vector1>::VectorCategory ());
+ }
+
+ template <class Vector>
+ inline Vector &mulin (Vector &x, const Element a) const
+ {
+ return mulinSpecialized (x, a, typename VectorTraits<Vector>::VectorCategory ());
+ }
+
+ template <class Vector1, class Vector2, class Vector3>
+ inline Vector1 &axpy (Vector1 &res, const Element a, const Vector2 &x, const Vector3 &y) const
+ {
+ if (a)
+ add (res, x, y);
+ else
+ this->copy (res, y);
+ return res;
+ }
+
+ template <class Vector1, class Vector2>
+ inline Vector1 &axpyin (Vector1 &y, const Element a, const Vector2 &x) const
+ {
+ if (a)
+ addin (y, x);
+ return y;
+ }
+
+ VectorDomain (const GF2 &F) :
+ VectorDomainBase<GF2> (F), DotProductDomain<GF2> (F)
+ {}
+
+
+ // Specialized function implementations
+ template <class Vector>
+ std::ostream &writeSpecialized (std::ostream &os, const Vector &x,
+ VectorCategories::DenseZeroOneVectorTag) const;
+ template <class Vector>
+ std::ostream &writeSpecialized (std::ostream &os, const Vector &x,
+ VectorCategories::SparseZeroOneVectorTag) const;
+
+ template <class Vector>
+ std::istream &readSpecialized (std::istream &is, const Vector &x,
+ VectorCategories::DenseZeroOneVectorTag) const;
+ template <class Vector>
+ std::istream &readSpecialized (std::istream &is, const Vector &x,
+ VectorCategories::SparseZeroOneVectorTag) const;
+
+ template <class Vector1, class Vector2>
+ bool areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const;
+
+ template <class Vector1, class Vector2>
+ bool areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const;
+ template <class Vector1, class Vector2>
+ inline bool areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ return areEqual (v2, v1);
+ }
+
+ template <class Vector1, class Vector2>
+ bool areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const;
+
+
+ template <class Vector>
+ bool isZeroSpecialized (const Vector &v, VectorCategories::DenseZeroOneVectorTag) const;
+ template <class Vector>
+ inline bool isZeroSpecialized (const Vector &v,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ return v.empty ();
+ }
+
+ template <class Vector1, class Vector2>
+ inline Vector1 ©Specialized (Vector1 &res, const Vector2 &v,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ std::copy (v.wordBegin (), v.wordEnd (), res.wordBegin ()); return res;
+ }
+
+ template <class Vector1, class Vector2>
+ inline Vector1 ©Specialized (Vector1 &res, const Vector2 &v, size_t i, size_t len, VectorCategories::DenseZeroOneVectorTag) const
+ {
+ std::copy (v.begin (), (len == 0) ? v.end () : v.begin () + len, res.begin () + i);
+ return res;
+ }
+
+ template <class Vector1, class Vector2>
+ inline Vector1 ©Specialized (Vector1 &res, const Vector2 &v, size_t i, size_t len, VectorCategories::DenseVectorTag) const
+ {
+ std::copy (v.begin (), (len == 0) ? v.end () : v.begin () + len, res.begin () + i);
+ return res;
+ }
+
+
+
+ template <class Vector1, class Vector2>
+ Vector1 ©Specialized (Vector1 &res, const Vector2 &v,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const;
+ template <class Vector1, class Vector2>
+ Vector1 ©Specialized (Vector1 &res, const Vector2 &v,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const;
+ template <class Vector1, class Vector2>
+ inline Vector1 ©Specialized (Vector1 &res, const Vector2 &v,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const
+ { res = v; return res; }
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecialized (Element &res, const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ return DotProductDomain<GF2>::dotSpecializedDD (res, v1, v2);
+ }
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecialized (Element &res, const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ return DotProductDomain<GF2>::dotSpecializedDSP (res, v1, v2);
+ }
+
+ template <class Vector1, class Vector2>
+ inline Element &dotSpecialized (Element &res, const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ return DotProductDomain<GF2>::dotSpecializedDSP (res, v2, v1);
+ }
+
+ template <class Vector1, class Vector2>
+ Element &dotSpecialized (Element &res, const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const;
+
+ template <class Vector1, class Vector2>
+ inline BitVector::reference dotSpecialized (BitVector::reference res, const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ return DotProductDomain<GF2>::dotSpecializedDD (res, v1, v2);
+ }
+
+ template <class Vector1, class Vector2>
+ inline BitVector::reference dotSpecialized (BitVector::reference res, const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ return DotProductDomain<GF2>::dotSpecializedDSP (res, v1, v2);
+ }
+
+ template <class Vector1, class Vector2>
+ inline BitVector::reference dotSpecialized (BitVector::reference res, const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ return DotProductDomain<GF2>::dotSpecializedDSP (res, v2, v1);
+ }
+
+ template <class Vector1, class Vector2>
+ BitVector::reference dotSpecialized (BitVector::reference res, const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const;
+
+ template <class Vector1, class Vector2, class Vector3>
+ Vector1 &addSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const;
+ template <class Vector1, class Vector2, class Vector3>
+ Vector1 &addSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ copy (res, y);
+ addin (res, x);
+ }
+
+ template <class Vector1, class Vector2, class Vector3>
+ Vector1 &addSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const;
+
+ template <class Vector1, class Vector2>
+ Vector1 &addinSpecialized (Vector1 &y, const Vector2 &x,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const;
+ template <class Vector1, class Vector2>
+ Vector1 &addinSpecialized (Vector1 &y, const Vector2 &x,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const;
+ template <class Vector1, class Vector2>
+ Vector1 &addinSpecialized (Vector1 &y, const Vector2 &x,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ Vector1 xp, res;
+ copy (xp, x);
+ add (res, y, xp);
+ copy (y, res);
+ return y;
+ }
+
+ template <class Vector1, class Vector2>
+ Vector1 &addinSpecialized (Vector1 &y, const Vector2 &x,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ Vector1 res;
+ add (res, y, x);
+ this->copy (y, res);
+ return y;
+ }
+
+ template <class Vector1, class Vector2>
+ Vector1 &mulSpecialized (Vector1 &res, const Vector2 &x, const Element a,
+ VectorCategories::DenseZeroOneVectorTag ) const
+ {
+ if (a)
+ this->copy (res, x);
+ else
+ std::fill (res.wordBegin (), res.wordEnd (), 0);
+ return res;
+ }
+
+ template <class Vector1, class Vector2>
+ Vector1 &mulSpecialized (Vector1 &res, const Vector2 &x, const Element a,
+ VectorCategories::SparseZeroOneVectorTag ) const
+ {
+ if (a)
+ this->copy (res, x);
+ else
+ res.clear ();
+ return res;
+ }
+
+ template <class Vector>
+ inline Vector &mulinSpecialized (Vector &x, const Element a,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ if (!a)
+ std::fill (x.wordBegin (), x.wordEnd (), 0);
+ return x;
+ }
+
+ template <class Vector>
+ inline Vector &mulinSpecialized (Vector &x, const Element a,
+ VectorCategories::SparseZeroOneVectorTag ) const
+ {
+ if (!a)
+ x.clear ();
+ return x;
+ }
+
+ template <class Vector1, class Vector2, class Vector3>
+ inline Vector1 &addSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
+ VectorCategories::GenericVectorTag,
+ VectorCategories::GenericVectorTag,
+ VectorCategories::GenericVectorTag) const
+ {
+ typename LinBox::Vector<GF2>::Sparse v;
+ typename LinBox::Vector<GF2>::Sparse w;
+ typename LinBox::Vector<GF2>::Sparse u;
+
+ copy (v, x);
+ copy (w, y);
+ add (u, w, v);
+ copy (res, u);
+
+ return u;
+ }
+
+ template <class Vector1, class Vector2, class Vector3>
+ inline Vector1 &subSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
+ VectorCategories::GenericVectorTag,
+ VectorCategories::GenericVectorTag,
+ VectorCategories::GenericVectorTag) const
+ {
+ typename LinBox::Vector<GF2>::Sparse v;
+ typename LinBox::Vector<GF2>::Sparse w;
+ typename LinBox::Vector<GF2>::Sparse u;
+
+ copy (v, x);
+ copy (w, y);
+ sub (u, w, v);
+ copy (res, u);
+
+ return u;
+ }
+ };
+
+}
+
+
+
+#include "linbox/vector/vector-domain-gf2.inl"
+
+#endif // __LINBOX_field_vector_domain_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/vector-domain-gf2.inl b/linbox/vector/vector-domain-gf2.inl
new file mode 100644
index 0000000..cb52ef2
--- /dev/null
+++ b/linbox/vector/vector-domain-gf2.inl
@@ -0,0 +1,408 @@
+/* linbox/vector/vector-domain.inl
+ * Copyright (C) 2001-2002 Bradford Hovinen
+ *
+ * Written by Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * ------------------------------------
+ * 2002-07-24 Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * Added support for the new SparseParallel vector type; this involves quite a
+ * few new specializations.
+ *
+ * ------------------------------------
+ * Modified by Dmitriy Morozov <linbox at foxcub.org>
+ *
+ * Added the modifications for categories and vector traits that were designed
+ * at the Rootbeer meeting. Added parametrization of VectorTags by VectorTraits.
+ *
+ * ------------------------------------
+ * 2002-06-04 Bradford Hovinen <hovinen at cis.udel.edu>
+ *
+ * Updated function definitions according to the new policy set in
+ * vector-domain.h This means the functions each take a parameter tag (or, for
+ * dot product, tag1 and tag2) that allows specialization by vector type.
+ * ------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+#ifndef __LINBOX_field_vector_domain_gf2_INL
+#define __LINBOX_field_vector_domain_gf2_INL
+
+
+#include <iostream>
+#include <cctype>
+
+namespace LinBox
+{ /* VectorDomain */
+ template <class Vector>
+ std::ostream &VectorDomain<GF2>::writeSpecialized (std::ostream &os, const Vector &x,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+
+
+ // TO BE REMOVED
+ os << "writeSpec DenseZO, of size " << x.size() << ' ';
+
+ os << "[ ";
+
+ for (typename Vector::const_iterator i = x.begin (); i != x.end (); ++i)
+ os << *i << ' ';
+
+ os << ']';
+
+ os << "( ";
+
+ for (typename Vector::const_word_iterator i = x.wordBegin (); i != x.wordEnd (); ++i)
+ os << *i << ' ';
+
+ os << ')';
+
+ return os;
+ }
+
+ template <class Vector>
+ std::ostream &VectorDomain<GF2>::writeSpecialized (std::ostream &os, const Vector &x,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ typename Vector::const_iterator i;
+ size_t idx = 0;
+
+ // TO BE REMOVED
+ os << "writeSpec SparseZO, of size " << x.size() << ' ';
+ os << "[ ";
+
+ for (i = x.begin (); i != x.end (); ++i) {
+ while (++idx <= *i)
+ os << 0 << ' ';
+
+ os << 1 << ' ';
+ }
+ os << ']';
+
+ return os;
+ }
+
+ template <class Vector>
+ std::istream &VectorDomain<GF2>::readSpecialized (std::istream &is, const Vector &x,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ typename Vector::iterator i;
+ char c;
+
+ do { is >> c ; } while (!std::isdigit (c));
+
+ is.unget ();
+
+ for (i = x.begin (); i != x.end (); ++i)
+ is >> *i;
+
+ return is;
+ }
+
+ template <class Vector>
+ std::istream &VectorDomain<GF2>::readSpecialized (std::istream &is, const Vector &x,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ char c;
+ size_t idx;
+
+ do { is >> c ; } while (!std::isdigit (c));
+
+ is.unget ();
+ x.clear ();
+
+ while (1) {
+ is >> c;
+
+ if (!std::isdigit (c) && c != ' ') break;
+ is.unget ();
+ is >> idx;
+ x.push_back (idx);
+ }
+
+ return is;
+ }
+
+ template <class Vector1, class Vector2>
+ bool VectorDomain<GF2>::areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ typename Vector1::const_iterator i = v1.begin ();
+ typename Vector2::const_iterator j = v2.begin ();
+ size_t idx = 0;
+
+ for (; j != v2.end (); ++j, ++i, ++idx) {
+ while (idx < *j) {
+ if (*i) return false;
+ ++idx;
+ ++i;
+ }
+
+ if (!*i) return false;
+ }
+
+ for (; i != v1.end (); ++i)
+ if (*i) return false;
+
+ return true;
+ }
+
+ template <class Vector1, class Vector2>
+ bool VectorDomain<GF2>::areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ typename Vector1::const_word_iterator i = v1.wordBegin ();
+ typename Vector2::const_word_iterator j = v2.wordBegin ();
+ for (; j != v2.wordEnd (); ++j, ++i)
+ if (*i != *j) return false;
+ return true;
+ }
+
+ template <class Vector1, class Vector2>
+ bool VectorDomain<GF2>::areEqualSpecialized (const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ return v1 == v2;
+ }
+
+ template <class Vector>
+ bool VectorDomain<GF2>::isZeroSpecialized (const Vector &v,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ typename Vector::const_word_iterator i;
+
+ for (i = v.wordBegin (); i != v.wordEnd (); ++i)
+ if (*i) return false;
+
+ return true;
+ }
+
+ template <class Vector1, class Vector2>
+ Vector1 &VectorDomain<GF2>::copySpecialized (Vector1 &res, const Vector2 &v,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ typename Vector2::const_iterator i;
+ size_t idx = 0;
+
+ res.clear ();
+
+ for (i = v.begin (); i != v.end (); ++i, ++idx)
+ if (*i) res.push_back (idx);
+
+ return res;
+ }
+
+ template <class Vector1, class Vector2>
+ Vector1 &VectorDomain<GF2>::copySpecialized (Vector1 &res, const Vector2 &v,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ size_t sparsesize = *(v.rbegin());
+ if (sparsesize > res.size()) res.resize( *(v.rbegin()) );
+ std::fill (res.wordBegin (), res.wordEnd (), 0);
+
+ for (typename Vector2::const_iterator i = v.begin ();
+ i != v.end ();
+ ++i)
+ res[*i] = true;
+ return res;
+ }
+
+ template <class Vector1, class Vector2>
+ bool &VectorDomain<GF2>::dotSpecialized (bool &res, const Vector1 &v1, const Vector2 &v2,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ typename Vector1::const_iterator i = v1.begin ();
+ typename Vector2::const_iterator j = v2.begin ();
+ res = false;
+
+ while (i != v1.end () || j != v2.end ()) {
+ while (i != v1.end () && (j == v2.end () || *i < *j)) { res = !res; ++i; }
+ while (j != v2.end () && (i == v1.end () || *j < *i)) { res = !res; ++j; }
+ if (i != v1.end () && j != v2.end () && *i == *j) { ++i; ++j; }
+ }
+
+ return res;
+ }
+
+ template <class Vector1, class Vector2, class Vector3>
+ Vector1 &VectorDomain<GF2>::addSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ linbox_check (res.size () == y.size ());
+ linbox_check (res.size () == x.size ());
+
+ typename Vector1::word_iterator i = res.wordBegin ();
+ typename Vector2::const_word_iterator j = y.wordBegin ();
+ typename Vector3::const_word_iterator k = x.wordBegin ();
+
+ for (; i != res.wordEnd (); ++i)
+ *i = *j++ ^ *k++;
+
+ return res;
+ }
+
+ template <class Vector1, class Vector2, class Vector3>
+ Vector1 &VectorDomain<GF2>::addSpecialized (Vector1 &res, const Vector2 &y, const Vector3 &x,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ typename Vector2::const_iterator i = y.begin ();
+ typename Vector3::const_iterator j = x.begin ();
+
+ res.clear ();
+
+ while (i != y.end () || j != x.end ()) {
+ while (i != y.end () && (j == x.end () || *i < *j)) { res.push_back (*i); ++i; }
+ while (j != x.end () && (i == y.end () || *j < *i)) { res.push_back (*j); ++j; }
+ if (i != y.end () && j != x.end () && *i == *j) { ++i; ++j; }
+ }
+
+ return res;
+ }
+
+ template <class Vector1, class Vector2>
+ Vector1 &VectorDomain<GF2>::addinSpecialized (Vector1 &y, const Vector2 &x,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::DenseZeroOneVectorTag) const
+ {
+ linbox_check (y.size () == x.size ());
+
+ typename Vector1::word_iterator i = y.wordBegin ();
+ typename Vector2::const_word_iterator j = x.wordBegin ();
+
+ for (; i != y.wordEnd (); ++i, ++j)
+ *i ^= *j;
+
+ return y;
+ }
+
+ template <class Vector1, class Vector2>
+ Vector1 &VectorDomain<GF2>::addinSpecialized (Vector1 &y, const Vector2 &x,
+ VectorCategories::DenseZeroOneVectorTag,
+ VectorCategories::SparseZeroOneVectorTag) const
+ {
+ typename Vector2::const_iterator i;
+
+ for (i = x.begin (); i != x.end (); ++i)
+ y[*i] = !y[*i];
+
+ return y;
+ }
+
+}
+
+namespace LinBox
+{ /* Dot product */
+ // template<>
+ template <class Vector1, class Vector2>
+ inline bool &DotProductDomain<GF2>::dotSpecializedDD
+ (bool &res,
+ const Vector1 &v1,
+ const Vector2 &v2) const
+ {
+ linbox_check (v1.size () == v2.size ());
+
+ unsigned long t = 0;
+ typename Vector1::const_word_iterator i = v1.wordBegin ();
+ typename Vector2::const_word_iterator j = v2.wordBegin ();
+
+ while (i != v1.wordEnd () - 1)
+ t ^= *i++ & *j++;
+
+ const size_t zeroing = __LINBOX_BITSOF_LONG - (v1.size() % __LINBOX_BITSOF_LONG);
+ unsigned long lastdot = *i & *j;
+ lastdot <<= zeroing;
+ lastdot >>= zeroing;
+
+ t ^= lastdot;
+ return res = __LINBOX_PARITY(t);
+ }
+
+ // template<>
+ template <class Vector1, class Vector2>
+ inline bool &DotProductDomain<GF2>::dotSpecializedDSP
+ (bool &res,
+ const Vector1 &v1,
+ const Vector2 &v2) const
+ {
+ typename Vector2::const_iterator i;
+
+ res = 0;
+
+ for (i = v2.begin (); i != v2.end (); ++i)
+ res ^= v1[*i];
+
+ return res;
+ }
+
+ // template<>
+ template <class Vector1, class Vector2>
+ inline BitVector::reference DotProductDomain<GF2>::dotSpecializedDD
+ (BitVector::reference res,
+ const Vector1 &v1,
+ const Vector2 &v2) const
+ {
+ bool tmp;
+ return res = dotSpecializedDD(tmp, v1, v2);
+ }
+
+ // template<>
+ template <class Vector1, class Vector2>
+ inline BitVector::reference DotProductDomain<GF2>::dotSpecializedDSP
+ (BitVector::reference res,
+ const Vector1 &v1,
+ const Vector2 &v2) const
+ {
+ typename Vector2::const_iterator i;
+
+ res = 0;
+
+ for (i = v2.begin (); i != v2.end (); ++i)
+ res ^= v1[*i];
+
+ return res;
+ }
+
+}
+
+
+#endif // __LINBOX_field_vector_domain_INL
+
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/vector-domain.h b/linbox/vector/vector-domain.h
index 25cb1c9..06767dc 100644
--- a/linbox/vector/vector-domain.h
+++ b/linbox/vector/vector-domain.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/vector/vector-domain.h
* Copyright (C) 2001-2002 Bradford Hovinen
*
@@ -34,7 +32,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_field_vector_domain_H
@@ -42,13 +58,13 @@
#include <iostream>
-//#include "linbox/field/archetype.h"
+#include "linbox/linbox-config.h"
+#include "linbox/util/debug.h"
#include "linbox/vector/vector-traits.h"
#include "linbox/util/field-axpy.h"
-#include "linbox/util/debug.h"
namespace LinBox
-{
+{ /* VectorDomainBase */
/** @name Vector domain base
*
* This class provides a virtual base for the VectorDomain and the
@@ -60,20 +76,23 @@ namespace LinBox
class VectorDomainBase {
public:
VectorDomainBase (const Field &F) :
- _F (F), accu(F)
+ _field (F), accu(F)
{}
VectorDomainBase& operator= (const VectorDomainBase& VD)
- { _F = VD._F;
+ { _field = VD._field;
accu = VD.accu;
return *this;
}
protected:
- Field _F;
+ Field _field;
mutable FieldAXPY<Field> accu;
};
+}
+namespace LinBox
+{ /* Dot Product */
/** @name Dot product domain
* @brief Performance-critical dotproducts
*
@@ -104,6 +123,10 @@ namespace LinBox
};
+}
+
+namespace LinBox
+{ /* Vector Domain */
/** @name Vector Domain
* @brief Vector arithmetic
@@ -134,7 +157,7 @@ namespace LinBox
* @param VD VectorDomain object.
*/
VectorDomain (const VectorDomain &VD) :
- VectorDomainBase<Field> (VD._F), DotProductDomain<Field> (VD._F)
+ VectorDomainBase<Field> (VD._field), DotProductDomain<Field> (VD._field)
{}
/** Assignment operator.
@@ -143,8 +166,8 @@ namespace LinBox
*/
VectorDomain &operator = (const VectorDomain &VD)
{
- VectorDomainBase<Field>::_F = VD._F;
- VectorDomainBase<Field>::accu = VD.accu;
+ VectorDomainBase<Field>:: _field = VD._field;
+ VectorDomainBase<Field>:: accu = VD.accu;
return *this;
}
@@ -156,7 +179,7 @@ namespace LinBox
const Field &field () const
{
- return VectorDomainBase<Field>::_F;
+ return VectorDomainBase<Field>:: _field;
}
/** Vector input/output operations
@@ -720,6 +743,7 @@ namespace LinBox
{
return DotProductDomain<Field>::dotSpecializedDD (res, v1, v2);
}
+
template <class Vector1, class Vector2>
inline Element &dotSpecialized (Element &res, const Vector1 &v1, const Vector2 &v2,
VectorCategories::SparseSequenceVectorTag,
@@ -1262,7 +1286,18 @@ namespace LinBox
} // namespace LinBox
-#include "linbox/vector/vector-domain.inl"
#endif // __LINBOX_field_vector_domain_H
+#include "linbox/vector/vector-domain.inl"
+#include "linbox/vector/vector-domain-gf2.h"
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/vector-domain.inl b/linbox/vector/vector-domain.inl
index 7dfb8df..b1fad43 100644
--- a/linbox/vector/vector-domain.inl
+++ b/linbox/vector/vector-domain.inl
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/vector/vector-domain.inl
* Copyright (C) 2001-2002 Bradford Hovinen
*
@@ -25,22 +23,36 @@
* dot product, tag1 and tag2) that allows specialization by vector type.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_field_vector_domain_INL
#define __LINBOX_field_vector_domain_INL
-#include "linbox/linbox-config.h"
#include <iostream>
#include <cctype>
-#include "linbox/vector/vector-domain.h"
-#include "linbox/util/debug.h"
-
namespace LinBox
-{
+{ /* VectorDomain */
template <class Field>
template <class Vector>
std::ostream &VectorDomain<Field>::writeSpecialized (std::ostream &os, const Vector &x,
@@ -51,7 +63,7 @@ namespace LinBox
os << '[';
for (i = x.begin (); i != x.end ();) {
- VectorDomainBase<Field>::_F.write (os, *i);
+ VectorDomainBase<Field>::_field.write (os, *i);
if (++i != x.end ())
os << ", ";
@@ -76,7 +88,7 @@ namespace LinBox
while (idx++ < i->first)
os << "0, ";
- VectorDomainBase<Field>::_F.write (os, i->second);
+ VectorDomainBase<Field>::_field.write (os, i->second);
if (++i != x.end ())
os << ", ";
@@ -101,7 +113,7 @@ namespace LinBox
while (idx++ < i->first)
os << "0, ";
- VectorDomainBase<Field>::_F.write (os, i->second);
+ VectorDomainBase<Field>::_field.write (os, i->second);
if (++i != x.end ())
os << ", ";
@@ -127,7 +139,7 @@ namespace LinBox
while (idx++ < *i)
os << "0, ";
- VectorDomainBase<Field>::_F.write (os, *j);
+ VectorDomainBase<Field>::_field.write (os, *j);
if (++i != x.first.end ())
os << ", ";
@@ -157,9 +169,9 @@ namespace LinBox
while (i != x.end() && is) {
do is >> c; while (!isdigit(c) && c != '-');
is.unget ();
- VectorDomainBase<Field>::_F.read (is, *i++);
+ VectorDomainBase<Field>::_field.read (is, *i++);
//std::cerr << std::endl << "just read this: ";
- //VectorDomainBase<Field>::_F.write(cerr, *(i-1)) << " at index " << (i-x.begin());
+ //VectorDomainBase<Field>::_field.write(cerr, *(i-1)) << " at index " << (i-x.begin());
}
if (seekrightbracket) do is >> c; while (is && c != ']');
@@ -185,8 +197,8 @@ namespace LinBox
while (is && c == ',') {
do is >> c; while (is && isspace (c));
is.unget ();
- VectorDomainBase<Field>::_F.read (is, tmp);
- if (!VectorDomainBase<Field>::_F.isZero (tmp))
+ VectorDomainBase<Field>::_field.read (is, tmp);
+ if (!VectorDomainBase<Field>::_field.isZero (tmp))
x.push_back (std::pair <size_t, typename Field::Element> (idx, tmp));
is >> c;
idx++;
@@ -214,8 +226,8 @@ namespace LinBox
while (is && c == ',') {
do is >> c; while (is && isspace (c));
is.unget ();
- VectorDomainBase<Field>::_F.read (is, tmp);
- if (!VectorDomainBase<Field>::_F.isZero (tmp))
+ VectorDomainBase<Field>::_field.read (is, tmp);
+ if (!VectorDomainBase<Field>::_field.isZero (tmp))
x[idx] = tmp;
is >> c;
idx++;
@@ -243,9 +255,9 @@ namespace LinBox
while (is && c == ',') {
do is >> c; while (is && isspace (c));
is.unget ();
- VectorDomainBase<Field>::_F.read (is, tmp);
+ VectorDomainBase<Field>::_field.read (is, tmp);
- if (!VectorDomainBase<Field>::_F.isZero (tmp)) {
+ if (!VectorDomainBase<Field>::_field.isZero (tmp)) {
x.first.push_back (idx);
x.second.push_back (tmp);
}
@@ -269,7 +281,7 @@ namespace LinBox
if (v1.size () != v2.size ()) return false;
for (i = v1.begin (), j = v2.begin (); i != v1.end (); i++, j++)
- if (!VectorDomainBase<Field>::_F.areEqual (*i, *j))
+ if (!VectorDomainBase<Field>::_field.areEqual (*i, *j))
return false;
return true;
@@ -287,11 +299,11 @@ namespace LinBox
for (i = v1.begin (), j = v2.begin (), idx = 0; i != v1.end () && j != v2.end (); j++, idx++) {
if (i->first == idx) {
- if (!VectorDomainBase<Field>::_F.areEqual (i->second, *j))
+ if (!VectorDomainBase<Field>::_field.areEqual (i->second, *j))
return false;
i++;
}
- else if (!VectorDomainBase<Field>::_F.isZero (*j))
+ else if (!VectorDomainBase<Field>::_field.isZero (*j))
return false;
}
@@ -310,11 +322,11 @@ namespace LinBox
for (i = v1.begin (), j = v2.begin (), idx = 0; i != v1.end () && j != v2.end (); j++, idx++) {
if (i->first == idx) {
- if (!VectorDomainBase<Field>::_F.areEqual (i->second, *j))
+ if (!VectorDomainBase<Field>::_field.areEqual (i->second, *j))
return false;
i++;
}
- else if (!VectorDomainBase<Field>::_F.isZero (*j))
+ else if (!VectorDomainBase<Field>::_field.isZero (*j))
return false;
}
@@ -337,13 +349,13 @@ namespace LinBox
j++, idx++)
{
if (*i_idx == idx) {
- if (!VectorDomainBase<Field>::_F.areEqual (*i_elt, *j))
+ if (!VectorDomainBase<Field>::_field.areEqual (*i_elt, *j))
return false;
++i_idx;
++i_elt;
}
- else if (!VectorDomainBase<Field>::_F.isZero (*j))
+ else if (!VectorDomainBase<Field>::_field.isZero (*j))
return false;
}
@@ -361,19 +373,19 @@ namespace LinBox
for (i = v1.begin (), j = v2.begin (); i != v1.end () || j != v2.end ();) {
while (i != v1.end () && (j == v2.end () || i->first < j->first)) {
- if (!VectorDomainBase<Field>::_F.isZero (i->second))
+ if (!VectorDomainBase<Field>::_field.isZero (i->second))
return false;
i++;
}
while (j != v2.end () && (i == v1.end () || j->first < i->first)) {
- if (!VectorDomainBase<Field>::_F.isZero (j->second))
+ if (!VectorDomainBase<Field>::_field.isZero (j->second))
return false;
j++;
}
if (i != v1.end () && j != v2.end () && i->first == j->first) {
- if (!VectorDomainBase<Field>::_F.areEqual (i->second, j->second))
+ if (!VectorDomainBase<Field>::_field.areEqual (i->second, j->second))
return false;
i++; j++;
@@ -394,19 +406,19 @@ namespace LinBox
for (i = v1.begin (), j = v2.begin (); i != v1.end () || j != v2.end ();) {
while (i != v1.end () && (j == v2.end () || i->first < j->first)) {
- if (!VectorDomainBase<Field>::_F.isZero (i->second))
+ if (!VectorDomainBase<Field>::_field.isZero (i->second))
return false;
i++;
}
while (j != v2.end () && (i == v1.end () || j->first < i->first)) {
- if (!VectorDomainBase<Field>::_F.isZero (j->second))
+ if (!VectorDomainBase<Field>::_field.isZero (j->second))
return false;
j++;
}
if (i != v1.end () && j != v2.end () && i->first == j->first) {
- if (!VectorDomainBase<Field>::_F.areEqual (i->second, j->second))
+ if (!VectorDomainBase<Field>::_field.areEqual (i->second, j->second))
return false;
i++; j++;
@@ -430,20 +442,20 @@ namespace LinBox
i_idx != v1.first.end () || j != v2.end ();)
{
while (i_idx != v1.first.end () && (j == v2.end () || *i_idx < j->first)) {
- if (!VectorDomainBase<Field>::_F.isZero (*i_elt))
+ if (!VectorDomainBase<Field>::_field.isZero (*i_elt))
return false;
i_idx++;
i_elt++;
}
while (j != v2.end () && (i_idx == v1.first.end () || j->first < *i_idx)) {
- if (!VectorDomainBase<Field>::_F.isZero (j->second))
+ if (!VectorDomainBase<Field>::_field.isZero (j->second))
return false;
j++;
}
if (i_idx != v1.first.end () && j != v2.end () && *i_idx == j->first) {
- if (!VectorDomainBase<Field>::_F.areEqual (*i_elt, j->second))
+ if (!VectorDomainBase<Field>::_field.areEqual (*i_elt, j->second))
return false;
i_idx++; i_elt++; j++;
@@ -464,19 +476,19 @@ namespace LinBox
for (i = v1.begin (), j = v2.begin (); i != v1.end () || j != v2.end ();) {
while (i != v1.end () && (j == v2.end () || i->first < j->first)) {
- if (!VectorDomainBase<Field>::_F.isZero (i->second))
+ if (!VectorDomainBase<Field>::_field.isZero (i->second))
return false;
i++;
}
while (j != v2.end () && (i == v1.end () || j->first < i->first)) {
- if (!VectorDomainBase<Field>::_F.isZero (j->second))
+ if (!VectorDomainBase<Field>::_field.isZero (j->second))
return false;
j++;
}
if (i != v1.end () && j != v2.end () && i->first == j->first) {
- if (!VectorDomainBase<Field>::_F.areEqual (i->second, j->second))
+ if (!VectorDomainBase<Field>::_field.areEqual (i->second, j->second))
return false;
i++; j++;
@@ -498,20 +510,20 @@ namespace LinBox
while (i_idx != v1.first.end () || j != v2.end ()) {
while (i_idx != v1.first.end () && (j == v2.end () || *i_idx < j->first)) {
- if (!VectorDomainBase<Field>::_F.isZero (*i_elt))
+ if (!VectorDomainBase<Field>::_field.isZero (*i_elt))
return false;
i_idx++;
i_elt++;
}
while (j != v2.end () && (i_idx == v1.first.end () || j->first < *i_idx)) {
- if (!VectorDomainBase<Field>::_F.isZero (j->second))
+ if (!VectorDomainBase<Field>::_field.isZero (j->second))
return false;
j++;
}
if (i_idx != v1.first.end () && j != v2.end () && *i_idx == j->first) {
- if (!VectorDomainBase<Field>::_F.areEqual (*i_elt, j->second))
+ if (!VectorDomainBase<Field>::_field.areEqual (*i_elt, j->second))
return false;
i_idx++; i_elt++; j++;
@@ -534,21 +546,21 @@ namespace LinBox
while (i_idx != v1.first.end () || j_idx != v2.first.end ()) {
while (i_idx != v1.first.end () && (j_idx == v2.first.end () || *i_idx < *j_idx)) {
- if (!VectorDomainBase<Field>::_F.isZero (*i_elt))
+ if (!VectorDomainBase<Field>::_field.isZero (*i_elt))
return false;
i_idx++;
i_elt++;
}
while (j_idx != v2.first.end () && (i_idx == v1.first.end () || *j_idx < *i_idx)) {
- if (!VectorDomainBase<Field>::_F.isZero (*j_elt))
+ if (!VectorDomainBase<Field>::_field.isZero (*j_elt))
return false;
j_idx++;
j_elt++;
}
if (i_idx != v1.first.end () && j_idx != v2.first.end () && *i_idx == *j_idx) {
- if (!VectorDomainBase<Field>::_F.areEqual (*i_elt, *j_elt))
+ if (!VectorDomainBase<Field>::_field.areEqual (*i_elt, *j_elt))
return false;
i_idx++; i_elt++; j_idx++; j_elt++;
@@ -565,7 +577,7 @@ namespace LinBox
typename Vector::const_iterator i;
for (i = v.begin (); i != v.end (); i++)
- if (!VectorDomainBase<Field>::_F.isZero (*i))
+ if (!VectorDomainBase<Field>::_field.isZero (*i))
return false;
return true;
@@ -578,7 +590,7 @@ namespace LinBox
typename Vector::const_iterator i;
for (i = v.begin (); i != v.end (); i++)
- if (!VectorDomainBase<Field>::_F.isZero (i->second))
+ if (!VectorDomainBase<Field>::_field.isZero (i->second))
return false;
return true;
@@ -591,7 +603,7 @@ namespace LinBox
typename Vector::const_iterator i;
for (i = v.begin (); i != v.end (); i++)
- if (!VectorDomainBase<Field>::_F.isZero (i->second))
+ if (!VectorDomainBase<Field>::_field.isZero (i->second))
return false;
return true;
@@ -604,7 +616,7 @@ namespace LinBox
typename Vector::second_type::const_iterator i;
for (i = v.second.begin (); i != v.second.end (); i++)
- if (!VectorDomainBase<Field>::_F.isZero (*i))
+ if (!VectorDomainBase<Field>::_field.isZero (*i))
return false;
return true;
@@ -622,7 +634,7 @@ namespace LinBox
res.clear ();
for (i = v.begin (), idx = 0; i != v.end (); i++, idx++)
- if (!VectorDomainBase<Field>::_F.isZero (*i))
+ if (!VectorDomainBase<Field>::_field.isZero (*i))
res.push_back (std::pair <size_t, typename Field::Element> (idx, *i));
return res;
@@ -640,7 +652,7 @@ namespace LinBox
res.clear ();
for (i = v.begin (), idx = 0; i != v.end (); i++, idx++)
- if (!VectorDomainBase<Field>::_F.isZero (*i))
+ if (!VectorDomainBase<Field>::_field.isZero (*i))
res[idx] = *i;
return res;
@@ -659,7 +671,7 @@ namespace LinBox
res.second.clear ();
for (i = v.begin (), idx = 0; i != v.end (); i++, idx++) {
- if (!VectorDomainBase<Field>::_F.isZero (*i)) {
+ if (!VectorDomainBase<Field>::_field.isZero (*i)) {
res.first.push_back (idx);
res.second.push_back (*i);
}
@@ -680,7 +692,7 @@ namespace LinBox
for (i = res.begin (), j = v.begin (), idx = 0; j != v.end (); i++, j++, idx++) {
while (idx < j->first) {
- VectorDomainBase<Field>::_F.init (*i, 0);
+ VectorDomainBase<Field>::_field.init (*i, 0);
i++; idx++;
}
@@ -737,7 +749,7 @@ namespace LinBox
for (i = res.begin (), j = v.begin (), idx = 0; j != v.end (); i++, j++, idx++) {
while (idx < j->first) {
- VectorDomainBase<Field>::_F.init (*i, 0);
+ VectorDomainBase<Field>::_field.init (*i, 0);
i++; idx++;
}
@@ -811,7 +823,7 @@ namespace LinBox
while (j_idx != v.first.end ()) {
while (idx < *j_idx) {
- VectorDomainBase<Field>::_F.init (*i, 0);
+ VectorDomainBase<Field>::_field.init (*i, 0);
++i; ++idx;
}
@@ -1099,7 +1111,7 @@ namespace LinBox
linbox_check (res.size () == x.size ());
for (i = y.begin (), j = x.begin (), k = res.begin (); i != y.end (); i++, j++, k++)
- VectorDomainBase<Field>::_F.add (*k, *i, *j);
+ VectorDomainBase<Field>::_field.add (*k, *i, *j);
return res;
}
@@ -1124,8 +1136,8 @@ namespace LinBox
}
if (i != y.end () && i->first == j->first) {
- VectorDomainBase<Field>::_F.add (tmp, i->second, j->second);
- if (!VectorDomainBase<Field>::_F.isZero (tmp))
+ VectorDomainBase<Field>::_field.add (tmp, i->second, j->second);
+ if (!VectorDomainBase<Field>::_field.isZero (tmp))
res.push_back (std::pair <size_t, Element> (j->first, tmp));
i++;
}
@@ -1162,7 +1174,7 @@ namespace LinBox
}
if (i != y.end () && i->first == j->first) {
- res[j->first] = VectorDomainBase<Field>::_F.add (tmp, i->second, j->second);
+ res[j->first] = VectorDomainBase<Field>::_field.add (tmp, i->second, j->second);
i++;
}
else {
@@ -1202,8 +1214,8 @@ namespace LinBox
}
if (i_idx != y.first.end () && *i_idx == *j_idx) {
- VectorDomainBase<Field>::_F.add (tmp, *i_elt, *j_elt);
- if (!VectorDomainBase<Field>::_F.isZero (tmp)) {
+ VectorDomainBase<Field>::_field.add (tmp, *i_elt, *j_elt);
+ if (!VectorDomainBase<Field>::_field.isZero (tmp)) {
res.first.push_back (*j_idx);
res.second.push_back (tmp);
}
@@ -1236,7 +1248,7 @@ namespace LinBox
linbox_check (y.size () == x.size ());
for (i = y.begin (), j = x.begin (); i != y.end (); i++, j++)
- VectorDomainBase<Field>::_F.addin (*i, *j);
+ VectorDomainBase<Field>::_field.addin (*i, *j);
return y;
}
@@ -1267,7 +1279,7 @@ namespace LinBox
while (i != y.end () && i->first < j->first) i++;
if (i != y.end () && i->first == j->first)
- VectorDomainBase<Field>::_F.addin (i->second, j->second);
+ VectorDomainBase<Field>::_field.addin (i->second, j->second);
else
y[j->first] = j->second;
}
@@ -1303,7 +1315,7 @@ namespace LinBox
linbox_check (res.size () == x.size ());
for (i = y.begin (), j = x.begin (), k = res.begin (); i != y.end (); i++, j++, k++)
- VectorDomainBase<Field>::_F.sub (*k, *i, *j);
+ VectorDomainBase<Field>::_field.sub (*k, *i, *j);
return res;
}
@@ -1328,13 +1340,13 @@ namespace LinBox
}
if (i != y.end () && i->first == j->first) {
- VectorDomainBase<Field>::_F.sub (tmp, i->second, j->second);
- if (!VectorDomainBase<Field>::_F.isZero (tmp))
+ VectorDomainBase<Field>::_field.sub (tmp, i->second, j->second);
+ if (!VectorDomainBase<Field>::_field.isZero (tmp))
res.push_back (std::pair <size_t, Element> (j->first, tmp));
i++;
}
else {
- res.push_back (std::pair <size_t, Element> (j->first, VectorDomainBase<Field>::_F.neg (tmp, j->second)));
+ res.push_back (std::pair <size_t, Element> (j->first, VectorDomainBase<Field>::_field.neg (tmp, j->second)));
}
}
@@ -1366,11 +1378,11 @@ namespace LinBox
}
if (i != y.end () && i->first == j->first) {
- res[j->first] = VectorDomainBase<Field>::_F.sub (tmp, i->second, j->second);
+ res[j->first] = VectorDomainBase<Field>::_field.sub (tmp, i->second, j->second);
i++;
}
else {
- res[j->first] = VectorDomainBase<Field>::_F.neg (tmp, j->second);
+ res[j->first] = VectorDomainBase<Field>::_field.neg (tmp, j->second);
}
}
@@ -1406,8 +1418,8 @@ namespace LinBox
}
if (i_idx != y.first.end () && *i_idx == *j_idx) {
- VectorDomainBase<Field>::_F.sub (tmp, *i_elt, *j_elt);
- if (!VectorDomainBase<Field>::_F.isZero (tmp)) {
+ VectorDomainBase<Field>::_field.sub (tmp, *i_elt, *j_elt);
+ if (!VectorDomainBase<Field>::_field.isZero (tmp)) {
res.first.push_back (*j_idx);
res.second.push_back (tmp);
}
@@ -1415,7 +1427,7 @@ namespace LinBox
}
else {
res.first.push_back (*j_idx);
- res.second.push_back (VectorDomainBase<Field>::_F.neg (tmp, *j_elt));
+ res.second.push_back (VectorDomainBase<Field>::_field.neg (tmp, *j_elt));
}
}
@@ -1440,7 +1452,7 @@ namespace LinBox
linbox_check (y.size () == x.size ());
for (i = y.begin (), j = x.begin (); i != y.end (); i++, j++)
- VectorDomainBase<Field>::_F.subin (*i, *j);
+ VectorDomainBase<Field>::_field.subin (*i, *j);
return y;
}
@@ -1472,9 +1484,9 @@ namespace LinBox
while (i != y.end () && i->first < j->first) i++;
if (i != y.end () && i->first == j->first)
- VectorDomainBase<Field>::_F.subin (i->second, j->second);
+ VectorDomainBase<Field>::_field.subin (i->second, j->second);
else
- y[j->first] = VectorDomainBase<Field>::_F.neg (tmp, j->second);
+ y[j->first] = VectorDomainBase<Field>::_field.neg (tmp, j->second);
}
return y;
@@ -1505,7 +1517,7 @@ namespace LinBox
linbox_check (res.size () == x.size ());
for (j = x.begin (), k = res.begin (); j != x.end (); ++j, ++k)
- VectorDomainBase<Field>::_F.neg (*k, *j);
+ VectorDomainBase<Field>::_field.neg (*k, *j);
return res;
}
@@ -1522,7 +1534,7 @@ namespace LinBox
res.clear ();
for (j = x.begin (); j != x.end (); ++j)
- res.push_back (std::pair <size_t, Element> (j->first, VectorDomainBase<Field>::_F.neg (tmp, j->second)));
+ res.push_back (std::pair <size_t, Element> (j->first, VectorDomainBase<Field>::_field.neg (tmp, j->second)));
return res;
}
@@ -1539,7 +1551,7 @@ namespace LinBox
res.clear ();
for (j = x.begin (); j != x.end (); ++j)
- res[j->first] = VectorDomainBase<Field>::_F.neg (tmp, j->second);
+ res[j->first] = VectorDomainBase<Field>::_field.neg (tmp, j->second);
return res;
}
@@ -1559,7 +1571,7 @@ namespace LinBox
std::copy (x.first.begin (), x.first.end (), res.first.begin ());
for (j = x.second.begin (); j != x.second.end (); ++j)
- res.second.push_back (VectorDomainBase<Field>::_F.neg (tmp, *j));
+ res.second.push_back (VectorDomainBase<Field>::_field.neg (tmp, *j));
return res;
}
@@ -1572,7 +1584,7 @@ namespace LinBox
typename Vector::iterator i;
for (i = y.begin (); i != y.end (); ++i)
- VectorDomainBase<Field>::_F.negin (*i);
+ VectorDomainBase<Field>::_field.negin (*i);
return y;
}
@@ -1585,7 +1597,7 @@ namespace LinBox
typename Vector::iterator i;
for (i = y.begin (); i != y.end (); ++i)
- VectorDomainBase<Field>::_F.negin (i->second);
+ VectorDomainBase<Field>::_field.negin (i->second);
return y;
}
@@ -1598,7 +1610,7 @@ namespace LinBox
typename Vector::iterator i;
for (i = y.begin (); i != y.end (); ++i)
- VectorDomainBase<Field>::_F.negin (i->second);
+ VectorDomainBase<Field>::_field.negin (i->second);
return y;
}
@@ -1611,7 +1623,7 @@ namespace LinBox
typename Vector::second_type::iterator i;
for (i = y.second.begin (); i != y.second.end (); ++i)
- VectorDomainBase<Field>::_F.negin (*i);
+ VectorDomainBase<Field>::_field.negin (*i);
return y;
}
@@ -1630,7 +1642,7 @@ namespace LinBox
linbox_check (res.size () == x.size ());
for (i = x.begin (), j = res.begin (); i != x.end (); ++i, ++j)
- VectorDomainBase<Field>::_F.mul (*j, *i, a);
+ VectorDomainBase<Field>::_field.mul (*j, *i, a);
return res;
}
@@ -1648,11 +1660,11 @@ namespace LinBox
res.clear ();
- if (VectorDomainBase<Field>::_F.isZero (a))
+ if (VectorDomainBase<Field>::_field.isZero (a))
return res;
for (i = x.begin (); i != x.end (); i++)
- res.push_back (std::pair <size_t, Element> (i->first, VectorDomainBase<Field>::_F.mul (tmp, i->second, a)));
+ res.push_back (std::pair <size_t, Element> (i->first, VectorDomainBase<Field>::_field.mul (tmp, i->second, a)));
return res;
}
@@ -1670,11 +1682,11 @@ namespace LinBox
res.clear ();
- if (VectorDomainBase<Field>::_F.isZero (a))
+ if (VectorDomainBase<Field>::_field.isZero (a))
return res;
for (i = x.begin (); i != x.end (); i++)
- res[i->first] = VectorDomainBase<Field>::_F.mul (tmp, i->second, a);
+ res[i->first] = VectorDomainBase<Field>::_field.mul (tmp, i->second, a);
return res;
}
@@ -1694,14 +1706,14 @@ namespace LinBox
res.first.clear ();
res.second.clear ();
- if (VectorDomainBase<Field>::_F.isZero (a))
+ if (VectorDomainBase<Field>::_field.isZero (a))
return res;
for (i_idx = x.first.begin (); i_idx != x.first.end (); ++i_idx)
res.first.push_back (*i_idx);
for (i_elt = x.second.begin (); i_elt != x.second.end (); ++i_elt)
- res.second.push_back (VectorDomainBase<Field>::_F.mul (tmp, *i_elt, a));
+ res.second.push_back (VectorDomainBase<Field>::_field.mul (tmp, *i_elt, a));
return res;
}
@@ -1716,7 +1728,7 @@ namespace LinBox
typename Vector::iterator i;
for (i = x.begin (); i != x.end (); i++)
- VectorDomainBase<Field>::_F.mulin (*i, a);
+ VectorDomainBase<Field>::_field.mulin (*i, a);
return x;
}
@@ -1730,13 +1742,13 @@ namespace LinBox
{
typename Vector::iterator i;
- if (VectorDomainBase<Field>::_F.isZero (a)) {
+ if (VectorDomainBase<Field>::_field.isZero (a)) {
x.clear ();
return x;
}
for (i = x.begin (); i != x.end (); i++)
- VectorDomainBase<Field>::_F.mulin (i->second, a);
+ VectorDomainBase<Field>::_field.mulin (i->second, a);
return x;
}
@@ -1750,13 +1762,13 @@ namespace LinBox
{
typename Vector::iterator i;
- if (VectorDomainBase<Field>::_F.isZero (a)) {
+ if (VectorDomainBase<Field>::_field.isZero (a)) {
x.clear ();
return x;
}
for (i = x.begin (); i != x.end (); i++)
- VectorDomainBase<Field>::_F.mulin (i->second, a);
+ VectorDomainBase<Field>::_field.mulin (i->second, a);
return x;
}
@@ -1770,14 +1782,14 @@ namespace LinBox
{
typename Vector::second_type::iterator i;
- if (VectorDomainBase<Field>::_F.isZero (a)) {
+ if (VectorDomainBase<Field>::_field.isZero (a)) {
x.first.clear ();
x.second.clear ();
return x;
}
for (i = x.second.begin (); i != x.second.end (); i++)
- VectorDomainBase<Field>::_F.mulin (*i, a);
+ VectorDomainBase<Field>::_field.mulin (*i, a);
return x;
}
@@ -1799,7 +1811,7 @@ namespace LinBox
linbox_check (res.size () == x.size ());
for (i = y.begin (), j = x.begin (), k = res.begin (); i != y.end (); i++, j++, k++)
- VectorDomainBase<Field>::_F.axpy (*k, a, *j, *i);
+ VectorDomainBase<Field>::_field.axpy (*k, a, *j, *i);
return res;
}
@@ -1826,13 +1838,13 @@ namespace LinBox
}
if (i != y.end () && i->first == j->first) {
- VectorDomainBase<Field>::_F.axpy (tmp, a, j->second, i->second);
+ VectorDomainBase<Field>::_field.axpy (tmp, a, j->second, i->second);
i++;
}
else
- VectorDomainBase<Field>::_F.mul (tmp, a, j->second);
+ VectorDomainBase<Field>::_field.mul (tmp, a, j->second);
- if (!VectorDomainBase<Field>::_F.isZero (tmp))
+ if (!VectorDomainBase<Field>::_field.isZero (tmp))
res.push_back (std::pair <size_t, Element> (j->first, tmp));
}
@@ -1865,11 +1877,11 @@ namespace LinBox
}
if (i != y.end () && i->first == j->first) {
- VectorDomainBase<Field>::_F.axpy (res[j->first], a, j->second, i->second);
+ VectorDomainBase<Field>::_field.axpy (res[j->first], a, j->second, i->second);
i++;
}
else
- VectorDomainBase<Field>::_F.mul (res[j->first], a, j->second);
+ VectorDomainBase<Field>::_field.mul (res[j->first], a, j->second);
}
while (i != y.end ()) {
@@ -1906,8 +1918,8 @@ namespace LinBox
}
if (i_idx != y.first.end () && *i_idx == *j_idx) {
- VectorDomainBase<Field>::_F.axpy (tmp, a, *j_elt, *i_elt);
- if (!VectorDomainBase<Field>::_F.isZero (tmp)) {
+ VectorDomainBase<Field>::_field.axpy (tmp, a, *j_elt, *i_elt);
+ if (!VectorDomainBase<Field>::_field.isZero (tmp)) {
res.first.push_back (*j_idx);
res.second.push_back (tmp);
}
@@ -1915,7 +1927,7 @@ namespace LinBox
}
else {
res.first.push_back (*j_idx);
- res.second.push_back (VectorDomainBase<Field>::_F.mul (tmp, *j_elt, a));
+ res.second.push_back (VectorDomainBase<Field>::_field.mul (tmp, *j_elt, a));
}
}
@@ -1943,7 +1955,7 @@ namespace LinBox
linbox_check (y.size () == x.size ());
for (i = y.begin (), j = x.begin (); i != y.end (); ++i, ++j)
- VectorDomainBase<Field>::_F.axpyin (*i, a, *j);
+ VectorDomainBase<Field>::_field.axpyin (*i, a, *j);
return y;
}
@@ -1960,7 +1972,7 @@ namespace LinBox
typename Vector2::const_iterator j;
for (j = x.begin (); j != x.end (); ++j)
- VectorDomainBase<Field>::_F.axpyin (y[j->first], a, j->second);
+ VectorDomainBase<Field>::_field.axpyin (y[j->first], a, j->second);
return y;
}
@@ -1977,7 +1989,7 @@ namespace LinBox
typename Vector2::const_iterator j;
for (j = x.begin (); j != x.end (); ++j)
- VectorDomainBase<Field>::_F.axpyin (y[j->first], a, j->second);
+ VectorDomainBase<Field>::_field.axpyin (y[j->first], a, j->second);
return y;
}
@@ -1995,7 +2007,7 @@ namespace LinBox
typename Vector2::second_type::const_iterator j_elt = x.second.begin ();
for (; j_idx != x.first.end (); ++j_idx, ++j_elt)
- VectorDomainBase<Field>::_F.axpyin (y[*j_idx], a, *j_elt);
+ VectorDomainBase<Field>::_field.axpyin (y[*j_idx], a, *j_elt);
return y;
}
@@ -2029,7 +2041,7 @@ namespace LinBox
typename Vector2::const_iterator j;
Element tmp;
- if (VectorDomainBase<Field>::_F.isZero (a)) {
+ if (VectorDomainBase<Field>::_field.isZero (a)) {
y.clear ();
return y;
}
@@ -2038,9 +2050,9 @@ namespace LinBox
while (i != y.end () && i->first != j->first) i++;
if (i != y.end () && i->first == j->first)
- VectorDomainBase<Field>::_F.axpyin (i->second, a, j->second);
- else if (!VectorDomainBase<Field>::_F.isZero (j->second))
- y[j->first] = VectorDomainBase<Field>::_F.mul (tmp, a, j->second);
+ VectorDomainBase<Field>::_field.axpyin (i->second, a, j->second);
+ else if (!VectorDomainBase<Field>::_field.isZero (j->second))
+ y[j->first] = VectorDomainBase<Field>::_field.mul (tmp, a, j->second);
}
return y;
@@ -2353,7 +2365,7 @@ namespace LinBox
//z.w. Does it require max bigger the maximal index of v?
if (v. first. size() > 0)
- max = *std::max_element(v. first. begin(), v. first. end());
+ max = (unsigned)(*std::max_element(v. first. begin(), v. first. end()));
for (Iterator i = P_start; i != P_end; ++i)
max = std::max (max, std::max (i->first, i->second));
@@ -2371,3 +2383,13 @@ namespace LinBox
#endif // __LINBOX_field_vector_domain_INL
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/vector-traits.h b/linbox/vector/vector-traits.h
index 5451173..d21d974 100644
--- a/linbox/vector/vector-traits.h
+++ b/linbox/vector/vector-traits.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/vector/vector-traits.h
* Copyright (C) 1999-2001 William J Turner,
* 2001-2002 Bradford Hovinen
@@ -18,11 +16,33 @@
* vector-implementation dependent code into VectorTraits only - as is done now
* with the function sort.
*
- * see COPYING for license details
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*
* ------------------------------------
*/
+/*! @file linbox/vector/vector-traits.h
+ * @ingroup vector
+ * @brief vector traits
+ * @details NO DOC
+ */
+
#ifndef __LINBOX_vector_traits_H
#define __LINBOX_vector_traits_H
@@ -55,8 +75,8 @@ namespace LinBox
* These types allow us to use template specialization to use different
* code for different types of vectors.
*/
- struct VectorCategories
- {
+ struct VectorCategories {
+ //! Generic vector (no assumption is made)
struct GenericVectorTag {
friend std::ostream& operator<< (std::ostream& o,
const GenericVectorTag& ) {
@@ -64,15 +84,15 @@ namespace LinBox
}
};
- // These are valid for GF2 only
-
+ //! Sparse @ref GF2 vectors
struct SparseZeroOneVectorTag : public GenericVectorTag {
friend std::ostream& operator<< (std::ostream& o,
const SparseZeroOneVectorTag& ) {
return o << "SparseZeroOneVectorTag";
}
};
- // These are valid for all fields
+
+ //! Dense vector (GF2 and general)
struct DenseVectorTag : public SparseZeroOneVectorTag {
// Inherits from SparseZeroOneVectorTag:
// This simplifies gf2 management of vectors
@@ -83,6 +103,7 @@ namespace LinBox
}
};
+ //! Sparse vectors (general)
struct SparseVectorTag : public GenericVectorTag {
friend std::ostream& operator<< (std::ostream& o,
const SparseVectorTag& ) {
@@ -90,18 +111,23 @@ namespace LinBox
}
};
+ //! Sparse vectors (general)
struct SparseSequenceVectorTag : public SparseVectorTag {
friend std::ostream& operator<< (std::ostream& o,
const SparseSequenceVectorTag& ) {
return o << "SparseSequenceVectorTag";
}
};
+
+ //! Sparse vectors (general)
struct SparseAssociativeVectorTag : public SparseVectorTag {
friend std::ostream& operator<< (std::ostream& o,
const SparseAssociativeVectorTag& ) {
return o << "SparseAssociativeVectorTag";
}
};
+
+ //! Sparse vectors (general)
struct SparseParallelVectorTag : public SparseVectorTag {
friend std::ostream& operator<< (std::ostream& o,
const SparseParallelVectorTag& ) {
@@ -109,6 +135,7 @@ namespace LinBox
}
};
+ //! Sparse vectors (general)
struct DenseZeroOneVectorTag : public DenseVectorTag {
friend std::ostream& operator<< (std::ostream& o,
const DenseZeroOneVectorTag& ) {
@@ -122,10 +149,11 @@ namespace LinBox
// for comparison of two pairs of elements (by their first elements)
template<class Element>
struct SparseSequenceVectorPairLessThan :
- public std::binary_function<const std::pair<size_t, Element>&, const std::pair<size_t, Element>&, bool >
- {
+ public std::binary_function<const std::pair<size_t, Element>&, const std::pair<size_t, Element>&, bool > {
bool operator() (const std::pair<size_t, Element>& p1, const std::pair<size_t, Element>& p2)
- { return p1.first < p2.first; }
+ {
+ return p1.first < p2.first;
+ }
};
@@ -134,12 +162,12 @@ namespace LinBox
* but it cannot usually do this. For example, the vector_category
* type is not defined in STL types, so this must be done through
* template specialization.
- * @param Vector \ref LinBox dense or sparse vector.
+ * @tparam Vector \ref LinBox dense or sparse vector.
*/
- template <class Vector> struct VectorTraits
- {
+ template <class Vector>
+ struct VectorTraits {
typedef typename Vector::VectorCategory VectorCategory;
- typedef Vector VectorType;
+ typedef Vector VectorType;
// These are defined for all STL vectors and sequence containers.
@@ -147,28 +175,25 @@ namespace LinBox
// Specialization for STL vectors
template <class Element>
- struct VectorTraits< std::vector<Element> >
- {
- typedef std::vector<Element> VectorType;
+ struct VectorTraits< std::vector<Element> > {
typedef typename VectorCategories::DenseVectorTag VectorCategory;
+ typedef std::vector<Element> VectorType;
};
// Specialization for STL vectors of pairs of size_t and elements
template <class Element>
- struct VectorTraits< std::vector< std::pair<size_t, Element> > >
- {
- typedef std::vector< std::pair<size_t, Element> > VectorType;
+ struct VectorTraits< std::vector< std::pair<size_t, Element> > > {
typedef typename VectorCategories::SparseSequenceVectorTag VectorCategory;
+ typedef std::vector< std::pair<size_t, Element> > VectorType;
static void sort (VectorType& v) { std::stable_sort(v.begin(), v.end(), SparseSequenceVectorPairLessThan<Element>()); }
};
// Specialization for STL lists of pairs of size_t and elements
template <class Element>
- struct VectorTraits< std::list< std::pair<size_t, Element> > >
- {
- typedef std::list< std::pair<size_t, Element> > VectorType;
+ struct VectorTraits< std::list< std::pair<size_t, Element> > > {
typedef typename VectorCategories::SparseSequenceVectorTag VectorCategory;
+ typedef std::list< std::pair<size_t, Element> > VectorType;
static void sort (VectorType& v) { v.sort(SparseSequenceVectorPairLessThan<Element>()); }
};
@@ -177,8 +202,8 @@ namespace LinBox
template <class Element>
struct VectorTraits< std::deque< std::pair<size_t, Element> > >
{
- typedef std::deque< std::pair<size_t, Element> > VectorType;
typedef typename VectorCategories::SparseSequenceVectorTag VectorCategory;
+ typedef std::deque< std::pair<size_t, Element> > VectorType;
static void sort (VectorType& v) { std::stable_sort(v.begin, v.end(), SparseSequenceVectorPairLessThan<Element>()); }
};
@@ -187,16 +212,16 @@ namespace LinBox
template <class Element>
struct VectorTraits< std::map<size_t, Element> >
{
- typedef std::map<size_t, Element> VectorType;
typedef typename VectorCategories::SparseAssociativeVectorTag VectorCategory;
+ typedef std::map<size_t, Element> VectorType;
};
// Specialization for an STL pair of an STL vector of size_t's and an STL vector of elements
template <class Element>
struct VectorTraits< std::pair<std::vector<size_t>, std::vector<Element> > >
{
- typedef std::pair<std::vector<size_t>, std::vector<Element> > VectorType;
typedef typename VectorCategories::SparseParallelVectorTag VectorCategory;
+ typedef std::pair<std::vector<size_t>, std::vector<Element> > VectorType;
};
// Namespace containing some useful generic functions
@@ -209,19 +234,23 @@ namespace LinBox
public:
template<typename PairType>
inline bool operator () (const PairType &i, const size_t j) const
- { return i.first < j; }
+ {
+ return i.first < j;
+ }
};
template <class Field, class Vector>
- inline typename Field::Element &refSpecialized
- (Vector &v, size_t i, VectorCategories::DenseVectorTag)
+ inline typename Field::Element &
+ refSpecialized (Vector &v, size_t i,
+ VectorCategories::DenseVectorTag)
{
return v[i];
}
template <class Field, class Vector>
- inline typename Field::Element &refSpecialized
- (Vector &v, size_t i, VectorCategories::SparseSequenceVectorTag)
+ inline typename Field::Element &
+ refSpecialized (Vector &v, size_t i,
+ VectorCategories::SparseSequenceVectorTag)
{
static typename Field::Element zero;
typename Vector::iterator j;
@@ -240,15 +269,17 @@ namespace LinBox
}
template <class Field, class Vector>
- inline typename Field::Element &refSpecialized
- (Vector &v, size_t i, VectorCategories::SparseAssociativeVectorTag)
+ inline typename Field::Element &
+ refSpecialized (Vector &v, size_t i,
+ VectorCategories::SparseAssociativeVectorTag)
{
return v[i];
}
template <class Field, class Vector>
- inline typename Field::Element &refSpecialized
- (Vector &v, size_t i, VectorCategories::SparseParallelVectorTag)
+ inline typename Field::Element &
+ refSpecialized (Vector &v, size_t i,
+ VectorCategories::SparseParallelVectorTag)
{
static typename Field::Element zero;
typename Vector::first_type::iterator j_idx;
@@ -278,15 +309,17 @@ namespace LinBox
}
template <class Field, class Vector>
- inline const typename Field::Element &constRefSpecialized
- (Vector &v, size_t i, VectorCategories::DenseVectorTag)
+ inline const typename Field::Element &
+ constRefSpecialized (Vector &v, size_t i,
+ VectorCategories::DenseVectorTag)
{
return v[i];
}
template <class Field, class Vector>
- inline const typename Field::Element &constRefSpecialized
- (Vector &v, size_t i, VectorCategories::SparseSequenceVectorTag)
+ inline const typename Field::Element &
+ constRefSpecialized (Vector &v, size_t i,
+ VectorCategories::SparseSequenceVectorTag)
{
static typename Field::Element zero;
typename Vector::const_iterator j;
@@ -303,15 +336,17 @@ namespace LinBox
}
template <class Field, class Vector>
- inline const typename Field::Element &constRefSpecialized
- (Vector &v, size_t i, VectorCategories::SparseAssociativeVectorTag)
+ inline const typename Field::Element &
+ constRefSpecialized (Vector &v, size_t i,
+ VectorCategories::SparseAssociativeVectorTag)
{
return v[i];
}
template <class Field, class Vector>
- inline typename Field::Element &constRefSpecialized
- (Vector &v, size_t i, VectorCategories::SparseParallelVectorTag)
+ inline typename Field::Element &
+ constRefSpecialized (Vector &v, size_t i,
+ VectorCategories::SparseParallelVectorTag)
{
static typename Field::Element zero;
typename Vector::first_type::iterator j_idx;
@@ -331,14 +366,16 @@ namespace LinBox
}
template <class Vector>
- inline void ensureDimSpecialized (Vector &v, size_t n, VectorCategories::DenseZeroOneVectorTag)
+ inline void ensureDimSpecialized (Vector &v, size_t n,
+ VectorCategories::DenseZeroOneVectorTag)
{
v.resize (n);
}
template <class Vector>
- inline void ensureDimSpecialized (Vector &v, size_t n, VectorCategories::SparseZeroOneVectorTag)
+ inline void ensureDimSpecialized (Vector &v, size_t n,
+ VectorCategories::SparseZeroOneVectorTag)
{}
template <class Field, class Vector>
@@ -348,21 +385,25 @@ namespace LinBox
}
template <class Vector>
- inline void ensureDimSpecialized (Vector &v, size_t n, VectorCategories::DenseVectorTag)
+ inline void ensureDimSpecialized (Vector &v, size_t n,
+ VectorCategories::DenseVectorTag)
{
v.resize (n);
}
template <class Vector>
- inline void ensureDimSpecialized (Vector &v, size_t n, VectorCategories::SparseSequenceVectorTag)
+ inline void ensureDimSpecialized (Vector &v, size_t n,
+ VectorCategories::SparseSequenceVectorTag)
{}
template <class Vector>
- inline void ensureDimSpecialized (Vector &v, size_t n, VectorCategories::SparseAssociativeVectorTag)
+ inline void ensureDimSpecialized (Vector &v, size_t n,
+ VectorCategories::SparseAssociativeVectorTag)
{}
template <class Vector>
- inline void ensureDimSpecialized (Vector &v, size_t n, VectorCategories::SparseParallelVectorTag)
+ inline void ensureDimSpecialized (Vector &v, size_t n,
+ VectorCategories::SparseParallelVectorTag)
{}
template <class Vector>
@@ -384,29 +425,41 @@ namespace LinBox
*/
template <class Element>
- struct RawVector
- {
- typedef std::vector<Element> Dense;
- typedef std::pair<std::vector<size_t>, std::vector<Element> > Sparse;
- typedef std::vector<std::pair<size_t, Element> > SparseSeq;
- typedef std::map<size_t, Element> SparseMap;
+ struct RawVector {
+ typedef std::vector<Element> Dense;
+ typedef std::pair<std::vector<size_t>, std::vector<Element> > Sparse;
+ typedef std::vector<std::pair<size_t, Element> > SparseSeq;
+ typedef std::map<size_t, Element> SparseMap;
typedef std::pair<std::vector<size_t>, std::vector<Element> > SparsePar;
- template<class VType> static size_t size(const VType& d) { return d.size(); }
- static size_t size(const Sparse& d) { return d.first.size(); }
+ template<class VType> static size_t size(const VType& d)
+ {
+ return d.size();
+ }
+
+ static size_t size(const Sparse& d)
+ {
+ return d.first.size();
+ }
// static size_t size(const SparsePar& d) { return d.first.size(); }
template<class VType>
- static VType& convert(VType& u, const VType& v) { return u = v; }
+ static VType& convert(VType& u, const VType& v)
+ {
+ return u = v;
+ }
- static Dense& convert(Dense& u, const SparseSeq& v) {
+ static Dense& convert(Dense& u, const SparseSeq& v)
+ {
for(typename SparseSeq::const_iterator sit = v.begin(); sit != v.end(); ++sit) {
if (sit->first > u.size()) u.resize(sit->first);
u[sit->first] = sit->second;
}
return u;
}
- static Sparse& convert(Sparse& u, const SparseSeq& v) {
+
+ static Sparse& convert(Sparse& u, const SparseSeq& v)
+ {
u.first.resize(v.size());
u.second.resize(v.size());
typename SparseSeq::const_iterator ssit = v.begin();
@@ -418,7 +471,9 @@ namespace LinBox
}
return u;
}
- static SparseSeq& convert(SparseSeq& u, const Sparse& v) {
+
+ static SparseSeq& convert(SparseSeq& u, const Sparse& v)
+ {
u.resize(v.first.size());
typename SparseSeq::iterator ssit = u.begin();
std::vector<size_t>::const_iterator vit = v.first.begin();
@@ -430,14 +485,15 @@ namespace LinBox
return u;
}
- // TODO : other convertions
+ //! @todo : other convertions
};
- template <class Field>
- struct Vector : public RawVector<typename Field::Element>
- {
- typedef typename Field::Element Element;
+ //! Vector ??
+ template <class Ring>
+ struct Vector : public RawVector<typename Ring::Element> {
+
+ typedef typename Ring::Element Element;
template<class U>
struct rebind {
@@ -446,6 +502,8 @@ namespace LinBox
};
+ //! Rebind
+ //@{
template<class T, class U>
struct Rebind< std::vector<T>, U > {
typedef typename Vector<U>::Dense other;
@@ -466,6 +524,7 @@ namespace LinBox
struct Rebind< std::map<size_t, T>, U > {
typedef typename Vector<U>::SparseMap other;
};
+ //@} Rebind
//@} Vector traits
@@ -474,3 +533,12 @@ namespace LinBox
#endif // __LINBOX_vector_traits_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/linbox/vector/vector.doxy b/linbox/vector/vector.doxy
index cdb2e1d..c11c07a 100644
--- a/linbox/vector/vector.doxy
+++ b/linbox/vector/vector.doxy
@@ -1,3 +1,25 @@
+/* Copyright (c) LinBox
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ */
+
+
/** \ingroup linbox
\defgroup Vector vector
diff --git a/macros/Makefile.am b/macros/Makefile.am
index 3cf6261..4ac6d1e 100644
--- a/macros/Makefile.am
+++ b/macros/Makefile.am
@@ -1,18 +1,44 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#
+
+
EXTRA_DIST=\
- aclocal-include.m4 \
- givaro-check.m4 \
- gmp-check.m4 \
- ntl-check.m4 \
- saclib-check.m4 \
- lidia-check.m4 \
- atlas-check.m4 \
- maple-check.m4 \
- sage-check.m4 \
- expat-check.m4 \
- config-header.m4 \
- linbox-misc.m4 \
- iml-check.m4 \
- maple-check-version.mpl
+ aclocal-include.m4 \
+ config-header.m4 \
+ debug.m4 \
+ expat-check.m4 \
+ fflas-ffpack-check.m4 \
+ givaro-check.m4 \
+ gmp-check.m4 \
+ iml-check.m4 \
+ lidia-check.m4 \
+ linbox-benchmark.m4 \
+ linbox-doc.m4 \
+ linbox-misc.m4 \
+ linbox-opt.m4 \
+ maple-check-version.mpl \
+ maple-check.m4 \
+ ntl-check.m4 \
+ saclib-check.m4 \
+ mpfr-check.m4 \
+ fplll-check.m4 \
+ m4rie-check.m4 \
+ m4ri-check.m4 \
+ sage-check.m4
diff --git a/macros/Makefile.in b/macros/Makefile.in
index 2171d6e..9e64738 100644
--- a/macros/Makefile.in
+++ b/macros/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,10 +14,48 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+#
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -39,12 +77,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -52,7 +93,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -61,10 +105,16 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -73,6 +123,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -96,10 +147,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -120,10 +173,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -132,6 +190,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -148,6 +208,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -210,25 +271,29 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
EXTRA_DIST = \
- aclocal-include.m4 \
- givaro-check.m4 \
- gmp-check.m4 \
- ntl-check.m4 \
- saclib-check.m4 \
- lidia-check.m4 \
- atlas-check.m4 \
- maple-check.m4 \
- sage-check.m4 \
- expat-check.m4 \
- config-header.m4 \
- linbox-misc.m4 \
- iml-check.m4 \
- maple-check-version.mpl
+ aclocal-include.m4 \
+ config-header.m4 \
+ debug.m4 \
+ expat-check.m4 \
+ fflas-ffpack-check.m4 \
+ givaro-check.m4 \
+ gmp-check.m4 \
+ iml-check.m4 \
+ lidia-check.m4 \
+ linbox-benchmark.m4 \
+ linbox-doc.m4 \
+ linbox-misc.m4 \
+ linbox-opt.m4 \
+ maple-check-version.mpl \
+ maple-check.m4 \
+ ntl-check.m4 \
+ saclib-check.m4 \
+ mpfr-check.m4 \
+ fplll-check.m4 \
+ m4rie-check.m4 \
+ m4ri-check.m4 \
+ sage-check.m4
all: all-am
@@ -242,9 +307,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps macros/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps macros/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps macros/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps macros/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -262,6 +327,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -291,13 +357,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -315,16 +385,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -408,6 +484,7 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/macros/aclocal-include.m4 b/macros/aclocal-include.m4
index 3dbea21..8a82960 100644
--- a/macros/aclocal-include.m4
+++ b/macros/aclocal-include.m4
@@ -1,14 +1,31 @@
-# Copyright (c) 2011 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+dnl Copyright (c) 2011 the LinBox group
+dnl This file is part of LinBox
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
-# aclocal-include.m4
-#
-# This macro adds the name macrodir to the set of directories
-# that `aclocal' searches for macros.
-# serial 1
+dnl aclocal-include.m4
+dnl This macro adds the name macrodir to the set of directories
+dnl that `aclocal' searches for macros.
+
+dnl serial 1
dnl AM_ACLOCAL_INCLUDE(macrodir)
AC_DEFUN([AM_ACLOCAL_INCLUDE],
diff --git a/macros/atlas-check.m4 b/macros/atlas-check.m4
deleted file mode 100644
index d8a4981..0000000
--- a/macros/atlas-check.m4
+++ /dev/null
@@ -1,167 +0,0 @@
-# Check for ATLAS
-# Copyright (c) 2003 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
-# Pascal Giorgi , 2003-03-04
-# Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
-# Stolen from Chris Lahey 99-2-5
-# stolen from Manish Singh again
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl LB_CHECK_ATLAS ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl
-dnl Test for ATLAS and define ATLAS_CFLAGS and ATLAS_LIBS
-
-AC_DEFUN([LB_CHECK_ATLAS],
-[
-
-AC_ARG_WITH(atlas,
- [AC_HELP_STRING([--with-atlas=<path>|yes|no],
- [Use Atlas library.
- If argument is no, you do not have the library installed on your machine (set as default).
- If argument is yes or <empty> that means the library is reachable with the standard
- search path (/usr or /usr/local).
- Otherwise you give the <path> to the directory which contain the library.
- ])],
- [if test "$withval" = yes ; then
- ATLAS_HOME_PATH="${DEFAULT_CHECKING_PATH}"
- elif test "$withval" != no ; then
- ATLAS_HOME_PATH="$withval"
- fi],
- [])
-
-AC_ARG_WITH(atlas-includes,
- [AC_HELP_STRING([--with-atlas-includes=<path>],
- [Useful for multi-platform installation.
- Add the path of ATLAS platform dependant headers.
- Need --with-atlas=<generic path> option.])
- ],
- [ if test -n "$withval" ; then
- OPT_ATLAS_CFLAGS="$withval"
- fi
- ],
- [])
-
-AC_ARG_WITH(atlas-libraries,
- [AC_HELP_STRING([--with-atlas-libraries=<path>],
- [Useful for multi-platform installation.
- Add the path of ATLAS platform dependant libraries.
- Need --with-atlas=<generic path> option.
- ])],
- [ if test -n "$withval" ; then
- OPT_ATLAS_LIBS="$withval"
- fi
- ],
- [])
-
-
-
-min_atlas_version=ifelse([$1], ,3.0,$1)
-
-dnl Check for existence
-
-BACKUP_CXXFLAGS=${CXXFLAGS}
-BACKUP_LIBS=${LIBS}
-
-if test -n "$ATLAS_HOME_PATH" ; then
-AC_MSG_CHECKING(for ATLAS >= $min_atlas_version)
-fi
-
-for ATLAS_HOME in ${ATLAS_HOME_PATH}
- do
-if test -r "$ATLAS_HOME/include/cblas.h"; then
-
- if test "x$ATLAS_HOME" != "x/usr" -a "x$ATLAS_HOME" != "x/usr/local"; then
- if test -z "${OPT_ATLAS_CFLAGS}" ; then
- ATLAS_CFLAGS="-I${ATLAS_HOME}/include "
- else
- ATLAS_CFLAGS="-I${ATLAS_HOME}/include -I${OPT_ATLAS_CFLAGS}"
- fi
- if test -z "${OPT_ATLAS_LIBS}" ; then
- ATLAS_LIBS="-L${ATLAS_HOME}/lib -llapack -lcblas -latlas"
- else
- ATLAS_LIBS="-L${ATLAS_HOME}/lib -L${OPT_ATLAS_LIBS} -llapack -lcblas -latlas"
- fi
-
- else
- if test -z "${OPT_ATLAS_CFLAGS}" ; then
- ATLAS_CFLAGS=
- else
- ATLAS_CFLAGS="-I${OPT_ATLAS_CFLAGS}"
- fi
- if test -z "${OPT_ATLAS_LIBS}" ; then
- ATLAS_LIBS="-llapack -lcblas -latlas"
- else
- ATLAS_LIBS="-L${OPT_ATLAS_LIBS} -llapack -lcblas -latlas"
- fi
- fi
-
- CXXFLAGS="${BACKUP_CXXFLAGS} ${ATLAS_CFLAGS} ${GMP_CFLAGS}"
- LIBS="${BACKUP_LIBS} ${ATLAS_LIBS} ${GMP_LIBS}"
-
- AC_TRY_LINK(
- [#include <cblas.h>],
- [double a;],
- [
- AC_TRY_RUN(
- [#include <atlas_buildinfo.h>
- int main () { if (ATL_VERS[0] <3) return -1; else return 0; }
- ],[
- atlas_found="yes"
- break
- ],[
- atlas_problem="$problem $ATLAS_HOME"
- unset ATLAS_CFLAGS
- unset ATLAS_LIBS
- ],[
- atlas_found="yes"
- atlas_cross="yes"
- break
- ])
- ],
- [
- atlas_found="no"
- atlas_checked="$checked $ATLAS_HOME"
- unset ATLAS_CFLAGS
- unset ATLAS_LIBS
- ifelse([$3], , :, [$3])
- ])
-else
- atlas_found="no"
-fi
-done
-
-if test "x$atlas_found" = "xyes" ; then
- AC_SUBST(ATLAS_CFLAGS)
- AC_SUBST(ATLAS_LIBS)
- AC_DEFINE(HAVE_ATLAS,1,[Define if ATLAS is installed])
- AC_DEFINE(BLAS_AVAILABLE,,[Define if BLAS routines are available])
- HAVE_ATLAS=yes
- if test "x$atlas_cross" != "xyes"; then
- AC_MSG_RESULT(found)
- else
- AC_MSG_RESULT(unknown)
- echo "WARNING: You appear to be cross compiling, so there is no way to determine"
- echo "whether your ATLAS version is new enough. I am assuming it is."
- fi
- ifelse([$2], , :, [$2])
-elif test -n "$atlas_problem"; then
- AC_MSG_RESULT(problem)
- echo "Sorry, your ATLAS version is too old. Disabling."
- ifelse([$3], , :, [$3])
-elif test "x$atlas_found" = "xno" ; then
- AC_MSG_RESULT(not found)
- ifelse([$3], , :, [$3])
-fi
-
-AM_CONDITIONAL(LINBOX_HAVE_ATLAS, test "x$HAVE_ATLAS" = "xyes")
-
-CXXFLAGS=${BACKUP_CXXFLAGS}
-LIBS=${BACKUP_LIBS}
-#unset LD_LIBRARY_PATH
-
-])
-
-
diff --git a/macros/config-header.m4 b/macros/config-header.m4
index 50ad739..3de8305 100644
--- a/macros/config-header.m4
+++ b/macros/config-header.m4
@@ -1,10 +1,28 @@
-# Copyright (c) 2011 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+dnl Copyright (c) 2011 the LinBox group
+dnl This file is part of LinBox
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
-AC_DEFUN([AX_PREFIX_CONFIG_H],[AC_REQUIRE([AC_CONFIG_HEADER])
+
+AC_DEFUN([AX_PREFIX_CONFIG_H],[AC_REQUIRE([AC_CONFIG_HEADERS])
AC_CONFIG_COMMANDS([ifelse($1,,$PACKAGE-config.h,$1)],[dnl
AS_VAR_PUSHDEF([_OUT],[ac_prefix_conf_OUT])dnl
AS_VAR_PUSHDEF([_DEF],[ac_prefix_conf_DEF])dnl
diff --git a/macros/debug.m4 b/macros/debug.m4
index b115fb6..9eaea20 100644
--- a/macros/debug.m4
+++ b/macros/debug.m4
@@ -1,9 +1,25 @@
-# Copyright(c)'2011 by The Givaro group
-# Written by BB <bboyer at imag.fr>
-# This file is part of Givaro.
-# Givaro is governed by the CeCILL-B license under French law
-# and abiding by the rules of distribution of free software.
-# see the COPYRIGHT file for more details.
+dnl Copyright(c)'2011 LinBox
+dnl Written by BB <bboyer at imag.fr>
+dnl This file is part of LinBox.
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl.
dnl enable basic debug mode.
AC_DEFUN([AC_DEBUG],
@@ -19,73 +35,104 @@ AC_DEFUN([AC_DEBUG],
]
)
-dnl enable as much debug flag options as possible
-dnl AC_DEFUN([AC_FULL_DEBUG],
-dnl [AC_MSG_CHECKING([whether to enable full debugging mode in the library])
- dnl AC_ARG_ENABLE(full-debug,
-dnl [ --enable-full-debug enable full debugging options in library],
- dnl USE_FULL_DEBUG=$enableval,
- dnl USE_FULL_DEBUG=no)
- dnl AC_MSG_RESULT([$USE_FULL_DEBUG])
- dnl AM_CONDITIONAL(FULL_DEBUG, [test $USE_FULL_DEBUG = yes])
- dnl FULLDBG=$USE_FULL_DEBUG
- dnl AC_SUBST(FULLDBG)dnl
-dnl ]
-dnl )
-
+AC_DEFUN([AC_PROFILE],
+[AC_MSG_CHECKING([whether to enable profiling everything in the library])
+ AC_ARG_ENABLE(profile,
+[AC_HELP_STRING([--enable-profile], [enable profiling options in library])],
+ USE_PROFILE=$enableval,
+ USE_PROFILE=no)
+ AC_MSG_RESULT([$USE_PROFILE])
+ AM_CONDITIONAL(PROFILE, [test $USE_PROFILE = yes])
+ PROF=$USE_PROFILE
+ AC_SUBST(PROF)dnl
+]
+)
dnl Enable warnings from compiler.
AC_DEFUN([AC_WARNINGS],
[AC_MSG_CHECKING([whether to enable warnings when compiling the library])
AC_ARG_ENABLE(warnings,
-[AC_HELP_STRING([--enable-warnings], [enable warings when compiling the library])],
+[AC_HELP_STRING([--enable-warnings=yes|full|no], [enable warnings when compiling the library.
+If nothing or yes is given, more aggressive compiler warnings are passed to the compiler.
+If full is given, we become paranoïd about warnings and treat them as errors.])],
USE_WARNINGS=$enableval,
USE_WARNINGS=no)
AC_MSG_RESULT([$USE_WARNINGS])
- AM_CONDITIONAL(WARNINGS, [test $USE_WARNINGS = yes])
+ dnl AM_CONDITIONAL(WARNINGS, [test $USE_WARNINGS = yes])
WARN=$USE_WARNINGS
AC_SUBST(WARN)dnl
-]
-)
+]dnl
+)dnl
-AC_DEFUN([AC_COMPILER_NAME],
-[
-AC_MSG_CHECKING(for family name of compiler)
-AC_TRY_RUN(dnl ICC ?
-[ #ifdef __INTEL_COMPILER
- int main() { return 0 ; }
- #else
- pas intel
- #endif],dnl
-[dnl
- AC_MSG_RESULT(icc)
- CCNAM=icc
- AC_SUBST(CCNAM)
-],dnl GCC ?
-[dnl
- AC_TRY_RUN(dnl GCC ?
-[#ifdef __GNUC__
- int main() { return 0 ; }
- #else
- pas gcc non plus.
- #endif],[
- AC_MSG_RESULT(gcc)
- CCNAM=gcc
- AC_SUBST(CCNAM)
- ],[
- AC_MSG_RESULT(unknown)
- CCNAM=unknown
- AC_SUBST(CCNAM)
- ],[
- AC_MSG_RESULT(unknown)
- CCNAM=unknown
- AC_SUBST(CCNAM)
- ])
-],dnl GCC !
-[
- AC_MSG_RESULT(unknown)
- CCNAM=unknown
- AC_SUBST(CCNAM)
-])
+CCNAM=""
+
+AC_DEFUN([AC_COMPILER_NAME], [
+ AC_MSG_CHECKING(for family name of compiler)
+
+ dnl CHECKING for various compilers
+ dnl ICC ?
+ AC_TRY_RUN( [
+ #ifdef __INTEL_COMPILER
+ int main() { return 0 ; }
+ #else
+ pas intel
+ #endif],
+ [ AC_MSG_RESULT(icc)
+ CCNAM=icc
+ AC_SUBST(CCNAM)
+ ])
+
+dnl PATHSCALE ?
+ AS_IF([ test -z "${CCNAM}"], [
+ AC_TRY_RUN( [
+ #ifdef __PATHSCALE__
+ int main() { return !(__PATHCC__ >= 4) ; }
+ #else
+ pas ekopath non plus.
+ #endif], [
+ AC_MSG_RESULT(eko)
+ CCNAM=eko
+ AC_SUBST(CCNAM) ])
+ ])
+
+dnl CLANG ?
+ AS_IF([ test -z "${CCNAM}"], [
+ AC_TRY_RUN( [
+ #ifdef __clang__
+ int main() { return !(__clang_major >=3) ; }
+ #else
+ pas clang non plus.
+ #endif], [
+ AC_MSG_RESULT(clang)
+ CCNAM=clang
+ AC_SUBST(CCNAM) ])
+ ])
+
+dnl GCC ?
+ AS_IF([ test -z "${CCNAM}"], [
+ AC_TRY_RUN( [
+ #ifdef __GNUC__
+ int main() { return !(__GNUC__ >= 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) ; }
+ #else
+ pas gcc non plus ???
+ #endif], [
+ CCNOM=gcc
+ AS_IF([ test -n "${CC}" ], [CCNOM="`$CC --version 2>&1| awk 'NR<2{print $1}'`"])
+ CCNAM=gcc
+ AC_SUBST(CCNAM)
+ AC_MSG_RESULT($CCNOM)
+ ])
+ ])
+
+ dnl autre ?
+
+ AS_IF([ test -z "${CCNAM}"],
+ [ AC_MSG_RESULT(unknown)
+ CCNAM=unknown
+ AC_SUBST(CCNAM)
+ echo
+ echo " *** unknow compiler. please file a bug "
+ echo
+ ])
])
diff --git a/macros/expat-check.m4 b/macros/expat-check.m4
index 1b035ae..18741a6 100644
--- a/macros/expat-check.m4
+++ b/macros/expat-check.m4
@@ -1,15 +1,33 @@
-# Check for expat
-# Copyright (c) the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
-# Rich Seagraves
-# stolen from Pascal Giorgi, 2001-12-10
-# Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
-# Stolen from Chris Lahey 99-2-5
-# stolen from Manish Singh again
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
+dnl Check for expat
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
+dnl Rich Seagraves
+dnl stolen from Pascal Giorgi, 2001-12-10
+dnl Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
+dnl Stolen from Chris Lahey 99-2-5
+dnl stolen from Manish Singh again
+dnl stolen back from Frank Belew
+dnl stolen from Manish Singh
+dnl Shamelessly stolen from Owen Taylor
dnl LB_CHECK_EXPAT ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl
@@ -18,7 +36,7 @@ AC_DEFUN([LB_CHECK_EXPAT],
[
AC_ARG_WITH(expat,
-[AC_ARG_WITH([--with-expat=<path>|yes|no], [Use Expat library. If argument is no, you do not
+[AC_HELP_STRING([--with-expat=<path>|yes|no], [Use Expat library. If argument is no, you do not
have the library installed on your machine (set
as default). If argument is yes or <empty> that
means the library is reachable with the standard
diff --git a/macros/fflaflas-check.m4 b/macros/fflaflas-check.m4
deleted file mode 100644
index ce859ee..0000000
--- a/macros/fflaflas-check.m4
+++ /dev/null
@@ -1,115 +0,0 @@
-# Check for Fflas-Ffpack
-# Copyright (c) the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
-# Boyer Brice 19/04/11
-# Bradford Hovinen, 2001-06-13
-# Modified by Pascal Giorgi, 2003-12-03
-# Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
-# Stolen from Chris Lahey 99-2-5
-# stolen from Manish Singh again
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl LB_CHECK_FFLAFLAS ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl
-dnl Test for FFLAFLAS and define FFLAFLAS_CFLAGS and FFLAFLAS_LIBS
-
-AC_DEFUN([LB_CHECK_FFLAFLAS],
-[
-
-AC_ARG_WITH(fflas-ffpack,
- [AC_HELP_STRING([--with-fflas-ffpack=<path>|yes], [Use Fflas-Ffpack library. This library is mandatory for
- LinBox compilation. If argument is yes or <empty> or <bad> :)
- that means the library is reachable with the standard
- search path (/usr or /usr/local). Otherwise you give
- the <path> to the directory which contains the
- library.
- Available at "http://linalg.org/projects/fflas-ffpack".
- ])],
- [if test "$withval" = yes ; then
- FFLAFLAS_HOME_PATH="${DEFAULT_CHECKING_PATH}"
- elif test "$withval" != no ; then
- FFLAFLAS_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}"
- fi],
- [FFLAFLAS_HOME_PATH="${DEFAULT_CHECKING_PATH}"])
-
-dnl min_iml_version=ifelse([$1], ,1.0.3,$1)
-
-
-dnl Check for existence
-BACKUP_CXXFLAGS=${CXXFLAGS}
-BACKUP_LIBS=${LIBS}
-
-AC_MSG_CHECKING(for FFLAFLAS)
-
-for FFLAFLAS_HOME in ${FFLAFLAS_HOME_PATH}
- do
- if test -r "$FFLAFLAS_HOME/include/fflas-ffpack/fflas-ffpack.h"; then
-
- BLAS_LIBS=`$FFLAFLAS_HOME/bin/fflasffpack-config --blas-libs`
- dnl BLAS_CFLAGS=`$FFLAFLAS_HOME/bin/fflasffpack-config --cflags`
-
-
- if test "x$FFLAFLAS_HOME" != "x/usr" -a "x$FFLAFLAS_HOME" != "x/usr/local"; then
- FFLAFLAS_CFLAGS="-I${FFLAFLAS_HOME}/include"
- else
- FFLAFLAS_CFLAGS=
- fi
-
- CXXFLAGS="${BACKUP_CXXFLAGS} ${FFLAFLAS_CFLAGS} ${BLAS_CFLAGS}"
- LIBS="${BACKUP_LIBS} ${BLAS_LIBS}"
-
- AC_TRY_LINK(
- [#include "fflas-ffpack/fflas-ffpack.h"],
- [FFLAS::FFLAS_TRANSPOSE a;],
- [
- fflaflas_found="yes"
- FFLAFLAS_LOC="$FFLAFLAS_HOME"
- ],
- [
- fflaflas_found="no"
- fflaflas_checked="$checked $FFLAFLAS_HOME"
- unset FFLAFLAS_CFLAGS
- unset FFLAFLAS_LOC
- unset BLAS_LIBS
- ])
- dnl AC_MSG_RESULT(found in $fflaflas_checked ? $fflaflas_found)
- else
- fflasflas_found="no"
- dnl AC_MSG_RESULT(not found at all $FFLAFLAS_HOME : $fflaflas_found)
- fi
-done
-
-if test "x$fflaflas_found" = "xyes" ; then
- AC_SUBST(FFLAFLAS_CFLAGS)
- AC_SUBST(FFLAFLAS_LIBS)
- AC_SUBST(FFLAFLAS_LOC)
- AC_SUBST(BLAS_LIBS)
- AC_DEFINE(HAVE_FFLAFLAS,1,[Define if FFLAFLAS is installed])
- HAVE_FFLAFLAS=yes
- if test "x$fflasflas_cross" != "xyes"; then
- AC_MSG_RESULT(found)
- else
- AC_MSG_RESULT(unknown)
- echo "WARNING: You appear to be cross compiling, so there is no way to determine"
- echo "whether your FFLAFLAS version is new enough. I am assuming it is."
- fi
- ifelse([$2], , :, [$2])
-elif test -n "$fflasflas_problem"; then
- AC_MSG_RESULT(problem)
- echo "Sorry, your FFLAFLAS version is too old. Disabling."
- ifelse([$3], , :, [$3])
-elif test "x$fflasflas_found" = "xno" ; then
- AC_MSG_RESULT(not found)
- ifelse([$3], , :, [$3])
-fi
-
-AM_CONDITIONAL(LINBOX_HAVE_FFLAFLAS, test "x$HAVE_FFLAFLAS" = "xyes")
-
-CXXFLAGS=${BACKUP_CXXFLAGS}
-LIBS=${BACKUP_LIBS}
-#unset LD_LIBRARY_PATH
-
-])
diff --git a/macros/fflas-ffpack-check.m4 b/macros/fflas-ffpack-check.m4
new file mode 100644
index 0000000..99411d4
--- /dev/null
+++ b/macros/fflas-ffpack-check.m4
@@ -0,0 +1,154 @@
+dnl Check for Fflas-Ffpack
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
+dnl Boyer Brice 19/04/11
+dnl Bradford Hovinen, 2001-06-13
+dnl Modified by Pascal Giorgi, 2003-12-03
+dnl Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
+dnl Stolen from Chris Lahey 99-2-5
+dnl stolen from Manish Singh again
+dnl stolen back from Frank Belew
+dnl stolen from Manish Singh
+dnl Shamelessly stolen from Owen Taylor
+
+dnl LB_CHECK_FFLAS_FFPACK ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl
+dnl Test for FFLAS_FFPACK and define FFLAS_FFPACK_CFLAGS and FFLAS_FFPACK_LIBS
+
+AC_DEFUN([LB_CHECK_FFLAS_FFPACK],
+[
+
+AC_ARG_WITH(fflas-ffpack,
+ [AC_HELP_STRING([--with-fflas-ffpack=<path>|yes], [Use Fflas-Ffpack library. This library is mandatory for
+ LinBox compilation. If argument is yes or <empty> or <bad> :)
+ that means the library is reachable with the standard
+ search path (/usr or /usr/local). Otherwise you give
+ the <path> to the directory which contains the
+ library.
+ Available at "http://linalg.org/projects/fflas-ffpack".
+ ])],
+ [if test "$withval" = yes ; then
+ FFLAS_FFPACK_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+ elif test "$withval" != no ; then
+ FFLAS_FFPACK_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}"
+ fi],
+ [FFLAS_FFPACK_HOME_PATH="${DEFAULT_CHECKING_PATH}"])
+
+dnl min_iml_version=ifelse([$1], ,1.0.3,$1)
+
+dnl -------------------- dnl
+dnl FFLAS-FFPACK VERSION dnl
+dnl -------------------- dnl
+
+version_min=10600
+version_max=10700
+
+
+dnl Check for existence
+BACKUP_CXXFLAGS=${CXXFLAGS}
+BACKUP_LIBS=${LIBS}
+
+AC_MSG_CHECKING(for FFLAS-FFPACK >= $version_min and < $version_max)
+
+for FFLAS_FFPACK_HOME in ${FFLAS_FFPACK_HOME_PATH}
+ do
+ if test -r "$FFLAS_FFPACK_HOME/include/fflas-ffpack/fflas-ffpack.h" -a -x "$FFLAS_FFPACK_HOME/bin/fflas-ffpack-config"; then
+
+ BLAS_LIBS=`$FFLAS_FFPACK_HOME/bin/fflas-ffpack-config --blas-libs`
+ BLAS_CFLAGS=`$FFLAS_FFPACK_HOME/bin/fflas-ffpack-config --cflags`
+
+
+ if test "x$FFLAS_FFPACK_HOME" != "x/usr" -a "x$FFLAS_FFPACK_HOME" != "x/usr/local"; then
+ FFLAS_FFPACK_CFLAGS="-I${FFLAS_FFPACK_HOME}/include"
+ else
+ FFLAS_FFPACK_CFLAGS=
+ fi
+
+ CXXFLAGS="${BACKUP_CXXFLAGS} ${FFLAS_FFPACK_CFLAGS} ${BLAS_CFLAGS}"
+ LIBS="${BACKUP_LIBS} ${BLAS_LIBS}"
+
+ AC_TRY_LINK(
+ [#include "fflas-ffpack/fflas-ffpack.h"],
+ [FFLAS::FFLAS_TRANSPOSE a;],
+ [
+
+ FF_VER=`$FFLAS_FFPACK_HOME/bin/fflas-ffpack-config --decimal-version`
+ AS_IF([ test $FF_VER -ge $version_min -a $FF_VER -lt $version_max ],
+ [
+ ffflasffpack_found="yes"
+ FFLAS_FFPACK_LOC="$FFLAS_FFPACK_HOME"
+ break
+ ],
+ [
+ ffflasffpack_found="no"
+ ]
+ )
+ ],
+ [
+ ffflasffpack_found="no"
+ ffflasffpack_checked="$checked $FFLAS_FFPACK_HOME"
+ unset FFLAS_FFPACK_CFLAGS
+ unset FFLAS_FFPACK_LOC
+ unset BLAS_LIBS
+ unset BLAS_CFLAGS
+ ])
+ dnl AC_MSG_RESULT(found in $ffflasffpack_checked ? $ffflasffpack_found)
+ else
+ fflasflas_found="no"
+ dnl AC_MSG_RESULT(not found at all $FFLAS_FFPACK_HOME : $ffflasffpack_found)
+ fi
+done
+
+if test "x$ffflasffpack_found" = "xyes" ; then
+ AC_SUBST(FFLAS_FFPACK_CFLAGS)
+ AC_SUBST(FFLAS_FFPACK_LIBS)
+ AC_SUBST(FFLAS_FFPACK_LOC)
+ AC_SUBST(BLAS_LIBS)
+ AC_SUBST(BLAS_CFLAGS)
+ AC_DEFINE(HAVE_FFLAS_FFPACK,1,[Define if FFLAS-FFPACK is installed])
+ FF_VER=`$FFLAS_FFPACK_LOC/bin/fflas-ffpack-config --decimal-version`
+ AC_DEFINE_UNQUOTED(FFLAS_FFPACK_VERSION, $FF_VER ,[what version of FFLAS-FFPACK is installed])
+ HAVE_FFLAS_FFPACK=yes
+ if test "x$fflasflas_cross" != "xyes"; then
+ AC_MSG_RESULT(found)
+ else
+ AC_MSG_RESULT(unknown)
+ echo "WARNING: You appear to be cross compiling, so there is no way to determine"
+ echo "whether your FFLAS-FFPACK version is new enough. I am assuming it is."
+ fi
+ ifelse([$2], , :, [$2])
+elif test -n "$fflasflas_problem"; then
+ AC_MSG_RESULT(problem)
+ echo "Sorry, your FFLAS-FFPACK version is too old. Disabling."
+ ifelse([$3], , :, [$3])
+elif test "x$fflasflas_found" = "xno" ; then
+ AC_MSG_RESULT(not found)
+ ifelse([$3], , :, [$3])
+fi
+
+AM_CONDITIONAL(LINBOX_HAVE_FFLAS_FFPACK, test "x$HAVE_FFLAS_FFPACK" = "xyes")
+
+CXXFLAGS=${BACKUP_CXXFLAGS}
+LIBS=${BACKUP_LIBS}
+#unset LD_LIBRARY_PATH
+
+])
diff --git a/macros/fplll-check.m4 b/macros/fplll-check.m4
new file mode 100644
index 0000000..ccdb17a
--- /dev/null
+++ b/macros/fplll-check.m4
@@ -0,0 +1,143 @@
+dnl Check for FPLLL
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
+dnl Boyer Brice 22/10/11
+dnl Bradford Hovinen, 2001-06-13
+dnl Modified by Pascal Giorgi, 2003-12-03
+dnl Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
+dnl Stolen from Chris Lahey 99-2-5
+dnl stolen from Manish Singh again
+dnl stolen back from Frank Belew
+dnl stolen from Manish Singh
+dnl Shamelessly stolen from Owen Taylor
+
+dnl LB_CHECK_FPLLL ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl
+dnl Test for FPLLL and define FPLLL_CFLAGS and FPLLL_LIBS
+
+AC_DEFUN([LB_CHECK_FPLLL],
+[
+
+AC_ARG_WITH(fplll,
+[AC_HELP_STRING([--with-fplll=<path>|yes], [Use FPLLL library. This library is (not yet) mandatory for
+ LinBox compilation. If argument is yes or <empty> or <bad> :)
+ that means the library is reachable with the standard
+ search path (/usr or /usr/local). Otherwise you give
+ the <path> to the directory which contains the
+ library.
+])],
+ [if test "$withval" = yes ; then
+ FPLLL_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+ elif test "$withval" != no ; then
+ FPLLL_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}"
+ fi],
+ [FPLLL_HOME_PATH="${DEFAULT_CHECKING_PATH}"])
+
+dnl min_fplll_version=ifelse([$1], ,1.0.3,$1)
+
+
+dnl Check for existence
+BACKUP_CXXFLAGS=${CXXFLAGS}
+BACKUP_LIBS=${LIBS}
+
+AC_MSG_CHECKING(for FPLLL)
+
+for FPLLL_HOME in ${FPLLL_HOME_PATH}
+ do
+ if test -r "$FPLLL_HOME/include/fplll/fplll.h"; then
+
+ AS_IF([ test "x$FPLLL_HOME" != "x/usr" -a "x$FPLLL_HOME" != "x/usr/local"], [
+ FPLLL_CFLAGS="-I${FPLLL_HOME}/include"
+ FPLLL_LIBS="-L${FPLLL_HOME}/lib -lfplll"
+ ],[
+ FPLLL_CFLAGS=
+ FPLLL_LIBS="-lfplll"
+ ])
+
+ CXXFLAGS="${BACKUP_CXXFLAGS} ${MPFR_CFLAGS} ${FPLLL_CFLAGS} ${GMP_CFLAGS}"
+ LIBS="${BACKUP_LIBS} ${GMP_LIBS} ${MPFR_LIBS} ${FPLLL_LIBS} "
+
+ AC_TRY_LINK(
+ [
+ #include <fplll/fplll.h>
+ #include <fplll/solver.h>
+ ],
+ [enum EvaluatorType a ;],
+ [
+ AC_TRY_RUN(
+ [
+ int main () { return 0; /* not important to check for version */ }
+ ],[
+ fplll_found="yes"
+ break
+ ],[
+ fplll_problem="$problem $FPLLL_HOME"
+ unset FPLLL_CFLAGS
+ unset FPLLL_LIBS
+ ],[
+ fplll_found="yes"
+ fplll_cross="yes"
+ break
+ ])
+ ],
+ [
+ fplll_found="no"
+ fplll_checked="$checked $FPLLL_HOME"
+ unset FPLLL_CFLAGS
+ unset FPLLL_LIBS
+ ])
+ dnl AC_MSG_RESULT(found in $fplll_checked ? $fplll_found)
+ else
+ fplll_found="no"
+ dnl AC_MSG_RESULT(not found at all $FPLLL_HOME : $fplll_found)
+ fi
+done
+
+if test "x$fplll_found" = "xyes" ; then
+ AC_SUBST(FPLLL_CFLAGS)
+ AC_SUBST(FPLLL_LIBS)
+ AC_DEFINE(HAVE_FPLLL,1,[Define if FPLLL is installed])
+ HAVE_FPLLL=yes
+ AS_IF([ test "x$fplll_cross" != "xyes" ],[
+ AC_MSG_RESULT(found)
+ ],[
+ AC_MSG_RESULT(unknown)
+ echo "WARNING: You appear to be cross compiling, so there is no way to determine"
+ echo "whether your FPLLL version is new enough. I am assuming it is."
+ ])
+ ifelse([$2], , :, [$2])
+elif test -n "$fplll_problem"; then
+ AC_MSG_RESULT(problem)
+ echo "Sorry, your FPLLL version is too old. Disabling."
+ ifelse([$3], , :, [$3])
+elif test "x$fplll_found" = "xno" ; then
+ AC_MSG_RESULT(not found)
+ ifelse([$3], , :, [$3])
+fi
+
+AM_CONDITIONAL(LINBOX_HAVE_FPLLL, test "x$HAVE_FPLLL" = "xyes")
+
+CXXFLAGS=${BACKUP_CXXFLAGS}
+LIBS=${BACKUP_LIBS}
+#unset LD_LIBRARY_PATH
+
+])
diff --git a/macros/givaro-check.m4 b/macros/givaro-check.m4
index 012b93c..f4f2901 100644
--- a/macros/givaro-check.m4
+++ b/macros/givaro-check.m4
@@ -1,16 +1,33 @@
-# Check for GIVARO
-# Copyright (c) the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
-# Bradford Hovinen, 2001-06-13
-# Modified by Pascal Giorgi, 2003-12-03
-# Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
-# Stolen from Chris Lahey 99-2-5
-# stolen from Manish Singh again
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-# This file is part of LinBox, see COPYING for licence information.
+dnl Check for GIVARO
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
+dnl Bradford Hovinen, 2001-06-13
+dnl Modified by Pascal Giorgi, 2003-12-03
+dnl Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
+dnl Stolen from Chris Lahey 99-2-5
+dnl stolen from Manish Singh again
+dnl stolen back from Frank Belew
+dnl stolen from Manish Singh
+dnl Shamelessly stolen from Owen Taylor
dnl LB_CHECK_GIVARO ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl
@@ -38,16 +55,15 @@ dnl -------------- dnl
dnl GIVARO VERSION dnl
dnl -------------- dnl
-version_min=30400
-min_givaro_version=ifelse([$1], ,3.4.0,$1)
-max_givaro_version=ifelse([$2], ,3.5.0,$2)
+version_min=30700
+version_max=30800
dnl Check for existence
BACKUP_CXXFLAGS=${CXXFLAGS}
BACKUP_LIBS=${LIBS}
-AC_MSG_CHECKING(for GIVARO >= $min_givaro_version and < $max_givaro_version)
+AC_MSG_CHECKING(for GIVARO >= $version_min and < $version_max)
for GIVARO_HOME in ${GIVARO_HOME_PATH}
do
@@ -55,7 +71,7 @@ if test -r "$GIVARO_HOME/include/givaro/givconfig.h"; then
if test "x$GIVARO_HOME" != "x/usr" -a "x$GIVARO_HOME" != "x/usr/local"; then
GIVARO_CFLAGS="-I${GIVARO_HOME}/include"
- GIVARO_LIBS="-L${GIVARO_HOME}/lib -lgivaro ${GIVARO_HOME}/lib/libgivaro.so"
+ GIVARO_LIBS="-L${GIVARO_HOME}/lib -lgivaro"
else
GIVARO_CFLAGS=
GIVARO_LIBS="-lgivaro"
@@ -69,7 +85,7 @@ if test -r "$GIVARO_HOME/include/givaro/givconfig.h"; then
[
AC_TRY_RUN(
[#include <givaro/givconfig.h>
- int main () { if (GIVARO_VERSION < $version_min || GIVARO_VERSION >= (($version_min/100+1)*100) || GIVARO_VERSION>0x030000) return -1; else return 0; /* old version of Givaro are defined as hexa 0x03yyzz*/ }
+ int main () { if (GIVARO_VERSION < $version_min || GIVARO_VERSION >= $version_max || GIVARO_VERSION>0x030000) return -1; else return 0; /* old version of Givaro are defined as hexa 0x03yyzz*/ }
],[
givaro_found="yes"
break
diff --git a/macros/gmp-check.m4 b/macros/gmp-check.m4
index a339124..ce9b2b6 100644
--- a/macros/gmp-check.m4
+++ b/macros/gmp-check.m4
@@ -1,8 +1,26 @@
-# Check for GMP
-# Copyright (c) the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
-# Modified by Pascal Giorgi, 2003-12-03
+dnl Check for GMP
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
+dnl Modified by Pascal Giorgi, 2003-12-03
dnl LB_CHECK_GMP ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl
@@ -49,11 +67,24 @@ for GMP_HOME in ${GMP_HOME_PATH}
LIBS="${LIBS} ${GMP_LIBS}"
AC_TRY_LINK(
- [#include <gmp.h>],
+ [
+#ifdef __PATHCC__
+#include <rw/_defs.h>
+#include <ansi/_cstddef.h>
+#endif
+#include "stddef.h"
+ #include <gmp.h>
+ ],
[mpz_t a; mpz_init (a);],
[
AC_TRY_RUN(
- [#include <gmp.h>
+ [
+#ifdef __PATHCC__
+#include <rw/_defs.h>
+ #include <ansi/_cstddef.h>
+ #include "stddef.h"
+#endif
+ #include <gmp.h>
int main () { if (__GNU_MP_VERSION < 3) return -1; else return 0; }
],[
AC_MSG_RESULT(found)
@@ -63,7 +94,13 @@ for GMP_HOME in ${GMP_HOME_PATH}
# See if we are running GMP 4.0
AC_MSG_CHECKING(whether GMP is 4.0 or greater)
AC_TRY_RUN(
- [#include <gmp.h>
+ [
+#ifdef __PATHCC__
+#include <rw/_defs.h>
+ #include <ansi/_cstddef.h>
+ #include "stddef.h"
+#endif
+#include <gmp.h>
int main () { if (__GNU_MP_VERSION < 4) return -1; else return 0; }
],[
gmp_found="yes"
diff --git a/macros/iml-check.m4 b/macros/iml-check.m4
index a7853ab..14c4dc4 100644
--- a/macros/iml-check.m4
+++ b/macros/iml-check.m4
@@ -1,17 +1,34 @@
-# Check for IML
-# Copyright (c) the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
-# Boyer Brice 07/04/11
-# Bradford Hovinen, 2001-06-13
-# Modified by Pascal Giorgi, 2003-12-03
-# Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
-# Stolen from Chris Lahey 99-2-5
-# stolen from Manish Singh again
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-# This file is part of LinBox, see COPYING for licence information.
+dnl Check for IML
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
+dnl Boyer Brice 07/04/11
+dnl Bradford Hovinen, 2001-06-13
+dnl Modified by Pascal Giorgi, 2003-12-03
+dnl Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
+dnl Stolen from Chris Lahey 99-2-5
+dnl stolen from Manish Singh again
+dnl stolen back from Frank Belew
+dnl stolen from Manish Singh
+dnl Shamelessly stolen from Owen Taylor
dnl LB_CHECK_IML ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl
diff --git a/macros/lapack-check.m4 b/macros/lapack-check.m4
new file mode 100644
index 0000000..9d28a73
--- /dev/null
+++ b/macros/lapack-check.m4
@@ -0,0 +1,68 @@
+dnl Check for LAPACK in fflas-ffpack
+dnl
+dnl Copyright (c) 2011 the LinBox group
+dnl Written by BB <bboyer at imag.fr>
+dnl This file is part of LinBox
+
+dnl ========LICENCE========
+dnl This file is part of the library LinBox.
+dnl
+dnl LinBox is free software: you can redistribute it and/or modify
+dnl it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+dnl ========LICENCE========
+dnl
+
+dnl LB_CHECK_LAPACK
+
+AC_DEFUN([LB_CHECK_LAPACK],
+[
+
+AC_MSG_CHECKING(for LAPACK in fflas-ffpack)
+
+BACKUP_CXXFLAGS=${CXXFLAGS}
+BACKUP_LIBS=${LIBS}
+
+CXXFLAGS="${BACKUP_CXXFLAGS} ${FFLAS_FFPACK_CFLAGS} ${BLAS_CFLAGS}"
+LIBS="${BACKUP_LIBS} ${BLAS_LIBS}"
+
+AC_TRY_RUN(dnl ICC ?
+[ #include "fflas-ffpack/fflas-ffpack-config.h"
+ #ifdef __FFLAS_FFPACK_HAVE_LAPACK
+ int main() { return 0 ; }
+ #else
+ a pas lapack
+ #endif
+],dnl
+[dnl
+ AC_MSG_RESULT(ok)
+ AC_DEFINE(HAVE_LAPACK,1,[Define if LAPACK is available])
+ AM_CONDITIONAL(LINBOX_HAVE_LAPACK, true)
+],dnl
+[
+ AC_MSG_RESULT(no)
+ AM_CONDITIONAL(LINBOX_HAVE_LAPACK, false)
+],dnl
+[
+ AC_MSG_RESULT(unknown)
+ AM_CONDITIONAL(LINBOX_HAVE_LAPACK, false)
+])
+
+CXXFLAGS=${BACKUP_CXXFLAGS}
+LIBS=${BACKUP_LIBS}
+
+
+])
+
+
+
diff --git a/macros/libtool.m4 b/macros/libtool.m4
index 8ff3c76..bc28ccc 100644
--- a/macros/libtool.m4
+++ b/macros/libtool.m4
@@ -1,8 +1,8 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -146,6 +146,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
@@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
@@ -801,6 +803,7 @@ AC_DEFUN([LT_LANG],
m4_case([$1],
[C], [_LT_LANG(C)],
[C++], [_LT_LANG(CXX)],
+ [Go], [_LT_LANG(GO)],
[Java], [_LT_LANG(GCJ)],
[Fortran 77], [_LT_LANG(F77)],
[Fortran], [_LT_LANG(FC)],
@@ -822,6 +825,31 @@ m4_defun([_LT_LANG],
])# _LT_LANG
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into #
+# GNU Autoconf as AC_PROG_GO. When it is available in #
+# a released version of Autoconf we should remove this #
+# macro and use it instead. #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC], [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+ if test -n "$ac_tool_prefix"; then
+ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+ fi
+fi
+if test -z "$GOC"; then
+ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
# _LT_LANG_DEFAULT_CONFIG
# -----------------------
m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -852,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
m4_ifdef([LT_PROG_GCJ],
[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+ [LT_LANG(GO)],
+ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
AC_PROVIDE_IFELSE([LT_PROG_RC],
[LT_LANG(RC)],
[m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -954,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-dynamiclib -Wl,-single_module conftest.c 2>conftest.err
_lt_result=$?
- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ # If there is a non-empty error log, and "single_module"
+ # appears in it, assume the flag caused a linker warning
+ if test -s conftest.err && $GREP single_module conftest.err; then
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ # Otherwise, if the output was created with a 0 exit code from
+ # the compiler, it worked.
+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
rm -rf libconftest.dylib*
rm -f conftest.*
fi])
+
AC_CACHE_CHECK([for -exported_symbols_list linker flag],
[lt_cv_ld_exported_symbols_list],
[lt_cv_ld_exported_symbols_list=no
@@ -973,6 +1012,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
+
AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
[lt_cv_ld_force_load=no
cat > conftest.c << _LT_EOF
@@ -990,7 +1030,9 @@ _LT_EOF
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
_lt_result=$?
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ if test -s conftest.err && $GREP force_load conftest.err; then
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1035,8 +1077,8 @@ _LT_EOF
])
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
# Checks for linker and compiler features on darwin
m4_defun([_LT_DARWIN_LINKER_FEATURES],
[
@@ -1047,6 +1089,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
if test "$lt_cv_ld_force_load" = "yes"; then
_LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=''
fi
@@ -1330,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
CFLAGS="$SAVE_CFLAGS"
fi
;;
-sparc*-*solaris*)
+*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ yes*)
+ case $host in
+ i?86-*-solaris*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ sparc*-*-solaris*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+ LD="${LD-ld}_sol2"
+ fi
+ ;;
*)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64"
@@ -1414,13 +1471,13 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
;;
esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
fi
case $host_os in
@@ -1600,6 +1657,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=196608
;;
+ os2*)
+ # The test takes a long time on OS/2.
+ lt_cv_sys_max_cmd_len=8192
+ ;;
+
osf*)
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1639,7 +1701,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
@@ -2185,7 +2247,7 @@ need_version=unknown
case $host_os in
aix3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
@@ -2194,7 +2256,7 @@ aix3*)
;;
aix[[4-9]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
@@ -2259,7 +2321,7 @@ beos*)
;;
bsdi[[45]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -2398,7 +2460,7 @@ m4_if([$1], [],[
;;
dgux*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2406,10 +2468,6 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
- dynamic_linker=no
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -2417,11 +2475,18 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[[123]]*) objformat=aout ;;
+ freebsd[[23]].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
- version_type=freebsd-$objformat
+ # Handle Gentoo/FreeBSD as it was Linux
+ case $host_vendor in
+ gentoo)
+ version_type=linux ;;
+ *)
+ version_type=freebsd-$objformat ;;
+ esac
+
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -2432,10 +2497,16 @@ freebsd* | dragonfly*)
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
+ linux)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ need_lib_prefix=no
+ need_version=no
+ ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2455,7 +2526,7 @@ freebsd* | dragonfly*)
;;
gnu*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
@@ -2466,7 +2537,7 @@ gnu*)
;;
haiku*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
@@ -2527,7 +2598,7 @@ hpux9* | hpux10* | hpux11*)
;;
interix[[3-9]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2543,7 +2614,7 @@ irix5* | irix6* | nonstopux*)
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
fi ;;
@@ -2580,9 +2651,9 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
-# This must be Linux ELF.
+# This must be glibc/ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2626,18 +2697,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -2657,7 +2716,7 @@ netbsd*)
;;
newsos6)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -2726,7 +2785,7 @@ rdos*)
;;
solaris*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2751,7 +2810,7 @@ sunos4*)
;;
sysv4 | sysv4.3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -2775,7 +2834,7 @@ sysv4 | sysv4.3*)
sysv4*MP*)
if test -d /usr/nec ;then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
soname_spec='$libname${shared_ext}.$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -2806,7 +2865,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2816,7 +2875,7 @@ tpf*)
;;
uts4*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -3238,12 +3297,12 @@ irix5* | irix6* | nonstopux*)
lt_cv_deplibs_check_method=pass_all
;;
-# This must be Linux ELF.
+# This must be glibc/ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -3658,6 +3717,7 @@ for ac_symprfx in "" "_"; do
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK ['"\
" {last_section=section; section=\$ 3};"\
+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4054,7 +4114,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4242,7 +4302,9 @@ m4_if([$1], [CXX], [
case $cc_basename in
nvcc*) # Cuda Compiler Driver 2.2
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+ fi
;;
esac
else
@@ -4334,18 +4396,33 @@ m4_if([$1], [CXX], [
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ F* | *Sun*Fortran*)
+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
# Sun Fortran 8.3 passes all unrecognized flags to the linker
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
_LT_TAGVAR(lt_prog_compiler_wl, $1)=''
;;
+ *Sun\ F* | *Sun*Fortran*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
*Sun\ C*)
# Sun C 5.9
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
+ *Intel*\ [[CF]]*Compiler*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+ *Portland\ Group*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
esac
;;
esac
@@ -4505,16 +4582,15 @@ m4_if([$1], [CXX], [
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
- cl*) ;;
+ cl*)
+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
_LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
;;
esac
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4533,7 +4609,6 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4578,9 +4653,6 @@ dnl Note also adjust exclude_expsyms for C++ above.
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4787,8 +4859,7 @@ _LT_EOF
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -4803,7 +4874,7 @@ _LT_EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -4980,7 +5051,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5084,6 +5154,7 @@ _LT_EOF
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5130,10 +5201,6 @@ _LT_EOF
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- freebsd1*)
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
# support. Future versions do this automatically, but an explicit c++rt0.o
# does not break anything, and helps significantly (at the cost of a little
@@ -5146,7 +5213,7 @@ _LT_EOF
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
+ freebsd2.*)
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5185,7 +5252,6 @@ _LT_EOF
fi
if test "$with_gnu_ld" = no; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5289,7 +5355,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -5627,9 +5693,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1],
_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
[Flag to hardcode $libdir into a binary during linking.
This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
- [[If ld is used when linking, flag to hardcode $libdir into a binary
- during linking. This must work even if $libdir does not exist]])
_LT_TAGDECL([], [hardcode_libdir_separator], [1],
[Whether we need a single "-rpath" flag with a separated argument])
_LT_TAGDECL([], [hardcode_direct], [0],
@@ -5787,7 +5850,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6157,7 +6219,7 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
;;
- freebsd[[12]]*)
+ freebsd2.*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -6918,12 +6980,18 @@ public class foo {
}
};
_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
])
_lt_libdeps_save_CFLAGS=$CFLAGS
case "$CC $CFLAGS " in #(
*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
esac
dnl Parse the compiler output and extract the necessary
@@ -7120,7 +7188,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7253,7 +7320,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7440,6 +7506,77 @@ CFLAGS=$lt_save_CFLAGS
])# _LT_LANG_GCJ_CONFIG
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined. These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+ _LT_COMPILER_NO_RTTI($1)
+ _LT_COMPILER_PIC($1)
+ _LT_COMPILER_C_O($1)
+ _LT_COMPILER_FILE_LOCKS($1)
+ _LT_LINKER_SHLIBS($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+
+ _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
# _LT_LANG_RC_CONFIG([TAG])
# -------------------------
# Ensure that the configuration variables for the Windows resource compiler
@@ -7509,6 +7646,13 @@ dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
# LT_PROG_RC
# ----------
AC_DEFUN([LT_PROG_RC],
diff --git a/macros/lidia-check.m4 b/macros/lidia-check.m4
index 7db9c8d..4e46435 100644
--- a/macros/lidia-check.m4
+++ b/macros/lidia-check.m4
@@ -1,15 +1,33 @@
-# Check for LIDIA
-# Pascal Giorgi, 2001-12-10
-# Modified by Pascal Giorgi, 2003-12-03
-# Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
-# Stolen from Chris Lahey 99-2-5
-# stolen from Manish Singh again
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-# Copyright (c) the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+dnl Check for LIDIA
+dnl Pascal Giorgi, 2001-12-10
+dnl Modified by Pascal Giorgi, 2003-12-03
+dnl Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
+dnl Stolen from Chris Lahey 99-2-5
+dnl stolen from Manish Singh again
+dnl stolen back from Frank Belew
+dnl stolen from Manish Singh
+dnl Shamelessly stolen from Owen Taylor
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
dnl LB_CHECK_LIDIA ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl
diff --git a/macros/linbox-benchmark.m4 b/macros/linbox-benchmark.m4
new file mode 100644
index 0000000..a5eff42
--- /dev/null
+++ b/macros/linbox-benchmark.m4
@@ -0,0 +1,98 @@
+dnl Copyright (c) 2011 the LinBox group
+dnl Brice Boyer <bboyer at imag.fr>
+dnl Adapted from linbox-doc.m4
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
+
+AC_DEFUN([LB_BENCH],
+[
+
+dnl AC_MSG_CHECKING(whether to try and benchmark linbox\n)
+
+AC_ARG_WITH(benchdir,
+[AC_HELP_STRING([--with-benchdir=<path>], [Where the LinBox benchmarks should be performed])],
+ [
+ LINBOX_BENCH_PATH="$withval"
+ ],
+ [
+ eval LINBOX_BENCH_PATH="${prefix}/benchmarks"
+ ])
+
+AC_SUBST(LINBOX_BENCH_PATH)
+
+AC_ARG_WITH(gnuplot,
+[AC_HELP_STRING([--with-gnuplot=<path>], [Give the path to Gnuplot. ])],
+ [
+ GNUPLOT_PATH="$PATH $withval"
+ ],
+ [
+ GNUPLOT_PATH="$PATH"
+ ])
+AC_ARG_WITH(ghostscript,
+[AC_HELP_STRING([--with-ghostscript=<path>], [Give the path to ghostscript. ])],
+ [
+ GHOSTSCRIPT_PATH="$PATH $withval"
+ ],
+ [
+ GHOSTSCRIPT_PATH="$PATH"
+ ])
+
+dnl AC_ARG_ENABLE(benchmarks,[ --enable-benchmarks Enables benchmarking],
+dnl [
+dnl AC_MSG_RESULT(yes)
+AC_MSG_CHECKING(whether gnuplot works)
+res=yes;
+export PATH=$GNUPLOT_PATH
+(gnuplot --version) < /dev/null > /dev/null 2>&1 || res=no
+AC_MSG_RESULT([$res])
+if test $res = no ; then
+ echo
+ echo "You must have gnuplot installed to create benchmark "
+ echo "graphics for LinBox. Download the appropriate package"
+ echo "for your distribution, or get the source tarball from"
+ echo "http://www.gnuplot.info/download.html "
+else
+AC_DEFINE(HAVE_GNUPLOT, 1, [gnuplot available as external program])
+fi
+
+AC_MSG_CHECKING(whether ps2pdf works)
+res=yes;
+export PATH=$GHOSTSCRIPT_PATH
+(ps2pdf --version -) < /dev/null > /dev/null 2>&1 || res=no
+AC_MSG_RESULT([$res])
+if test $res = no ; then
+ echo
+ echo "You must have ps2pdf installed to create pdf benchmarks"
+ echo "graphics for LinBox. Download the appropriate package "
+ echo "for your distribution, or get the source tarball from "
+ echo "http://pages.cs.wisc.edu/~ghost/ "
+else
+AC_DEFINE(HAVE_GHOSTSCRIPT, 1, [ps2pdf available as external program])
+fi
+
+dnl AM_CONDITIONAL(LINBOX_BUILD_BENCH, true)
+dnl ],
+dnl [
+dnl AC_MSG_RESULT(no)
+dnl AM_CONDITIONAL(LINBOX_BUILD_BENCH, false)
+dnl ])
+])
+
diff --git a/macros/linbox-doc.m4 b/macros/linbox-doc.m4
index 355df62..e866a0e 100644
--- a/macros/linbox-doc.m4
+++ b/macros/linbox-doc.m4
@@ -1,6 +1,24 @@
-# Copyright (c) the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
AC_DEFUN([LB_DOC],
[
@@ -28,25 +46,40 @@ AC_ARG_WITH(doxygen,
DOXYGEN_PATH="$PATH"
])
-AC_ARG_ENABLE(doc,[AC_HELP_STRING([--enable-doc], [Enable building documentation])],
+AC_ARG_ENABLE(doc,[AC_HELP_STRING([--enable-doc], [Enable building documentation])])
+WANTDOC="no"
+AS_IF([ test "x$enable_doc" = "xyes"],[
+ AC_MSG_RESULT(yes)
+ AC_MSG_CHECKING(whether doxygen works)
+ export PATH=$DOXYGEN_PATH
+ (doxygen --version) < /dev/null > /dev/null 2>&1 || {
+ AC_MSG_RESULT(no)
+ echo
+ echo "You must have doxygen installed to create documentation for"
+ echo "LinBox. This error only happens if you use --enable-doc."
+ echo "Download the appropriate package for your distribution, or get"
+ echo "the source tarball from http://www.stack.nl/~dimitri/doxygen/"
+ exit -1
+ }
+ AC_MSG_RESULT(yes)
+ WANTDOC="yes"
+],[AC_MSG_RESULT(no)])
+
+AM_CONDITIONAL(LINBOX_BUILD_DOC, test "x$WANTDOC" != "xno" )
+
+
+AC_MSG_CHECKING(whether dot works)
+res=yes;
+(dot -V) < /dev/null > /dev/null 2>&1 || res=no
+AC_MSG_RESULT([$res])
+AS_IF([test $res = yes],
[
-AC_MSG_RESULT(yes)
-AC_MSG_CHECKING(whether doxygen works)
-export PATH=$DOXYGEN_PATH
-(doxygen --version) < /dev/null > /dev/null 2>&1 || {
- AC_MSG_RESULT(no)
- echo
- echo "You must have doxygen installed to create documentation for"
- echo "LinBox. This error only happens if you use --enable-doc."
- echo "Download the appropriate package for your distribution, or get"
- echo "the source tarball from http://www.stack.nl/~dimitri/doxygen/"
- exit -1
-}
-AC_MSG_RESULT(yes)
-AM_CONDITIONAL(LINBOX_BUILD_DOC, true)
+sed 's/^HAVE_DOT.*/HAVE_DOT = YES/' doc/Doxyfile.mod > doc/Doxyfile
+sed 's/^HAVE_DOT.*/HAVE_DOT = YES/' doc/DoxyfileDev.mod > doc/DoxyfileDev
],
-[
-AC_MSG_RESULT(no)
-AM_CONDITIONAL(LINBOX_BUILD_DOC, false)
+[ cp doc/Doxyfile.mod doc/Doxyfile ;
+cp doc/DoxyfileDev.mod doc/DoxyfileDev
])
+
+
])
diff --git a/macros/linbox-misc.m4 b/macros/linbox-misc.m4
index d16fb3a..6b36b4b 100644
--- a/macros/linbox-misc.m4
+++ b/macros/linbox-misc.m4
@@ -1,7 +1,25 @@
-# linbox miscellaneous functonnnalities
-# Copyright (c) the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+dnl linbox miscellaneous functonnnalities
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
@@ -51,10 +69,12 @@ if test -n "$check_all"; then
GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
GIVARO_HOME_PATH="${DEFAULT_CHECKING_PATH}"
NTL_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+ IML_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+ FFLAS_FFPACK_HOME_PATH="${DEFAULT_CHECKING_PATH}"
LIDIA_HOME_PATH="${DEFAULT_CHECKING_PATH}"
SACLIB_HOME_PATH="${DEFAULT_CHECKING_PATH}"
MAPLE_HOME_PATH="${DEFAULT_CHECKING_PATH} unknown"
-# EXPAT_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+dnl EXPAT_HOME_PATH="${DEFAULT_CHECKING_PATH}"
BLAS_HOME_PATH="${DEFAULT_CHECKING_PATH}"
fi
diff --git a/macros/linbox-opt.m4 b/macros/linbox-opt.m4
index e25dca8..4e4cfbc 100644
--- a/macros/linbox-opt.m4
+++ b/macros/linbox-opt.m4
@@ -1,6 +1,24 @@
-# Copyright (c) the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
@@ -11,36 +29,18 @@ AC_MSG_CHECKING([whether to use run time optimization])
AC_ARG_ENABLE(optimization,
[AC_HELP_STRING([--enable-optimization], [Enable run time optimization in LinBox code (only Strassen matrix threshold for now)])],
[
-
-
-BACKUP_CXXFLAGS=${CXXFLAGS}
-BACKUP_LIBS=${LIBS}
-
-CXXFLAGS=${FFLAFLAS_CFLAGS}
-
-AC_TRY_RUN([ #include "fflasffpack-config.h"
- int main() {
-#ifdef __FFLAFLAS_STRASSEN_OPTIMIZATION
-return 0;
-#else
-pas bon !
-#endif
-} ],[dnl OK
- strassen_opti="yes"
- AC_DEFINE(STRASSEN_OPTIMIZATION,,[Define if optimized threshold for Strassen-Winograd matrix multiplication is available])
- WINO="`grep "define.*__FFLAFLAS_WINOTHRESHOLD" ${FFLAFLAS_LOC}/include/fflasffpack-config.h | awk '{print $NF}'`"
- AC_MSG_RESULT(ok : $WINO)
- AC_DEFINE_UNQUOTED(WINOTHRESHOLD, $WINO, [optimized threshold for switching to strassen matrix multiplication])
- ],[ dnl NO
- AC_MSG_RESULT(not enabled. Please optimise Strassen threshold in Fflas-Ffpack)
- strassen_opti="no"
- ],[ dnl CROSS
- AC_MSG_RESULT(cross compilation)
- strassen_opti="no"
+ dnl AC_DEFINE_UNQUOTED(WINOTHRESHOLD, __FFLASFFPACK_WINOTHRESHOLD) ?
+
+ WINO="`grep "define.*__FFLASFFPACK_WINOTHRESHOLD" ${FFLAS_FFPACK_LOC}/include/fflas-ffpack/fflas-ffpack-optimise.h | awk '{print $NF}'`"
+ AS_IF([ test -z "{WINO}"],[
+ AC_MSG_RESULT("fflas-ffpack was not optimised. Defaulting")
+ WINO="`grep "define.*__FFLASFFPACK_WINOTHRESHOLD" ${FFLAS_FFPACK_LOC}/include/fflas-ffpack/fflas-ffpack-config.h | awk '{print $NF}'`"
+ ],[
+ AC_MSG_RESULT(OK)
])
+ AC_DEFINE_UNQUOTED(WINOTHRESHOLD, $WINO, [optimized threshold for switching to strassen matrix multiplication])
],
[AC_MSG_RESULT(no)])
])
-CXXFLAGS=${BACKUP_CXXFLAGS}
diff --git a/macros/ltoptions.m4 b/macros/ltoptions.m4
index 17cfd51..5d9acd8 100644
--- a/macros/ltoptions.m4
+++ b/macros/ltoptions.m4
@@ -326,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
m4_define([_LT_WITH_PIC],
[AC_ARG_WITH([pic],
- [AS_HELP_STRING([--with-pic],
+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [pic_mode="$withval"],
+ [lt_p=${PACKAGE-default}
+ case $withval in
+ yes|no) pic_mode=$withval ;;
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for lt_pkg in $withval; do
+ IFS="$lt_save_ifs"
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac],
[pic_mode=default])
test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
diff --git a/macros/ltversion.m4 b/macros/ltversion.m4
index 9c7b5d4..07a8602 100644
--- a/macros/ltversion.m4
+++ b/macros/ltversion.m4
@@ -9,15 +9,15 @@
# @configure_input@
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff --git a/macros/m4ri-check.m4 b/macros/m4ri-check.m4
new file mode 100644
index 0000000..d1827a4
--- /dev/null
+++ b/macros/m4ri-check.m4
@@ -0,0 +1,136 @@
+dnl Check for M4RI
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
+dnl Boyer Brice 22/06/11
+dnl Bradford Hovinen, 2001-06-13
+dnl Modified by Pascal Giorgi, 2003-12-03
+dnl Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
+dnl Stolen from Chris Lahey 99-2-5
+dnl stolen from Manish Singh again
+dnl stolen back from Frank Belew
+dnl stolen from Manish Singh
+dnl Shamelessly stolen from Owen Taylor
+
+dnl LB_CHECK_M4RI ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl
+dnl Test for M4RI and define M4RI_CFLAGS and M4RI_LIBS
+
+AC_DEFUN([LB_CHECK_M4RI],
+[
+
+AC_ARG_WITH(m4ri,
+[AC_HELP_STRING([--with-m4ri=<path>|yes], [Use M4RI library. This library is (not yet) mandatory for
+ LinBox compilation. If argument is yes or <empty> or <bad>
+ that means the library is reachable with the standard
+ search path (/usr or /usr/local). Otherwise you give
+ the <path> to the directory which contains the
+ library. ])
+])
+
+AS_IF([test "$withval" = yes ],
+ [ M4RI_HOME_PATH="${DEFAULT_CHECKING_PATH}" ],
+ [ test "$withval" != no ],
+ [ M4RI_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}" ],
+ [ M4RI_HOME_PATH="${DEFAULT_CHECKING_PATH}"])
+
+dnl min_m4ri_version=ifelse([$1], ,1.0.3,$1)
+
+
+dnl Check for existence
+BACKUP_CXXFLAGS=${CXXFLAGS}
+BACKUP_LIBS=${LIBS}
+
+AC_MSG_CHECKING(for M4RI)
+
+for M4RI_HOME in ${M4RI_HOME_PATH}
+ do
+ AS_IF([test -r "$M4RI_HOME/include/m4ri/m4ri.h"],[
+
+ AS_IF([ test "x$M4RI_HOME" != "x/usr" -a "x$M4RI_HOME" != "x/usr/local"],[
+ M4RI_CFLAGS="-I${M4RI_HOME}/include"
+ M4RI_LIBS="-L${M4RI_HOME}/lib -lm4ri"], [
+ M4RI_CFLAGS=
+ M4RI_LIBS="-lm4ri" ])
+
+ CXXFLAGS="${BACKUP_CXXFLAGS} ${M4RI_CFLAGS} ${GMP_CFLAGS}"
+ LIBS="${BACKUP_LIBS} ${M4RI_LIBS} ${GMP_LIBS}"
+
+ AC_TRY_LINK(
+ [#include <m4ri/m4ri.h> ],
+ [mzd_t a;],
+ [
+ AC_TRY_RUN(
+ [
+ int main () { return 0; /* not possible to check version */ }
+ ],[
+ m4ri_found="yes"
+ break
+ ],[
+ m4ri_problem="$problem $M4RI_HOME"
+ unset M4RI_CFLAGS
+ unset M4RI_LIBS
+ ],[
+ m4ri_found="yes"
+ m4ri_cross="yes"
+ break
+ ])
+ ],
+ [
+ m4ri_found="no"
+ m4ri_checked="$checked $M4RI_HOME"
+ unset M4RI_CFLAGS
+ unset M4RI_LIBS
+ ])
+ dnl AC_MSG_RESULT(found in $m4ri_checked ? $m4ri_found)
+ ],[
+ m4ri_found="no"
+ dnl AC_MSG_RESULT(not found at all $M4RI_HOME : $m4ri_found)
+ ])
+done
+
+AS_IF([test "x$m4ri_found" = "xyes"],[
+ AC_SUBST(M4RI_CFLAGS)
+ AC_SUBST(M4RI_LIBS)
+ AC_DEFINE(HAVE_M4RI,1,[Define if M4RI is installed])
+ HAVE_M4RI=yes
+ AS_IF([test "x$m4ri_cross" != "xyes"],
+ [AC_MSG_RESULT(found)],
+ [AC_MSG_RESULT(unknown)
+ echo "WARNING: You appear to be cross compiling, so there is no way to determine"
+ echo "whether your M4RI version is new enough. I am assuming it is."
+ ])
+ ifelse([$2], , :, [$2])],
+ [ test -n "$m4ri_problem" ],
+ [ AC_MSG_RESULT(problem)
+ echo "Sorry, your M4RI version is too old. Disabling."
+ ifelse([$3], , :, [$3]) ],
+ [ test "x$m4ri_found" = "xno" ],
+ [ AC_MSG_RESULT(not found)
+ ifelse([$3], , :, [$3])])
+
+AM_CONDITIONAL(LINBOX_HAVE_M4RI, test "x$HAVE_M4RI" = "xyes")
+
+CXXFLAGS=${BACKUP_CXXFLAGS}
+LIBS=${BACKUP_LIBS}
+#unset LD_LIBRARY_PATH
+
+])
diff --git a/macros/m4rie-check.m4 b/macros/m4rie-check.m4
new file mode 100644
index 0000000..c11c747
--- /dev/null
+++ b/macros/m4rie-check.m4
@@ -0,0 +1,136 @@
+dnl Check for M4RIE
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
+dnl Boyer Brice 18/04/12
+dnl Bradford Hovinen, 2001-06-13
+dnl Modified by Pascal Giorgi, 2003-12-03
+dnl Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
+dnl Stolen from Chris Lahey 99-2-5
+dnl stolen from Manish Singh again
+dnl stolen back from Frank Belew
+dnl stolen from Manish Singh
+dnl Shamelessly stolen from Owen Taylor
+
+dnl LB_CHECK_M4RIE ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl
+dnl Test for M4RIE and define M4RIE_CFLAGS and M4RIE_LIBS
+
+AC_DEFUN([LB_CHECK_M4RIE],
+[
+
+AC_ARG_WITH(m4rie,
+[AC_HELP_STRING([--with-m4rie=<path>|yes], [Use M4RIE library. This library is (not yet) mandatory for
+ LinBox compilation. If argument is yes or <empty> or <bad>
+ that means the library is reachable with the standard
+ search path (/usr or /usr/local). Otherwise you give
+ the <path> to the directory which contains the
+ library. ])
+])
+
+AS_IF([test "$withval" = yes ],
+ [ M4RIE_HOME_PATH="${DEFAULT_CHECKING_PATH}" ],
+ [ test "$withval" != no ],
+ [ M4RIE_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}" ],
+ [ M4RIE_HOME_PATH="${DEFAULT_CHECKING_PATH}"])
+
+dnl min_m4rie_version=ifelse([$1], ,1.0.3,$1)
+
+
+dnl Check for existence
+BACKUP_CXXFLAGS=${CXXFLAGS}
+BACKUP_LIBS=${LIBS}
+
+AC_MSG_CHECKING(for M4RIE)
+
+for M4RIE_HOME in ${M4RIE_HOME_PATH}
+ do
+ AS_IF([test -r "$M4RIE_HOME/include/m4rie/m4rie.h"],[
+
+ AS_IF([ test "x$M4RIE_HOME" != "x/usr" -a "x$M4RIE_HOME" != "x/usr/local"],[
+ M4RIE_CFLAGS="-I${M4RIE_HOME}/include"
+ M4RIE_LIBS="-L${M4RIE_HOME}/lib -lm4rie"], [
+ M4RIE_CFLAGS=
+ M4RIE_LIBS="-lm4rie" ])
+
+ CXXFLAGS="${BACKUP_CXXFLAGS} ${M4RIE_CFLAGS} ${GMP_CFLAGS}"
+ LIBS="${BACKUP_LIBS} ${M4RIE_LIBS} ${GMP_LIBS}"
+
+ AC_TRY_LINK(
+ [#include <m4rie/m4rie.h> ],
+ [gf2e a;],
+ [
+ AC_TRY_RUN(
+ [
+ int main () { return 0; /* not possible to check version */ }
+ ],[
+ m4rie_found="yes"
+ break
+ ],[
+ m4rie_problem="$problem $M4RIE_HOME"
+ unset M4RIE_CFLAGS
+ unset M4RIE_LIBS
+ ],[
+ m4rie_found="yes"
+ m4rie_cross="yes"
+ break
+ ])
+ ],
+ [
+ m4rie_found="no"
+ m4rie_checked="$checked $M4RIE_HOME"
+ unset M4RIE_CFLAGS
+ unset M4RIE_LIBS
+ ])
+ dnl AC_MSG_RESULT(found in $m4rie_checked ? $m4rie_found)
+ ],[
+ m4rie_found="no"
+ dnl AC_MSG_RESULT(not found at all $M4RIE_HOME : $m4rie_found)
+ ])
+done
+
+AS_IF([test "x$m4rie_found" = "xyes"],[
+ AC_SUBST(M4RIE_CFLAGS)
+ AC_SUBST(M4RIE_LIBS)
+ AC_DEFINE(HAVE_M4RIE,1,[Define if M4RIE is installed])
+ HAVE_M4RIE=yes
+ AS_IF([test "x$m4rie_cross" != "xyes"],
+ [AC_MSG_RESULT(found)],
+ [AC_MSG_RESULT(unknown)
+ echo "WARNING: You appear to be cross compiling, so there is no way to determine"
+ echo "whether your M4RIE version is new enough. I am assuming it is."
+ ])
+ ifelse([$2], , :, [$2])],
+ [ test -n "$m4rie_problem" ],
+ [ AC_MSG_RESULT(problem)
+ echo "Sorry, your M4RIE version is too old. Disabling."
+ ifelse([$3], , :, [$3]) ],
+ [ test "x$m4rie_found" = "xno" ],
+ [ AC_MSG_RESULT(not found)
+ ifelse([$3], , :, [$3])])
+
+AM_CONDITIONAL(LINBOX_HAVE_M4RIE, test "x$HAVE_M4RIE" = "xyes")
+
+CXXFLAGS=${BACKUP_CXXFLAGS}
+LIBS=${BACKUP_LIBS}
+#unset LD_LIBRARY_PATH
+
+])
diff --git a/macros/maple-check.m4 b/macros/maple-check.m4
index c5ccb6d..da3a661 100644
--- a/macros/maple-check.m4
+++ b/macros/maple-check.m4
@@ -1,18 +1,36 @@
-# Check for Maple, for maple examples
-# Rich Seagraves, 2002-10-31
-# Modified by PAscal Giorgi, 2003-12-03
-# a gutted and modified version of ntl-check.m4 by Bradford Hovinen, 2001-06-13
-# which was in turn inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
-# Stolen from Chris Lahey
-# stolen from Manish Singh again
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-
-# Copyright (c) the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+dnl Check for Maple, for maple examples
+dnl Rich Seagraves, 2002-10-31
+dnl Modified by PAscal Giorgi, 2003-12-03
+dnl a gutted and modified version of ntl-check.m4 by Bradford Hovinen, 2001-06-13
+dnl which was in turn inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
+dnl Stolen from Chris Lahey
+dnl stolen from Manish Singh again
+dnl stolen back from Frank Belew
+dnl stolen from Manish Singh
+dnl Shamelessly stolen from Owen Taylor
+
+
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
diff --git a/macros/mpfr-check.m4 b/macros/mpfr-check.m4
new file mode 100644
index 0000000..748e7ec
--- /dev/null
+++ b/macros/mpfr-check.m4
@@ -0,0 +1,142 @@
+dnl Check for MPFR
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
+dnl Boyer Brice 22/10/11
+dnl Bradford Hovinen, 2001-06-13
+dnl Modified by Pascal Giorgi, 2003-12-03
+dnl Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
+dnl Stolen from Chris Lahey 99-2-5
+dnl stolen from Manish Singh again
+dnl stolen back from Frank Belew
+dnl stolen from Manish Singh
+dnl Shamelessly stolen from Owen Taylor
+
+dnl LB_CHECK_MPFR ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl
+dnl Test for MPFR and define MPFR_CFLAGS and MPFR_LIBS
+
+AC_DEFUN([LB_CHECK_MPFR],
+[
+
+AC_ARG_WITH(mpfr,
+[AC_HELP_STRING([--with-mpfr=<path>|yes], [Use MPFR library. This library is (not yet) mandatory for
+ LinBox compilation. If argument is yes or <empty> or <bad> :)
+ that means the library is reachable with the standard
+ search path (/usr or /usr/local). Otherwise you give
+ the <path> to the directory which contains the
+ library.
+])],
+ [if test "$withval" = yes ; then
+ MPFR_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+ elif test "$withval" != no ; then
+ MPFR_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}"
+ fi],
+ [MPFR_HOME_PATH="${DEFAULT_CHECKING_PATH}"])
+
+dnl min_mpfr_version=ifelse([$1], ,1.0.3,$1)
+
+
+dnl Check for existence
+BACKUP_CXXFLAGS=${CXXFLAGS}
+BACKUP_LIBS=${LIBS}
+
+AC_MSG_CHECKING(for MPFR)
+
+for MPFR_HOME in ${MPFR_HOME_PATH}
+ do
+ if test -r "$MPFR_HOME/include/mpfr.h"; then
+
+ AS_IF([ test "x$MPFR_HOME" != "x/usr" -a "x$MPFR_HOME" != "x/usr/local"], [
+ MPFR_CFLAGS="-I${MPFR_HOME}/include"
+ MPFR_LIBS="-L${MPFR_HOME}/lib -lmpfr"
+ ],[
+ MPFR_CFLAGS=
+ MPFR_LIBS="-lmpfr"
+ ])
+
+ CXXFLAGS="${BACKUP_CXXFLAGS} ${MPFR_CFLAGS} ${GMP_CFLAGS}"
+ LIBS="${BACKUP_LIBS} ${GMP_LIBS} ${MPFR_LIBS} "
+
+ AC_TRY_LINK(
+ [
+ #include <mpfr.h>
+ ],
+ [mpfr_t a ;],
+ [
+ AC_TRY_RUN(
+ [
+ int main () { return 0; /* not important to check for version */ }
+ ],[
+ mpfr_found="yes"
+ break
+ ],[
+ mpfr_problem="$problem $MPFR_HOME"
+ unset MPFR_CFLAGS
+ unset MPFR_LIBS
+ ],[
+ mpfr_found="yes"
+ mpfr_cross="yes"
+ break
+ ])
+ ],
+ [
+ mpfr_found="no"
+ mpfr_checked="$checked $MPFR_HOME"
+ unset MPFR_CFLAGS
+ unset MPFR_LIBS
+ ])
+ dnl AC_MSG_RESULT(found in $mpfr_checked ? $mpfr_found)
+ else
+ mpfr_found="no"
+ dnl AC_MSG_RESULT(not found at all $MPFR_HOME : $mpfr_found)
+ fi
+done
+
+if test "x$mpfr_found" = "xyes" ; then
+ AC_SUBST(MPFR_CFLAGS)
+ AC_SUBST(MPFR_LIBS)
+ AC_DEFINE(HAVE_MPFR,1,[Define if MPFR is installed])
+ HAVE_MPFR=yes
+ AS_IF([ test "x$mpfr_cross" != "xyes" ],[
+ AC_MSG_RESULT(found)
+ ],[
+ AC_MSG_RESULT(unknown)
+ echo "WARNING: You appear to be cross compiling, so there is no way to determine"
+ echo "whether your MPFR version is new enough. I am assuming it is."
+ ])
+ ifelse([$2], , :, [$2])
+elif test -n "$mpfr_problem"; then
+ AC_MSG_RESULT(problem)
+ echo "Sorry, your MPFR version is too old. Disabling."
+ ifelse([$3], , :, [$3])
+elif test "x$mpfr_found" = "xno" ; then
+ AC_MSG_RESULT(not found)
+ ifelse([$3], , :, [$3])
+fi
+
+AM_CONDITIONAL(LINBOX_HAVE_MPFR, test "x$HAVE_MPFR" = "xyes")
+
+CXXFLAGS=${BACKUP_CXXFLAGS}
+LIBS=${BACKUP_LIBS}
+#unset LD_LIBRARY_PATH
+
+])
diff --git a/macros/ntl-check.m4 b/macros/ntl-check.m4
index 5429cbe..35981c2 100644
--- a/macros/ntl-check.m4
+++ b/macros/ntl-check.m4
@@ -1,15 +1,33 @@
-# Check for NTL
-# Bradford Hovinen, 2001-06-13
-# Modified by Pascal Giorgi, 2003-12-03
-# Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
-# Stolen from Chris Lahey 99-2-5
-# stolen from Manish Singh again
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-# Copyright (c) the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+dnl Check for NTL
+dnl Bradford Hovinen, 2001-06-13
+dnl Modified by Pascal Giorgi, 2003-12-03
+dnl Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
+dnl Stolen from Chris Lahey 99-2-5
+dnl stolen from Manish Singh again
+dnl stolen back from Frank Belew
+dnl stolen from Manish Singh
+dnl Shamelessly stolen from Owen Taylor
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
dnl LB_CHECK_NTL ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
@@ -31,9 +49,9 @@ AC_ARG_WITH(ntl,
[if test "$withval" = yes ; then
NTL_HOME_PATH="${DEFAULT_CHECKING_PATH}"
elif test "$withval" != no ; then
- NTL_HOME_PATH="$withval"
+ NTL_HOME_PATH="$withval ${DEFAULT_CHECKING_PATH}"
fi],
- [])
+ [NTL_HOME_PATH=${DEFAULT_CHECKING_PATH}])
min_ntl_version=ifelse([$1], ,5.0,$1)
diff --git a/macros/saclib-check.m4 b/macros/saclib-check.m4
index 6c92f0e..36b17f3 100644
--- a/macros/saclib-check.m4
+++ b/macros/saclib-check.m4
@@ -1,15 +1,33 @@
-# Check for SACLIB
-# Bradford Hovinen, 2001-06-13
-# Modified by Pascal Giorgi, 2003-12-03
-# Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
-# Stolen from Chris Lahey 99-2-5
-# stolen from Manish Singh again
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-# Copyright (c) the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+dnl Check for SACLIB
+dnl Bradford Hovinen, 2001-06-13
+dnl Modified by Pascal Giorgi, 2003-12-03
+dnl Inspired by gnome-bonobo-check.m4 by Miguel de Icaza, 99-04-12
+dnl Stolen from Chris Lahey 99-2-5
+dnl stolen from Manish Singh again
+dnl stolen back from Frank Belew
+dnl stolen from Manish Singh
+dnl Shamelessly stolen from Owen Taylor
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
dnl LB_CHECK_SACLIB ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
diff --git a/macros/sage-check.m4 b/macros/sage-check.m4
index eb12be4..5e2a2ae 100644
--- a/macros/sage-check.m4
+++ b/macros/sage-check.m4
@@ -1,36 +1,61 @@
-# Copyright (c) the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+dnl Copyright (c) the LinBox group
+dnl This file is part of LinBox
+
+ dnl ========LICENCE========
+ dnl This file is part of the library LinBox.
+ dnl
+ dnl LinBox is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU Lesser General Public
+ dnl License as published by the Free Software Foundation; either
+ dnl version 2.1 of the License, or (at your option) any later version.
+ dnl
+ dnl This library is distributed in the hope that it will be useful,
+ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ dnl Lesser General Public License for more details.
+ dnl
+ dnl You should have received a copy of the GNU Lesser General Public
+ dnl License along with this library; if not, write to the Free Software
+ dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ dnl ========LICENCE========
+ dnl
AC_DEFUN([LB_CHECK_SAGE],
[
-AC_MSG_CHECKING([whether to compile the sage interface])
+AC_MSG_CHECKING([whether to compile the SAGE interface])
AC_ARG_ENABLE(sage,
-[AC_HELP_STRING([--enable-sage], [Enable the compilation of the sage interface])],
+[AC_HELP_STRING([--enable-sage], [Enable the compilation of the SAGE interface])])
+AM_CONDITIONAL(LINBOX_HAVE_SAGE, test "x$enable_sage" = "xyes")
+AS_IF([test "x$enable_sage" = "xyes"],
[
AC_MSG_RESULT(yes)
-sage_interface="yes"
-if test "x$HAVE_NTL" = "xyes" ; then
-dnl AC_CHECK_TOOL(OBJDUMP, objdump, false)
-AC_MSG_CHECKING([whether NTL was built with -fPIC])
-res=yes;
-$OBJDUMP --reloc $NTL_HOME/lib/libntl.a | $EGREP '(GOT|PLT|JU?MP_SLOT)' >/dev/null || res=no
-if test "x$res" = "xno" ; then
- AC_MSG_RESULT(no)
- echo
- echo "You must have NTL compiled with -fPIC for Sage interface "
- exit 1
-else
- AC_MSG_RESULT(yes)
-fi
-fi
+dnl if test "x$HAVE_NTL" = "xyes" ; then
+ dnl AC_CHECK_TOOL(OBJDUMP, objdump, false)
+ dnl AC_MSG_CHECKING([whether NTL was built with -fPIC])
+ dnl res=yes;
+ dnl if test -f "$NTL_HOME/lib/libntl.a" ; then
+ dnl $OBJDUMP --reloc $NTL_HOME/lib/libntl.a | $EGREP '(GOT|PLT|JU?MP_SLOT)' >/dev/null || res=no
+ dnl else if test -f "$NTL_HOME/lib/libntl.so" ; then
+ dnl $OBJDUMP -R $NTL_HOME/lib/libntl.so | $EGREP '(GOT|PLT|JU?MP_SLOT)' >/dev/null || res=no
+ dnl else
+ dnl AC_MSG_RESULT(no, libntl not found !)
+ dnl fi
+ dnl fi
+
+ dnl if test "x$res" = "xno" ; then
+ dnl AC_MSG_RESULT(no)
+ dnl echo
+ dnl echo "You must have NTL compiled with -fPIC for Sage interface "
+ dnl dnl exit 1
+ dnl else
+ dnl AC_MSG_RESULT(yes)
+ dnl fi
+dnl fi
],[
AC_MSG_RESULT(no)
-sage_interface="no"
])
-AM_CONDITIONAL(LINBOX_HAVE_SAGE, test "x$sage_interface" = "xyes")
])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e3641b1..25f938c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,24 +1,43 @@
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# Copyright (c) 2010-2011 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
AM_CPPFLAGS=-I$(top_srcdir) -I$(top_srcdir)/linbox
# AM_LDFLAGS = -llapack -lcblas -latlas
AM_LDFLAGS = $(top_srcdir)/linbox/.libs/liblinbox.a
# SAFER_FLAGS = -g -Wall -Wextra -Wno-unused-parameter
# bds: no need to optimize for unit/regression tests, and opt adds a lot to compilation time
-AM_CXXFLAGS = @TESTS_CFLAGS@ -DLinBoxSrcOnly
+#AM_CXXFLAGS = @TESTS_CFLAGS@ -DLinBoxSrcOnly
# AM_CXXFLAGS = $(SAFER_FLAGS) -DLinBoxSrcOnly
#AM_CXXFLAGS = $(SAFER_FLAGS) -DLinBoxSrcOnly -O2
-# AM_CXXFLAGS = -g -DLinBoxSrcOnly -Wall -DDEBUG -O0
+# AM_CXXFLAGS = -g -DLinBoxSrcOnly -Wall -DDEBUG -O0
+AM_CXXFLAGS = -DLinBoxSrcOnly @TESTS_CFLAGS@ @DEBUG_CFLAGS@
# AM_CXXFLAGS = -g -DLinBoxSrcOnly -Wall -D__LINBOX_HAVE_DGETRF -D__LINBOX_HAVE_DGETRI
# AM_CFLAGS = -g -Wall
SUBDIRS = data matrix
-AM_CPPFLAGS+= $(CBLAS_FLAG) $(FFLAFLAS_CFLAGS) $(GMP_CFLAGS) $(NTL_CFLAGS) $(GIVARO_CFLAGS) $(LIDIA_CFLAGS)
-LDADD = $(BLAS_LIBS) $(NTL_LIBS) $(GIVARO_LIBS) $(GMP_LIBS) $(LIDIA_LIBS)
-AM_LDFLAGS+=-static
+AM_CPPFLAGS+= $(CBLAS_FLAG) $(FFLAS_FFPACK_CFLAGS) $(GMP_CFLAGS) $(NTL_CFLAGS) $(GIVARO_CFLAGS) $(LIDIA_CFLAGS) $(IML_CFLAGS)
+LDADD = $(GIVARO_LIBS) $(BLAS_LIBS) $(NTL_LIBS) $(GMP_LIBS) $(LIDIA_LIBS) $(MPFR_LIBS) $(FPLLL_LIBS) $(IML_LIBS) $(LDFLAGS)
+# AM_LDFLAGS+=-static -Wl,-rpath -Wl,$(GIVARO_LIBS)
EXTRA_DIST= \
test-common.C \
@@ -34,18 +53,30 @@ EXTRA_DIST= \
# Note that among the available groups are NONCOMPILING_TESTS and FAILING_TESTS, which
# will be ignored by "make check" and can be temporary storage for problematic tests.
BASIC_TESTS = \
+ test-commentator \
+ test-det \
+ test-frobenius \
+ test-rank \
+ test-solve \
+ test-nullspace \
+ test-smith-form-binary \
+ test-rational-solver \
+ test-rational-solver-adaptive \
+ test-charpoly \
+ test-cra
+
+FULLCHECK_TESTS = \
test-bitonic-sort \
+ test-blackbox-block-container \
test-blas-domain \
test-butterfly \
- test-commentator \
test-companion \
test-dense \
- test-det \
test-diagonal \
test-dif \
test-direct-sum \
+ test-echelon-form \
test-ffpack \
- test-frobenius \
test-getentry \
test-gf2 \
test-gmp-rational \
@@ -70,9 +101,9 @@ BASIC_TESTS = \
test-PID-integer \
test-moore-penrose \
test-randiter-nonzero \
- test-rank \
test-rational-matrix-factory \
test-scalar-matrix \
+ test-solve-nonsingular \
test-sparse \
test-subiterator \
test-submatrix \
@@ -83,17 +114,8 @@ BASIC_TESTS = \
test-vector-domain \
test-qlup \
test-zero-one \
- test-solve \
- test-nullspace \
- test-smith-form-binary \
- test-rational-solver \
- test-rational-solver-adaptive \
- test-solve-nonsingular \
test-last-invariant-factor \
- test-charpoly \
- test-cra \
test-cradomain \
- test-unparametric-field \
test-rational-reconstruction-base
# test-integer-tools
@@ -106,8 +128,9 @@ NONCOMPLIANT_TESTS = \
#These need clapack
#test-rational-solver-adaptive
-
DUBIOUS_TESTS = \
+ test-unparametric-field \
+ test-bmseq \
test-zo
# test-quad-matrix
@@ -152,8 +175,7 @@ BENCHMARKS = \
# Compose is tested in test-butterfly
GIVARO_TESTS = \
- test-givaro-zpz \
- test-givaro-zpzuns
+ test-givaro-fields
NTL_TESTS = \
test-smith-form \
@@ -171,6 +193,9 @@ LIDIA_TESTS = \
ATLAS_TESTS = \
test-optimization
+BLAS3_UNIT_TESTS = \
+ test-toom-cook
+
if LINBOX_HAVE_NTL
USE_NTL_TESTS = $(NTL_TESTS)
endif
@@ -197,7 +222,6 @@ TESTS = \
$(USE_ATLAS_TESTS)
-CLEANFILES = $(TESTS)
EXTRA_PROGRAMS = \
$(BASIC_TESTS) \
@@ -210,6 +234,7 @@ EXTRA_PROGRAMS = \
$(NONCOMPILING_TESTS) \
$(NONCOMPLIANT_TESTS) \
$(DUBIOUS_TESTS) \
+ $(FULLCHECK_TESTS) \
$(FAILING_TESTS)
@@ -222,6 +247,14 @@ test_modular_SOURCES = \
test-generic.h \
test-common.h
+test_blackbox_block_container_SOURCES = \
+ test-blackbox-block-container.C \
+ test-common.h
+
+test_solve_nonsingular_SOURCES = \
+ test-solve-nonsingular.C \
+ test-common.h
+
test_block_ring_SOURCES = \
test-block-ring.C \
test-field.h \
@@ -309,6 +342,10 @@ test_scalar_matrix_SOURCES = \
test-generic.h \
test-common.h
+test_bmseq_SOURCES = \
+ test-bmseq.C \
+ test-common.h
+
test_butterfly_SOURCES = \
test-vector-domain.h \
test-blackbox.h \
@@ -392,6 +429,10 @@ test_direct_sum_SOURCES = \
test-generic.h \
test-common.h
+test_echelon_form_SOURCES = \
+ test-echelon-form.C \
+ test-common.h
+
test_frobenius_SOURCES = \
test-frobenius.C \
test-generic.h \
@@ -425,16 +466,11 @@ test_ntl_lzz_p_SOURCES = \
test-generic.h \
test-common.h
-test_givaro_zpz_SOURCES = \
- test-givaro-zpz.C \
+test_givaro_fields_SOURCES = \
+ test-givaro-fields.C \
test-generic.h \
test-common.h
-test_givaro_zpzuns_SOURCES = \
- test-givaro-zpzuns.C \
- test-generic.h \
- test-common.h
-
test_lidia_gfq_SOURCES = \
test-lidia-gfq.C \
test-generic.h \
@@ -600,28 +636,32 @@ test_ispossemidef_SOURCES= \
test_ftrmm_SOURCES = \
test-ftrmm.C
-test_solve_nonsingular_SOURCES= \
- test-common.h \
- test-solve-nonsingular.C
+test_toom_cook_SOURCES = test-toom-cook.C
# test_integer_tools_SOURCES = \
# test-integer-tools.C
+#check: checker
+# checker -c
+
+# for compilation of new non-enumerated tests
+%:%.C
+ $(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.C -o $@ $(LDADD)
+
fullcheck: checker
./checker
checker: checker.C
CLEANFILES= checker \
+ $(TESTS) \
$(BASIC_TESTS) \
$(FAILING_TESTS) \
$(NONCOMPLIANT_TESTS) \
$(BENCHMARKS) \
$(DUBIOUS_TESTS) \
+ $(FULLCHECK_TESTS) \
$(NTL_TESTS) \
$(GIVARO_TESTS) \
$(ATLAS_TESTS)
-
-# %:%.C
-# $(CXX) $(OPTFLAGS) $(AM_CPPFLAGS) $(AM_CXXFLAGS) $*.C -o $* `$(GIVARO_BIN)/givaro-config --cflags` `$(FFLAFLAS_BIN)/fflasffpack-config --cflags` $(LDADD) `$(GIVARO_BIN)/givaro-config --libs` `$(FFLAFLAS_BIN)/ffasffpack-config --libs`
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 167dee0..a3f4842 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,13 +15,46 @@
@SET_MAKE@
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# Copyright (c) 2010-2011 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -36,13 +69,13 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-TESTS = $(am__EXEEXT_1) $(am__EXEEXT_11) $(am__EXEEXT_12) \
- $(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_14) \
- $(am__EXEEXT_15)
+TESTS = $(am__EXEEXT_1) $(am__EXEEXT_12) $(am__EXEEXT_13) \
+ $(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_15) \
+ $(am__EXEEXT_16)
EXTRA_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
- $(am__EXEEXT_10)
+ $(am__EXEEXT_10) $(am__EXEEXT_11)
subdir = tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -50,12 +83,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -63,7 +99,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -72,40 +111,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-am__EXEEXT_1 = test-bitonic-sort$(EXEEXT) test-blas-domain$(EXEEXT) \
- test-butterfly$(EXEEXT) test-commentator$(EXEEXT) \
- test-companion$(EXEEXT) test-dense$(EXEEXT) test-det$(EXEEXT) \
- test-diagonal$(EXEEXT) test-dif$(EXEEXT) \
- test-direct-sum$(EXEEXT) test-ffpack$(EXEEXT) \
- test-frobenius$(EXEEXT) test-getentry$(EXEEXT) \
- test-gf2$(EXEEXT) test-gmp-rational$(EXEEXT) \
- test-hilbert$(EXEEXT) test-hom$(EXEEXT) test-inverse$(EXEEXT) \
- test-isposdef$(EXEEXT) test-ispossemidef$(EXEEXT) \
- test-matrix-domain$(EXEEXT) test-matrix-stream$(EXEEXT) \
- test-minpoly$(EXEEXT) test-modular$(EXEEXT) \
- test-modular-balanced-int$(EXEEXT) \
- test-modular-balanced-float$(EXEEXT) \
- test-modular-balanced-double$(EXEEXT) \
- test-modular-byte$(EXEEXT) test-modular-double$(EXEEXT) \
- test-modular-float$(EXEEXT) test-modular-int$(EXEEXT) \
- test-modular-short$(EXEEXT) test-block-ring$(EXEEXT) \
- test-PID-integer$(EXEEXT) test-moore-penrose$(EXEEXT) \
- test-randiter-nonzero$(EXEEXT) test-rank$(EXEEXT) \
- test-rational-matrix-factory$(EXEEXT) \
- test-scalar-matrix$(EXEEXT) test-sparse$(EXEEXT) \
- test-subiterator$(EXEEXT) test-submatrix$(EXEEXT) \
- test-subvector$(EXEEXT) test-sum$(EXEEXT) test-trace$(EXEEXT) \
- test-triplesbb$(EXEEXT) test-vector-domain$(EXEEXT) \
- test-qlup$(EXEEXT) test-zero-one$(EXEEXT) test-solve$(EXEEXT) \
+CONFIG_CLEAN_VPATH_FILES =
+am__EXEEXT_1 = test-commentator$(EXEEXT) test-det$(EXEEXT) \
+ test-frobenius$(EXEEXT) test-rank$(EXEEXT) test-solve$(EXEEXT) \
test-nullspace$(EXEEXT) test-smith-form-binary$(EXEEXT) \
test-rational-solver$(EXEEXT) \
- test-rational-solver-adaptive$(EXEEXT) \
- test-solve-nonsingular$(EXEEXT) \
- test-last-invariant-factor$(EXEEXT) test-charpoly$(EXEEXT) \
- test-cra$(EXEEXT) test-cradomain$(EXEEXT) \
- test-unparametric-field$(EXEEXT) \
- test-rational-reconstruction-base$(EXEEXT)
-am__EXEEXT_2 = test-givaro-zpz$(EXEEXT) test-givaro-zpzuns$(EXEEXT)
+ test-rational-solver-adaptive$(EXEEXT) test-charpoly$(EXEEXT) \
+ test-cra$(EXEEXT)
+am__EXEEXT_2 = test-givaro-fields$(EXEEXT)
am__EXEEXT_3 = test-smith-form$(EXEEXT) test-ntl-lzz_p$(EXEEXT) \
test-ntl-ZZ_p$(EXEEXT) test-ntl-toeplitz$(EXEEXT) \
test-ntl-hankel$(EXEEXT) test-ntl-sylvester$(EXEEXT) \
@@ -116,8 +129,37 @@ am__EXEEXT_6 = benchmark-fields$(EXEEXT) \
benchmark-blas-domain$(EXEEXT)
am__EXEEXT_7 = test-dense-zero-one$(EXEEXT)
am__EXEEXT_8 = test-ntl-RR$(EXEEXT) test-param-fuzzy$(EXEEXT)
-am__EXEEXT_9 = test-zo$(EXEEXT)
-am__EXEEXT_10 = test-rat-charpoly$(EXEEXT) test-rat-solve$(EXEEXT) \
+am__EXEEXT_9 = test-unparametric-field$(EXEEXT) test-bmseq$(EXEEXT) \
+ test-zo$(EXEEXT)
+am__EXEEXT_10 = test-bitonic-sort$(EXEEXT) \
+ test-blackbox-block-container$(EXEEXT) \
+ test-blas-domain$(EXEEXT) test-butterfly$(EXEEXT) \
+ test-companion$(EXEEXT) test-dense$(EXEEXT) \
+ test-diagonal$(EXEEXT) test-dif$(EXEEXT) \
+ test-direct-sum$(EXEEXT) test-echelon-form$(EXEEXT) \
+ test-ffpack$(EXEEXT) test-getentry$(EXEEXT) test-gf2$(EXEEXT) \
+ test-gmp-rational$(EXEEXT) test-hilbert$(EXEEXT) \
+ test-hom$(EXEEXT) test-inverse$(EXEEXT) test-isposdef$(EXEEXT) \
+ test-ispossemidef$(EXEEXT) test-matrix-domain$(EXEEXT) \
+ test-matrix-stream$(EXEEXT) test-minpoly$(EXEEXT) \
+ test-modular$(EXEEXT) test-modular-balanced-int$(EXEEXT) \
+ test-modular-balanced-float$(EXEEXT) \
+ test-modular-balanced-double$(EXEEXT) \
+ test-modular-byte$(EXEEXT) test-modular-double$(EXEEXT) \
+ test-modular-float$(EXEEXT) test-modular-int$(EXEEXT) \
+ test-modular-short$(EXEEXT) test-block-ring$(EXEEXT) \
+ test-PID-integer$(EXEEXT) test-moore-penrose$(EXEEXT) \
+ test-randiter-nonzero$(EXEEXT) \
+ test-rational-matrix-factory$(EXEEXT) \
+ test-scalar-matrix$(EXEEXT) test-solve-nonsingular$(EXEEXT) \
+ test-sparse$(EXEEXT) test-subiterator$(EXEEXT) \
+ test-submatrix$(EXEEXT) test-subvector$(EXEEXT) \
+ test-sum$(EXEEXT) test-trace$(EXEEXT) test-triplesbb$(EXEEXT) \
+ test-vector-domain$(EXEEXT) test-qlup$(EXEEXT) \
+ test-zero-one$(EXEEXT) test-last-invariant-factor$(EXEEXT) \
+ test-cradomain$(EXEEXT) \
+ test-rational-reconstruction-base$(EXEEXT)
+am__EXEEXT_11 = test-rat-charpoly$(EXEEXT) test-rat-solve$(EXEEXT) \
test-rat-minpoly$(EXEEXT) test-smith-form-local$(EXEEXT) \
test-smith-form-adaptive$(EXEEXT) \
test-dyadic-to-rational$(EXEEXT) \
@@ -129,108 +171,162 @@ benchmark_blas_domain_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
benchmark_blas_domain_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_benchmark_fields_OBJECTS = benchmark-fields.$(OBJEXT)
benchmark_fields_OBJECTS = $(am_benchmark_fields_OBJECTS)
benchmark_fields_LDADD = $(LDADD)
benchmark_fields_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_PID_integer_OBJECTS = test-PID-integer.$(OBJEXT)
test_PID_integer_OBJECTS = $(am_test_PID_integer_OBJECTS)
test_PID_integer_LDADD = $(LDADD)
test_PID_integer_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_bitonic_sort_OBJECTS = test-bitonic-sort.$(OBJEXT)
test_bitonic_sort_OBJECTS = $(am_test_bitonic_sort_OBJECTS)
test_bitonic_sort_LDADD = $(LDADD)
test_bitonic_sort_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_test_blackbox_block_container_OBJECTS = \
+ test-blackbox-block-container.$(OBJEXT)
+test_blackbox_block_container_OBJECTS = \
+ $(am_test_blackbox_block_container_OBJECTS)
+test_blackbox_block_container_LDADD = $(LDADD)
+test_blackbox_block_container_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_blas_domain_OBJECTS = test-blas-domain.$(OBJEXT)
test_blas_domain_OBJECTS = $(am_test_blas_domain_OBJECTS)
test_blas_domain_LDADD = $(LDADD)
test_blas_domain_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_block_ring_OBJECTS = test-block-ring.$(OBJEXT)
test_block_ring_OBJECTS = $(am_test_block_ring_OBJECTS)
test_block_ring_LDADD = $(LDADD)
test_block_ring_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_test_bmseq_OBJECTS = test-bmseq.$(OBJEXT)
+test_bmseq_OBJECTS = $(am_test_bmseq_OBJECTS)
+test_bmseq_LDADD = $(LDADD)
+test_bmseq_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_test_butterfly_OBJECTS = test-butterfly.$(OBJEXT)
test_butterfly_OBJECTS = $(am_test_butterfly_OBJECTS)
test_butterfly_LDADD = $(LDADD)
test_butterfly_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_charpoly_OBJECTS = test-charpoly.$(OBJEXT)
test_charpoly_OBJECTS = $(am_test_charpoly_OBJECTS)
test_charpoly_LDADD = $(LDADD)
test_charpoly_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_commentator_OBJECTS = test-commentator.$(OBJEXT)
test_commentator_OBJECTS = $(am_test_commentator_OBJECTS)
test_commentator_LDADD = $(LDADD)
test_commentator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_companion_OBJECTS = test-companion.$(OBJEXT)
test_companion_OBJECTS = $(am_test_companion_OBJECTS)
test_companion_LDADD = $(LDADD)
test_companion_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_cra_OBJECTS = test-cra.$(OBJEXT)
test_cra_OBJECTS = $(am_test_cra_OBJECTS)
test_cra_LDADD = $(LDADD)
test_cra_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_cradomain_OBJECTS = test-cradomain.$(OBJEXT)
test_cradomain_OBJECTS = $(am_test_cradomain_OBJECTS)
test_cradomain_LDADD = $(LDADD)
test_cradomain_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_dense_OBJECTS = test-dense.$(OBJEXT)
test_dense_OBJECTS = $(am_test_dense_OBJECTS)
test_dense_LDADD = $(LDADD)
test_dense_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_dense_zero_one_OBJECTS = test-dense-zero-one.$(OBJEXT)
test_dense_zero_one_OBJECTS = $(am_test_dense_zero_one_OBJECTS)
test_dense_zero_one_LDADD = $(LDADD)
test_dense_zero_one_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_det_OBJECTS = test-det.$(OBJEXT)
test_det_OBJECTS = $(am_test_det_OBJECTS)
test_det_LDADD = $(LDADD)
test_det_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_diagonal_OBJECTS = test-diagonal.$(OBJEXT)
test_diagonal_OBJECTS = $(am_test_diagonal_OBJECTS)
test_diagonal_LDADD = $(LDADD)
test_diagonal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_dif_OBJECTS = test-dif.$(OBJEXT)
test_dif_OBJECTS = $(am_test_dif_OBJECTS)
test_dif_LDADD = $(LDADD)
test_dif_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_direct_sum_OBJECTS = test-direct-sum.$(OBJEXT)
test_direct_sum_OBJECTS = $(am_test_direct_sum_OBJECTS)
test_direct_sum_LDADD = $(LDADD)
test_direct_sum_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_dyadic_to_rational_OBJECTS = \
test-dyadic-to-rational.$(OBJEXT)
@@ -239,47 +335,63 @@ test_dyadic_to_rational_OBJECTS = \
test_dyadic_to_rational_LDADD = $(LDADD)
test_dyadic_to_rational_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_test_echelon_form_OBJECTS = test-echelon-form.$(OBJEXT)
+test_echelon_form_OBJECTS = $(am_test_echelon_form_OBJECTS)
+test_echelon_form_LDADD = $(LDADD)
+test_echelon_form_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_ffpack_OBJECTS = test-ffpack.$(OBJEXT)
test_ffpack_OBJECTS = $(am_test_ffpack_OBJECTS)
test_ffpack_LDADD = $(LDADD)
test_ffpack_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_frobenius_OBJECTS = test-frobenius.$(OBJEXT)
test_frobenius_OBJECTS = $(am_test_frobenius_OBJECTS)
test_frobenius_LDADD = $(LDADD)
test_frobenius_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_ftrmm_OBJECTS = test-ftrmm.$(OBJEXT)
test_ftrmm_OBJECTS = $(am_test_ftrmm_OBJECTS)
test_ftrmm_LDADD = $(LDADD)
test_ftrmm_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_getentry_OBJECTS = test-getentry.$(OBJEXT)
test_getentry_OBJECTS = $(am_test_getentry_OBJECTS)
test_getentry_LDADD = $(LDADD)
test_getentry_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_gf2_OBJECTS = test-gf2.$(OBJEXT)
test_gf2_OBJECTS = $(am_test_gf2_OBJECTS)
test_gf2_LDADD = $(LDADD)
test_gf2_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
-am_test_givaro_zpz_OBJECTS = test-givaro-zpz.$(OBJEXT)
-test_givaro_zpz_OBJECTS = $(am_test_givaro_zpz_OBJECTS)
-test_givaro_zpz_LDADD = $(LDADD)
-test_givaro_zpz_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+am_test_givaro_fields_OBJECTS = test-givaro-fields.$(OBJEXT)
+test_givaro_fields_OBJECTS = $(am_test_givaro_fields_OBJECTS)
+test_givaro_fields_LDADD = $(LDADD)
+test_givaro_fields_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_test_givaro_zpzuns_OBJECTS = test-givaro-zpzuns.$(OBJEXT)
-test_givaro_zpzuns_OBJECTS = $(am_test_givaro_zpzuns_OBJECTS)
-test_givaro_zpzuns_LDADD = $(LDADD)
-test_givaro_zpzuns_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_gmp_rational_OBJECTS = test-gmp-rational.$(OBJEXT)
@@ -287,42 +399,56 @@ test_gmp_rational_OBJECTS = $(am_test_gmp_rational_OBJECTS)
test_gmp_rational_LDADD = $(LDADD)
test_gmp_rational_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_hilbert_OBJECTS = test-hilbert.$(OBJEXT)
test_hilbert_OBJECTS = $(am_test_hilbert_OBJECTS)
test_hilbert_LDADD = $(LDADD)
test_hilbert_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_hom_OBJECTS = test-hom.$(OBJEXT)
test_hom_OBJECTS = $(am_test_hom_OBJECTS)
test_hom_LDADD = $(LDADD)
test_hom_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_inverse_OBJECTS = test-inverse.$(OBJEXT)
test_inverse_OBJECTS = $(am_test_inverse_OBJECTS)
test_inverse_LDADD = $(LDADD)
test_inverse_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_isposdef_OBJECTS = test-isposdef.$(OBJEXT)
test_isposdef_OBJECTS = $(am_test_isposdef_OBJECTS)
test_isposdef_LDADD = $(LDADD)
test_isposdef_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_ispossemidef_OBJECTS = test-ispossemidef.$(OBJEXT)
test_ispossemidef_OBJECTS = $(am_test_ispossemidef_OBJECTS)
test_ispossemidef_LDADD = $(LDADD)
test_ispossemidef_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_la_block_lanczos_OBJECTS = test-la-block-lanczos.$(OBJEXT)
test_la_block_lanczos_OBJECTS = $(am_test_la_block_lanczos_OBJECTS)
test_la_block_lanczos_LDADD = $(LDADD)
test_la_block_lanczos_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_last_invariant_factor_OBJECTS = \
test-last-invariant-factor.$(OBJEXT)
@@ -331,42 +457,56 @@ test_last_invariant_factor_OBJECTS = \
test_last_invariant_factor_LDADD = $(LDADD)
test_last_invariant_factor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_lidia_gfq_OBJECTS = test-lidia-gfq.$(OBJEXT)
test_lidia_gfq_OBJECTS = $(am_test_lidia_gfq_OBJECTS)
test_lidia_gfq_LDADD = $(LDADD)
test_lidia_gfq_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_matrix_domain_OBJECTS = test-matrix-domain.$(OBJEXT)
test_matrix_domain_OBJECTS = $(am_test_matrix_domain_OBJECTS)
test_matrix_domain_LDADD = $(LDADD)
test_matrix_domain_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_matrix_stream_OBJECTS = test-matrix-stream.$(OBJEXT)
test_matrix_stream_OBJECTS = $(am_test_matrix_stream_OBJECTS)
test_matrix_stream_LDADD = $(LDADD)
test_matrix_stream_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_mg_block_lanczos_OBJECTS = test-mg-block-lanczos.$(OBJEXT)
test_mg_block_lanczos_OBJECTS = $(am_test_mg_block_lanczos_OBJECTS)
test_mg_block_lanczos_LDADD = $(LDADD)
test_mg_block_lanczos_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_minpoly_OBJECTS = test-minpoly.$(OBJEXT)
test_minpoly_OBJECTS = $(am_test_minpoly_OBJECTS)
test_minpoly_LDADD = $(LDADD)
test_minpoly_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_modular_OBJECTS = test-modular.$(OBJEXT)
test_modular_OBJECTS = $(am_test_modular_OBJECTS)
test_modular_LDADD = $(LDADD)
test_modular_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_modular_balanced_double_OBJECTS = \
test-modular-balanced-double.$(OBJEXT)
@@ -375,6 +515,8 @@ test_modular_balanced_double_OBJECTS = \
test_modular_balanced_double_LDADD = $(LDADD)
test_modular_balanced_double_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_modular_balanced_float_OBJECTS = \
test-modular-balanced-float.$(OBJEXT)
@@ -383,6 +525,8 @@ test_modular_balanced_float_OBJECTS = \
test_modular_balanced_float_LDADD = $(LDADD)
test_modular_balanced_float_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_modular_balanced_int_OBJECTS = \
test-modular-balanced-int.$(OBJEXT)
@@ -391,132 +535,176 @@ test_modular_balanced_int_OBJECTS = \
test_modular_balanced_int_LDADD = $(LDADD)
test_modular_balanced_int_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_modular_byte_OBJECTS = test-modular-byte.$(OBJEXT)
test_modular_byte_OBJECTS = $(am_test_modular_byte_OBJECTS)
test_modular_byte_LDADD = $(LDADD)
test_modular_byte_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_modular_double_OBJECTS = test-modular-double.$(OBJEXT)
test_modular_double_OBJECTS = $(am_test_modular_double_OBJECTS)
test_modular_double_LDADD = $(LDADD)
test_modular_double_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_modular_float_OBJECTS = test-modular-float.$(OBJEXT)
test_modular_float_OBJECTS = $(am_test_modular_float_OBJECTS)
test_modular_float_LDADD = $(LDADD)
test_modular_float_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_modular_int_OBJECTS = test-modular-int.$(OBJEXT)
test_modular_int_OBJECTS = $(am_test_modular_int_OBJECTS)
test_modular_int_LDADD = $(LDADD)
test_modular_int_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_modular_short_OBJECTS = test-modular-short.$(OBJEXT)
test_modular_short_OBJECTS = $(am_test_modular_short_OBJECTS)
test_modular_short_LDADD = $(LDADD)
test_modular_short_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_moore_penrose_OBJECTS = test-moore-penrose.$(OBJEXT)
test_moore_penrose_OBJECTS = $(am_test_moore_penrose_OBJECTS)
test_moore_penrose_LDADD = $(LDADD)
test_moore_penrose_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_ntl_RR_OBJECTS = test-ntl-RR.$(OBJEXT)
test_ntl_RR_OBJECTS = $(am_test_ntl_RR_OBJECTS)
test_ntl_RR_LDADD = $(LDADD)
test_ntl_RR_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_ntl_ZZ_p_OBJECTS = test-ntl-ZZ_p.$(OBJEXT)
test_ntl_ZZ_p_OBJECTS = $(am_test_ntl_ZZ_p_OBJECTS)
test_ntl_ZZ_p_LDADD = $(LDADD)
test_ntl_ZZ_p_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_ntl_hankel_OBJECTS = test-ntl-hankel.$(OBJEXT)
test_ntl_hankel_OBJECTS = $(am_test_ntl_hankel_OBJECTS)
test_ntl_hankel_LDADD = $(LDADD)
test_ntl_hankel_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_ntl_lzz_p_OBJECTS = test-ntl-lzz_p.$(OBJEXT)
test_ntl_lzz_p_OBJECTS = $(am_test_ntl_lzz_p_OBJECTS)
test_ntl_lzz_p_LDADD = $(LDADD)
test_ntl_lzz_p_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_ntl_sylvester_OBJECTS = test-ntl-sylvester.$(OBJEXT)
test_ntl_sylvester_OBJECTS = $(am_test_ntl_sylvester_OBJECTS)
test_ntl_sylvester_LDADD = $(LDADD)
test_ntl_sylvester_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_ntl_toeplitz_OBJECTS = test-ntl-toeplitz.$(OBJEXT)
test_ntl_toeplitz_OBJECTS = $(am_test_ntl_toeplitz_OBJECTS)
test_ntl_toeplitz_LDADD = $(LDADD)
test_ntl_toeplitz_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_nullspace_OBJECTS = test-nullspace.$(OBJEXT)
test_nullspace_OBJECTS = $(am_test_nullspace_OBJECTS)
test_nullspace_LDADD = $(LDADD)
test_nullspace_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_optimization_OBJECTS = test-optimization.$(OBJEXT)
test_optimization_OBJECTS = $(am_test_optimization_OBJECTS)
test_optimization_LDADD = $(LDADD)
test_optimization_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_param_fuzzy_OBJECTS = test-param-fuzzy.$(OBJEXT)
test_param_fuzzy_OBJECTS = $(am_test_param_fuzzy_OBJECTS)
test_param_fuzzy_LDADD = $(LDADD)
test_param_fuzzy_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_qlup_OBJECTS = test-qlup.$(OBJEXT)
test_qlup_OBJECTS = $(am_test_qlup_OBJECTS)
test_qlup_LDADD = $(LDADD)
test_qlup_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_randiter_nonzero_OBJECTS = test-randiter-nonzero.$(OBJEXT)
test_randiter_nonzero_OBJECTS = $(am_test_randiter_nonzero_OBJECTS)
test_randiter_nonzero_LDADD = $(LDADD)
test_randiter_nonzero_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_rank_OBJECTS = test-rank.$(OBJEXT)
test_rank_OBJECTS = $(am_test_rank_OBJECTS)
test_rank_LDADD = $(LDADD)
test_rank_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_rat_charpoly_OBJECTS = test-rat-charpoly.$(OBJEXT)
test_rat_charpoly_OBJECTS = $(am_test_rat_charpoly_OBJECTS)
test_rat_charpoly_LDADD = $(LDADD)
test_rat_charpoly_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_rat_minpoly_OBJECTS = test-rat-minpoly.$(OBJEXT)
test_rat_minpoly_OBJECTS = $(am_test_rat_minpoly_OBJECTS)
test_rat_minpoly_LDADD = $(LDADD)
test_rat_minpoly_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_rat_solve_OBJECTS = test-rat-solve.$(OBJEXT)
test_rat_solve_OBJECTS = $(am_test_rat_solve_OBJECTS)
test_rat_solve_LDADD = $(LDADD)
test_rat_solve_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_rational_matrix_factory_OBJECTS = \
test-rational-matrix-factory.$(OBJEXT)
@@ -525,6 +713,8 @@ test_rational_matrix_factory_OBJECTS = \
test_rational_matrix_factory_LDADD = $(LDADD)
test_rational_matrix_factory_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_rational_reconstruction_base_OBJECTS = \
test-rational-reconstruction-base.$(OBJEXT)
@@ -534,12 +724,16 @@ test_rational_reconstruction_base_LDADD = $(LDADD)
test_rational_reconstruction_base_DEPENDENCIES = \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_rational_solver_OBJECTS = test-rational-solver.$(OBJEXT)
test_rational_solver_OBJECTS = $(am_test_rational_solver_OBJECTS)
test_rational_solver_LDADD = $(LDADD)
test_rational_solver_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_rational_solver_adaptive_OBJECTS = \
test-rational-solver-adaptive.$(OBJEXT)
@@ -548,18 +742,24 @@ test_rational_solver_adaptive_OBJECTS = \
test_rational_solver_adaptive_LDADD = $(LDADD)
test_rational_solver_adaptive_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_scalar_matrix_OBJECTS = test-scalar-matrix.$(OBJEXT)
test_scalar_matrix_OBJECTS = $(am_test_scalar_matrix_OBJECTS)
test_scalar_matrix_LDADD = $(LDADD)
test_scalar_matrix_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_smith_form_OBJECTS = test-smith-form.$(OBJEXT)
test_smith_form_OBJECTS = $(am_test_smith_form_OBJECTS)
test_smith_form_LDADD = $(LDADD)
test_smith_form_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_smith_form_adaptive_OBJECTS = \
test-smith-form-adaptive.$(OBJEXT)
@@ -568,12 +768,16 @@ test_smith_form_adaptive_OBJECTS = \
test_smith_form_adaptive_LDADD = $(LDADD)
test_smith_form_adaptive_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_smith_form_binary_OBJECTS = test-smith-form-binary.$(OBJEXT)
test_smith_form_binary_OBJECTS = $(am_test_smith_form_binary_OBJECTS)
test_smith_form_binary_LDADD = $(LDADD)
test_smith_form_binary_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_smith_form_iliopoulos_OBJECTS = \
test-smith-form-iliopoulos.$(OBJEXT)
@@ -582,72 +786,96 @@ test_smith_form_iliopoulos_OBJECTS = \
test_smith_form_iliopoulos_LDADD = $(LDADD)
test_smith_form_iliopoulos_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_smith_form_local_OBJECTS = test-smith-form-local.$(OBJEXT)
test_smith_form_local_OBJECTS = $(am_test_smith_form_local_OBJECTS)
test_smith_form_local_LDADD = $(LDADD)
test_smith_form_local_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_solve_OBJECTS = test-solve.$(OBJEXT)
test_solve_OBJECTS = $(am_test_solve_OBJECTS)
test_solve_LDADD = $(LDADD)
test_solve_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_solve_nonsingular_OBJECTS = test-solve-nonsingular.$(OBJEXT)
test_solve_nonsingular_OBJECTS = $(am_test_solve_nonsingular_OBJECTS)
test_solve_nonsingular_LDADD = $(LDADD)
test_solve_nonsingular_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_sparse_OBJECTS = test-sparse.$(OBJEXT)
test_sparse_OBJECTS = $(am_test_sparse_OBJECTS)
test_sparse_LDADD = $(LDADD)
test_sparse_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_subiterator_OBJECTS = test-subiterator.$(OBJEXT)
test_subiterator_OBJECTS = $(am_test_subiterator_OBJECTS)
test_subiterator_LDADD = $(LDADD)
test_subiterator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_submatrix_OBJECTS = test-submatrix.$(OBJEXT)
test_submatrix_OBJECTS = $(am_test_submatrix_OBJECTS)
test_submatrix_LDADD = $(LDADD)
test_submatrix_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_subvector_OBJECTS = test-subvector.$(OBJEXT)
test_subvector_OBJECTS = $(am_test_subvector_OBJECTS)
test_subvector_LDADD = $(LDADD)
test_subvector_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_sum_OBJECTS = test-sum.$(OBJEXT)
test_sum_OBJECTS = $(am_test_sum_OBJECTS)
test_sum_LDADD = $(LDADD)
test_sum_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_toeplitz_det_OBJECTS = test-toeplitz-det.$(OBJEXT)
test_toeplitz_det_OBJECTS = $(am_test_toeplitz_det_OBJECTS)
test_toeplitz_det_LDADD = $(LDADD)
test_toeplitz_det_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_trace_OBJECTS = test-trace.$(OBJEXT)
test_trace_OBJECTS = $(am_test_trace_OBJECTS)
test_trace_LDADD = $(LDADD)
test_trace_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_test_triplesbb_OBJECTS = test-triplesbb.$(OBJEXT)
test_triplesbb_OBJECTS = $(am_test_triplesbb_OBJECTS)
test_triplesbb_LDADD = $(LDADD)
test_triplesbb_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_unparametric_field_OBJECTS = \
test-unparametric-field.$(OBJEXT)
@@ -656,24 +884,32 @@ test_unparametric_field_OBJECTS = \
test_unparametric_field_LDADD = $(LDADD)
test_unparametric_field_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_vector_domain_OBJECTS = test-vector-domain.$(OBJEXT)
test_vector_domain_OBJECTS = $(am_test_vector_domain_OBJECTS)
test_vector_domain_LDADD = $(LDADD)
test_vector_domain_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_zero_one_OBJECTS = test-zero-one.$(OBJEXT)
test_zero_one_OBJECTS = $(am_test_zero_one_OBJECTS)
test_zero_one_LDADD = $(LDADD)
test_zero_one_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_test_zo_OBJECTS = test-zo.$(OBJEXT)
test_zo_OBJECTS = $(am_test_zo_OBJECTS)
test_zo_LDADD = $(LDADD)
test_zo_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp =
@@ -698,21 +934,22 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(benchmark_blas_domain_SOURCES) $(benchmark_fields_SOURCES) \
$(test_PID_integer_SOURCES) $(test_bitonic_sort_SOURCES) \
+ $(test_blackbox_block_container_SOURCES) \
$(test_blas_domain_SOURCES) $(test_block_ring_SOURCES) \
- $(test_butterfly_SOURCES) $(test_charpoly_SOURCES) \
- $(test_commentator_SOURCES) $(test_companion_SOURCES) \
- $(test_cra_SOURCES) $(test_cradomain_SOURCES) \
- $(test_dense_SOURCES) $(test_dense_zero_one_SOURCES) \
- $(test_det_SOURCES) $(test_diagonal_SOURCES) \
- $(test_dif_SOURCES) $(test_direct_sum_SOURCES) \
- $(test_dyadic_to_rational_SOURCES) $(test_ffpack_SOURCES) \
+ $(test_bmseq_SOURCES) $(test_butterfly_SOURCES) \
+ $(test_charpoly_SOURCES) $(test_commentator_SOURCES) \
+ $(test_companion_SOURCES) $(test_cra_SOURCES) \
+ $(test_cradomain_SOURCES) $(test_dense_SOURCES) \
+ $(test_dense_zero_one_SOURCES) $(test_det_SOURCES) \
+ $(test_diagonal_SOURCES) $(test_dif_SOURCES) \
+ $(test_direct_sum_SOURCES) $(test_dyadic_to_rational_SOURCES) \
+ $(test_echelon_form_SOURCES) $(test_ffpack_SOURCES) \
$(test_frobenius_SOURCES) $(test_ftrmm_SOURCES) \
$(test_getentry_SOURCES) $(test_gf2_SOURCES) \
- $(test_givaro_zpz_SOURCES) $(test_givaro_zpzuns_SOURCES) \
- $(test_gmp_rational_SOURCES) $(test_hilbert_SOURCES) \
- $(test_hom_SOURCES) $(test_inverse_SOURCES) \
- $(test_isposdef_SOURCES) $(test_ispossemidef_SOURCES) \
- $(test_la_block_lanczos_SOURCES) \
+ $(test_givaro_fields_SOURCES) $(test_gmp_rational_SOURCES) \
+ $(test_hilbert_SOURCES) $(test_hom_SOURCES) \
+ $(test_inverse_SOURCES) $(test_isposdef_SOURCES) \
+ $(test_ispossemidef_SOURCES) $(test_la_block_lanczos_SOURCES) \
$(test_last_invariant_factor_SOURCES) \
$(test_lidia_gfq_SOURCES) $(test_matrix_domain_SOURCES) \
$(test_matrix_stream_SOURCES) $(test_mg_block_lanczos_SOURCES) \
@@ -749,18 +986,20 @@ SOURCES = $(benchmark_blas_domain_SOURCES) $(benchmark_fields_SOURCES) \
$(test_zo_SOURCES)
DIST_SOURCES = $(benchmark_blas_domain_SOURCES) \
$(benchmark_fields_SOURCES) $(test_PID_integer_SOURCES) \
- $(test_bitonic_sort_SOURCES) $(test_blas_domain_SOURCES) \
- $(test_block_ring_SOURCES) $(test_butterfly_SOURCES) \
+ $(test_bitonic_sort_SOURCES) \
+ $(test_blackbox_block_container_SOURCES) \
+ $(test_blas_domain_SOURCES) $(test_block_ring_SOURCES) \
+ $(test_bmseq_SOURCES) $(test_butterfly_SOURCES) \
$(test_charpoly_SOURCES) $(test_commentator_SOURCES) \
$(test_companion_SOURCES) $(test_cra_SOURCES) \
$(test_cradomain_SOURCES) $(test_dense_SOURCES) \
$(test_dense_zero_one_SOURCES) $(test_det_SOURCES) \
$(test_diagonal_SOURCES) $(test_dif_SOURCES) \
$(test_direct_sum_SOURCES) $(test_dyadic_to_rational_SOURCES) \
- $(test_ffpack_SOURCES) $(test_frobenius_SOURCES) \
- $(test_ftrmm_SOURCES) $(test_getentry_SOURCES) \
- $(test_gf2_SOURCES) $(test_givaro_zpz_SOURCES) \
- $(test_givaro_zpzuns_SOURCES) $(test_gmp_rational_SOURCES) \
+ $(test_echelon_form_SOURCES) $(test_ffpack_SOURCES) \
+ $(test_frobenius_SOURCES) $(test_ftrmm_SOURCES) \
+ $(test_getentry_SOURCES) $(test_gf2_SOURCES) \
+ $(test_givaro_fields_SOURCES) $(test_gmp_rational_SOURCES) \
$(test_hilbert_SOURCES) $(test_hom_SOURCES) \
$(test_inverse_SOURCES) $(test_isposdef_SOURCES) \
$(test_ispossemidef_SOURCES) $(test_la_block_lanczos_SOURCES) \
@@ -805,17 +1044,52 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
ETAGS = etags
CTAGS = ctags
- at LINBOX_HAVE_GIVARO_TRUE@am__EXEEXT_11 = $(am__EXEEXT_2)
- at LINBOX_HAVE_NTL_TRUE@am__EXEEXT_12 = $(am__EXEEXT_3)
- at LINBOX_HAVE_LIDIA_TRUE@am__EXEEXT_13 = $(am__EXEEXT_5)
-am__EXEEXT_14 =
-am__EXEEXT_15 = $(am__EXEEXT_4)
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
+ at LINBOX_HAVE_GIVARO_TRUE@am__EXEEXT_12 = $(am__EXEEXT_2)
+ at LINBOX_HAVE_NTL_TRUE@am__EXEEXT_13 = $(am__EXEEXT_3)
+ at LINBOX_HAVE_LIDIA_TRUE@am__EXEEXT_14 = $(am__EXEEXT_5)
+am__EXEEXT_15 =
+am__EXEEXT_16 = $(am__EXEEXT_4)
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -823,6 +1097,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -846,10 +1121,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -870,10 +1147,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -882,6 +1164,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -898,6 +1182,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -961,20 +1246,22 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/linbox $(CBLAS_FLAG) \
- $(FFLAFLAS_CFLAGS) $(GMP_CFLAGS) $(NTL_CFLAGS) \
- $(GIVARO_CFLAGS) $(LIDIA_CFLAGS)
+ $(FFLAS_FFPACK_CFLAGS) $(GMP_CFLAGS) $(NTL_CFLAGS) \
+ $(GIVARO_CFLAGS) $(LIDIA_CFLAGS) $(IML_CFLAGS)
# AM_LDFLAGS = -llapack -lcblas -latlas
-AM_LDFLAGS = $(top_srcdir)/linbox/.libs/liblinbox.a -static
+AM_LDFLAGS = $(top_srcdir)/linbox/.libs/liblinbox.a
# SAFER_FLAGS = -g -Wall -Wextra -Wno-unused-parameter
# bds: no need to optimize for unit/regression tests, and opt adds a lot to compilation time
-AM_CXXFLAGS = @TESTS_CFLAGS@ -DLinBoxSrcOnly
+#AM_CXXFLAGS = @TESTS_CFLAGS@ -DLinBoxSrcOnly
# AM_CXXFLAGS = $(SAFER_FLAGS) -DLinBoxSrcOnly
#AM_CXXFLAGS = $(SAFER_FLAGS) -DLinBoxSrcOnly -O2
-# AM_CXXFLAGS = -g -DLinBoxSrcOnly -Wall -DDEBUG -O0
+# AM_CXXFLAGS = -g -DLinBoxSrcOnly -Wall -DDEBUG -O0
+AM_CXXFLAGS = -DLinBoxSrcOnly @TESTS_CFLAGS@ @DEBUG_CFLAGS@
# AM_CXXFLAGS = -g -DLinBoxSrcOnly -Wall -D__LINBOX_HAVE_DGETRF -D__LINBOX_HAVE_DGETRI
# AM_CFLAGS = -g -Wall
SUBDIRS = data matrix
-LDADD = $(BLAS_LIBS) $(NTL_LIBS) $(GIVARO_LIBS) $(GMP_LIBS) $(LIDIA_LIBS)
+LDADD = $(GIVARO_LIBS) $(BLAS_LIBS) $(NTL_LIBS) $(GMP_LIBS) $(LIDIA_LIBS) $(MPFR_LIBS) $(FPLLL_LIBS) $(IML_LIBS) $(LDFLAGS)
+# AM_LDFLAGS+=-static -Wl,-rpath -Wl,$(GIVARO_LIBS)
EXTRA_DIST = \
test-common.C \
tests.doxy \
@@ -990,18 +1277,30 @@ EXTRA_DIST = \
# Note that among the available groups are NONCOMPILING_TESTS and FAILING_TESTS, which
# will be ignored by "make check" and can be temporary storage for problematic tests.
BASIC_TESTS = \
+ test-commentator \
+ test-det \
+ test-frobenius \
+ test-rank \
+ test-solve \
+ test-nullspace \
+ test-smith-form-binary \
+ test-rational-solver \
+ test-rational-solver-adaptive \
+ test-charpoly \
+ test-cra
+
+FULLCHECK_TESTS = \
test-bitonic-sort \
+ test-blackbox-block-container \
test-blas-domain \
test-butterfly \
- test-commentator \
test-companion \
test-dense \
- test-det \
test-diagonal \
test-dif \
test-direct-sum \
+ test-echelon-form \
test-ffpack \
- test-frobenius \
test-getentry \
test-gf2 \
test-gmp-rational \
@@ -1026,9 +1325,9 @@ BASIC_TESTS = \
test-PID-integer \
test-moore-penrose \
test-randiter-nonzero \
- test-rank \
test-rational-matrix-factory \
test-scalar-matrix \
+ test-solve-nonsingular \
test-sparse \
test-subiterator \
test-submatrix \
@@ -1039,17 +1338,8 @@ BASIC_TESTS = \
test-vector-domain \
test-qlup \
test-zero-one \
- test-solve \
- test-nullspace \
- test-smith-form-binary \
- test-rational-solver \
- test-rational-solver-adaptive \
- test-solve-nonsingular \
test-last-invariant-factor \
- test-charpoly \
- test-cra \
test-cradomain \
- test-unparametric-field \
test-rational-reconstruction-base
@@ -1064,6 +1354,8 @@ NONCOMPLIANT_TESTS = \
#These need clapack
#test-rational-solver-adaptive
DUBIOUS_TESTS = \
+ test-unparametric-field \
+ test-bmseq \
test-zo
# test-quad-matrix
@@ -1107,8 +1399,7 @@ BENCHMARKS = \
# Transpose is tested in test-triplesbb
# Compose is tested in test-butterfly
GIVARO_TESTS = \
- test-givaro-zpz \
- test-givaro-zpzuns
+ test-givaro-fields
NTL_TESTS = \
test-smith-form \
@@ -1126,20 +1417,13 @@ LIDIA_TESTS = \
ATLAS_TESTS = \
test-optimization
+BLAS3_UNIT_TESTS = \
+ test-toom-cook
+
@LINBOX_HAVE_NTL_TRUE at USE_NTL_TESTS = $(NTL_TESTS)
@LINBOX_HAVE_GIVARO_TRUE at USE_GIVARO_TESTS = $(GIVARO_TESTS)
@LINBOX_HAVE_LIDIA_TRUE at USE_LIDIA_TESTS = $(LIDIA_TESTS)
USE_ATLAS_TESTS = $(ATLAS_TESTS)
-CLEANFILES = checker \
- $(BASIC_TESTS) \
- $(FAILING_TESTS) \
- $(NONCOMPLIANT_TESTS) \
- $(BENCHMARKS) \
- $(DUBIOUS_TESTS) \
- $(NTL_TESTS) \
- $(GIVARO_TESTS) \
- $(ATLAS_TESTS)
-
test_commentator_SOURCES = \
test-commentator.C \
test-common.h
@@ -1149,6 +1433,14 @@ test_modular_SOURCES = \
test-generic.h \
test-common.h
+test_blackbox_block_container_SOURCES = \
+ test-blackbox-block-container.C \
+ test-common.h
+
+test_solve_nonsingular_SOURCES = \
+ test-solve-nonsingular.C \
+ test-common.h
+
test_block_ring_SOURCES = \
test-block-ring.C \
test-field.h \
@@ -1236,6 +1528,10 @@ test_scalar_matrix_SOURCES = \
test-generic.h \
test-common.h
+test_bmseq_SOURCES = \
+ test-bmseq.C \
+ test-common.h
+
test_butterfly_SOURCES = \
test-vector-domain.h \
test-blackbox.h \
@@ -1318,6 +1614,10 @@ test_direct_sum_SOURCES = \
test-generic.h \
test-common.h
+test_echelon_form_SOURCES = \
+ test-echelon-form.C \
+ test-common.h
+
test_frobenius_SOURCES = \
test-frobenius.C \
test-generic.h \
@@ -1351,16 +1651,11 @@ test_ntl_lzz_p_SOURCES = \
test-generic.h \
test-common.h
-test_givaro_zpz_SOURCES = \
- test-givaro-zpz.C \
+test_givaro_fields_SOURCES = \
+ test-givaro-fields.C \
test-generic.h \
test-common.h
-test_givaro_zpzuns_SOURCES = \
- test-givaro-zpzuns.C \
- test-generic.h \
- test-common.h
-
test_lidia_gfq_SOURCES = \
test-lidia-gfq.C \
test-generic.h \
@@ -1524,9 +1819,18 @@ test_ispossemidef_SOURCES = \
test_ftrmm_SOURCES = \
test-ftrmm.C
-test_solve_nonsingular_SOURCES = \
- test-common.h \
- test-solve-nonsingular.C
+test_toom_cook_SOURCES = test-toom-cook.C
+CLEANFILES = checker \
+ $(TESTS) \
+ $(BASIC_TESTS) \
+ $(FAILING_TESTS) \
+ $(NONCOMPLIANT_TESTS) \
+ $(BENCHMARKS) \
+ $(DUBIOUS_TESTS) \
+ $(FULLCHECK_TESTS) \
+ $(NTL_TESTS) \
+ $(GIVARO_TESTS) \
+ $(ATLAS_TESTS)
all: all-recursive
@@ -1541,9 +1845,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps tests/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps tests/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps tests/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps tests/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -1561,268 +1865,275 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-benchmark-blas-domain$(EXEEXT): $(benchmark_blas_domain_OBJECTS) $(benchmark_blas_domain_DEPENDENCIES)
+$(am__aclocal_m4_deps):
+benchmark-blas-domain$(EXEEXT): $(benchmark_blas_domain_OBJECTS) $(benchmark_blas_domain_DEPENDENCIES) $(EXTRA_benchmark_blas_domain_DEPENDENCIES)
@rm -f benchmark-blas-domain$(EXEEXT)
$(CXXLINK) $(benchmark_blas_domain_OBJECTS) $(benchmark_blas_domain_LDADD) $(LIBS)
-benchmark-fields$(EXEEXT): $(benchmark_fields_OBJECTS) $(benchmark_fields_DEPENDENCIES)
+benchmark-fields$(EXEEXT): $(benchmark_fields_OBJECTS) $(benchmark_fields_DEPENDENCIES) $(EXTRA_benchmark_fields_DEPENDENCIES)
@rm -f benchmark-fields$(EXEEXT)
$(CXXLINK) $(benchmark_fields_OBJECTS) $(benchmark_fields_LDADD) $(LIBS)
-test-PID-integer$(EXEEXT): $(test_PID_integer_OBJECTS) $(test_PID_integer_DEPENDENCIES)
+test-PID-integer$(EXEEXT): $(test_PID_integer_OBJECTS) $(test_PID_integer_DEPENDENCIES) $(EXTRA_test_PID_integer_DEPENDENCIES)
@rm -f test-PID-integer$(EXEEXT)
$(CXXLINK) $(test_PID_integer_OBJECTS) $(test_PID_integer_LDADD) $(LIBS)
-test-bitonic-sort$(EXEEXT): $(test_bitonic_sort_OBJECTS) $(test_bitonic_sort_DEPENDENCIES)
+test-bitonic-sort$(EXEEXT): $(test_bitonic_sort_OBJECTS) $(test_bitonic_sort_DEPENDENCIES) $(EXTRA_test_bitonic_sort_DEPENDENCIES)
@rm -f test-bitonic-sort$(EXEEXT)
$(CXXLINK) $(test_bitonic_sort_OBJECTS) $(test_bitonic_sort_LDADD) $(LIBS)
-test-blas-domain$(EXEEXT): $(test_blas_domain_OBJECTS) $(test_blas_domain_DEPENDENCIES)
+test-blackbox-block-container$(EXEEXT): $(test_blackbox_block_container_OBJECTS) $(test_blackbox_block_container_DEPENDENCIES) $(EXTRA_test_blackbox_block_container_DEPENDENCIES)
+ @rm -f test-blackbox-block-container$(EXEEXT)
+ $(CXXLINK) $(test_blackbox_block_container_OBJECTS) $(test_blackbox_block_container_LDADD) $(LIBS)
+test-blas-domain$(EXEEXT): $(test_blas_domain_OBJECTS) $(test_blas_domain_DEPENDENCIES) $(EXTRA_test_blas_domain_DEPENDENCIES)
@rm -f test-blas-domain$(EXEEXT)
$(CXXLINK) $(test_blas_domain_OBJECTS) $(test_blas_domain_LDADD) $(LIBS)
-test-block-ring$(EXEEXT): $(test_block_ring_OBJECTS) $(test_block_ring_DEPENDENCIES)
+test-block-ring$(EXEEXT): $(test_block_ring_OBJECTS) $(test_block_ring_DEPENDENCIES) $(EXTRA_test_block_ring_DEPENDENCIES)
@rm -f test-block-ring$(EXEEXT)
$(CXXLINK) $(test_block_ring_OBJECTS) $(test_block_ring_LDADD) $(LIBS)
-test-butterfly$(EXEEXT): $(test_butterfly_OBJECTS) $(test_butterfly_DEPENDENCIES)
+test-bmseq$(EXEEXT): $(test_bmseq_OBJECTS) $(test_bmseq_DEPENDENCIES) $(EXTRA_test_bmseq_DEPENDENCIES)
+ @rm -f test-bmseq$(EXEEXT)
+ $(CXXLINK) $(test_bmseq_OBJECTS) $(test_bmseq_LDADD) $(LIBS)
+test-butterfly$(EXEEXT): $(test_butterfly_OBJECTS) $(test_butterfly_DEPENDENCIES) $(EXTRA_test_butterfly_DEPENDENCIES)
@rm -f test-butterfly$(EXEEXT)
$(CXXLINK) $(test_butterfly_OBJECTS) $(test_butterfly_LDADD) $(LIBS)
-test-charpoly$(EXEEXT): $(test_charpoly_OBJECTS) $(test_charpoly_DEPENDENCIES)
+test-charpoly$(EXEEXT): $(test_charpoly_OBJECTS) $(test_charpoly_DEPENDENCIES) $(EXTRA_test_charpoly_DEPENDENCIES)
@rm -f test-charpoly$(EXEEXT)
$(CXXLINK) $(test_charpoly_OBJECTS) $(test_charpoly_LDADD) $(LIBS)
-test-commentator$(EXEEXT): $(test_commentator_OBJECTS) $(test_commentator_DEPENDENCIES)
+test-commentator$(EXEEXT): $(test_commentator_OBJECTS) $(test_commentator_DEPENDENCIES) $(EXTRA_test_commentator_DEPENDENCIES)
@rm -f test-commentator$(EXEEXT)
$(CXXLINK) $(test_commentator_OBJECTS) $(test_commentator_LDADD) $(LIBS)
-test-companion$(EXEEXT): $(test_companion_OBJECTS) $(test_companion_DEPENDENCIES)
+test-companion$(EXEEXT): $(test_companion_OBJECTS) $(test_companion_DEPENDENCIES) $(EXTRA_test_companion_DEPENDENCIES)
@rm -f test-companion$(EXEEXT)
$(CXXLINK) $(test_companion_OBJECTS) $(test_companion_LDADD) $(LIBS)
-test-cra$(EXEEXT): $(test_cra_OBJECTS) $(test_cra_DEPENDENCIES)
+test-cra$(EXEEXT): $(test_cra_OBJECTS) $(test_cra_DEPENDENCIES) $(EXTRA_test_cra_DEPENDENCIES)
@rm -f test-cra$(EXEEXT)
$(CXXLINK) $(test_cra_OBJECTS) $(test_cra_LDADD) $(LIBS)
-test-cradomain$(EXEEXT): $(test_cradomain_OBJECTS) $(test_cradomain_DEPENDENCIES)
+test-cradomain$(EXEEXT): $(test_cradomain_OBJECTS) $(test_cradomain_DEPENDENCIES) $(EXTRA_test_cradomain_DEPENDENCIES)
@rm -f test-cradomain$(EXEEXT)
$(CXXLINK) $(test_cradomain_OBJECTS) $(test_cradomain_LDADD) $(LIBS)
-test-dense$(EXEEXT): $(test_dense_OBJECTS) $(test_dense_DEPENDENCIES)
+test-dense$(EXEEXT): $(test_dense_OBJECTS) $(test_dense_DEPENDENCIES) $(EXTRA_test_dense_DEPENDENCIES)
@rm -f test-dense$(EXEEXT)
$(CXXLINK) $(test_dense_OBJECTS) $(test_dense_LDADD) $(LIBS)
-test-dense-zero-one$(EXEEXT): $(test_dense_zero_one_OBJECTS) $(test_dense_zero_one_DEPENDENCIES)
+test-dense-zero-one$(EXEEXT): $(test_dense_zero_one_OBJECTS) $(test_dense_zero_one_DEPENDENCIES) $(EXTRA_test_dense_zero_one_DEPENDENCIES)
@rm -f test-dense-zero-one$(EXEEXT)
$(CXXLINK) $(test_dense_zero_one_OBJECTS) $(test_dense_zero_one_LDADD) $(LIBS)
-test-det$(EXEEXT): $(test_det_OBJECTS) $(test_det_DEPENDENCIES)
+test-det$(EXEEXT): $(test_det_OBJECTS) $(test_det_DEPENDENCIES) $(EXTRA_test_det_DEPENDENCIES)
@rm -f test-det$(EXEEXT)
$(CXXLINK) $(test_det_OBJECTS) $(test_det_LDADD) $(LIBS)
-test-diagonal$(EXEEXT): $(test_diagonal_OBJECTS) $(test_diagonal_DEPENDENCIES)
+test-diagonal$(EXEEXT): $(test_diagonal_OBJECTS) $(test_diagonal_DEPENDENCIES) $(EXTRA_test_diagonal_DEPENDENCIES)
@rm -f test-diagonal$(EXEEXT)
$(CXXLINK) $(test_diagonal_OBJECTS) $(test_diagonal_LDADD) $(LIBS)
-test-dif$(EXEEXT): $(test_dif_OBJECTS) $(test_dif_DEPENDENCIES)
+test-dif$(EXEEXT): $(test_dif_OBJECTS) $(test_dif_DEPENDENCIES) $(EXTRA_test_dif_DEPENDENCIES)
@rm -f test-dif$(EXEEXT)
$(CXXLINK) $(test_dif_OBJECTS) $(test_dif_LDADD) $(LIBS)
-test-direct-sum$(EXEEXT): $(test_direct_sum_OBJECTS) $(test_direct_sum_DEPENDENCIES)
+test-direct-sum$(EXEEXT): $(test_direct_sum_OBJECTS) $(test_direct_sum_DEPENDENCIES) $(EXTRA_test_direct_sum_DEPENDENCIES)
@rm -f test-direct-sum$(EXEEXT)
$(CXXLINK) $(test_direct_sum_OBJECTS) $(test_direct_sum_LDADD) $(LIBS)
-test-dyadic-to-rational$(EXEEXT): $(test_dyadic_to_rational_OBJECTS) $(test_dyadic_to_rational_DEPENDENCIES)
+test-dyadic-to-rational$(EXEEXT): $(test_dyadic_to_rational_OBJECTS) $(test_dyadic_to_rational_DEPENDENCIES) $(EXTRA_test_dyadic_to_rational_DEPENDENCIES)
@rm -f test-dyadic-to-rational$(EXEEXT)
$(CXXLINK) $(test_dyadic_to_rational_OBJECTS) $(test_dyadic_to_rational_LDADD) $(LIBS)
-test-ffpack$(EXEEXT): $(test_ffpack_OBJECTS) $(test_ffpack_DEPENDENCIES)
+test-echelon-form$(EXEEXT): $(test_echelon_form_OBJECTS) $(test_echelon_form_DEPENDENCIES) $(EXTRA_test_echelon_form_DEPENDENCIES)
+ @rm -f test-echelon-form$(EXEEXT)
+ $(CXXLINK) $(test_echelon_form_OBJECTS) $(test_echelon_form_LDADD) $(LIBS)
+test-ffpack$(EXEEXT): $(test_ffpack_OBJECTS) $(test_ffpack_DEPENDENCIES) $(EXTRA_test_ffpack_DEPENDENCIES)
@rm -f test-ffpack$(EXEEXT)
$(CXXLINK) $(test_ffpack_OBJECTS) $(test_ffpack_LDADD) $(LIBS)
-test-frobenius$(EXEEXT): $(test_frobenius_OBJECTS) $(test_frobenius_DEPENDENCIES)
+test-frobenius$(EXEEXT): $(test_frobenius_OBJECTS) $(test_frobenius_DEPENDENCIES) $(EXTRA_test_frobenius_DEPENDENCIES)
@rm -f test-frobenius$(EXEEXT)
$(CXXLINK) $(test_frobenius_OBJECTS) $(test_frobenius_LDADD) $(LIBS)
-test-ftrmm$(EXEEXT): $(test_ftrmm_OBJECTS) $(test_ftrmm_DEPENDENCIES)
+test-ftrmm$(EXEEXT): $(test_ftrmm_OBJECTS) $(test_ftrmm_DEPENDENCIES) $(EXTRA_test_ftrmm_DEPENDENCIES)
@rm -f test-ftrmm$(EXEEXT)
$(CXXLINK) $(test_ftrmm_OBJECTS) $(test_ftrmm_LDADD) $(LIBS)
-test-getentry$(EXEEXT): $(test_getentry_OBJECTS) $(test_getentry_DEPENDENCIES)
+test-getentry$(EXEEXT): $(test_getentry_OBJECTS) $(test_getentry_DEPENDENCIES) $(EXTRA_test_getentry_DEPENDENCIES)
@rm -f test-getentry$(EXEEXT)
$(CXXLINK) $(test_getentry_OBJECTS) $(test_getentry_LDADD) $(LIBS)
-test-gf2$(EXEEXT): $(test_gf2_OBJECTS) $(test_gf2_DEPENDENCIES)
+test-gf2$(EXEEXT): $(test_gf2_OBJECTS) $(test_gf2_DEPENDENCIES) $(EXTRA_test_gf2_DEPENDENCIES)
@rm -f test-gf2$(EXEEXT)
$(CXXLINK) $(test_gf2_OBJECTS) $(test_gf2_LDADD) $(LIBS)
-test-givaro-zpz$(EXEEXT): $(test_givaro_zpz_OBJECTS) $(test_givaro_zpz_DEPENDENCIES)
- @rm -f test-givaro-zpz$(EXEEXT)
- $(CXXLINK) $(test_givaro_zpz_OBJECTS) $(test_givaro_zpz_LDADD) $(LIBS)
-test-givaro-zpzuns$(EXEEXT): $(test_givaro_zpzuns_OBJECTS) $(test_givaro_zpzuns_DEPENDENCIES)
- @rm -f test-givaro-zpzuns$(EXEEXT)
- $(CXXLINK) $(test_givaro_zpzuns_OBJECTS) $(test_givaro_zpzuns_LDADD) $(LIBS)
-test-gmp-rational$(EXEEXT): $(test_gmp_rational_OBJECTS) $(test_gmp_rational_DEPENDENCIES)
+test-givaro-fields$(EXEEXT): $(test_givaro_fields_OBJECTS) $(test_givaro_fields_DEPENDENCIES) $(EXTRA_test_givaro_fields_DEPENDENCIES)
+ @rm -f test-givaro-fields$(EXEEXT)
+ $(CXXLINK) $(test_givaro_fields_OBJECTS) $(test_givaro_fields_LDADD) $(LIBS)
+test-gmp-rational$(EXEEXT): $(test_gmp_rational_OBJECTS) $(test_gmp_rational_DEPENDENCIES) $(EXTRA_test_gmp_rational_DEPENDENCIES)
@rm -f test-gmp-rational$(EXEEXT)
$(CXXLINK) $(test_gmp_rational_OBJECTS) $(test_gmp_rational_LDADD) $(LIBS)
-test-hilbert$(EXEEXT): $(test_hilbert_OBJECTS) $(test_hilbert_DEPENDENCIES)
+test-hilbert$(EXEEXT): $(test_hilbert_OBJECTS) $(test_hilbert_DEPENDENCIES) $(EXTRA_test_hilbert_DEPENDENCIES)
@rm -f test-hilbert$(EXEEXT)
$(CXXLINK) $(test_hilbert_OBJECTS) $(test_hilbert_LDADD) $(LIBS)
-test-hom$(EXEEXT): $(test_hom_OBJECTS) $(test_hom_DEPENDENCIES)
+test-hom$(EXEEXT): $(test_hom_OBJECTS) $(test_hom_DEPENDENCIES) $(EXTRA_test_hom_DEPENDENCIES)
@rm -f test-hom$(EXEEXT)
$(CXXLINK) $(test_hom_OBJECTS) $(test_hom_LDADD) $(LIBS)
-test-inverse$(EXEEXT): $(test_inverse_OBJECTS) $(test_inverse_DEPENDENCIES)
+test-inverse$(EXEEXT): $(test_inverse_OBJECTS) $(test_inverse_DEPENDENCIES) $(EXTRA_test_inverse_DEPENDENCIES)
@rm -f test-inverse$(EXEEXT)
$(CXXLINK) $(test_inverse_OBJECTS) $(test_inverse_LDADD) $(LIBS)
-test-isposdef$(EXEEXT): $(test_isposdef_OBJECTS) $(test_isposdef_DEPENDENCIES)
+test-isposdef$(EXEEXT): $(test_isposdef_OBJECTS) $(test_isposdef_DEPENDENCIES) $(EXTRA_test_isposdef_DEPENDENCIES)
@rm -f test-isposdef$(EXEEXT)
$(CXXLINK) $(test_isposdef_OBJECTS) $(test_isposdef_LDADD) $(LIBS)
-test-ispossemidef$(EXEEXT): $(test_ispossemidef_OBJECTS) $(test_ispossemidef_DEPENDENCIES)
+test-ispossemidef$(EXEEXT): $(test_ispossemidef_OBJECTS) $(test_ispossemidef_DEPENDENCIES) $(EXTRA_test_ispossemidef_DEPENDENCIES)
@rm -f test-ispossemidef$(EXEEXT)
$(CXXLINK) $(test_ispossemidef_OBJECTS) $(test_ispossemidef_LDADD) $(LIBS)
-test-la-block-lanczos$(EXEEXT): $(test_la_block_lanczos_OBJECTS) $(test_la_block_lanczos_DEPENDENCIES)
+test-la-block-lanczos$(EXEEXT): $(test_la_block_lanczos_OBJECTS) $(test_la_block_lanczos_DEPENDENCIES) $(EXTRA_test_la_block_lanczos_DEPENDENCIES)
@rm -f test-la-block-lanczos$(EXEEXT)
$(CXXLINK) $(test_la_block_lanczos_OBJECTS) $(test_la_block_lanczos_LDADD) $(LIBS)
-test-last-invariant-factor$(EXEEXT): $(test_last_invariant_factor_OBJECTS) $(test_last_invariant_factor_DEPENDENCIES)
+test-last-invariant-factor$(EXEEXT): $(test_last_invariant_factor_OBJECTS) $(test_last_invariant_factor_DEPENDENCIES) $(EXTRA_test_last_invariant_factor_DEPENDENCIES)
@rm -f test-last-invariant-factor$(EXEEXT)
$(CXXLINK) $(test_last_invariant_factor_OBJECTS) $(test_last_invariant_factor_LDADD) $(LIBS)
-test-lidia-gfq$(EXEEXT): $(test_lidia_gfq_OBJECTS) $(test_lidia_gfq_DEPENDENCIES)
+test-lidia-gfq$(EXEEXT): $(test_lidia_gfq_OBJECTS) $(test_lidia_gfq_DEPENDENCIES) $(EXTRA_test_lidia_gfq_DEPENDENCIES)
@rm -f test-lidia-gfq$(EXEEXT)
$(CXXLINK) $(test_lidia_gfq_OBJECTS) $(test_lidia_gfq_LDADD) $(LIBS)
-test-matrix-domain$(EXEEXT): $(test_matrix_domain_OBJECTS) $(test_matrix_domain_DEPENDENCIES)
+test-matrix-domain$(EXEEXT): $(test_matrix_domain_OBJECTS) $(test_matrix_domain_DEPENDENCIES) $(EXTRA_test_matrix_domain_DEPENDENCIES)
@rm -f test-matrix-domain$(EXEEXT)
$(CXXLINK) $(test_matrix_domain_OBJECTS) $(test_matrix_domain_LDADD) $(LIBS)
-test-matrix-stream$(EXEEXT): $(test_matrix_stream_OBJECTS) $(test_matrix_stream_DEPENDENCIES)
+test-matrix-stream$(EXEEXT): $(test_matrix_stream_OBJECTS) $(test_matrix_stream_DEPENDENCIES) $(EXTRA_test_matrix_stream_DEPENDENCIES)
@rm -f test-matrix-stream$(EXEEXT)
$(CXXLINK) $(test_matrix_stream_OBJECTS) $(test_matrix_stream_LDADD) $(LIBS)
-test-mg-block-lanczos$(EXEEXT): $(test_mg_block_lanczos_OBJECTS) $(test_mg_block_lanczos_DEPENDENCIES)
+test-mg-block-lanczos$(EXEEXT): $(test_mg_block_lanczos_OBJECTS) $(test_mg_block_lanczos_DEPENDENCIES) $(EXTRA_test_mg_block_lanczos_DEPENDENCIES)
@rm -f test-mg-block-lanczos$(EXEEXT)
$(CXXLINK) $(test_mg_block_lanczos_OBJECTS) $(test_mg_block_lanczos_LDADD) $(LIBS)
-test-minpoly$(EXEEXT): $(test_minpoly_OBJECTS) $(test_minpoly_DEPENDENCIES)
+test-minpoly$(EXEEXT): $(test_minpoly_OBJECTS) $(test_minpoly_DEPENDENCIES) $(EXTRA_test_minpoly_DEPENDENCIES)
@rm -f test-minpoly$(EXEEXT)
$(CXXLINK) $(test_minpoly_OBJECTS) $(test_minpoly_LDADD) $(LIBS)
-test-modular$(EXEEXT): $(test_modular_OBJECTS) $(test_modular_DEPENDENCIES)
+test-modular$(EXEEXT): $(test_modular_OBJECTS) $(test_modular_DEPENDENCIES) $(EXTRA_test_modular_DEPENDENCIES)
@rm -f test-modular$(EXEEXT)
$(CXXLINK) $(test_modular_OBJECTS) $(test_modular_LDADD) $(LIBS)
-test-modular-balanced-double$(EXEEXT): $(test_modular_balanced_double_OBJECTS) $(test_modular_balanced_double_DEPENDENCIES)
+test-modular-balanced-double$(EXEEXT): $(test_modular_balanced_double_OBJECTS) $(test_modular_balanced_double_DEPENDENCIES) $(EXTRA_test_modular_balanced_double_DEPENDENCIES)
@rm -f test-modular-balanced-double$(EXEEXT)
$(CXXLINK) $(test_modular_balanced_double_OBJECTS) $(test_modular_balanced_double_LDADD) $(LIBS)
-test-modular-balanced-float$(EXEEXT): $(test_modular_balanced_float_OBJECTS) $(test_modular_balanced_float_DEPENDENCIES)
+test-modular-balanced-float$(EXEEXT): $(test_modular_balanced_float_OBJECTS) $(test_modular_balanced_float_DEPENDENCIES) $(EXTRA_test_modular_balanced_float_DEPENDENCIES)
@rm -f test-modular-balanced-float$(EXEEXT)
$(CXXLINK) $(test_modular_balanced_float_OBJECTS) $(test_modular_balanced_float_LDADD) $(LIBS)
-test-modular-balanced-int$(EXEEXT): $(test_modular_balanced_int_OBJECTS) $(test_modular_balanced_int_DEPENDENCIES)
+test-modular-balanced-int$(EXEEXT): $(test_modular_balanced_int_OBJECTS) $(test_modular_balanced_int_DEPENDENCIES) $(EXTRA_test_modular_balanced_int_DEPENDENCIES)
@rm -f test-modular-balanced-int$(EXEEXT)
$(CXXLINK) $(test_modular_balanced_int_OBJECTS) $(test_modular_balanced_int_LDADD) $(LIBS)
-test-modular-byte$(EXEEXT): $(test_modular_byte_OBJECTS) $(test_modular_byte_DEPENDENCIES)
+test-modular-byte$(EXEEXT): $(test_modular_byte_OBJECTS) $(test_modular_byte_DEPENDENCIES) $(EXTRA_test_modular_byte_DEPENDENCIES)
@rm -f test-modular-byte$(EXEEXT)
$(CXXLINK) $(test_modular_byte_OBJECTS) $(test_modular_byte_LDADD) $(LIBS)
-test-modular-double$(EXEEXT): $(test_modular_double_OBJECTS) $(test_modular_double_DEPENDENCIES)
+test-modular-double$(EXEEXT): $(test_modular_double_OBJECTS) $(test_modular_double_DEPENDENCIES) $(EXTRA_test_modular_double_DEPENDENCIES)
@rm -f test-modular-double$(EXEEXT)
$(CXXLINK) $(test_modular_double_OBJECTS) $(test_modular_double_LDADD) $(LIBS)
-test-modular-float$(EXEEXT): $(test_modular_float_OBJECTS) $(test_modular_float_DEPENDENCIES)
+test-modular-float$(EXEEXT): $(test_modular_float_OBJECTS) $(test_modular_float_DEPENDENCIES) $(EXTRA_test_modular_float_DEPENDENCIES)
@rm -f test-modular-float$(EXEEXT)
$(CXXLINK) $(test_modular_float_OBJECTS) $(test_modular_float_LDADD) $(LIBS)
-test-modular-int$(EXEEXT): $(test_modular_int_OBJECTS) $(test_modular_int_DEPENDENCIES)
+test-modular-int$(EXEEXT): $(test_modular_int_OBJECTS) $(test_modular_int_DEPENDENCIES) $(EXTRA_test_modular_int_DEPENDENCIES)
@rm -f test-modular-int$(EXEEXT)
$(CXXLINK) $(test_modular_int_OBJECTS) $(test_modular_int_LDADD) $(LIBS)
-test-modular-short$(EXEEXT): $(test_modular_short_OBJECTS) $(test_modular_short_DEPENDENCIES)
+test-modular-short$(EXEEXT): $(test_modular_short_OBJECTS) $(test_modular_short_DEPENDENCIES) $(EXTRA_test_modular_short_DEPENDENCIES)
@rm -f test-modular-short$(EXEEXT)
$(CXXLINK) $(test_modular_short_OBJECTS) $(test_modular_short_LDADD) $(LIBS)
-test-moore-penrose$(EXEEXT): $(test_moore_penrose_OBJECTS) $(test_moore_penrose_DEPENDENCIES)
+test-moore-penrose$(EXEEXT): $(test_moore_penrose_OBJECTS) $(test_moore_penrose_DEPENDENCIES) $(EXTRA_test_moore_penrose_DEPENDENCIES)
@rm -f test-moore-penrose$(EXEEXT)
$(CXXLINK) $(test_moore_penrose_OBJECTS) $(test_moore_penrose_LDADD) $(LIBS)
-test-ntl-RR$(EXEEXT): $(test_ntl_RR_OBJECTS) $(test_ntl_RR_DEPENDENCIES)
+test-ntl-RR$(EXEEXT): $(test_ntl_RR_OBJECTS) $(test_ntl_RR_DEPENDENCIES) $(EXTRA_test_ntl_RR_DEPENDENCIES)
@rm -f test-ntl-RR$(EXEEXT)
$(CXXLINK) $(test_ntl_RR_OBJECTS) $(test_ntl_RR_LDADD) $(LIBS)
-test-ntl-ZZ_p$(EXEEXT): $(test_ntl_ZZ_p_OBJECTS) $(test_ntl_ZZ_p_DEPENDENCIES)
+test-ntl-ZZ_p$(EXEEXT): $(test_ntl_ZZ_p_OBJECTS) $(test_ntl_ZZ_p_DEPENDENCIES) $(EXTRA_test_ntl_ZZ_p_DEPENDENCIES)
@rm -f test-ntl-ZZ_p$(EXEEXT)
$(CXXLINK) $(test_ntl_ZZ_p_OBJECTS) $(test_ntl_ZZ_p_LDADD) $(LIBS)
-test-ntl-hankel$(EXEEXT): $(test_ntl_hankel_OBJECTS) $(test_ntl_hankel_DEPENDENCIES)
+test-ntl-hankel$(EXEEXT): $(test_ntl_hankel_OBJECTS) $(test_ntl_hankel_DEPENDENCIES) $(EXTRA_test_ntl_hankel_DEPENDENCIES)
@rm -f test-ntl-hankel$(EXEEXT)
$(CXXLINK) $(test_ntl_hankel_OBJECTS) $(test_ntl_hankel_LDADD) $(LIBS)
-test-ntl-lzz_p$(EXEEXT): $(test_ntl_lzz_p_OBJECTS) $(test_ntl_lzz_p_DEPENDENCIES)
+test-ntl-lzz_p$(EXEEXT): $(test_ntl_lzz_p_OBJECTS) $(test_ntl_lzz_p_DEPENDENCIES) $(EXTRA_test_ntl_lzz_p_DEPENDENCIES)
@rm -f test-ntl-lzz_p$(EXEEXT)
$(CXXLINK) $(test_ntl_lzz_p_OBJECTS) $(test_ntl_lzz_p_LDADD) $(LIBS)
-test-ntl-sylvester$(EXEEXT): $(test_ntl_sylvester_OBJECTS) $(test_ntl_sylvester_DEPENDENCIES)
+test-ntl-sylvester$(EXEEXT): $(test_ntl_sylvester_OBJECTS) $(test_ntl_sylvester_DEPENDENCIES) $(EXTRA_test_ntl_sylvester_DEPENDENCIES)
@rm -f test-ntl-sylvester$(EXEEXT)
$(CXXLINK) $(test_ntl_sylvester_OBJECTS) $(test_ntl_sylvester_LDADD) $(LIBS)
-test-ntl-toeplitz$(EXEEXT): $(test_ntl_toeplitz_OBJECTS) $(test_ntl_toeplitz_DEPENDENCIES)
+test-ntl-toeplitz$(EXEEXT): $(test_ntl_toeplitz_OBJECTS) $(test_ntl_toeplitz_DEPENDENCIES) $(EXTRA_test_ntl_toeplitz_DEPENDENCIES)
@rm -f test-ntl-toeplitz$(EXEEXT)
$(CXXLINK) $(test_ntl_toeplitz_OBJECTS) $(test_ntl_toeplitz_LDADD) $(LIBS)
-test-nullspace$(EXEEXT): $(test_nullspace_OBJECTS) $(test_nullspace_DEPENDENCIES)
+test-nullspace$(EXEEXT): $(test_nullspace_OBJECTS) $(test_nullspace_DEPENDENCIES) $(EXTRA_test_nullspace_DEPENDENCIES)
@rm -f test-nullspace$(EXEEXT)
$(CXXLINK) $(test_nullspace_OBJECTS) $(test_nullspace_LDADD) $(LIBS)
-test-optimization$(EXEEXT): $(test_optimization_OBJECTS) $(test_optimization_DEPENDENCIES)
+test-optimization$(EXEEXT): $(test_optimization_OBJECTS) $(test_optimization_DEPENDENCIES) $(EXTRA_test_optimization_DEPENDENCIES)
@rm -f test-optimization$(EXEEXT)
$(CXXLINK) $(test_optimization_OBJECTS) $(test_optimization_LDADD) $(LIBS)
-test-param-fuzzy$(EXEEXT): $(test_param_fuzzy_OBJECTS) $(test_param_fuzzy_DEPENDENCIES)
+test-param-fuzzy$(EXEEXT): $(test_param_fuzzy_OBJECTS) $(test_param_fuzzy_DEPENDENCIES) $(EXTRA_test_param_fuzzy_DEPENDENCIES)
@rm -f test-param-fuzzy$(EXEEXT)
$(CXXLINK) $(test_param_fuzzy_OBJECTS) $(test_param_fuzzy_LDADD) $(LIBS)
-test-qlup$(EXEEXT): $(test_qlup_OBJECTS) $(test_qlup_DEPENDENCIES)
+test-qlup$(EXEEXT): $(test_qlup_OBJECTS) $(test_qlup_DEPENDENCIES) $(EXTRA_test_qlup_DEPENDENCIES)
@rm -f test-qlup$(EXEEXT)
$(CXXLINK) $(test_qlup_OBJECTS) $(test_qlup_LDADD) $(LIBS)
-test-randiter-nonzero$(EXEEXT): $(test_randiter_nonzero_OBJECTS) $(test_randiter_nonzero_DEPENDENCIES)
+test-randiter-nonzero$(EXEEXT): $(test_randiter_nonzero_OBJECTS) $(test_randiter_nonzero_DEPENDENCIES) $(EXTRA_test_randiter_nonzero_DEPENDENCIES)
@rm -f test-randiter-nonzero$(EXEEXT)
$(CXXLINK) $(test_randiter_nonzero_OBJECTS) $(test_randiter_nonzero_LDADD) $(LIBS)
-test-rank$(EXEEXT): $(test_rank_OBJECTS) $(test_rank_DEPENDENCIES)
+test-rank$(EXEEXT): $(test_rank_OBJECTS) $(test_rank_DEPENDENCIES) $(EXTRA_test_rank_DEPENDENCIES)
@rm -f test-rank$(EXEEXT)
$(CXXLINK) $(test_rank_OBJECTS) $(test_rank_LDADD) $(LIBS)
-test-rat-charpoly$(EXEEXT): $(test_rat_charpoly_OBJECTS) $(test_rat_charpoly_DEPENDENCIES)
+test-rat-charpoly$(EXEEXT): $(test_rat_charpoly_OBJECTS) $(test_rat_charpoly_DEPENDENCIES) $(EXTRA_test_rat_charpoly_DEPENDENCIES)
@rm -f test-rat-charpoly$(EXEEXT)
$(CXXLINK) $(test_rat_charpoly_OBJECTS) $(test_rat_charpoly_LDADD) $(LIBS)
-test-rat-minpoly$(EXEEXT): $(test_rat_minpoly_OBJECTS) $(test_rat_minpoly_DEPENDENCIES)
+test-rat-minpoly$(EXEEXT): $(test_rat_minpoly_OBJECTS) $(test_rat_minpoly_DEPENDENCIES) $(EXTRA_test_rat_minpoly_DEPENDENCIES)
@rm -f test-rat-minpoly$(EXEEXT)
$(CXXLINK) $(test_rat_minpoly_OBJECTS) $(test_rat_minpoly_LDADD) $(LIBS)
-test-rat-solve$(EXEEXT): $(test_rat_solve_OBJECTS) $(test_rat_solve_DEPENDENCIES)
+test-rat-solve$(EXEEXT): $(test_rat_solve_OBJECTS) $(test_rat_solve_DEPENDENCIES) $(EXTRA_test_rat_solve_DEPENDENCIES)
@rm -f test-rat-solve$(EXEEXT)
$(CXXLINK) $(test_rat_solve_OBJECTS) $(test_rat_solve_LDADD) $(LIBS)
-test-rational-matrix-factory$(EXEEXT): $(test_rational_matrix_factory_OBJECTS) $(test_rational_matrix_factory_DEPENDENCIES)
+test-rational-matrix-factory$(EXEEXT): $(test_rational_matrix_factory_OBJECTS) $(test_rational_matrix_factory_DEPENDENCIES) $(EXTRA_test_rational_matrix_factory_DEPENDENCIES)
@rm -f test-rational-matrix-factory$(EXEEXT)
$(CXXLINK) $(test_rational_matrix_factory_OBJECTS) $(test_rational_matrix_factory_LDADD) $(LIBS)
-test-rational-reconstruction-base$(EXEEXT): $(test_rational_reconstruction_base_OBJECTS) $(test_rational_reconstruction_base_DEPENDENCIES)
+test-rational-reconstruction-base$(EXEEXT): $(test_rational_reconstruction_base_OBJECTS) $(test_rational_reconstruction_base_DEPENDENCIES) $(EXTRA_test_rational_reconstruction_base_DEPENDENCIES)
@rm -f test-rational-reconstruction-base$(EXEEXT)
$(CXXLINK) $(test_rational_reconstruction_base_OBJECTS) $(test_rational_reconstruction_base_LDADD) $(LIBS)
-test-rational-solver$(EXEEXT): $(test_rational_solver_OBJECTS) $(test_rational_solver_DEPENDENCIES)
+test-rational-solver$(EXEEXT): $(test_rational_solver_OBJECTS) $(test_rational_solver_DEPENDENCIES) $(EXTRA_test_rational_solver_DEPENDENCIES)
@rm -f test-rational-solver$(EXEEXT)
$(CXXLINK) $(test_rational_solver_OBJECTS) $(test_rational_solver_LDADD) $(LIBS)
-test-rational-solver-adaptive$(EXEEXT): $(test_rational_solver_adaptive_OBJECTS) $(test_rational_solver_adaptive_DEPENDENCIES)
+test-rational-solver-adaptive$(EXEEXT): $(test_rational_solver_adaptive_OBJECTS) $(test_rational_solver_adaptive_DEPENDENCIES) $(EXTRA_test_rational_solver_adaptive_DEPENDENCIES)
@rm -f test-rational-solver-adaptive$(EXEEXT)
$(CXXLINK) $(test_rational_solver_adaptive_OBJECTS) $(test_rational_solver_adaptive_LDADD) $(LIBS)
-test-scalar-matrix$(EXEEXT): $(test_scalar_matrix_OBJECTS) $(test_scalar_matrix_DEPENDENCIES)
+test-scalar-matrix$(EXEEXT): $(test_scalar_matrix_OBJECTS) $(test_scalar_matrix_DEPENDENCIES) $(EXTRA_test_scalar_matrix_DEPENDENCIES)
@rm -f test-scalar-matrix$(EXEEXT)
$(CXXLINK) $(test_scalar_matrix_OBJECTS) $(test_scalar_matrix_LDADD) $(LIBS)
-test-smith-form$(EXEEXT): $(test_smith_form_OBJECTS) $(test_smith_form_DEPENDENCIES)
+test-smith-form$(EXEEXT): $(test_smith_form_OBJECTS) $(test_smith_form_DEPENDENCIES) $(EXTRA_test_smith_form_DEPENDENCIES)
@rm -f test-smith-form$(EXEEXT)
$(CXXLINK) $(test_smith_form_OBJECTS) $(test_smith_form_LDADD) $(LIBS)
-test-smith-form-adaptive$(EXEEXT): $(test_smith_form_adaptive_OBJECTS) $(test_smith_form_adaptive_DEPENDENCIES)
+test-smith-form-adaptive$(EXEEXT): $(test_smith_form_adaptive_OBJECTS) $(test_smith_form_adaptive_DEPENDENCIES) $(EXTRA_test_smith_form_adaptive_DEPENDENCIES)
@rm -f test-smith-form-adaptive$(EXEEXT)
$(CXXLINK) $(test_smith_form_adaptive_OBJECTS) $(test_smith_form_adaptive_LDADD) $(LIBS)
-test-smith-form-binary$(EXEEXT): $(test_smith_form_binary_OBJECTS) $(test_smith_form_binary_DEPENDENCIES)
+test-smith-form-binary$(EXEEXT): $(test_smith_form_binary_OBJECTS) $(test_smith_form_binary_DEPENDENCIES) $(EXTRA_test_smith_form_binary_DEPENDENCIES)
@rm -f test-smith-form-binary$(EXEEXT)
$(CXXLINK) $(test_smith_form_binary_OBJECTS) $(test_smith_form_binary_LDADD) $(LIBS)
-test-smith-form-iliopoulos$(EXEEXT): $(test_smith_form_iliopoulos_OBJECTS) $(test_smith_form_iliopoulos_DEPENDENCIES)
+test-smith-form-iliopoulos$(EXEEXT): $(test_smith_form_iliopoulos_OBJECTS) $(test_smith_form_iliopoulos_DEPENDENCIES) $(EXTRA_test_smith_form_iliopoulos_DEPENDENCIES)
@rm -f test-smith-form-iliopoulos$(EXEEXT)
$(CXXLINK) $(test_smith_form_iliopoulos_OBJECTS) $(test_smith_form_iliopoulos_LDADD) $(LIBS)
-test-smith-form-local$(EXEEXT): $(test_smith_form_local_OBJECTS) $(test_smith_form_local_DEPENDENCIES)
+test-smith-form-local$(EXEEXT): $(test_smith_form_local_OBJECTS) $(test_smith_form_local_DEPENDENCIES) $(EXTRA_test_smith_form_local_DEPENDENCIES)
@rm -f test-smith-form-local$(EXEEXT)
$(CXXLINK) $(test_smith_form_local_OBJECTS) $(test_smith_form_local_LDADD) $(LIBS)
-test-solve$(EXEEXT): $(test_solve_OBJECTS) $(test_solve_DEPENDENCIES)
+test-solve$(EXEEXT): $(test_solve_OBJECTS) $(test_solve_DEPENDENCIES) $(EXTRA_test_solve_DEPENDENCIES)
@rm -f test-solve$(EXEEXT)
$(CXXLINK) $(test_solve_OBJECTS) $(test_solve_LDADD) $(LIBS)
-test-solve-nonsingular$(EXEEXT): $(test_solve_nonsingular_OBJECTS) $(test_solve_nonsingular_DEPENDENCIES)
+test-solve-nonsingular$(EXEEXT): $(test_solve_nonsingular_OBJECTS) $(test_solve_nonsingular_DEPENDENCIES) $(EXTRA_test_solve_nonsingular_DEPENDENCIES)
@rm -f test-solve-nonsingular$(EXEEXT)
$(CXXLINK) $(test_solve_nonsingular_OBJECTS) $(test_solve_nonsingular_LDADD) $(LIBS)
-test-sparse$(EXEEXT): $(test_sparse_OBJECTS) $(test_sparse_DEPENDENCIES)
+test-sparse$(EXEEXT): $(test_sparse_OBJECTS) $(test_sparse_DEPENDENCIES) $(EXTRA_test_sparse_DEPENDENCIES)
@rm -f test-sparse$(EXEEXT)
$(CXXLINK) $(test_sparse_OBJECTS) $(test_sparse_LDADD) $(LIBS)
-test-subiterator$(EXEEXT): $(test_subiterator_OBJECTS) $(test_subiterator_DEPENDENCIES)
+test-subiterator$(EXEEXT): $(test_subiterator_OBJECTS) $(test_subiterator_DEPENDENCIES) $(EXTRA_test_subiterator_DEPENDENCIES)
@rm -f test-subiterator$(EXEEXT)
$(CXXLINK) $(test_subiterator_OBJECTS) $(test_subiterator_LDADD) $(LIBS)
-test-submatrix$(EXEEXT): $(test_submatrix_OBJECTS) $(test_submatrix_DEPENDENCIES)
+test-submatrix$(EXEEXT): $(test_submatrix_OBJECTS) $(test_submatrix_DEPENDENCIES) $(EXTRA_test_submatrix_DEPENDENCIES)
@rm -f test-submatrix$(EXEEXT)
$(CXXLINK) $(test_submatrix_OBJECTS) $(test_submatrix_LDADD) $(LIBS)
-test-subvector$(EXEEXT): $(test_subvector_OBJECTS) $(test_subvector_DEPENDENCIES)
+test-subvector$(EXEEXT): $(test_subvector_OBJECTS) $(test_subvector_DEPENDENCIES) $(EXTRA_test_subvector_DEPENDENCIES)
@rm -f test-subvector$(EXEEXT)
$(CXXLINK) $(test_subvector_OBJECTS) $(test_subvector_LDADD) $(LIBS)
-test-sum$(EXEEXT): $(test_sum_OBJECTS) $(test_sum_DEPENDENCIES)
+test-sum$(EXEEXT): $(test_sum_OBJECTS) $(test_sum_DEPENDENCIES) $(EXTRA_test_sum_DEPENDENCIES)
@rm -f test-sum$(EXEEXT)
$(CXXLINK) $(test_sum_OBJECTS) $(test_sum_LDADD) $(LIBS)
-test-toeplitz-det$(EXEEXT): $(test_toeplitz_det_OBJECTS) $(test_toeplitz_det_DEPENDENCIES)
+test-toeplitz-det$(EXEEXT): $(test_toeplitz_det_OBJECTS) $(test_toeplitz_det_DEPENDENCIES) $(EXTRA_test_toeplitz_det_DEPENDENCIES)
@rm -f test-toeplitz-det$(EXEEXT)
$(CXXLINK) $(test_toeplitz_det_OBJECTS) $(test_toeplitz_det_LDADD) $(LIBS)
-test-trace$(EXEEXT): $(test_trace_OBJECTS) $(test_trace_DEPENDENCIES)
+test-trace$(EXEEXT): $(test_trace_OBJECTS) $(test_trace_DEPENDENCIES) $(EXTRA_test_trace_DEPENDENCIES)
@rm -f test-trace$(EXEEXT)
$(CXXLINK) $(test_trace_OBJECTS) $(test_trace_LDADD) $(LIBS)
-test-triplesbb$(EXEEXT): $(test_triplesbb_OBJECTS) $(test_triplesbb_DEPENDENCIES)
+test-triplesbb$(EXEEXT): $(test_triplesbb_OBJECTS) $(test_triplesbb_DEPENDENCIES) $(EXTRA_test_triplesbb_DEPENDENCIES)
@rm -f test-triplesbb$(EXEEXT)
$(CXXLINK) $(test_triplesbb_OBJECTS) $(test_triplesbb_LDADD) $(LIBS)
-test-unparametric-field$(EXEEXT): $(test_unparametric_field_OBJECTS) $(test_unparametric_field_DEPENDENCIES)
+test-unparametric-field$(EXEEXT): $(test_unparametric_field_OBJECTS) $(test_unparametric_field_DEPENDENCIES) $(EXTRA_test_unparametric_field_DEPENDENCIES)
@rm -f test-unparametric-field$(EXEEXT)
$(CXXLINK) $(test_unparametric_field_OBJECTS) $(test_unparametric_field_LDADD) $(LIBS)
-test-vector-domain$(EXEEXT): $(test_vector_domain_OBJECTS) $(test_vector_domain_DEPENDENCIES)
+test-vector-domain$(EXEEXT): $(test_vector_domain_OBJECTS) $(test_vector_domain_DEPENDENCIES) $(EXTRA_test_vector_domain_DEPENDENCIES)
@rm -f test-vector-domain$(EXEEXT)
$(CXXLINK) $(test_vector_domain_OBJECTS) $(test_vector_domain_LDADD) $(LIBS)
-test-zero-one$(EXEEXT): $(test_zero_one_OBJECTS) $(test_zero_one_DEPENDENCIES)
+test-zero-one$(EXEEXT): $(test_zero_one_OBJECTS) $(test_zero_one_DEPENDENCIES) $(EXTRA_test_zero_one_DEPENDENCIES)
@rm -f test-zero-one$(EXEEXT)
$(CXXLINK) $(test_zero_one_OBJECTS) $(test_zero_one_LDADD) $(LIBS)
-test-zo$(EXEEXT): $(test_zo_OBJECTS) $(test_zo_DEPENDENCIES)
+test-zo$(EXEEXT): $(test_zo_OBJECTS) $(test_zo_DEPENDENCIES) $(EXTRA_test_zo_DEPENDENCIES)
@rm -f test-zo$(EXEEXT)
$(CXXLINK) $(test_zo_OBJECTS) $(test_zo_LDADD) $(LIBS)
@@ -1871,7 +2182,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -1905,16 +2216,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -1929,7 +2240,7 @@ tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -1941,7 +2252,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1950,29 +2261,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1981,6 +2297,7 @@ check-TESTS: $(TESTS)
@failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
+ $(am__tty_colors); \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
@@ -1992,10 +2309,10 @@ check-TESTS: $(TESTS)
*[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
+ col=$$red; res=XPASS; \
;; \
*) \
- echo "PASS: $$tst"; \
+ col=$$grn; res=PASS; \
;; \
esac; \
elif test $$? -ne 77; then \
@@ -2003,17 +2320,18 @@ check-TESTS: $(TESTS)
case " $(XFAIL_TESTS) " in \
*[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
+ col=$$lgn; res=XFAIL; \
;; \
*) \
failed=`expr $$failed + 1`; \
- echo "FAIL: $$tst"; \
+ col=$$red; res=FAIL; \
;; \
esac; \
else \
skip=`expr $$skip + 1`; \
- echo "SKIP: $$tst"; \
+ col=$$blu; res=SKIP; \
fi; \
+ echo "$${col}$$res$${std}: $$tst"; \
done; \
if test "$$all" -eq 1; then \
tests="test"; \
@@ -2055,11 +2373,16 @@ check-TESTS: $(TESTS)
dashes="$$report"; \
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
- echo "$$dashes"; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
- echo "$$dashes"; \
+ if test "$$failed" -eq 0; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ fi; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
test "$$failed" -eq 0; \
else :; fi
@@ -2079,29 +2402,41 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -2122,10 +2457,15 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -2133,6 +2473,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -2205,8 +2546,8 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
+ ctags-recursive install-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-TESTS check-am clean clean-generic \
@@ -2227,13 +2568,18 @@ uninstall-am:
# test_integer_tools_SOURCES = \
# test-integer-tools.C
+#check: checker
+# checker -c
+
+# for compilation of new non-enumerated tests
+%:%.C
+ $(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) $(OPTFLAGS) ${INCLUDES} $(AM_CPPFLAGS) $*.C -o $@ $(LDADD)
+
fullcheck: checker
./checker
checker: checker.C
-# %:%.C
-# $(CXX) $(OPTFLAGS) $(AM_CPPFLAGS) $(AM_CXXFLAGS) $*.C -o $* `$(GIVARO_BIN)/givaro-config --cflags` `$(FFLAFLAS_BIN)/fflasffpack-config --cflags` $(LDADD) `$(GIVARO_BIN)/givaro-config --libs` `$(FFLAFLAS_BIN)/ffasffpack-config --libs`
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/tests/benchmark-blas-domain.C b/tests/benchmark-blas-domain.C
index 13b608e..e69de29 100644
--- a/tests/benchmark-blas-domain.C
+++ b/tests/benchmark-blas-domain.C
@@ -1,1187 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-
-/* tests/test-blas-domain.C
- * Copyright (C) 2004 Pascal Giorgi
- *
- * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
- *
- * ---------------------------------------------------------
- *
- * See COPYING for license information.
- *
- *
- */
-
-/*! @file tests/benchmark-blas-domain.C
- * @ingroup tests
- * @brief no doc.
- */
-
-
- // where is this used?
-#define __MINP_CONSTRUCT
-#include "linbox/linbox-config.h"
-#include <iostream>
-#include <string>
-#include <linbox/integer.h>
-#include <linbox/matrix/dense.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/matrix/matrix-domain.h>
-#include <linbox/vector/vector-domain.h>
-#include <linbox/field/modular.h>
-#include <linbox/randiter/nonzero.h>
-#include <linbox/util/commentator.h>
-#include <linbox/algorithms/blas-domain.h>
-
-#include <vector>
-
-#include "test-common.h"
-
-using namespace LinBox;
-
-const int maxpretty = 35;
-
-string blank;
-
-const char* pretty(string a)
-{
-
- blank = " " + a;
- int msgsize= maxpretty - blank.size();
- string dot(".");
- for (int i=0;i<msgsize ;++i)
- blank+=dot;
- return blank.c_str();
-}
-
-#define mycommentator commentator
-
-template <class Field>
-static bool testMulAdd (const Field& F, size_t n, int iterations)
-{
-
- typedef typename Field::Element Element;
- typedef typename Field::RandIter RandIter;
- typedef BlasMatrix<Element> Matrix;
-
- //Commentator mycommentator (std::cout);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing muladd"),"testMulAdd",iterations);
-
- RandIter G(F);
- bool ret = true;
- BlasMatrixDomain<Field> BMD(F);
- MatrixDomain<Field> MD(F);
- VectorDomain<Field> VD(F);
-
- for (int k=0;k<iterations; ++k) {
-
- mycommentator.progress(k);
- Matrix A(n,n),B(n,n),C(n,n),D(n,n),T(n,n),R(n,n);
- std::vector<Element> x(n),y(n),z(n),t(n);
-
- Element alpha, beta,malpha,tmp;
-
-
- // Create 3 random n*n matrices
- for (size_t i=0;i<n;++i)
- for (size_t j=0;j<n;++j){
- A.setEntry(i,j,G.random(tmp));
- B.setEntry(i,j,G.random(tmp));
- C.setEntry(i,j,G.random(tmp));
- }
-
- // Create 2 random vectors
- for (size_t i=0;i<n;++i) {
- G.random(x[i]);
- G.random(y[i]);
- }
-
- // create 2 random element
- G.random(alpha);
- G.random(beta);
-
- F.neg(malpha,alpha);
-
- // compute D = -alpha.(A*C+B*C) + alpha.(A+B)*C
-
- BMD.mul(D,A,C);
- BMD.mul(T,B,C);
- MD.addin(D,T);
-
- MD.add(T,A,B);
- BMD.muladd(R,malpha,D,alpha,T,C);
-
- if (!MD.isZero(R))
- ret=false;
-
- // compute z = beta.y + alpha.A*x
-
- BMD.muladd(z,beta,y,alpha,A,x);
-
- MD.vectorMul(t,A,x);
- for (size_t i=0;i<n;++i){
- F.mulin(t[i],alpha);
- F.axpyin(t[i],beta,y[i]);
- }
-
- if (!VD.areEqual(t,z))
- ret=false;
- }
-
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testMulAdd");
-
- return ret;
-}
-
-/*
- * Testing the rank of dense matrices using BlasDomain
- * construct a n*n matrices of rank r and compute the rank
- */
-template <class Field>
-static bool testRank (const Field& F,size_t n, int iterations)
-{
-
- typedef typename Field::Element Element;
- typedef typename Field::RandIter RandIter;
-
- //Commentator mycommentator (std::cout);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing rank"),"testRank",iterations);
-
- RandIter G(F);
- NonzeroRandIter<Field> Gn(F,G);
- Element tmp;
- unsigned int r;
- bool ret = true;
- BlasMatrixDomain<Field> BMD(F);
-
- for (int k=0;k<iterations; ++k) {
-
- mycommentator.progress(k);
- BlasMatrix<Element> A(n,n),S(n,n), L(n,n);
-
- r = rand() % n;
- // create S as an upper triangular matrix with r nonzero rows
- for (size_t i=0;i<r;++i){
- S.setEntry(i,i,Gn.random(tmp));
- for (size_t j=i+1;j<n;++j)
- S.setEntry(i,j,G.random(tmp));
- }
-
- // create L as a lower triangular matrix with nonzero elements on the diagonal
- for (size_t i=0;i<n;++i){
- for (size_t j=0;j<i;++j)
- L.setEntry(i,j,G.random(tmp));
- L.setEntry(i,i,Gn.random(tmp));
- }
-
- // compute A=LS
- BMD.mul(A,L,S);
-
- // compute the rank of A
- unsigned int rank= BMD.rankin(A);
- if (rank!=r)
- ret=false;
- }
-
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testRank");
-
- return ret;
-}
-
-/*
- * Testing the determinant of dense matrices using BlasDomain
- * construct a n*n matrices of determinant d and compute the determinant
- */
-template <class Field>
-static bool testDet (const Field& F,size_t n, int iterations)
-{
-
- typedef typename Field::Element Element;
- typedef typename Field::RandIter RandIter;
-
- //Commentator mycommentator (std::cout);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing determinant"),"testDet",iterations);
-
- RandIter G(F);
- NonzeroRandIter<Field> Gn(F,G);
- Element tmp,One,d;
- F.init(One,1UL);
-
- bool ret = true;
- BlasMatrixDomain<Field> BMD(F);
-
- for (int k=0;k<iterations;++k) {
-
- mycommentator.progress(k);
-
- G.random(d);
-
- BlasMatrix<Element> A(n,n),S(n,n), L(n,n);
-
- // create S as an upper triangular matrix of full rank
- // with diagonal's element equal to 1 except the first entry wich equals to d
- for (size_t i=0;i<n;++i){
- S.setEntry(i,i,One);
- for (size_t j=i+1;j<n;++j)
- S.setEntry(i,j,G.random(tmp));
- }
- S.setEntry(0,0,d);
-
- // create L as a lower triangular matrix with only 1's on diagonal
- for (size_t i=0;i<n;++i){
- for (size_t j=0;j<i;++j)
- L.setEntry(i,j,G.random(tmp));
- L.setEntry(i,i,One);
- }
-
-
- // compute A=LS
- BMD.mul(A,L,S);
-
- // compute the determinant of A
- Element det= BMD.detin(A);
-
- if (!F.areEqual(det,d))
- ret=false;
- }
-
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testDet");
-
- return ret;
-}
-
-/*
- * Testing the inverse of dense matrices using BlasDomain
- * construct a non-singular n*n matrices
- */
-template <class Field>
-static bool testInv (const Field& F,size_t n, int iterations)
-{
-
- typedef typename Field::Element Element;
- typedef typename Field::RandIter RandIter;
- typedef BlasMatrix<Element> Matrix;
-
- //Commentator mycommentator (std::cout);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing inverse"),"testInv",iterations);
-
- RandIter G(F);
- NonzeroRandIter<Field> Gn(F,G);
- Element One,tmp;
- F.init(One,1UL);
-
- bool ret = true;
- MatrixDomain<Field> MD(F);
- BlasMatrixDomain<Field> BMD(F);
-
- Matrix Id(n,n);
- for (size_t i=0;i<n;++i)
- Id.setEntry(i,i,One);
-
- for (int k=0;k<iterations;++k) {
-
- mycommentator.progress(k);
-
-
- Matrix A(n,n),S(n,n), L(n,n), invA(n,n);
-
- // create S as an upper triangular matrix of full rank
- // with nonzero random diagonal's element
- for (size_t i=0;i<n;++i){
- S.setEntry(i,i,Gn.random(tmp));
- for (size_t j=i+1;j<n;++j)
- S.setEntry(i,j,G.random(tmp));
- }
-
- // create L as a lower triangular matrix
- // with only 1's on diagonal
- for (size_t i=0;i<n;++i){
- for (size_t j=0;j<i;++j)
- L.setEntry(i,j,G.random(tmp));
- L.setEntry(i,i,One);
- }
-
- // compute A=LS
- BMD.mul(A,L,S);
-
- // compute the inverse of A
- BMD.inv(invA,A);
-
- // compute Ainv*A and A*Ainv
- BMD.mul(L,invA,A);
- BMD.mul(S,A,invA);
-
- if (!MD.areEqual(L,Id) || !MD.areEqual(S,Id))
- ret=false;
- }
-
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testInv");
-
- return ret;
-}
-
-/*
- * Test resolution of linear system with a triangular matrix
- */
-template <class Field>
-static bool testTriangularSolve (const Field& F, size_t m, size_t n, int iterations)
-{
-
- typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix;
- typedef TriangularBlasMatrix<Element> TriangularMatrix;
- typedef typename Field::RandIter RandIter;
-
- //Commentator mycommentator (std::cout);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing triangular solver"),"testTriangularSolve",iterations);
-
- RandIter G(F);
- NonzeroRandIter<Field> Gn(F,G);
- Element One,tmp;
- F.init(One,1UL);
-
- bool ret = true;
- MatrixDomain<Field> MD(F);
- VectorDomain<Field> VD(F);
- BlasMatrixDomain<Field> BMD(F);
-
- for (int k=0;k<iterations;++k) {
-
- mycommentator.progress(k);
-
- Matrix Al(m,m),Au(m,m);
- Matrix X(m,n), B(m,n), C(m,n);
-
- std::vector<Element> b(m),x(m),c(m);
-
- // Create B a random matrix
- for (size_t i=0;i<m;++i)
- for (size_t j=0;j<m;++j)
- B.setEntry(i,j,G.random(tmp));
-
- //create random vector b
- for( size_t i=0;i<m;++i)
- F.init(b[i],G.random(tmp));
-
- // Create Au a random full rank upper triangular matrix
- for (size_t i=0;i<m;++i){
- Au.setEntry(i,i,Gn.random(tmp));
- for (size_t j=i+1;j<m;++j)
- Au.setEntry(i,j,G.random(tmp));
- }
-
- // Create Al a random full rank lower triangular matrix
- for (size_t i=0;i<m;++i){
- for (size_t j=0;j<i;++j)
- Al.setEntry(i,j,G.random(tmp));
- Al.setEntry(i,i,Gn.random(tmp));
- }
-
- // Create 2 trinagular matrix as view of matrix
- TriangularMatrix TAl(Al,BlasTag::low,BlasTag::nonunit), TAu(Au,BlasTag::up,BlasTag::nonunit);
-
- // testing solver with matrix right hand side
- BMD.left_solve(X,TAl,B);
- BMD.mul(C,Al,X);
- if (!MD.areEqual(C,B))
- ret=false;
-
- BMD.left_solve(X,TAu,B);
- BMD.mul(C,Au,X);
- if (!MD.areEqual(C,B))
- ret=false;
-
- // testing solver with matrix left hand side
- BMD.right_solve(X,TAl,B);
- BMD.mul(C,X,Al);
- if (!MD.areEqual(C,B))
- ret=false;
-
- BMD.right_solve(X,TAu,B);
- BMD.mul(C,X,Au);
- if (!MD.areEqual(C,B))
- ret=false;
-
-
- // testing solver with vector right hand side
- BMD.left_solve(x,TAl,b);
- BMD.mul(c,Al,x);
- if (!VD.areEqual(c,b))
- ret=false;
-
- BMD.left_solve(x,TAu,b);
- BMD.mul(c,Au,x);
- if (!VD.areEqual(c,b))
- ret=false;
-
- // testing solver with vector left hand side
- BMD.right_solve(x,TAl,b);
- BMD.mul(c,x,Al);
- if (!VD.areEqual(c,b))
- ret=false;
-
- BMD.right_solve(x,TAu,b);
- BMD.mul(c,x,Au);
- if (!VD.areEqual(c,b))
- ret=false;
-
- }
-
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testTriangularSolve");
-
- return ret;
-}
-
-/*
- * Test resolution of linear system with a matrix
- */
-template <class Field>
-static bool testSolve (const Field& F, size_t m, size_t n, int iterations)
-{
-
- typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix;
- typedef typename Field::RandIter RandIter;
-
- //Commentator mycommentator (std::cout);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing solver"),"testSolve",iterations);
-
- RandIter G(F);
- NonzeroRandIter<Field> Gn(F,G);
- Element One,tmp;
- F.init(One,1UL);
-
- bool ret = true;
- MatrixDomain<Field> MD(F);
- VectorDomain<Field> VD(F);
- BlasMatrixDomain<Field> BMD(F);
-
- for (int k=0;k<iterations;++k) {
-
- mycommentator.progress(k);
-
- Matrix A(m,m),L(m,m),S(m,m);
- Matrix X(m,n), B(m,n), C(m,n);
-
- std::vector<Element> b(m),x(m),c(m);
-
- // Create B a random matrix
- for (size_t i=0;i<m;++i)
- for (size_t j=0;j<n;++j)
- B.setEntry(i,j,G.random(tmp));
-
- //create a random vector b
- for( size_t i=0;i<m;++i)
- F.init(b[i],G.random(tmp));
-
-
- // create S as an upper triangular matrix of full rank
- // with nonzero random diagonal's element
- for (size_t i=0;i<m;++i){
- S.setEntry(i,i,Gn.random(tmp));
- for (size_t j=i+1;j<n;++j)
- S.setEntry(i,j,G.random(tmp));
- }
-
- // create L as a lower triangular matrix
- // with only 1's on diagonal
- for (size_t i=0;i<m;++i){
- for (size_t j=0;j<i;++j)
- L.setEntry(i,j,G.random(tmp));
- L.setEntry(i,i,One);
- }
-
- // compute A=LS
- BMD.mul(A,L,S);
-
-
- // testing solver with matrix right hand side
- BMD.left_solve(X,A,B);
- BMD.mul(C,A,X);
- if (!MD.areEqual(C,B))
- ret=false;
-
- BMD.left_solve(X,A,B);
- BMD.mul(C,A,X);
- if (!MD.areEqual(C,B))
- ret=false;
-
- // testing solver with matrix left hand side
- BMD.right_solve(X,A,B);
- BMD.mul(C,X,A);
- if (!MD.areEqual(C,B))
- ret=false;
-
- BMD.right_solve(X,A,B);
- BMD.mul(C,X,A);
- if (!MD.areEqual(C,B))
- ret=false;
-
-
- // testing solver with vector right hand side
- BMD.left_solve(x,A,b);
- BMD.mul(c,A,x);
- if (!VD.areEqual(c,b))
- ret=false;
-
- BMD.left_solve(x,A,b);
- BMD.mul(c,A,x);
- if (!VD.areEqual(c,b))
- ret=false;
-
- // testing solver with vector left hand side
- BMD.right_solve(x,A,b);
- BMD.mul(c,x,A);
- if (!VD.areEqual(c,b))
- ret=false;
-
- BMD.right_solve(x,A,b);
- BMD.mul(c,x,A);
- if (!VD.areEqual(c,b))
- ret=false;
-
- }
-
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testSolve");
-
- return ret;
-}
-
-/*
- * Test of the BlasPermutations
- */
-template <class Field>
-static bool testPermutation (const Field& F, size_t m, int iterations)
-{
-
- typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix;
- typedef typename Field::RandIter RandIter;
-
- //Commentator mycommentator (std::cout);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing permutations"),"testPermutation",iterations);
-
- RandIter G(F);
- NonzeroRandIter<Field> Gn(F,G);
- Element One,zero,tmp,tmp2;
- F.init(One,1UL);
- F.init(zero,0UL);
-
- bool ret = true;
- MatrixDomain<Field> MD(F);
- VectorDomain<Field> VD(F);
- BlasMatrixDomain<Field> BMD(F);
-
- for (int k=0;k<iterations;++k) {
-
- mycommentator.progress(k);
-
- std::vector<size_t> P(m);
-
- Field Z2(2);
- RandIter G2(Z2);
-
- for (size_t i=0; i<m; ++i){
- G.random(tmp);
- if ( Z2.isZero(G2.random(tmp2) ) )
- P[i] = i + ( (size_t) tmp % (m-i) );
- else
- P[i] = i;
- }
-
- //std::cerr<<P<<std::endl;
- Matrix A(m,m), Abis(m,m), B(m,m), C(m,m), D(m,m);
- std::vector<Element> a(m),abis(m),b(m),c(m), d(m);
- BlasPermutation<size_t> Perm(P);
-
- // Create A a random matrix
- for (size_t i=0;i<m;++i)
- for (size_t j=0;j<m;++j)
- A.setEntry(i,j,Gn.random(tmp));
- // Create a a random vector
- for (size_t i=0;i<m;++i)
- F.assign(a[i],Gn.random(tmp));
-
- /*
- * Test A.P.P^t == A
- */
-
- // B = A.P
- BMD.mul( B, A, Perm);
- // C = B.P^t
- BMD.mul( C, B, TransposedBlasMatrix<BlasPermutation<size_t> >(Perm) );
- // Test C==A
- if (!MD.areEqual(A,C))
- ret=false;
- /*
- * Test A.P^t.P == A
- */
-
- // B = A.P^t
- BMD.mul( B, A, TransposedBlasMatrix<BlasPermutation<size_t> >(Perm));
- // C = B.P
- BMD.mul( C, B, Perm );
- // Test C==A
- if (!MD.areEqual(A,C))
- ret=false;
- /*
- * Test P.P^t.A == A
- */
-
- // B = P.A
- BMD.mul( B, Perm, A);
- // C = P^t.B
- BMD.mul( C, TransposedBlasMatrix<BlasPermutation<size_t> >(Perm) , B);
- // Test C==A
- if (!MD.areEqual(A,C))
- ret=false;
- /*
- * Test P^t.P.A == A
- */
-
- // B = P^t.A
- BMD.mul( B, TransposedBlasMatrix<BlasPermutation<size_t> >(Perm), A);
- // C = P.B
- BMD.mul( C, Perm, B);
- // Test C==A
- if (!MD.areEqual(A,C))
- ret=false;
-
- /*
- * Test a.P.P^t == a
- */
-
- // b = a.P
- BMD.mul( b, a, Perm);
- // c = b.P^t
- BMD.mul( c, b, TransposedBlasMatrix<BlasPermutation<size_t> >(Perm) );
- // Test c==a
- if (!VD.areEqual(a,c))
- ret=false;
-
- /*
- * Test a.P^t.P == a
- */
-
- // b = a.P^t
- BMD.mul( b, a, TransposedBlasMatrix<BlasPermutation<size_t> >(Perm));
- // c = B.P
- BMD.mul( c, b, Perm );
- // Test c==a
- if (!VD.areEqual(a,c))
- ret=false;
- /*
- * Test P.P^t.a == a
- */
-
- // b = P.a
- BMD.mul( b, Perm, a);
- // c = P^t.b
- BMD.mul( c, TransposedBlasMatrix<BlasPermutation<size_t> >(Perm) , b);
- // Test c==a
- if (!VD.areEqual(a,c))
- ret=false;
-
- /*
- * Test P^t.P.a == a
- */
-
- // b = P^t.a
- BMD.mul( b, TransposedBlasMatrix<BlasPermutation<size_t> >(Perm), a);
- // c = P.b
- BMD.mul( c, Perm, b);
- // Test c==a
- if (!VD.areEqual(a,c))
- ret=false;
-
-
- /*
- * Test P^t.A.(P.A)^-1.B == B
- */
- // Create B a random matrix
- for (size_t i=0;i<m;++i)
- for (size_t j=0;j<m;++j)
- B.setEntry(i,j,G.random(tmp));
-
- // Abis = P.A
- BMD.mul( Abis, Perm, A);
- // C = (P.A)^-1.B
- BMD.left_solve( C, Abis, B);
- // D = A.C (= P^-1.B)
- BMD.mul(D, A, C);
- // D = P.D
- BMD.mulin_right( Perm,D);
- if (!MD.areEqual(D,B))
- ret=false;
- /*
- * Test A.P^t.(A.P)^-1.B == B
- */
- // Create B a random matrix
- for (size_t i=0;i<m;++i)
- for (size_t j=0;j<m;++j)
- B.setEntry(i,j,G.random(tmp));
-
- // Abis = A.P
- BMD.mul( Abis, A, Perm);
- // C = (A.P)^-1.B
- BMD.left_solve( C, Abis, B);
- // C = P.C
- BMD.mulin_right( Perm,C);
- // D = A.C (= P^-1.B)
- BMD.mul(D, A, C);
-
- if (!MD.areEqual(D,B))
- ret=false;
- /*
- * Test B.P^t.A.(P.A)^-1 == B
- */
- // Create B a random matrix
- for (size_t i=0;i<m;++i)
- for (size_t j=0;j<m;++j)
- B.setEntry(i,j,G.random(tmp));
-
- // Abis = P.A
- BMD.mul( Abis, Perm, A);
- // C = B.(P.A)^-1
- BMD.right_solve( C, Abis, B);
- // C = C.P
- BMD.mulin_left( C,Perm);
- // D = C.A (=B)
- BMD.mul(D, C, A);
- if (!MD.areEqual(D,B))
- ret=false;
-
- /*
- * Test B.A.P^t.(A.P)^-1 == B
- */
- // Create B a random matrix
- for (size_t i=0;i<m;++i)
- for (size_t j=0;j<m;++j)
- B.setEntry(i,j,G.random(tmp));
-
- // Abis = A.P
- BMD.mul( Abis, A, Perm);
- // C = B.(A.P)^-1
- BMD.right_solve( C, Abis, B);
- // D = C.A (= B.P^t)
- BMD.mul(D, C, A);
- // C = C.P
- BMD.mulin_left( D, Perm);
-
- if (!MD.areEqual(D,B))
- ret=false;
- /*
- * Test P.A.(P^t.A)^-1.B == B
- */
- // Create B a random matrix
- for (size_t i=0;i<m;++i)
- for (size_t j=0;j<m;++j)
- B.setEntry(i,j,G.random(tmp));
-
- // Abis = P^t.A
- BMD.mul( Abis, TransposedBlasMatrix<BlasPermutation<size_t> >(Perm), A);
- // C = (P^t.A)^-1.B
- BMD.left_solve( C, Abis, B);
- // D = A.C (= P.B)
- BMD.mul(D, A, C);
- // D = P^t.D
- BMD.mulin_right( TransposedBlasMatrix<BlasPermutation<size_t> >(Perm),D);
- if (!MD.areEqual(D,B))
- ret=false;
- /*
- * Test A.P.(A.P^t)^-1.B == B
- */
- // Create B a random matrix
- for (size_t i=0;i<m;++i)
- for (size_t j=0;j<m;++j)
- B.setEntry(i,j,G.random(tmp));
-
- // Abis = A.P^t
- BMD.mul( Abis, A, TransposedBlasMatrix<BlasPermutation<size_t> >(Perm));
- // C = (A.P^t)^-1.B
- BMD.left_solve( C, Abis, B);
- // C = P^t.C
- BMD.mulin_right( TransposedBlasMatrix<BlasPermutation<size_t> >(Perm),C);
- // D = A.C (= P.B)
- BMD.mul(D, A, C);
-
- if (!MD.areEqual(D,B))
- ret=false;
- /*
- * Test B.P.A.(P^t.A)^-1 == B
- */
- // Create B a random matrix
- for (size_t i=0;i<m;++i)
- for (size_t j=0;j<m;++j)
- B.setEntry(i,j,G.random(tmp));
-
- // Abis = P^t.A
- BMD.mul( Abis, TransposedBlasMatrix<BlasPermutation<size_t> >(Perm), A);
- // C = B.(P^t.A)^-1
- BMD.right_solve( C, Abis, B);
- // C = C.P^t
- BMD.mulin_left( C,TransposedBlasMatrix<BlasPermutation<size_t> >(Perm));
- // D = C.A (=B)
- BMD.mul(D, C, A);
- if (!MD.areEqual(D,B))
- ret=false;
-
- /*
- * Test B.A.P.(A.P^t)^-1 == B
- */
- // Create B a random matrix
- for (size_t i=0;i<m;++i)
- for (size_t j=0;j<m;++j)
- B.setEntry(i,j,G.random(tmp));
-
- // Abis = A.P^t
- BMD.mul( Abis, A, TransposedBlasMatrix<BlasPermutation<size_t> >(Perm));
- // C = B.(A.P^t)^-1
- BMD.right_solve( C, Abis, B);
- // D = C.A (= B.P)
- BMD.mul(D, C, A);
- // C = C.P^t
- BMD.mulin_left( D, TransposedBlasMatrix<BlasPermutation<size_t> >(Perm));
-
- if (!MD.areEqual(D,B))
- ret=false;
- }
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testPermutation");
-
- return ret;
-}
-
-/*
- * Test of the LQUPMatrix class
- */
-template <class Field>
-static bool testLQUP (const Field& F, size_t m, size_t n, int iterations)
-{
-
- typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix;
- typedef typename Field::RandIter RandIter;
-
- //Commentator mycommentator (std::cout);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing LQUP factorization"),"testLQUP",iterations);
-
- RandIter G(F);
- NonzeroRandIter<Field> Gn(F,G);
- Element One,zero,tmp;
- F.init(One,1UL);
- F.init(zero,0UL);
-
- bool ret = true;
- MatrixDomain<Field> MD(F);
- BlasMatrixDomain<Field> BMD(F);
-
- for (int k=0;k<iterations;++k) {
-
- mycommentator.progress(k);
-
- Matrix A(m,n), Abis(m,n), B(m,m), C(m,n);
-
-
- // Create B a random matrix of rank n/2
- for (size_t j=0;j<m;++j)
- if ( j % 2 )
- for (size_t i=0;i<m;++i)
- B.setEntry(i,j,G.random(tmp));
- else
- for (size_t i=0;i<m;++i)
- B.setEntry(i,j,zero);
- // Create C a random matrix of rank n/2
- for (size_t i=0;i<m;++i)
- if ( i % 2 )
- for (size_t j=0;j<n;++j)
- C.setEntry(i,j,G.random(tmp));
- else
- for (size_t j=0;j<n;++j)
- C.setEntry(i,j,zero);
-
- // A = B*C
- BMD.mul(A, B, C);
-
- Abis = A;
-
- BlasPermutation<size_t> P(A.coldim()),Q(A.rowdim());
- LQUPMatrix<Field> X(F,A,P,Q);
-
- TriangularBlasMatrix<Element> L(m,m,BlasTag::low,BlasTag::unit);
- TriangularBlasMatrix<Element> U(m,n,BlasTag::up,BlasTag::nonunit);
- X.getL(L);
- X.getU(U);
- P=X.getP();
-
- Q=X.getQ();
-
- // C = U*P
- BMD.mul( C, U, P);
- // C = Q*C
- BMD.mulin_right( Q, C);
- // A = L*C
- BMD.mul( A, L, C);
-
- if (!MD.areEqual(A,Abis))
- ret=false;
-
- // Second pass
- // A = B*C
- BMD.mul(A, B, C);
-
- Abis = A;
-
- LQUPMatrix<Field> Y(F,A,P,Q);
-
- TriangularBlasMatrix<Element> L2(m,m,BlasTag::low,BlasTag::unit);
- TriangularBlasMatrix<Element> U2(m,n,BlasTag::up,BlasTag::nonunit);
- Y.getL(L2);
- Y.getU(U2);
- P=Y.getP();
-
- Q=Y.getQ();
-
- // C = Q*U2
- BMD.mul( C,Q,U2);
- // C = Q*C
- BMD.mulin_left( C,P);
- // A = L*C
- BMD.mul( A, L2, C);
-
- if (!MD.areEqual(A,Abis))
- ret=false;
- }
-
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testLQUP");
-
- return ret;
-}
-
-template <class Field>
-static bool testMinPoly (const Field& F, size_t n, int iterations)
-{
- typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix;
- typedef typename Field::RandIter RandIter;
- typedef vector<Element> Polynomial;
-
- //Commentator mycommentator (std::cout);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing minpoly"),"testMinPoly",iterations);
- Element tmp, one, zero,mone;
- RandIter G(F);
- NonzeroRandIter<Field> Gn(F,G);
- F.init(one, 1UL);
- F.init(zero, 0UL);
- F.neg(mone, one);
- //F.neg( mone, one);
- bool ret = true;
- BlasMatrixDomain<Field> BMD(F);
-
- for (int k=0;k<iterations;++k) {
-
- mycommentator.progress(k);
-
- Matrix A(n,n);
- Polynomial P;
- // Test MinPoly(In) = X-1
- for (size_t i=0;i<n;++i)
- A.setEntry(i,i,one);
-
- BMD.minpoly( P, A );
-
- if ( P.size() !=2 )
- ret = false;
- if ( !F.areEqual(P[0], mone) )
- ret = false;
- if ( !F.areEqual(P[1], one) )
- ret = false;
-
- // Test MinPoly(a*In) = X-a
- G.random(tmp);
-
- for (size_t i=0;i<n;++i)
- A.setEntry(i,i,tmp);
- F.negin(tmp);
- BMD.minpoly( P, A );
- if ( P.size() !=2 )
- ret = false;
- if ( !F.areEqual(P[0], tmp) )
- ret = false;
- if ( !F.areEqual(P[1], one) )
- ret = false;
-
- for (size_t i=0;i<n-1;++i){
- for (size_t j=0; j<i+1; ++j)
- A.setEntry(i,j,zero);
- A.setEntry(i,i+1,one);
- if (i<n-2)
- for (size_t j=i+2; j<n; ++j)
- A.setEntry(i,j,zero);
- }
- for (size_t j=0;j<n;++j)
- A.setEntry(n-1,j,zero);
-
- BMD.minpoly( P, A );
- if ( P.size() !=n+1 )
- ret = false;
- for (size_t i=0; i<n;++i)
- if ( !F.areEqual(P[i], zero) )
- ret = false;
- if ( !F.areEqual(P[n], one) )
- ret = false;
-
- }
-
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testMinPoly");
-
- return ret;
-}
-
-template <class Field>
-static bool testCharPoly (const Field& F, size_t n, int iterations)
-{
- typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix;
- typedef typename Field::RandIter RandIter;
- typedef vector<Element> Polynomial;
-
- //Commentator mycommentator (std::cout);
- //mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing charpoly"),"testCharPoly",iterations);
- Element tmp, one, zero,mone;
- RandIter G(F);
- NonzeroRandIter<Field> Gn(F,G);
- F.init(one, 1UL);
- F.init(zero, 0UL);
- F.neg(mone, one);
- //F.neg( mone, one);
- bool ret = true;
- BlasMatrixDomain<Field> BMD(F);
-
- for (int k=0;k<iterations;++k) {
-
- mycommentator.progress(k);
-
- Matrix A(n,n);
- list<Polynomial> P;
- // Test CharPoly(In) = (X-1)^n
- for (size_t i=0;i<n;++i){
- for (size_t j=0;j<i;++j)
- A.setEntry(i,j,zero);
- A.setEntry(i,i,one);
- for (size_t j=i+1;j<n;++j)
- A.setEntry(i,j,zero);
- }
- P.clear();
- BMD.charpoly( P, A );
-
- typename list<Polynomial>::const_iterator P_it = P.begin();
- while (P_it != P.end()){
- if ( P_it->size() !=2 )
- ret = false;
- if ( !F.areEqual(P_it->operator[](0), mone) )
- ret = false;
- if ( !F.areEqual(P_it->operator[](1), one) )
- ret = false;
-
- P_it++;
- }
-
- // Test CharPoly(a*In) = X-a
- G.random(tmp);
-
- for (size_t i=0;i<n;++i)
- A.setEntry(i,i,tmp);
- F.negin(tmp);
- P.clear();
- BMD.charpoly( P, A );
- P_it = P.begin();
- while (P_it != P.end()){
- if ( P_it->size() !=2 )
- ret = false;
- if ( !F.areEqual(P_it->operator[](0), tmp) )
- ret = false;
- if ( !F.areEqual(P_it->operator[](1), one) )
- ret = false;
- P_it++;
- }
- }
-
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testCharPoly");
-
- return ret;
-}
-
-
-int main(int argc, char **argv)
-{
- commentator.setBriefReportStream (cout);
- commentator.getMessageClass (BRIEF_REPORT).setMaxDepth (2);
- commentator.getMessageClass (BRIEF_REPORT).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
-
- static size_t n = 400;
- static integer q = 1000003U;
- static int iterations = 3;
-
- static Argument args[] = {
- { 'n', "-n N", "Set dimension of test matrices to NxN", TYPE_INT, &n },
- { 'q', "-q Q", "Operate over the \"field\" GF(Q) [1]", TYPE_INTEGER, &q },
- { 'i', "-i I", "Perform each test for I iterations", TYPE_INT, &iterations },
- END_OF_ARGUMENTS
- };
-
- parseArguments (argc, argv, args);
-
- commentator.setBriefReportStream (cout);
- typedef Modular<double> Field;
- //typedef Modular<int> Field;
- //typedef Modular<float> Field;
-
- Field F (q);
-
- bool pass = true;
-
- srand (time (NULL));
-
-
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (20);
- //commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_IMPORTANT);
-
- commentator.start("BlasMatrixDomain benchmark", "BlasMatrixDomain");
-
-
- if (!testMulAdd (F,n,iterations)) pass=false;
- if (!testRank (F, n, iterations)) pass = false;
- if (!testDet (F, n, iterations)) pass = false;
- if (!testInv (F, n, iterations)) pass = false;
- if (!testTriangularSolve (F,n,n,iterations)) pass=false;
- if (!testSolve (F,n,n,iterations)) pass=false;
- if (!testPermutation (F,n,iterations)) pass=false;
- if (!testLQUP (F,n,n,iterations)) pass=false;
- if (!testMinPoly (F,n,iterations)) pass=false;
- if (!testCharPoly (F,n,iterations)) pass=false;
-
- commentator.stop("done", 0, "BlasMatrixDomain");
- return pass ? 0 : -1;
-}
-
-
diff --git a/tests/benchmark-fields.C b/tests/benchmark-fields.C
index 11c7b7e..b364144 100644
--- a/tests/benchmark-fields.C
+++ b/tests/benchmark-fields.C
@@ -1,11 +1,28 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-fields.C
* Written by Dan Roche
- * Copyright (C) June 2004 Dan Roche, part of LinBox, GNU LGPL. See COPYING for license.
+ * Copyright (C) June 2004 Dan Roche
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
+
/*! @file tests/benchmark-fields.C
* @ingroup tests
* @brief no doc
@@ -16,16 +33,14 @@
// #include "linbox/field/givaro-gfq.h"
#ifdef __LINBOX_HAVE_NTL
-#include "linbox/field/ntl-lzz_p.h"
-#include "linbox/field/ntl-ZZ.h"
-#include "linbox/field/ntl-ZZ_p.h"
-#include "linbox/field/ntl-pid-lzz_p.h"
+#include "linbox/field/ntl.h"
+#include "linbox/field/PID-ntl-zz_p.h"
#include "linbox/field/PIR-ntl-ZZ_p.h"
#endif
#include "linbox/field/modular.h"
#include "linbox/field/modular-balanced.h"
-#include "linbox/field/modular-crooked-double.h"
+#include "linbox/field/Modular/modular-crooked-double.h"
#include "linbox/field/field-traits.h"
#include "linbox/vector/stream.h"
#include "linbox/integer.h"
@@ -33,8 +48,6 @@
// #include "linbox/field/gf2.h"
#include "linbox/field/gmp-rational.h"
#include "linbox/field/local2_32.h"
-#include "linbox/field/modular-byte.h"
-#include "linbox/field/modular-short.h"
#ifdef __LINBOX_HAVE_LIDIA
#include "linbox/field/lidia.h"
@@ -60,7 +73,7 @@ void fieldTest( const Field& f, double* array, long iter = 1000000, bool fulltes
{
long vectorSize = 10000;
- float sparsity = .01;
+ float sparsity = .01f;
long sparsity_inv = 100;
int i;
@@ -219,7 +232,7 @@ void fieldTest( const Field& f, double* array, long iter = 1000000, bool fulltes
// Convert timings to mops (million operations per second)
for( i = 0; i < 9; i++ ) {
double t = array[i];
- array[i] = iter / (t > 0 ? (t * 1000000) : 0) ;
+ array[i] = (double)iter / (t > 0 ? (t * 1000000) : 0) ;
}
// use s (just in case compiler cares)
if (f.isZero(s)) std::cout << "zero sum" << std::endl;
@@ -368,3 +381,12 @@ int main(int argc, char** argv)
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/checker.C b/tests/checker.C
index 61305e7..36a5f32 100644
--- a/tests/checker.C
+++ b/tests/checker.C
@@ -1,10 +1,33 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=g0,t0,\:0
+/*
+ * Copyright (c) 2011 LinBox
+ * Written by bds.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
+ */
/** @file tests/checker.C
@brief script to run LinBox tests
-Checker is compiled and run by the check macro invoked by "make check" in the top source dir or in tests/. It may be run with "make test" or by "make checker; checker" in /tests, avoiding spurrious output of the autotool's check macro. Run without args, checker prints an explanation of command line options, then proceeds with default test behaviour.
+Checker is compiled and run by the check macro invoked by "make fullcheck" in the top source dir or in tests/.
+
+Run without args, checker prints an explanation of command line options, then proceeds with default test behaviour. "checker -h" just prints the options.
Each LinBox test gets a line below. A LinBox unit/regresssion test has a default behaviour -- when there are no command line file names -- in which nothing is written to any output stream and the return value is 0 for a passing test, nonzero for any failure.
@@ -23,6 +46,7 @@ here to build_n_run() or no_build_n_run() (possibly commented out).
//#include <iomanip>
using namespace std;
+#include "fflas-ffpack/fflas-ffpack-config.h"
#include "../linbox/linbox-config.h"
struct counts {
@@ -44,25 +68,39 @@ void no_build_n_run(string s, counts& cnt, int flag = 2, string r = "") ;
int main(int argc, char* argv[])
{
- int flag = 1; // default verbosity, no force
- if (argc < 2) {
- cout << "usage: " << argv[0] << " [summary,default,errors,verbose] [c]" << endl;
- cout << " summary: only 4 lines printed." << endl;
- cout << " default: also one line per test." << endl;
- cout << " warnings: shows subtest failures." << endl;
- cout << " errors: also any build and run output for error cases." << endl;
- cout << " verbose: also any build and run output for each test." << endl;
- cout << " 2nd arg, if present, forces rebuild of all tests." << endl;
+ int f = 0; // f = 1 ==> force recompile all tests.
+ int flag = 1; // verbosity flag.
+
+ bool check = false;// true for install time check
+ int arg;
+ for (arg = 1; arg < argc && argv[arg][0] == '-'; ++ arg)
+ switch (argv[arg][1]) {
+ case 'r': f = 1; break;
+ case 'f': flag = atoi(argv[++arg]); break;
+ case 'c': check = true; break;
+ default:
+ cout << "usage: " << argv[0] << " [-r] [-f n] [-c] [test]*" << endl;
+ cout << " -f 0 for a summary: only 4 lines printed." << endl;
+ cout << " -f 1 for default: also one line per test." << endl;
+ cout << " -f 2 for warnings: shows subtest failures." << endl;
+ cout << " -f 3 for errors: also any build and run output for error cases." << endl;
+ cout << " -f 4 for verbose: also any build and run output for each test." << endl;
+ cout << " -r forces rebuild of all tests." << endl;
+ cout << " -c conducts an install time check (a few selected tests only)." << endl;
+ cout << " if any [test] is present, it is built and run, otherwise all tests are processed." << endl;
+ return 0;
}
+ flag = flag+5*f; // clean up later
+#if 0
else {
if (argv[1][0] == 's') flag = 0; // summary
if (argv[1][0] == 'd') flag = 1; // default
- if (argv[1][0] == 'w') flag = 2; // errors
- if (argv[1][0] == 'e') flag = 3; // verbose
+ if (argv[1][0] == 'w') flag = 2; // warnings
+ if (argv[1][0] == 'e') flag = 3; // errors
if (argv[1][0] == 'v') flag = 3; // verbose
- if (argc > 2) flag += 5; // force rebuilds
+ if (argc > 2 && argv[2] == "rebuild") flag += 5; // force rebuilds
}
-
+#endif
// the setup
system("rm -f checkdata");
#if 0
@@ -79,6 +117,13 @@ int main(int argc, char* argv[])
// the tests
counts counter;
+ // if only specific test(s) specified
+ if (arg < argc) {
+ for (; arg < argc; ++arg)
+ build_n_run(argv[arg], counter , flag);
+ return counter.buildfail || counter.runfail ? -1 : 0;
+ }
+
/*
Each test gets a line below. A LinBox unit/regresssion test has a default behaviour -- when there are no command line file names -- in which nothing is written to any output stream and the return value is 0 for a passing test, nonzero for any failure.
@@ -92,117 +137,140 @@ Thus "ls test-*.C |wc" and "grep test- checker.C |grep \
build |wc" should yield the same number of lines.
*/
+ if (check) {
+ build_n_run("test-charpoly", counter , flag);//, "intermittent inf loop, bb or cp responsible?");
+ build_n_run("test-cra", counter , flag);
+ build_n_run("test-det", counter , flag);
+ build_n_run("test-frobenius", counter , flag);
+ build_n_run("test-rank", counter , flag);
+ build_n_run("test-qlup", counter , flag);
+ build_n_run("test-solve", counter , flag);
+ build_n_run("test-nullspace", counter , flag);
+ build_n_run("test-rat-solve", counter , flag); // "infinite loop");
+ build_n_run("test-rat-minpoly", counter , flag); // "intermittent failures");
+ build_n_run("test-rational-solver", counter , flag);
+ build_n_run("test-smith-form", counter , flag);
+ build_n_run("test-smith-form-adaptive", counter , flag);
+ build_n_run("test-smith-form-iliopoulos", counter , flag);
+ build_n_run("test-smith-form-binary", counter , flag);
+ return counter.buildfail || counter.runfail ? -1 : 0;
+ } else {
//BASIC_TESTS
- build_n_run("test-bitonic-sort", counter, flag);
- build_n_run("test-blas-domain", counter, flag);
- build_n_run("test-block-ring", counter, flag);
- build_n_run("test-butterfly", counter, flag);
- build_n_run("test-charpoly", counter, flag);//, "intermittent inf loop, bb or cp responsible?");
- build_n_run("test-commentator", counter, flag);
- build_n_run("test-companion", counter, flag);
- build_n_run("test-cra", counter, flag);
- build_n_run("test-cradomain", counter, flag);
- build_n_run("test-dense", counter, flag);
- build_n_run("test-det", counter, flag);
- build_n_run("test-diagonal", counter, flag);
- build_n_run("test-dif", counter, flag);
- build_n_run("test-direct-sum", counter, flag);
- build_n_run("test-dyadic-to-rational", counter, flag, "bds responsible");
- build_n_run("test-ffpack", counter, flag);
- build_n_run("test-frobenius", counter, flag);
- build_n_run("test-getentry", counter, flag);
- build_n_run("test-gf2", counter, flag);
- build_n_run("test-gmp-rational", counter, flag);
- build_n_run("test-hilbert", counter, flag);
- build_n_run("test-hom", counter, flag);
- build_n_run("test-inverse", counter, flag);
- build_n_run("test-isposdef", counter, flag);
- build_n_run("test-ispossemidef", counter, flag);
- build_n_run("test-last-invariant-factor", counter, flag);
- build_n_run("test-matrix-domain", counter, flag);
- build_n_run("test-matrix-stream", counter, flag);
- build_n_run("test-minpoly", counter, flag);
- build_n_run("test-modular", counter, flag);
- build_n_run("test-modular-balanced-int", counter, flag);
- build_n_run("test-modular-balanced-float", counter, flag);
- build_n_run("test-modular-balanced-double", counter, flag);
- build_n_run("test-modular-byte", counter, flag);
- build_n_run("test-modular-double", counter, flag);
- build_n_run("test-modular-float", counter, flag);
- build_n_run("test-modular-int", counter, flag);
- build_n_run("test-modular-short", counter, flag);
- build_n_run("test-moore-penrose", counter, flag);
- build_n_run("test-nullspace", counter, flag);
- build_n_run("test-PID-integer", counter, flag);
- build_n_run("test-qlup", counter, flag);
- build_n_run("test-randiter-nonzero", counter, flag);
- build_n_run("test-rank", counter, flag);
- build_n_run("test-rational-matrix-factory ", counter, flag);
- build_n_run("test-rational-reconstruction-base", counter, flag);
- build_n_run("test-rat-charpoly", counter, flag);//, "infinite loop, cp responsible?");
- build_n_run("test-scalar-matrix", counter, flag);
- build_n_run("test-smith-form-binary", counter, flag);
- build_n_run("test-solve", counter, flag);
- build_n_run("test-sparse", counter, flag);
- build_n_run("test-subiterator", counter, flag);
- build_n_run("test-submatrix", counter, flag);
- build_n_run("test-subvector", counter, flag);
- build_n_run("test-sum", counter, flag);
- build_n_run("test-rational-solver", counter, flag);
- build_n_run("test-trace", counter, flag);
- build_n_run("test-triplesbb", counter, flag);
- build_n_run("test-unparametric-field", counter, flag); //has been useful in num/sym.
- build_n_run("test-vector-domain", counter, flag);
- build_n_run("test-zero-one", counter, flag);
+ build_n_run("test-bitonic-sort", counter , flag);
+ build_n_run("test-blackbox-block-container", counter , flag);
+ build_n_run("test-blas-domain", counter , flag);
+ build_n_run("test-block-ring", counter , flag);
+ no_build_n_run("test-block-wiedemann", counter , flag, "bds tracking down BlasMatrix bug");
+ no_build_n_run("test-bmseq", counter , flag, "under development by George Yuhasz");
+ build_n_run("test-butterfly", counter , flag);
+ build_n_run("test-charpoly", counter , flag);//, "intermittent inf loop, bb or cp responsible?");
+ build_n_run("test-commentator", counter , flag);
+ build_n_run("test-companion", counter , flag);
+ build_n_run("test-cra", counter , flag);
+ build_n_run("test-cradomain", counter , flag,"intermittent failure, as in 1 every 10-20");
+ build_n_run("test-dense", counter , flag);
+ build_n_run("test-det", counter , flag);
+ build_n_run("test-diagonal", counter , flag);
+ build_n_run("test-dif", counter , flag);
+ build_n_run("test-direct-sum", counter , flag);
+ build_n_run("test-dyadic-to-rational", counter , flag, "bds responsible");
+ build_n_run("test-ffpack", counter , flag);
+ build_n_run("test-frobenius", counter , flag);
+ build_n_run("test-getentry", counter , flag);
+ build_n_run("test-gf2", counter , flag);
+ build_n_run("test-gmp-rational", counter , flag);
+ build_n_run("test-hilbert", counter , flag);
+ build_n_run("test-hom", counter , flag);
+ build_n_run("test-inverse", counter , flag);
+ build_n_run("test-isposdef", counter , flag);
+ build_n_run("test-ispossemidef", counter , flag);
+ build_n_run("test-last-invariant-factor", counter , flag);
+ build_n_run("test-matrix-domain", counter , flag);
+ build_n_run("test-matrix-stream", counter , flag);
+ no_build_n_run("test-mg-block-lanczos", counter , flag, "fails");
+ build_n_run("test-minpoly", counter , flag);
+ build_n_run("test-modular", counter , flag);
+ build_n_run("test-modular-balanced-int", counter , flag);
+ build_n_run("test-modular-balanced-float", counter , flag);
+ build_n_run("test-modular-balanced-double", counter , flag);
+ build_n_run("test-modular-byte", counter , flag);
+ build_n_run("test-modular-double", counter , flag);
+ build_n_run("test-modular-float", counter , flag);
+ build_n_run("test-modular-int", counter , flag);
+ build_n_run("test-modular-short", counter , flag);
+ build_n_run("test-moore-penrose", counter , flag);
+ build_n_run("test-nullspace", counter , flag);
+ build_n_run("test-PID-integer", counter , flag);
+ build_n_run("test-qlup", counter , flag);
+ build_n_run("test-randiter-nonzero", counter , flag);
+ build_n_run("test-rank", counter , flag);
+ build_n_run("test-rational-matrix-factory ", counter , flag);
+ build_n_run("test-rational-reconstruction-base", counter , flag);
+ build_n_run("test-rat-charpoly", counter , flag);//, "infinite loop, cp responsible?");
+ build_n_run("test-scalar-matrix", counter , flag);
+ build_n_run("test-smith-form-binary", counter , flag);
+ build_n_run("test-solve", counter , flag);
+ build_n_run("test-sparse", counter , flag);
+ build_n_run("test-subiterator", counter , flag);
+ build_n_run("test-submatrix", counter , flag);
+ build_n_run("test-subvector", counter , flag);
+ build_n_run("test-sum", counter , flag);
+ build_n_run("test-rational-solver", counter , flag);
+ build_n_run("test-trace", counter , flag);
+ build_n_run("test-triplesbb", counter , flag);
+ build_n_run("test-unparametric-field", counter , flag); //has been useful in num/sym.
+ build_n_run("test-vector-domain", counter , flag);
+ build_n_run("test-zero-one", counter , flag);
#if __LINBOX_HAVE_GIVARO
// if (flag > 0) cout << " Givaro tests" << endl;
- build_n_run("test-givaro-zpz", counter, flag);
- build_n_run("test-givaro-zpzuns", counter, flag, "may fail on small fields because of supposed non-randomness or failure to find a non trivial element");
- build_n_run("test-rat-solve", counter, flag); // "infinite loop");
- build_n_run("test-rat-minpoly", counter, flag); // "intermittent failures");
+ build_n_run("test-givaro-fields", counter , flag, "may fail on small fields because of supposed non-randomness or failure to find a non trivial element");
+ //build_n_run("test-givaro-zpz", counter , flag, "superceded by test-givaro-fields");
+ //build_n_run("test-givaro-zpzuns", counter , flag, "superceded by test-givaro-fields");
+ build_n_run("test-rat-solve", counter , flag); // "infinite loop");
+ build_n_run("test-rat-minpoly", counter , flag); // "intermittent failures");
#else
if (flag > 0) cout << " not doing Givaro dependent tests" << endl;
cout << "Configuration problem? __LINBOX_HAVE_GIVARO is not set, but LinBox requires Givaro" << endl;
counter.skipped += 4;
#endif
-#if __LINBOX_HAVE_LAPACK
+#if __FFLASFFPACK_HAVE_LAPACK
if (flag > 0) cout << " Lapack dependent tests" << endl;
build_n_run("test-rational-solver-adaptive", counter, flag);
// needs output cleanup. Resolve whether a benchmark or a test.
- build_n_run("test-solve-nonsingular", counter, flag, "bds responsible");
+ build_n_run("test-solve-nonsingular", counter, flag, "BY responsible");
#else
if (flag > 0) cout << " not doing Lapack dependent tests" << endl;
no_build_n_run("test-rational-solver-adaptive", counter, flag);
// needs output cleanup. Resolve whether a benchmark or a test.
- no_build_n_run("test-solve-nonsingular", counter, flag, "bds responsible");
+ no_build_n_run("test-solve-nonsingular", counter, flag, "BY responsible");
#endif
#if __LINBOX_HAVE_NTL
if (flag > 0) cout << " NTL dependent tests" << endl;
- build_n_run("test-ntl-hankel", counter, flag);
- build_n_run("test-ntl-lzz_p", counter, flag);
- build_n_run("test-ntl-toeplitz", counter, flag);
- build_n_run("test-ntl-sylvester", counter, flag);
- build_n_run("test-ntl-RR", counter, flag);
- build_n_run("test-ntl-ZZ_p", counter, flag);
- build_n_run("test-toeplitz-det", counter, flag);
- build_n_run("test-smith-form", counter, flag);
- build_n_run("test-smith-form-adaptive", counter, flag);
- build_n_run("test-smith-form-iliopoulos", counter, flag);
+ build_n_run("test-ntl-hankel", counter , flag);
+ build_n_run("test-ntl-lzz_p", counter , flag);
+ build_n_run("test-ntl-toeplitz", counter , flag);
+ build_n_run("test-ntl-sylvester", counter , flag);
+ no_build_n_run("test-ntl-RR", counter , flag, "floating point equality");
+ build_n_run("test-ntl-ZZ_p", counter , flag);
+ build_n_run("test-toeplitz-det", counter , flag);
+ build_n_run("test-smith-form", counter , flag);
+ build_n_run("test-smith-form-adaptive", counter , flag);
+ build_n_run("test-smith-form-iliopoulos", counter , flag);
#else
if (flag > 0) cout << " not doing NTL dependent tests" << endl;
- no_build_n_run("test-ntl-hankel", counter, flag);
- no_build_n_run("test-ntl-lzz_p", counter, flag);
- no_build_n_run("test-ntl-toeplitz", counter, flag);
- no_build_n_run("test-ntl-RR", counter, flag);
- no_build_n_run("test-ntl-sylvester", counter, flag);
- no_build_n_run("test-ntl-ZZ_p", counter, flag);
- no_build_n_run("test-toeplitz-det", counter, flag, "can we have non NTL version?");
- no_build_n_run("test-smith-form", counter, flag);
- no_build_n_run("test-smith-form-adaptive", counter, flag);
- no_build_n_run("test-smith-form-iliopoulos", counter, flag);
+ no_build_n_run("test-ntl-hankel", counter , flag);
+ no_build_n_run("test-ntl-lzz_p", counter , flag);
+ no_build_n_run("test-ntl-toeplitz", counter , flag);
+ no_build_n_run("test-ntl-RR", counter , flag, "floating point equality");
+ no_build_n_run("test-ntl-sylvester", counter , flag);
+ no_build_n_run("test-ntl-ZZ_p", counter , flag);
+ no_build_n_run("test-toeplitz-det", counter , flag, "can we have non NTL version?");
+ no_build_n_run("test-smith-form", counter , flag);
+ no_build_n_run("test-smith-form-adaptive", counter , flag);
+ no_build_n_run("test-smith-form-iliopoulos", counter , flag);
#endif
#if __LINBOX_HAVE_LIDIA
@@ -215,10 +283,10 @@ build |wc" should yield the same number of lines.
#if __LINBOX_HAVE_ATLAS
if (flag > 0) cout << " Atlas dependent tests" << endl;
- build_n_run("./test-optimization", counter, flag);
+ no_build_n_run("./test-optimization", counter, flag, "not a test");
#else
if (flag > 0) cout << " not doing Atlas dependent test" << endl;
- no_build_n_run("test-optimization", counter, flag, "?");
+ no_build_n_run("test-optimization", counter, flag, "not a test");
#endif
// tests of "doubles as a field" which doesn't adhere to LinBox field or ring specs.
@@ -234,7 +302,7 @@ build |wc" should yield the same number of lines.
no_build_n_run("test-quad-matrix", counter, flag, "half baked, bds responsible"); no_build_n_run("test-dense-zero-one", counter, flag, "half baked, bds responsible"); build_n_run("test-zo", counter, flag, "half baked, BY responsible");
// test-integer-tools -- there is no test-integer-tools.C file
// no one has taken these on.
- //no_build_n_run("test-mg-block-lanczos", counter, flag, "make fails, nobody responsible");
+ no_build_n_run("test-la-block-lanczos",counter,flag,"segfaults");
#endif
#if 0
@@ -248,8 +316,8 @@ build |wc" should yield the same number of lines.
no_build_n_run("test-image-field", counter, flag, "deprecated");
//BENCHMARKS =
- build_n_run("benchmark-fields", counter, flag);
- build_n_run("benchmark-blas-domain", counter, flag);
+ build_n_run("benchmark-fields", counter, flag, "not a test");
+ build_n_run("benchmark-blas-domain", counter, flag, "not a test");
# I put test-gssv_rank in hmrg:~saunders/gen_superlu. It is not linbox until and unless it is made to work
# test-gssv is an ntl test
@@ -259,7 +327,7 @@ build |wc" should yield the same number of lines.
# Compose is tested in test-butterfly
#endif
-
+ }
// the summary
cout << "--------------------------------------------------------------------" << endl;
if (counter.buildfail || counter.runfail)
@@ -318,12 +386,12 @@ void build_n_run(string s, counts& cnt, int flag, string r)
if (status == 2) goto abort; // valid on at least one platform.
if (status != 0) {
if (flag >= 1) cout << " FAILS" << endl;
- if (flag >= 3) system ("cat checkdata");
+ if (flag >= 3) system ("cat checkdata; rm checkdata");
cnt.runfail++;
}
else {
if (flag >= 1) cout << "\b\b\b\bOK " << endl;
- if (flag >= 2) system ("grep \"warn\" checkdata");
+ if (flag >= 2) system ("grep \"warn\" checkdata; rm checkdata");
cnt.pass++;
//cerr << "ok" << endl;
}
@@ -335,3 +403,12 @@ abort:
exit(-1);
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 866a168..a0fd89f 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -1,6 +1,24 @@
# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
EXTRA_DIST = \
test.matrix \
sms.matrix \
diff --git a/tests/data/Makefile.in b/tests/data/Makefile.in
index 090b537..0cbfb2d 100644
--- a/tests/data/Makefile.in
+++ b/tests/data/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,10 +14,47 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+# Copyright (c) 2010 the LinBox group
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -39,12 +76,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -52,7 +92,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -61,10 +104,16 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -73,6 +122,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -96,10 +146,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -120,10 +172,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -132,6 +189,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -148,6 +207,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -210,10 +270,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-# Copyright (c) 2010 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
EXTRA_DIST = \
test.matrix \
sms.matrix \
@@ -236,9 +292,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps tests/data/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps tests/data/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps tests/data/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps tests/data/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -256,6 +312,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -285,13 +342,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -309,16 +370,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -402,6 +469,7 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/tests/matrix/Makefile.am b/tests/matrix/Makefile.am
index c4e73ca..34374b7 100644
--- a/tests/matrix/Makefile.am
+++ b/tests/matrix/Makefile.am
@@ -1,6 +1,24 @@
# Copyright (c) 2011 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
+
+
+
EXTRA_DIST = \
coin.h \
diff --git a/tests/matrix/Makefile.in b/tests/matrix/Makefile.in
index 4f832da..262b374 100644
--- a/tests/matrix/Makefile.in
+++ b/tests/matrix/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,12 +16,45 @@
@SET_MAKE@
# Copyright (c) 2011 the LinBox group
-# This file is part of LinBox
-# see COPYING for licence
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# ========LICENCE========
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -43,12 +76,15 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/config-header.m4 \
$(top_srcdir)/macros/debug.m4 \
$(top_srcdir)/macros/expat-check.m4 \
- $(top_srcdir)/macros/fflaflas-check.m4 \
+ $(top_srcdir)/macros/fflas-ffpack-check.m4 \
+ $(top_srcdir)/macros/fplll-check.m4 \
$(top_srcdir)/macros/givaro-check.m4 \
$(top_srcdir)/macros/gmp-check.m4 \
$(top_srcdir)/macros/iml-check.m4 \
+ $(top_srcdir)/macros/lapack-check.m4 \
$(top_srcdir)/macros/libtool.m4 \
$(top_srcdir)/macros/lidia-check.m4 \
+ $(top_srcdir)/macros/linbox-benchmark.m4 \
$(top_srcdir)/macros/linbox-doc.m4 \
$(top_srcdir)/macros/linbox-misc.m4 \
$(top_srcdir)/macros/linbox-opt.m4 \
@@ -56,7 +92,10 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \
$(top_srcdir)/macros/ltsugar.m4 \
$(top_srcdir)/macros/ltversion.m4 \
$(top_srcdir)/macros/lt~obsolete.m4 \
+ $(top_srcdir)/macros/m4ri-check.m4 \
+ $(top_srcdir)/macros/m4rie-check.m4 \
$(top_srcdir)/macros/maple-check.m4 \
+ $(top_srcdir)/macros/mpfr-check.m4 \
$(top_srcdir)/macros/ntl-check.m4 \
$(top_srcdir)/macros/saclib-check.m4 \
$(top_srcdir)/macros/sage-check.m4 $(top_srcdir)/configure.ac
@@ -65,10 +104,16 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
depcomp =
am__depfiles_maybe =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -77,6 +122,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BLAS_CFLAGS = @BLAS_CFLAGS@
BLAS_LIBS = @BLAS_LIBS@
CC = @CC@
CCNAM = @CCNAM@
@@ -100,10 +146,12 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
-FFLAFLAS_CFLAGS = @FFLAFLAS_CFLAGS@
-FFLAFLAS_LIBS = @FFLAFLAS_LIBS@
-FFLAFLAS_LOC = @FFLAFLAS_LOC@
+FFLAS_FFPACK_CFLAGS = @FFLAS_FFPACK_CFLAGS@
+FFLAS_FFPACK_LIBS = @FFLAS_FFPACK_LIBS@
+FFLAS_FFPACK_LOC = @FFLAS_FFPACK_LOC@
FGREP = @FGREP@
+FPLLL_CFLAGS = @FPLLL_CFLAGS@
+FPLLL_LIBS = @FPLLL_LIBS@
GIVARO_CFLAGS = @GIVARO_CFLAGS@
GIVARO_LIBS = @GIVARO_LIBS@
GMP_CFLAGS = @GMP_CFLAGS@
@@ -124,10 +172,15 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIDIA_CFLAGS = @LIDIA_CFLAGS@
LIDIA_LIBS = @LIDIA_LIBS@
+LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@
LINBOX_DOC_PATH = @LINBOX_DOC_PATH@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+M4RIE_CFLAGS = @M4RIE_CFLAGS@
+M4RIE_LIBS = @M4RIE_LIBS@
+M4RI_CFLAGS = @M4RI_CFLAGS@
+M4RI_LIBS = @M4RI_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -136,6 +189,8 @@ MAPLE_HOME = @MAPLE_HOME@
MAPLE_LIBS = @MAPLE_LIBS@
MAPLE_VERSION = @MAPLE_VERSION@
MKDIR_P = @MKDIR_P@
+MPFR_CFLAGS = @MPFR_CFLAGS@
+MPFR_LIBS = @MPFR_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NTL_CFLAGS = @NTL_CFLAGS@
@@ -152,6 +207,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PROF = @PROF@
RANLIB = @RANLIB@
RM = @RM@
SACLIB_CFLAGS = @SACLIB_CFLAGS@
@@ -235,9 +291,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps tests/matrix/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu --ignore-deps tests/matrix/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps tests/matrix/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu --ignore-deps tests/matrix/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -255,6 +311,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
mostlyclean-libtool:
-rm -f *.lo
@@ -284,13 +341,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -308,16 +369,22 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -401,6 +468,7 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/tests/matrix/coin.h b/tests/matrix/coin.h
index 66891c3..705f187 100644
--- a/tests/matrix/coin.h
+++ b/tests/matrix/coin.h
@@ -1,3 +1,27 @@
+
+/*
+ * Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
+ */
+
#ifndef _COIN_H
#define _COIN_H
@@ -6,3 +30,12 @@
#define COMB_CEILING 10
#endif
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/matrix/hadamard.h b/tests/matrix/hadamard.h
index ae27603..656746b 100644
--- a/tests/matrix/hadamard.h
+++ b/tests/matrix/hadamard.h
@@ -1,3 +1,26 @@
+/* Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+
+
namespace LinBox{
void isPower2(size_t n){
@@ -28,3 +51,12 @@ Matrix& hadamard(const Ring& R, Matrix& Mat, size_t n){
}
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/matrix/invhilb.h b/tests/matrix/invhilb.h
index 1fb7818..1d7eccb 100644
--- a/tests/matrix/invhilb.h
+++ b/tests/matrix/invhilb.h
@@ -1,3 +1,27 @@
+
+/*
+ * Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
+ */
+
#include<cstdlib>
#include "linbox/integer.h"
@@ -8,14 +32,14 @@ namespace LinBox{
template<class Ring, class Matrix>
Matrix& invhilb(const Ring& R, Matrix& Mat, int n){
typedef typename Ring::Element Element;
-
+
integer p = n;
integer r;
Element val;
int i, j, i_ind, j_ind;
for(i_ind=0, i = 1; i <= n; i++, i_ind++){
if(i>1) p = ((n-i+1)*p*(n+i-1))/((i-1)*(i-1));
- r = p*p;
+ r = p*p;
R.init(val, (r/(2*i-1)));
Mat.setEntry(i_ind, i_ind, val);
for(j_ind=i, j = i+1; j <= n; j++, j_ind++){
@@ -30,3 +54,12 @@ Matrix& invhilb(const Ring& R, Matrix& Mat, int n){
}
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/matrix/jmat.h b/tests/matrix/jmat.h
index c1ff0f9..c917372 100644
--- a/tests/matrix/jmat.h
+++ b/tests/matrix/jmat.h
@@ -1,3 +1,26 @@
+/* Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+
+
namespace LinBox{
size_t lambda = 1000000000;
@@ -21,4 +44,13 @@ Matrix& jordanform(const Ring& R, Matrix& Mat, size_t n){
return Mat;
}
-}; //LinBox
+} //LinBox
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/matrix/minmax.h b/tests/matrix/minmax.h
index 2c7b2ef..4502f2e 100644
--- a/tests/matrix/minmax.h
+++ b/tests/matrix/minmax.h
@@ -1,3 +1,26 @@
+
+/*
+ * Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
+ */
namespace LinBox{
template<class Ring, class Matrix>
@@ -49,4 +72,13 @@ Matrix& qlehmer(const Ring& R, Matrix& Mat, size_t n){
return Mat;
}
-}; //LinBox
+} //LinBox
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/matrix/randomans.h b/tests/matrix/randomans.h
index 20d5625..fcf0d58 100644
--- a/tests/matrix/randomans.h
+++ b/tests/matrix/randomans.h
@@ -1,5 +1,28 @@
// randomans.h - Random Almost NonSingular matrix
+/*
+ * Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
+ */
+
#include<cstdlib>
#include<vector>
#include "coin.h"
@@ -17,7 +40,7 @@ Matrix& randomAns(const Ring& R, Matrix& Mat, size_t n, size_t epr){
vector<int> usedV(epr);
typename Ring::Element tmp;
- srand(time(NULL));
+ srand((unsigned)time(NULL));
// build first n-1 rows
for(size_t i = 0; i < n-1; ++i) {
@@ -34,11 +57,11 @@ Matrix& randomAns(const Ring& R, Matrix& Mat, size_t n, size_t epr){
val = neg*(rand()%CEILING);
// choose random location for value
do{
- pos = rand()%n; // pos in [0, n)
+ pos = int(rand()%n); // pos in [0, n)
}
while(used(usedV, pos));
usedV[k] = pos; // record location
-
+
//std::cerr << "\t set value " << val << " in pos " << pos << std::endl;
// finally, set entry
Mat.setEntry(i, pos, R.init(tmp, val));
@@ -50,7 +73,7 @@ Matrix& randomAns(const Ring& R, Matrix& Mat, size_t n, size_t epr){
for(size_t i=0; i<n; ++i)
R.init(tmps[i], 0);
- // build last row incorporate every row
+ // build last row incorporate every row
for(size_t i = 0; i < n-1; ++i){
neg = 1;
if(rand()%2) neg = -1;
@@ -64,12 +87,21 @@ Matrix& randomAns(const Ring& R, Matrix& Mat, size_t n, size_t epr){
Mat.setEntry(n-1, i, tmps[i]);
// add one to random value
- size_t wildcard = rand()%n;
+ size_t wildcard = rand()%n;
R.init(tmp, Mat.getEntry(n-1, wildcard));
R.addin(tmp, 1);
Mat.setEntry(n-1, wildcard, tmp);
-
+
return Mat;
}
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/matrix/randommat.h b/tests/matrix/randommat.h
index aff41bf..e0ac291 100644
--- a/tests/matrix/randommat.h
+++ b/tests/matrix/randommat.h
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
+ */
+
#include "coin.h"
#include<cstdlib>
#include<vector>
@@ -39,19 +62,28 @@ Matrix& randomMat(const Ring& R, Matrix& Mat, size_t n, size_t epr){
val = neg*(rand()%CEILING);
// choose random location for value
do{
- pos = rand()%n; // pos in [0, n)
+ pos = int(rand()%n); // pos in [0, n)
}
while(used(usedV, pos));
usedV[k] = pos; // record location
-
+
//std::cerr << "\t set value " << val << " in pos " << pos << std::endl;
// finally, set entry
//Mat.setEntry(i, pos, R.init(tmp, 1));
Mat.setEntry(i, pos, R.init(tmp, val));
}
}
-
+
return Mat;
}
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-PID-integer.C b/tests/test-PID-integer.C
index 0486886..d765b95 100644
--- a/tests/test-PID-integer.C
+++ b/tests/test-PID-integer.C
@@ -1,12 +1,28 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-PID-integer.C
* Copyright (C) 2011 Dave Saunders
*
* morphed from another test by Dave Saunders <saunders at cis.udel.edu>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file tests/test-PID-integer.C
@@ -49,18 +65,27 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("PID-integer ring test suite", "PID-integer");
+ commentator().start("PID-integer ring test suite", "PID-integer");
bool pass = true;
PID_integer ZZ;
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (!runBasicRingTests (ZZ, "PID-integer", iterations, false)) pass = false;
// if (!testRandomIterator (ZZ, "PID-integer", trials, categories, hist_level)) pass = false;
- commentator.stop("PID-integer, field test suite");
+ commentator().stop("PID-integer, field test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-bitonic-sort.C b/tests/test-bitonic-sort.C
index a56254e..3563e9f 100644
--- a/tests/test-bitonic-sort.C
+++ b/tests/test-bitonic-sort.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Author: Zhendong Wan
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -31,9 +32,9 @@
#include <algorithm>
-#include <linbox/algorithms/bitonic-sort.h>
-#include <linbox/util/commentator.h>
-#include <linbox/vector/stream.h>
+#include "linbox/algorithms/bitonic-sort.h"
+#include "linbox/util/commentator.h"
+#include "linbox/vector/stream.h"
#include "test-common.h"
using namespace LinBox;
@@ -50,126 +51,91 @@ public:
};
-bool testRandom (std::ostream& report, int s, int iteration)
+bool testRandom (std::ostream& report, size_t s)
{
using namespace std;
- commentator.start ("test bitonic sort", "test bitonic sort", iteration);
+ commentator().start ("test bitonic sort", "test bitonic sort");
- bool iter_passed = true;
bool ret = true;
Comparator comp;
- for (int i = 0; i < iteration; ++ i) {
-
- commentator.startIteration (i);
-
- std::vector<int> v(s), d(s);
-
-
- std::vector<int>::iterator p1, p2;
-
-
- for (p1 = v. begin(), p2 = d.begin(); p1 != v.end(); ++ p1, ++p2)
-
- *p1 = *p2 = rand();
-
- report << "Input vector: ";
-
-
- for (p1 = v.begin(); p1 != v.end(); ++ p1)
-
- report << *p1 << " ";
-
- report << endl;
-
-
- bitonicSort(v.begin(), v.end(), comp);
-
-
-
- report << "Computed sequence by bitonic sorting network:\n";
-
-
- for (p1 = v.begin(); p1 != v.end(); ++ p1)
+ std::vector<int> v(s), d(s);
+ std::vector<int>::iterator p1, p2;
- report << *p1 << " ";
+ for (p1 = v. begin(), p2 = d.begin(); p1 != v.end(); ++ p1, ++p2)
+ *p1 = *p2 = rand();
- report << '\n';
+ report << "Input vector: ";
- stable_sort(d.begin(), d.end());
- report << "Expected sequence after sorting:\n";
+ for (p1 = v.begin(); p1 != v.end(); ++ p1)
+ report << *p1 << " ";
+ report << endl;
+ bitonicSort(v.begin(), v.end(), comp);
- for (p1 = d.begin(); p1 != d.end(); ++ p1)
+ report << "Computed sequence by bitonic sorting network:\n";
- report << *p1 << " ";
+ for (p1 = v.begin(); p1 != v.end(); ++ p1)
+ report << *p1 << " ";
+ report << '\n';
- report << '\n';
+ stable_sort(d.begin(), d.end());
+ report << "Expected sequence after sorting:\n";
+ for (p1 = d.begin(); p1 != d.end(); ++ p1)
+ report << *p1 << " ";
+ report << '\n';
- for (p1 = v.begin(), p2 = d. begin(); p1 != v.end(); ++ p1, ++ p2)
+ for (p1 = v.begin(), p2 = d. begin(); p1 != v.end(); ++ p1, ++ p2)
+ if (*p1 != *p2) {
+ ret = false;
+ break;
+ }
- if (*p1 != *p2) {
+ if (!ret)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ << "ERROR: Computed Smith form is incorrect" << endl;
- ret = iter_passed = false;
-
- break;
- }
-
- if (!iter_passed)
-
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
- << "ERROR: Computed Smith form is incorrect" << endl;
-
-
-
- commentator.stop ("done");
-
- commentator.progress ();
-
- }
-
-
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandom");
+ commentator().stop (MSG_STATUS (ret), NULL, "testRandom");
return ret;
-
}
int main(int argc, char** argv)
{
-
using namespace LinBox;
bool pass = true;
static size_t n = 512;
- static int iterations = 2;
-
static Argument args[] = {
{ 'n', "-n N", "Set size of sequence to N. N must be a power of 2)", TYPE_INT, &n },
- { 'i', "-i I", "Perform each test for I iterations"
- , TYPE_INT, &iterations },
END_OF_ARGUMENTS
};
-
-
parseArguments (argc, argv, args);
- commentator.start("Sort network test suite", "bitonic sort");
- std::ostream& report = commentator.report();
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().start("Sort network test suite", "bitonic sort");
+ std::ostream& report = commentator().report();
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- if (!testRandom(report, n, iterations)) pass = false;
- commentator.stop("sort network test suite");
+ if (!testRandom(report, n)) pass = false;
+ commentator().stop("sort network test suite");
return pass ? 0 : -1;
-
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-blackbox-block-container.C b/tests/test-blackbox-block-container.C
new file mode 100644
index 0000000..1e925f7
--- /dev/null
+++ b/tests/test-blackbox-block-container.C
@@ -0,0 +1,106 @@
+
+
+/* tests/test-blackbox-block-container.C
+ *
+ * Written by bds
+ *
+ * -----------------------------------------------------
+ *
+ * Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
+
+ */
+
+
+/*! @file tests/test-blackbox-block-container.C
+ * @ingroup tests
+ * @brief no doc
+ * @test no doc.
+ */
+
+
+
+#include "linbox/linbox-config.h"
+
+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <cstdio>
+
+#include "linbox/algorithms/blackbox-block-container.h"
+
+#include "linbox/util/commentator.h"
+#include "linbox/field/modular.h"
+
+#include "test-common.h"
+
+using namespace LinBox;
+
+
+int main (int argc, char **argv)
+{
+
+ bool pass = true;
+
+ static size_t n = 40;
+ static size_t k = 4;
+ static integer q = 65519U;
+
+ static Argument args[] = {
+ { 'n', "-n N", "Set dimension of test matrices to NxN.", TYPE_INT, &n },
+ { 'k', "-k K", "Set dimension of blocks matrices to KxK.", TYPE_INT, &k },
+ { 'q', "-q Q", "Operate over the \"field\" GF(Q) [1].", TYPE_INTEGER, &q },
+ END_OF_ARGUMENTS
+ };
+
+ parseArguments (argc, argv, args);
+
+ commentator().start("block container test", "bbbc");
+ ostream& report = commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
+ report << "over Modular<double>" << endl;
+ typedef Modular<double> Field;
+ typedef BlasMatrix<Field> Block;
+ typedef BlasMatrix<Field> Blackbox;
+ Modular<double> F (q);
+
+ Blackbox A(F, n, n);
+ Block U(F, k, n);
+ Block V(F, n, k);
+ Block W(F, k, k);
+
+ // Solved a segfault in init.
+ BlackboxBlockContainer<Field, Blackbox> B(&A, F, U, V);
+
+ // A more thorough test should be constructed.
+
+ if (pass) commentator().stop("block container test pass");
+ else commentator().stop("block container test FAIL");
+ return pass ? 0 : -1;
+}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-blackbox.h b/tests/test-blackbox.h
index 7231ed8..5ca3e7d 100644
--- a/tests/test-blackbox.h
+++ b/tests/test-blackbox.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/tests/test-blackbox.h
* Copyright (C) 2001, 2002 Bradford Hovinen
*
@@ -13,7 +11,25 @@
* ------------------------------------
* fix testLinearity for rectangular matrices. 2006-02-17 Hui Wang
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_test_blackbox_H
@@ -27,7 +43,6 @@
#include "linbox/util/field-axpy.h"
#include "linbox/vector/stream.h"
#include "linbox/vector/vector-domain.h"
-#include "linbox/blackbox/dense.h"
#include "test-common.h"
@@ -70,16 +85,16 @@ testTranspose (Field &F,
LinBox::VectorDomain <Field> VD (A.field());
//LinBox::VectorDomain <Field> VD (F);
typename Field::Element r1, r2;
- ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Blackbox transpose test [that u^T(Av) == (uA)^T v]" << std::endl;
while (stream1 && stream2) {
- LinBox::commentator.startIteration (stream1.j ());
+ LinBox::commentator().startIteration ((unsigned int) stream1.j ());
stream1.next (u);
stream2.next (v);
- //ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ //ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
VD.write( report << "Input vector u: ", u) << endl;
VD.write( report << "Input vector v: ", v) << endl;
@@ -101,12 +116,12 @@ testTranspose (Field &F,
if (!F.areEqual (r1, r2)) {
ret = false;
- LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Values are not equal" << endl;
}
- LinBox::commentator.stop ("done");
- LinBox::commentator.progress ();
+ LinBox::commentator().stop ("done");
+ LinBox::commentator().progress ();
}
return ret;
@@ -149,11 +164,11 @@ testLinearity (Field &F,
LinBox::VectorWrapper::ensureDim (Ay, n);
LinBox::VectorWrapper::ensureDim (AxpaAy, n);
- ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Blackbox linearity test [that A.apply to (ax + y) == a A.apply to x + A.apply to y]" << std::endl;
while (stream1 && stream2) {
- LinBox::commentator.startIteration (stream1.j ());
+ LinBox::commentator().startIteration ((unsigned int) stream1.j ());
iter_passed = true;
@@ -162,7 +177,7 @@ testLinearity (Field &F,
r.random (alpha);
- //ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ //ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
VD.write( report << "Input vector x: ", x) << endl;
VD.write( report << "Input vector y: ", y) << endl;
@@ -190,11 +205,11 @@ testLinearity (Field &F,
ret = iter_passed = false;
if (!iter_passed)
- LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vectors are not equal" << endl;
- LinBox::commentator.stop ("done");
- LinBox::commentator.progress ();
+ LinBox::commentator().stop ("done");
+ LinBox::commentator().progress ();
}
return ret;
@@ -213,12 +228,12 @@ testBlackbox(BB &A)
size_t largeThresh = 2000; // Above it do timing of apply and applyTr.
typedef typename BB::Field Field;
typedef std::vector<typename Field::Element> DenseVector;
- std::ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "testBlackbox on " << A.rowdim() << " by " << A.coldim() << " matrix." << endl;
- LinBox::commentator.setMaxDepth(-1);
+ LinBox::commentator().setMaxDepth(-1);
bool ret = true;
- typename BB::Field F = A.field();
+ Field F = A.field();
/* timing tests */ // I changed the order of all tests. Timing now is the first set of tests and then linearity and transpose
{
@@ -229,17 +244,17 @@ testBlackbox(BB &A)
if (A.coldim() >= largeThresh)
{
- LinBox::commentator.start ("\t--Timing Test (Av)","testApply", 1);
+ LinBox::commentator().start ("\t--Timing Test (Av)","testApply", 1);
A.apply(y, x);
- LinBox::commentator.stop (MSG_STATUS (true), (const char *) 0, "testApply");
+ LinBox::commentator().stop (MSG_STATUS (true), (const char *) 0, "testApply");
}
if (A.rowdim() >= largeThresh)
{
- LinBox::commentator.start ("\t--Timing Test(v^T A)",
+ LinBox::commentator().start ("\t--Timing Test(v^T A)",
"testApplyTranspose", 1);
A.applyTranspose(x, y);
- LinBox::commentator.stop (MSG_STATUS (true), (const char *) 0, "testApplyTranspose");
+ LinBox::commentator().stop (MSG_STATUS (true), (const char *) 0, "testApplyTranspose");
}
} // timing test block
@@ -252,20 +267,20 @@ testBlackbox(BB &A)
r.random(x);
LinBox::RandomDenseStream<Field, DenseVector> stream2 (F, r, A.coldim(), iterations);
- LinBox::commentator.start ("\t--Testing A(ax+y) = a(Ax) + (Ay)", "testLinearity", 1);
+ LinBox::commentator().start ("\t--Testing A(ax+y) = a(Ax) + (Ay)", "testLinearity", 1);
ret = ret && testLinearity (F, A, stream1, stream2);
- LinBox::commentator.stop (MSG_STATUS (ret),
+ LinBox::commentator().stop (MSG_STATUS (ret),
(const char *) 0, "testLinearity");
- LinBox::commentator.start ("\t--Testing u^T(Av) = (u^T A)v",
+ LinBox::commentator().start ("\t--Testing u^T(Av) = (u^T A)v",
"testTranspose", 1);
LinBox::RandomDenseStream<Field, DenseVector> stream3 (F, r, A.rowdim(), iterations);
LinBox::RandomDenseStream<Field, DenseVector> stream4 (F, r, A.coldim(), iterations);
ret = ret && testTranspose (F, A, stream3, stream4);
- LinBox::commentator.stop (MSG_STATUS (ret),
+ LinBox::commentator().stop (MSG_STATUS (ret),
(const char *) 0, "testTranspose");
#endif
@@ -297,3 +312,12 @@ testBB(Field& F)
}
#endif // __LINBOX_test_blackbox_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-blas-domain.C b/tests/test-blas-domain.C
index abc43a2..2653a48 100644
--- a/tests/test-blas-domain.C
+++ b/tests/test-blas-domain.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-blas-domain.C
* Copyright (C) 2004 Pascal Giorgi
@@ -8,7 +6,25 @@
*
* ---------------------------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*
*
*/
@@ -26,15 +42,20 @@
#include "linbox/linbox-config.h"
#include <iostream>
#include <string>
-#include <linbox/integer.h>
-#include <linbox/matrix/dense.h>
-#include <linbox/matrix/blas-matrix.h>
-#include <linbox/matrix/matrix-domain.h>
-#include <linbox/vector/vector-domain.h>
-#include <linbox/field/modular.h>
-#include <linbox/randiter/nonzero.h>
-#include <linbox/util/commentator.h>
-#include <linbox/algorithms/blas-domain.h>
+#include "linbox/integer.h"
+#include "linbox/field/gf2.h"
+#include "linbox/field/modular.h"
+#include "linbox/field/modular-balanced.h"
+#include "linbox/field/givaro.h"
+#ifdef __LINBOX_HAVE_NTL
+#include "linbox/field/ntl.h"
+#endif
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/matrix/matrix-domain.h"
+#include "linbox/vector/vector-domain.h"
+#include "linbox/randiter/nonzero.h"
+#include "linbox/util/commentator.h"
+#include "linbox/algorithms/blas-domain.h"
#include "linbox/field/PID-integer.h"
// #include "linbox/algorithms/matrix-hom.h"
@@ -54,7 +75,7 @@ const char* pretty(string a)
{
blank = " " + a;
- int msgsize= maxpretty - blank.size();
+ int msgsize= maxpretty - (int)blank.size();
string dot(".");
for (int i=0;i<msgsize ;++i)
blank+=dot;
@@ -69,12 +90,12 @@ static bool testMulAdd (const Field& F, size_t n, int iterations)
typedef typename Field::Element Element;
typedef typename Field::RandIter RandIter;
- typedef BlasMatrix<Element> Matrix;
+ typedef BlasMatrix<Field> Matrix;
//Commentator mycommentator;
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing muladd"),"testMulAdd",iterations);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing muladd"),"testMulAdd",iterations);
RandIter G(F);
bool ret = true;
@@ -84,8 +105,8 @@ static bool testMulAdd (const Field& F, size_t n, int iterations)
for (int k=0;k<iterations; ++k) {
- mycommentator.progress(k);
- Matrix A(n,n),B(n,n),C(n,n),D(n,n),T(n,n),R(n,n);
+ mycommentator().progress(k);
+ Matrix A(F, n,n),B(F, n,n),C(F, n,n),D(F, n,n),T(F, n,n),R(F, n,n);
std::vector<Element> x(n),y(n),z(n),t(n);
Element alpha, beta,malpha,tmp;
@@ -137,48 +158,52 @@ static bool testMulAdd (const Field& F, size_t n, int iterations)
ret=false;
}
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testMulAdd");
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testMulAdd");
return ret;
}
// computes D = alpha A B + beta C on integers and check the result is ok mod p.
// actually we check the mod p muladd here...
-bool CheckMulAdd( const Integer & alpha , const BlasMatrix<Integer> & A , const BlasMatrix<Integer> & B , const Integer & beta , const BlasMatrix<Integer> & C)
+bool CheckMulAdd( const Integer & alpha ,
+ const BlasMatrix<PID_integer> & A ,
+ const BlasMatrix<PID_integer> & B ,
+ const Integer & beta ,
+ const BlasMatrix<PID_integer> & C)
{
size_t M = C.rowdim();
size_t N = C.coldim();
- typedef Modular<double> ModularField ;
- typedef ModularField::Element Element ;
+ typedef Modular<double> Field ;
+ typedef Field::Element Element ;
PID_integer ZZ ;
MatrixDomain<PID_integer> ZMD(ZZ);
- BlasMatrix<Integer> D(M,N);
+ BlasMatrix<PID_integer> D(ZZ,M,N);
Integer p = Integer::random_between(10,12) ;
nextprime(p,p); //!@bug si p n'est pas premier, fgemm fait n'importe quoi (division par alpha)
- ModularField Zp (p);
+ Field Zp (p);
- BlasMatrixDomain<ModularField> BMD (Zp);
- MatrixDomain<ModularField> MD (Zp);
+ BlasMatrixDomain<Field> BMD (Zp);
+ MatrixDomain<Field> MD (Zp);
// Ep = b C + a A B
ZMD.muladd(D,beta,C,alpha,A,B);
- BlasMatrix<Element> Dp(D,Zp); // D mod p
-
- BlasMatrix<Element> Ap(A,Zp);
- BlasMatrix<Element> Bp(B,Zp);
- BlasMatrix<Element> Cp(C,Zp);
- // BlasMatrix<Element> Ap(A.rowdim(),A.coldim());
- // BlasMatrix<Element> Bp(B.rowdim(),B.coldim());
- // BlasMatrix<Element> Cp(C.rowdim(),C.coldim());
+ BlasMatrix<Field> Dp(D,Zp); // D mod p
+
+ BlasMatrix<Field> Ap(A,Zp);
+ BlasMatrix<Field> Bp(B,Zp);
+ BlasMatrix<Field> Cp(C,Zp);
+ // BlasMatrix<Field> Ap(A.rowdim(),A.coldim());
+ // BlasMatrix<Field> Bp(B.rowdim(),B.coldim());
+ // BlasMatrix<Field> Cp(C.rowdim(),C.coldim());
// MatrixHom::map(Ap,A,Zp);
// MatrixHom::map(Bp,B,Zp);
// MatrixHom::map(Cp,C,Zp);
- BlasMatrix<Element> Ep(M,N); // D mod p
+ BlasMatrix<Field> Ep(Zp,M,N); // D mod p
Element ap, bp ;
Zp.init(ap,alpha);
@@ -189,31 +214,31 @@ bool CheckMulAdd( const Integer & alpha , const BlasMatrix<Integer> & A , const
bool pass = MD.areEqual(Ep,Dp);
if (!pass) {
-#if 0
+#if 0 /* maple check on stdout */
std::cout << "#########################################" << std::endl;
std::cout << "p := " << p << ';' << std::endl;
std::cout << "ap,bp := " << ap << ',' << bp << ';' << std::endl;
- Ap.write(std::cout << "Ap :=", true) << ";" << std::endl;
- Bp.write(std::cout << "Bp :=", true) << ";" << std::endl;
- Cp.write(std::cout << "Cp :=", true) << ";" << std::endl;
- Dp.write(std::cout << "Dp :=", true) << ";" << std::endl;
- Ep.write(std::cout << "Ep :=", true) << ";" << std::endl;
+ Ap.write(std::cout << "Ap :=", LinBoxTag::FormatMaple) << ";" << std::endl;
+ Bp.write(std::cout << "Bp :=", LinBoxTag::FormatMaple) << ";" << std::endl;
+ Cp.write(std::cout << "Cp :=", LinBoxTag::FormatMaple) << ";" << std::endl;
+ Dp.write(std::cout << "Dp :=", LinBoxTag::FormatMaple) << ";" << std::endl;
+ Ep.write(std::cout << "Ep :=", LinBoxTag::FormatMaple) << ";" << std::endl;
std::cout << "alpha,beta := " << alpha << ',' << beta << ';' << std::endl;
- A.write(std::cout << "A :=",true) << ';' << std::endl;
- B.write(std::cout << "B :=",true) << ';' << std::endl;
- C.write(std::cout << "C :=",true) << ';' << std::endl;
- D.write(std::cout << "E :=",true) << ';' << std::endl;
+ A.write(std::cout << "A :=",LinBoxTag::FormatMaple) << ';' << std::endl;
+ B.write(std::cout << "B :=",LinBoxTag::FormatMaple) << ';' << std::endl;
+ C.write(std::cout << "C :=",LinBoxTag::FormatMaple) << ';' << std::endl;
+ D.write(std::cout << "E :=",LinBoxTag::FormatMaple) << ';' << std::endl;
std::cout << "evalm(E-alpha*A.B-beta*C);" << std::endl;
std::cout << "#########################################" << std::endl;
#endif
- mycommentator.report() << " *** BMD ERROR (" << alpha << ',' << beta << ") *** " << std::endl;
+ mycommentator().report() << " *** BMD ERROR (" << alpha << ',' << beta << ") *** " << std::endl;
}
// Ep = bp Cp + ap Ap Bp mod p
MD.muladd(Ep,bp,Cp,ap,Ap,Bp);
bool all = MD.areEqual(Ep,Dp);
if (!all) {
- mycommentator.report() << " *** MD ERROR *** " << std::endl;
+ mycommentator().report() << " *** MD ERROR *** " << std::endl;
}
return pass&all ;
@@ -225,12 +250,13 @@ template <class Field>
static bool testMulAddAgain (const Field& , size_t n, int iterations)
{
- typedef BlasMatrix<Integer> IMatrix;
+ PID_integer ZZ ;
+ typedef BlasMatrix<PID_integer> IMatrix;
//Commentator mycommentator;
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing muladd again"),"testMulAddAgain",iterations);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing muladd again"),"testMulAddAgain",iterations);
bool ret = true;
@@ -257,8 +283,8 @@ static bool testMulAddAgain (const Field& , size_t n, int iterations)
for (int k=0;k<iterations; ++k) {
- mycommentator.progress(k);
- IMatrix A(n,n),B(n,n),C(n,n),D(n,n),E(n,n);
+ mycommentator().progress(k);
+ IMatrix A(ZZ, n,n),B(ZZ, n,n),C(ZZ, n,n),D(ZZ, n,n),E(ZZ, n,n);
Integer a , b;
#if 0
@@ -307,7 +333,7 @@ static bool testMulAddAgain (const Field& , size_t n, int iterations)
}
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testMulAddAgain");
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testMulAddAgain");
return ret;
}
@@ -317,13 +343,13 @@ template <class Field>
static bool testMulAddShapeTrans (const Field &F, size_t m, size_t n, size_t k, int iterations)
{
bool ret = true ;
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing muladd for shapes and transposition"),"testMulAddShapeTrans",iterations);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing muladd for shapes and transposition"),"testMulAddShapeTrans",iterations);
typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix ;
+ typedef BlasMatrix<Field> Matrix ;
typedef TransposedBlasMatrix<Matrix> TransposedMatrix ;
typedef typename Field::RandIter Randiter ;
Randiter R(F) ;
@@ -333,12 +359,12 @@ static bool testMulAddShapeTrans (const Field &F, size_t m, size_t n, size_t k,
MatrixDomain<Field> MD (F);
// input matrix
- Matrix A(m,k);
- Matrix B(k,n);
- Matrix C(m,n);
+ Matrix A(F, m,k);
+ Matrix B(F, k,n);
+ Matrix C(F, m,n);
// result matrix
- Matrix D(m,n);
- Matrix E(m,n);
+ Matrix D(F, m,n);
+ Matrix E(F, m,n);
// random A,B
RandMat.random(A);
@@ -346,9 +372,9 @@ static bool testMulAddShapeTrans (const Field &F, size_t m, size_t n, size_t k,
RandMat.random(C);
// hard tranpose A,B
- Matrix A1 (k,m) ;
+ Matrix A1 (F, k,m) ;
A.transpose(A1) ;
- Matrix B1 (n,k) ;
+ Matrix B1 (F, n,k) ;
B.transpose(B1) ;
TransposedMatrix tA(A1); // t(tA)=A
TransposedMatrix tB(B1); // t(tB)=B
@@ -367,29 +393,29 @@ static bool testMulAddShapeTrans (const Field &F, size_t m, size_t n, size_t k,
BMD.muladd(E,beta,C,alpha,A,B);
if (!MD.areEqual(E,D)) {
ret = false ;
- mycommentator.report() << " *** BMD ERROR (" << alpha << ',' << beta << ") (noTrans, noTrans) *** " << std::endl;
+ mycommentator().report() << " *** BMD ERROR (" << alpha << ',' << beta << ") (noTrans, noTrans) *** " << std::endl;
}
BMD.muladd(E,beta,C,alpha,A,tB);
if (!MD.areEqual(E,D)) {
ret = false ;
- mycommentator.report() << " *** BMD ERROR (" << alpha << ',' << beta << ") (noTrans, Trans) *** " << std::endl;
+ mycommentator().report() << " *** BMD ERROR (" << alpha << ',' << beta << ") (noTrans, Trans) *** " << std::endl;
}
BMD.muladd(E,beta,C,alpha,tA,B);
if (!MD.areEqual(E,D)) {
ret = false ;
- mycommentator.report() << " *** BMD ERROR (" << alpha << ',' << beta << ") (Trans, noTrans) *** " << std::endl;
+ mycommentator().report() << " *** BMD ERROR (" << alpha << ',' << beta << ") (Trans, noTrans) *** " << std::endl;
}
BMD.muladd(E,beta,C,alpha,tA,tB);
if (!MD.areEqual(E,D)) {
ret = false ;
- mycommentator.report() << " *** BMD ERROR (" << alpha << ',' << beta << ") (Trans, Trans) *** " << std::endl;
+ mycommentator().report() << " *** BMD ERROR (" << alpha << ',' << beta << ") (Trans, Trans) *** " << std::endl;
}
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testMulAddShapeTrans");
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testMulAddShapeTrans");
return ret ;
}
@@ -398,14 +424,14 @@ template<class Field, bool LeftSide, bool UnitDiag>
static bool testTriangMulShapeTrans (const Field &F, size_t m, size_t n, int iterations)
{
bool ret = true ;
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing triangular matmul for shapes and transposition"),"testTriangMulShapeTrans",iterations);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing triangular matmul for shapes and transposition"),"testTriangMulShapeTrans",iterations);
typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix ;
- typedef TriangularBlasMatrix<Element> TriangularMatrix ;
+ typedef BlasMatrix<Field> Matrix ;
+ typedef TriangularBlasMatrix<Field> TriangularMatrix ;
typedef TransposedBlasMatrix<Matrix> TransposedMatrix ;
typedef TransposedBlasMatrix<TriangularMatrix > TransposedTriangular ;
typedef typename Field::RandIter Randiter ;
@@ -418,20 +444,20 @@ static bool testTriangMulShapeTrans (const Field &F, size_t m, size_t n, int ite
BlasMatrixDomain<Field> BMD (F);
MatrixDomain<Field> MD (F);
- int k = LeftSide?m:n ;
+ int k =(int) (LeftSide?m:n) ;
// input matrix
- Matrix A(k,k); // A = L+U-I. Either L or U is unit.
- Matrix B(m,n);
+ Matrix A(F, k,k); // A = L+U-I. Either L or U is unit.
+ Matrix B(F, m,n);
// result matrix
- Matrix D(m,n);
- Matrix E(m,n);
+ Matrix D(F, m,n);
+ Matrix E(F, m,n);
// random A,B
RandMat.random(A);
RandMat.random(B);
// hard tranpose A,B
- Matrix A1 (k,k) ;
+ Matrix A1 (F, k,k) ;
A.transpose(A1) ;
@@ -445,12 +471,12 @@ static bool testTriangMulShapeTrans (const Field &F, size_t m, size_t n, int ite
/**** DIRECT ****/
{
/* L */
- TriangularMatrix L (A, BlasTag::low,
- (UnitDiag?BlasTag::unit:BlasTag::nonunit));
+ TriangularMatrix L (A, LinBoxTag::Lower,
+ (UnitDiag?LinBoxTag::Unit:LinBoxTag::NonUnit));
/* U */
- TriangularMatrix U (A, BlasTag::up,
- (!UnitDiag?BlasTag::unit:BlasTag::nonunit));
+ TriangularMatrix U (A, LinBoxTag::Upper,
+ (!UnitDiag?LinBoxTag::Unit:LinBoxTag::NonUnit));
/* make product */
E = B ;
@@ -470,21 +496,21 @@ static bool testTriangMulShapeTrans (const Field &F, size_t m, size_t n, int ite
/* check equality */
if (!MD.areEqual(E,D)) {
ret = false ;
- mycommentator.report() << " *** BMD ERROR (" << (LeftSide?"left":"right") << ',' << (UnitDiag?" L":" U") << " is unit) *** " << std::endl;
+ mycommentator().report() << " *** BMD ERROR (" << (LeftSide?"left":"right") << ',' << (UnitDiag?" L":" U") << " is unit) *** " << std::endl;
}
else {
- mycommentator.report() << " direct triangular multiplication ok." << std::endl;
+ mycommentator().report() << " direct triangular multiplication ok." << std::endl;
}
}
/**** Transpose ****/
{
/* L */
- TriangularMatrix L1 (A1, BlasTag::low,
- (UnitDiag?BlasTag::unit:BlasTag::nonunit));
+ TriangularMatrix L1 (A1, LinBoxTag::Lower,
+ (UnitDiag?LinBoxTag::Unit:LinBoxTag::NonUnit));
/* U */
- TriangularMatrix U1 (A1, BlasTag::up,
- (!UnitDiag?BlasTag::unit:BlasTag::nonunit));
+ TriangularMatrix U1 (A1, LinBoxTag::Upper,
+ (!UnitDiag?LinBoxTag::Unit:LinBoxTag::NonUnit));
TransposedTriangular L(L1);
TransposedTriangular U(U1);
@@ -506,14 +532,14 @@ static bool testTriangMulShapeTrans (const Field &F, size_t m, size_t n, int ite
/* check equality */
if (!MD.areEqual(E,D)) {
ret = false ;
- mycommentator.report() << " *** BMD ERROR Transpose (" << (LeftSide?"left":"right") << ',' << (UnitDiag?" L":" U") << " is unit) *** " << std::endl;
+ mycommentator().report() << " *** BMD ERROR Transpose (" << (LeftSide?"left":"right") << ',' << (UnitDiag?" L":" U") << " is unit) *** " << std::endl;
}
else {
- mycommentator.report() << " transposed triangular multiplication ok." << std::endl;
+ mycommentator().report() << " transposed triangular multiplication ok." << std::endl;
}
}
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testMulAddShapeTrans");
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testMulAddShapeTrans");
return ret ;
}
@@ -530,9 +556,9 @@ static bool testRank (const Field& F,size_t n, int iterations)
typedef typename Field::RandIter RandIter;
//Commentator mycommentator;
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing rank"),"testRank",iterations);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing rank"),"testRank",iterations);
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
@@ -543,17 +569,17 @@ static bool testRank (const Field& F,size_t n, int iterations)
for (int k=0;k<iterations; ++k) {
- mycommentator.progress(k);
- BlasMatrix<Element> A(n,n),S(n,n), L(n,n);
+ mycommentator().progress(k);
+ BlasMatrix<Field> A(F,n,n),S(F,n,n), L(F,n,n);
- r = random() % n;
+ r = (unsigned int)(random() % n);
// create S as an upper triangular matrix with r nonzero rows
for (size_t i=0;i<r;++i){
S.setEntry(i,i,Gn.random(tmp));
for (size_t j=i+1;j<n;++j)
S.setEntry(i,j,G.random(tmp));
}
- BMD.write(commentator.report(), S) << std::endl;
+ BMD.write(commentator().report(), S) << std::endl;
// create L as a lower triangular matrix with nonzero elements on the diagonal
@@ -562,21 +588,21 @@ static bool testRank (const Field& F,size_t n, int iterations)
L.setEntry(i,j,G.random(tmp));
L.setEntry(i,i,Gn.random(tmp));
}
- BMD.write(commentator.report(), L) << std::endl;
+ BMD.write(commentator().report(), L) << std::endl;
// compute A=LS
BMD.mul(A,L,S);
- BMD.write(commentator.report(), A) << std::endl;
+ BMD.write(commentator().report(), A) << std::endl;
// compute the rank of A
unsigned int rank= BMD.rankin(A);
- commentator.report() << "Rank " << rank << " should be " << r << std::endl;
+ commentator().report() << "Rank " << rank << " should be " << r << std::endl;
if (rank!=r)
ret=false;
}
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testRank");
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testRank");
return ret;
}
@@ -594,9 +620,9 @@ static bool testDet (const Field& F,size_t n, int iterations)
typedef typename Field::RandIter RandIter;
//Commentator mycommentator;
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing determinant"),"testDet",iterations);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing determinant"),"testDet",iterations);
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
@@ -608,11 +634,11 @@ static bool testDet (const Field& F,size_t n, int iterations)
for (int k=0;k<iterations;++k) {
- mycommentator.progress(k);
+ mycommentator().progress(k);
G.random(d);
- BlasMatrix<Element> A(n,n),S(n,n), L(n,n);
+ BlasMatrix<Field> A(F,n,n),S(F,n,n), L(F,n,n);
// create S as an upper triangular matrix of full rank
// with diagonal's element equal to 1 except the first entry wich equals to d
@@ -641,7 +667,7 @@ static bool testDet (const Field& F,size_t n, int iterations)
ret=false;
}
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testDet");
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testDet");
return ret;
}
@@ -656,12 +682,12 @@ static bool testInv (const Field& F,size_t n, int iterations)
typedef typename Field::Element Element;
typedef typename Field::RandIter RandIter;
- typedef BlasMatrix<Element> Matrix;
+ typedef BlasMatrix<Field> Matrix;
//Commentator mycommentator;
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing inverse"),"testInv",iterations);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing inverse"),"testInv",iterations);
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
@@ -672,16 +698,16 @@ static bool testInv (const Field& F,size_t n, int iterations)
MatrixDomain<Field> MD(F);
BlasMatrixDomain<Field> BMD(F);
- Matrix Id(n,n);
+ Matrix Id(F, n,n);
for (size_t i=0;i<n;++i)
Id.setEntry(i,i,One);
for (int k=0;k<iterations;++k) {
- mycommentator.progress(k);
+ mycommentator().progress(k);
- Matrix A(n,n),S(n,n), L(n,n), invA(n,n);
+ Matrix A(F, n,n),S(F, n,n), L(F, n,n), invA(F, n,n);
// create S as an upper triangular matrix of full rank
// with nonzero random diagonal's element
@@ -713,7 +739,7 @@ static bool testInv (const Field& F,size_t n, int iterations)
ret=false;
}
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testInv");
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testInv");
return ret;
}
@@ -727,14 +753,14 @@ static bool testTriangularSolve (const Field& F, size_t m, size_t n, int iterati
{
typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix;
- typedef TriangularBlasMatrix<Element> TriangularMatrix;
+ typedef BlasMatrix<Field> Matrix;
+ typedef TriangularBlasMatrix<Field> TriangularMatrix;
typedef typename Field::RandIter RandIter;
//Commentator mycommentator;
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing triangular solver"),"testTriangularSolve",iterations);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing triangular solver"),"testTriangularSolve",iterations);
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
@@ -748,10 +774,10 @@ static bool testTriangularSolve (const Field& F, size_t m, size_t n, int iterati
for (int k=0;k<iterations;++k) {
- mycommentator.progress(k);
+ mycommentator().progress(k);
- Matrix Al(m,m),Au(m,m);
- Matrix X(m,n), B(m,n), C(m,n);
+ Matrix Al(F, m,m),Au(F, m,m);
+ Matrix X(F, m,n), B(F, m,n), C(F, m,n);
std::vector<Element> b(m),x(m),c(m);
@@ -779,7 +805,7 @@ static bool testTriangularSolve (const Field& F, size_t m, size_t n, int iterati
}
// Create 2 trinagular matrix as view of matrix
- TriangularMatrix TAl(Al,BlasTag::low,BlasTag::nonunit), TAu(Au,BlasTag::up,BlasTag::nonunit);
+ TriangularMatrix TAl(Al,LinBoxTag::Lower,LinBoxTag::NonUnit), TAu(Au,LinBoxTag::Upper,LinBoxTag::NonUnit);
// testing solver with matrix right hand side
BMD.left_solve(X,TAl,B);
@@ -828,7 +854,7 @@ static bool testTriangularSolve (const Field& F, size_t m, size_t n, int iterati
}
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testTriangularSolve");
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testTriangularSolve");
return ret;
}
@@ -841,13 +867,13 @@ static bool testSolve (const Field& F, size_t m, size_t n, int iterations)
{
typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix;
+ typedef BlasMatrix<Field> Matrix;
typedef typename Field::RandIter RandIter;
//Commentator mycommentator;
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing solver"),"testTriangularSolve",iterations);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing solver"),"testTriangularSolve",iterations);
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
@@ -861,10 +887,10 @@ static bool testSolve (const Field& F, size_t m, size_t n, int iterations)
for (int k=0;k<iterations;++k) {
- mycommentator.progress(k);
+ mycommentator().progress(k);
- Matrix A(m,m),L(m,m),S(m,m);
- Matrix X(m,n), B(m,n), C(m,n);
+ Matrix A(F, m,m),L(F, m,m),S(F, m,m);
+ Matrix X(F, m,n), B(F, m,n), C(F, m,n);
std::vector<Element> b(m),x(m),c(m);
@@ -945,7 +971,7 @@ static bool testSolve (const Field& F, size_t m, size_t n, int iterations)
}
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testTriangularSolve");
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testTriangularSolve");
return ret;
}
@@ -958,17 +984,17 @@ static bool testPermutation (const Field& F, size_t m, int iterations)
{
typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix;
+ typedef BlasMatrix<Field> Matrix;
typedef typename Field::RandIter RandIter;
//Commentator mycommentator;
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing permutations"),"testPermutation",iterations);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing permutations"),"testPermutation",iterations);
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
- Element One,zero,tmp,tmp2;
+ Element One,zero,tmp;
F.init(One,1UL);
F.init(zero,0UL);
@@ -979,25 +1005,26 @@ static bool testPermutation (const Field& F, size_t m, int iterations)
for (int k=0;k<iterations;++k) {
- mycommentator.progress(k);
+ mycommentator().progress(k);
std::vector<size_t> P(m);
Field Z2(2);
RandIter G2(Z2);
- for (size_t i=0; i<m; ++i){
- G.random(tmp);
- if ( Z2.isZero(G2.random(tmp2) ) )
- P[i] = i + ( (size_t) tmp % (m-i) );
- else
- P[i] = i;
- }
+ // for (size_t i=0; i<m; ++i){
+ // G.random(tmp);
+ // if ( Z2.isZero(G2.random(tmp2) ) )
+ // P[i] = i + ( (size_t) random() % (m-i) );
+ // else
+ // P[i] = i;
+ // }
//std::cerr<<P<<std::endl;
- Matrix A(m,m), Abis(m,m), B(m,m), C(m,m), D(m,m);
+ Matrix A(F, m,m), Abis(F, m,m), B(F, m,m), C(F, m,m), D(F, m,m);
std::vector<Element> a(m),abis(m),b(m),c(m), d(m);
- BlasPermutation<size_t> Perm(P);
+ BlasPermutation<size_t> Perm(m);
+ RandomBlasPermutation(Perm);
// Create A a random matrix
for (size_t i=0;i<m;++i)
@@ -1251,7 +1278,7 @@ static bool testPermutation (const Field& F, size_t m, int iterations)
if (!MD.areEqual(D,B))
ret=false;
}
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testLQUP");
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testLQUP");
return ret;
}
@@ -1264,13 +1291,13 @@ static bool testLQUP (const Field& F, size_t m, size_t n, int iterations)
{
typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix;
+ typedef BlasMatrix<Field> Matrix;
typedef typename Field::RandIter RandIter;
//Commentator mycommentator;
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing LQUP factorization"),"testLQUP",iterations);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing LQUP factorization"),"testLQUP",iterations);
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
@@ -1284,9 +1311,9 @@ static bool testLQUP (const Field& F, size_t m, size_t n, int iterations)
for (int k=0;k<iterations;++k) {
- mycommentator.progress(k);
+ mycommentator().progress(k);
- Matrix A(m,n), Abis(m,n), B(m,m), C(m,n);
+ Matrix A(F, m,n), Abis(F, m,n), B(F, m,m), C(F, m,n);
// Create B a random matrix of rank n/2
@@ -1312,10 +1339,10 @@ static bool testLQUP (const Field& F, size_t m, size_t n, int iterations)
Abis = A;
BlasPermutation<size_t> P(A.coldim()),Q(A.rowdim());
- LQUPMatrix<Field> X(F,A,P,Q);
+ LQUPMatrix<Field> X(A,P,Q);
- TriangularBlasMatrix<Element> L(m,m,BlasTag::low,BlasTag::unit);
- TriangularBlasMatrix<Element> U(m,n,BlasTag::up,BlasTag::nonunit);
+ TriangularBlasMatrix<Field> L(F,m,m,LinBoxTag::Lower,LinBoxTag::Unit);
+ TriangularBlasMatrix<Field> U(F,m,n,LinBoxTag::Upper,LinBoxTag::NonUnit);
X.getL(L);
X.getU(U);
P=X.getP();
@@ -1338,10 +1365,10 @@ static bool testLQUP (const Field& F, size_t m, size_t n, int iterations)
Abis = A;
- LQUPMatrix<Field> Y(F,A,P,Q);
+ LQUPMatrix<Field> Y(A,P,Q);
- TriangularBlasMatrix<Element> L2(m,m,BlasTag::low,BlasTag::unit);
- TriangularBlasMatrix<Element> U2(m,n,BlasTag::up,BlasTag::nonunit);
+ TriangularBlasMatrix<Field> L2(F,m,m,LinBoxTag::Lower,LinBoxTag::Unit);
+ TriangularBlasMatrix<Field> U2(F,m,n,LinBoxTag::Upper,LinBoxTag::NonUnit);
Y.getL(L2);
Y.getU(U2);
P=Y.getP();
@@ -1359,7 +1386,7 @@ static bool testLQUP (const Field& F, size_t m, size_t n, int iterations)
ret=false;
}
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testLQUP");
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testLQUP");
return ret;
}
@@ -1368,28 +1395,28 @@ template <class Field>
static bool testMinPoly (const Field& F, size_t n, int iterations)
{
typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix;
+ typedef BlasMatrix<Field> Matrix;
typedef typename Field::RandIter RandIter;
typedef vector<Element> Polynomial;
//Commentator mycommentator;
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing minpoly"),"testMinPoly",iterations);
- Element tmp, one, zero,mone;
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing minpoly"),"testMinPoly",iterations);
+ Element tmp, one, zero,mOne;
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
F.init(one, 1UL);
F.init(zero, 0UL);
- F.neg(mone, one);
- //F.neg( mone, one);
+ F.neg(mOne, one);
+ //F.neg( mOne, one);
bool ret = true;
BlasMatrixDomain<Field> BMD(F);
for (int k=0;k<iterations;++k) {
- mycommentator.progress(k);
+ mycommentator().progress(k);
- Matrix A(n,n);
+ Matrix A(F,n,n);
Polynomial P;
// Test MinPoly(In) = X-1
for (size_t i=0;i<n;++i)
@@ -1399,7 +1426,7 @@ static bool testMinPoly (const Field& F, size_t n, int iterations)
if ( P.size() !=2 )
ret = false;
- if ( !F.areEqual(P[0], mone) )
+ if ( !F.areEqual(P[0], mOne) )
ret = false;
if ( !F.areEqual(P[1], one) )
ret = false;
@@ -1440,7 +1467,7 @@ static bool testMinPoly (const Field& F, size_t n, int iterations)
}
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testMinPoly");
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testMinPoly");
return ret;
}
@@ -1449,28 +1476,28 @@ template <class Field>
static bool testCharPoly (const Field& F, size_t n, int iterations)
{
typedef typename Field::Element Element;
- typedef BlasMatrix<Element> Matrix;
+ typedef BlasMatrix<Field> Matrix;
typedef typename Field::RandIter RandIter;
typedef vector<Element> Polynomial;
//Commentator mycommentator;
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- mycommentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- mycommentator.start (pretty("Testing charpoly"),"testCharPoly",iterations);
- Element tmp, one, zero,mone;
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing charpoly"),"testCharPoly",iterations);
+ Element tmp, one, zero,mOne;
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
F.init(one, 1UL);
F.init(zero, 0UL);
- F.neg(mone, one);
- //F.neg( mone, one);
+ F.neg(mOne, one);
+ //F.neg( mOne, one);
bool ret = true;
BlasMatrixDomain<Field> BMD(F);
for (int k=0;k<iterations;++k) {
- mycommentator.progress(k);
+ mycommentator().progress(k);
- Matrix A(n,n);
+ Matrix A(F,n,n);
list<Polynomial> P;
// Test CharPoly(In) = (X-1)^n
for (size_t i=0;i<n;++i){
@@ -1487,7 +1514,7 @@ static bool testCharPoly (const Field& F, size_t n, int iterations)
while (P_it != P.end()){
if ( P_it->size() !=2 )
ret = false;
- if ( !F.areEqual(P_it->operator[](0), mone) )
+ if ( !F.areEqual(P_it->operator[](0), mOne) )
ret = false;
if ( !F.areEqual(P_it->operator[](1), one) )
ret = false;
@@ -1515,7 +1542,7 @@ static bool testCharPoly (const Field& F, size_t n, int iterations)
}
}
- mycommentator.stop(MSG_STATUS (ret), (const char *) 0, "testCharPoly");
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testCharPoly");
return ret;
}
@@ -1581,26 +1608,53 @@ int main(int argc, char **argv)
//typedef Modular<int> Field;
//typedef Modular<float> Field;
- Field F (q);
- // ModularBalanced<double> G(q);
- Modular<float> H(2011);
+ Field F1 (q);
+ ModularBalanced<double> F2(q);
+ Modular<float> F3(2011);
+ GF2 F4 ;
+ GivaroZpz<Givaro::Unsigned32> F5(2001);
+ Modular<bool> F6 ;
+ // BB. (Blas)MatrixDomain are not very generic...
+#ifdef __LINBOX_HAVE_NTL
+ NTL::ZZ_p::init(NTL::to_ZZ((size_t)q));
+ NTL_ZZ_p F7;
+#endif
+
bool pass = true;
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start("BlasMatrixDomain test suite", "BlasMatrixDomain");
+ commentator().start("BlasMatrixDomain test suite", "BlasMatrixDomain");
- pass &= launch_tests(F,n,iterations);
- // pass &= launch_tests(G,n,iterations);
- pass &= launch_tests(H,n,iterations);
+ pass &= launch_tests(F1,(int)n,iterations);
+ pass &= launch_tests(F2,(int)n,iterations);
+ pass &= launch_tests(F3,(int)n,iterations);
+#pragma message "#warning GF2 is not working at all -> working on m4ri"
+ // pass &= launch_tests(F4,(int)n,iterations);
+ // pass &= launch_tests(F6,(int)n,iterations);
+#pragma message "#warning GivaroZpz is not working at all"
+ // pass &= launch_tests(F5,(int)n,iterations);
+#ifdef __LINBOX_HAVE_NTL
+#pragma message "#warning NTL_ZZp is not working at all"
+ // pass &= launch_tests(F7,(int)n,iterations);
+#endif
- commentator.stop(MSG_STATUS (pass), (const char *) 0,"BlasMatrixDomain test suite");
+ commentator().stop(MSG_STATUS (pass), (const char *) 0,"BlasMatrixDomain test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-block-ring.C b/tests/test-block-ring.C
index 2c4eb20..0f11d18 100644
--- a/tests/test-block-ring.C
+++ b/tests/test-block-ring.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Copyright (C) 2007 b d saunders
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -48,40 +49,49 @@ using namespace LinBox;
int main (int argc, char **argv)
{
static size_t n = 10;
- static integer q = 10733;
+ static integer q = 10733;
static int iterations = 2;
- static Argument args[] = {
- { 'n', "-n N", "Set dimension of blocks to N.", TYPE_INT, &n },
- { 'q', "-q Q", "Operate over the \"field\" GF(Q) [1].", TYPE_INTEGER, &q },
- { 'i', "-i I", "Perform each test for I iterations.", TYPE_INT, &iterations },
- END_OF_ARGUMENTS
- };
+ static Argument args[] = {
+ { 'n', "-n N", "Set dimension of blocks to N.", TYPE_INT, &n },
+ { 'q', "-q Q", "Operate over the \"field\" GF(Q) [1].", TYPE_INTEGER, &q },
+ { 'i', "-i I", "Perform each test for I iterations.", TYPE_INT, &iterations },
+ END_OF_ARGUMENTS
+ };
- parseArguments (argc, argv, args);
+ parseArguments (argc, argv, args);
- commentator.start("block-ring test suite", "block-ring");
+ commentator().start("block-ring test suite", "block-ring");
bool pass = true;
typedef Modular<int> Field1;
typedef Modular<double> Field2;
- Field1 F1(q, 1);
+ Field1 F1(q, 1);
BlockRing<Field1> R1(F1, n);
- Field2 F2(q, 1);
- BlockRing<Field2> R2(F2, n);
+ Field2 F2(q, 1);
+ BlockRing<Field2> R2(F2, n);
// Make sure some more detailed messages get printed
- //commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ //commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (!runBasicRingTests(R1, "BlockRing of Modular<int>", iterations)) pass = false;
if (!runBasicRingTests(R2, "BlockRing of Modular<double>", iterations)) pass = false;
- commentator.stop("block-ring test suite");
+ commentator().stop("block-ring test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-bmseq.C b/tests/test-bmseq.C
new file mode 100644
index 0000000..dbcc75a
--- /dev/null
+++ b/tests/test-bmseq.C
@@ -0,0 +1,233 @@
+
+/* tests/test-dense.C
+ * Copyright (C) 2001, 2002 Bradford Hovinen
+ *
+ * Written by George Yuhasz <yuhasz at gmail.com>
+ *
+ * --------------------------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ */
+
+#include "linbox/linbox-config.h"
+
+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <cstdio>
+#include <algorithm>
+#include <set>
+#include <list>
+
+#include "linbox/util/commentator.h"
+#include "linbox/field/modular.h"
+#include "linbox/algorithms/bm-seq.h"
+
+#include "test-common.h"
+#include "test-generic.h"
+
+using namespace LinBox;
+using namespace std;
+
+/* Test 1: Identity matrix in dense representation
+ *
+ * Construct a dense representation of an n x n identity matrix and check
+ * whether the output of its application to a series of random vectors is equal
+ * to the input.
+ *
+ * F - Field over which to perform computations
+ * n - Dimension to which to make matrix
+ * iterations - Number of random vectors to which to apply identity inverse
+ *
+ * Return true on success and false on failure
+ */
+
+template <class Field>
+static bool testIdentity (Field &F, long n, int iterations)
+{
+ typedef typename Vector<Field>::Dense Vector;
+ typedef BlasMatrix <Field> Blackbox;
+
+ commentator().start ("Testing identity apply", "testIdentity", iterations);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+
+ bool ret = true;
+ bool iter_passed = true;
+
+ int i, j;
+
+ Blackbox I (F, n, n);
+ typename Field::Element one;
+
+ F.init (one, 1);
+
+ for (i = 0; i < n; i++)
+ I.setEntry (i, i, one);
+
+ Vector v(n), w(n);
+ typename Field::RandIter r (F);
+
+ for (i = 0; i < iterations; i++) {
+ char buf[80];
+ snprintf (buf, 80, "Iteration %d", i);
+ commentator().start (buf);
+
+ iter_passed = true;
+
+ for (j = 0; j < n; j++)
+ r.random (v[j]);
+
+ report << "Input vector: ";
+ printVector<Field> (F, report, v);
+
+ I.apply (w, v);
+
+ report << "Output vector: ";
+ printVector<Field> (F, report, w);
+
+ for (j = 0; j < n; j++)
+ if (!F.areEqual (w[j], v[j]))
+ ret = iter_passed = false;
+
+ if (!iter_passed)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ << "ERROR: Vectors are not equal" << endl;
+
+ commentator().stop ("done");
+ commentator().progress ();
+ }
+
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testIdentity");
+
+ return ret;
+}
+
+
+int main (int argc, char **argv)
+{
+ bool pass = true;
+
+ static size_t n = 10;
+ static integer q = 101;
+ static int iterations = 2; // was 100
+ //static int N = 1;
+
+ static Argument args[] = {
+ { 'n', "-n N", "Set dimension of test matrices to NxN.", TYPE_INT, &n },
+ { 'q', "-q Q", "Operate over the \"field\" GF(Q) [1].", TYPE_INTEGER, &q },
+ { 'i', "-i I", "Perform each test for I iterations.", TYPE_INT, &iterations },
+ END_OF_ARGUMENTS
+ };
+
+ typedef Modular<uint32_t> Field;
+
+ parseArguments (argc, argv, args);
+ Field F (q);
+
+ commentator().start("Dense matrix black box test suite", "BlasMatrix");
+
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+
+
+
+ Field::Element one, zero;
+ F.init(one,1);
+ F.init(zero,0);
+ BlasMatrix<Field> D(F,2,2);
+ BlasMatrix<Field> zero24(F,2,4);
+ for(size_t i=0; i<2; i++)
+ D.setEntry(i,i,one);
+ D.setEntry(1,0,one);
+ BM_Seq<Field> seq(2,D);
+ BlasMatrix<Field> S2(F,2,2);
+ MatrixDomain<Field> MD(F);
+ BM_Seq<Field>::BM_iterator bmit(seq, 0), bmit2(seq.BM_begin());
+ bmit.setDelta(4);
+ BM_Seq<Field>::BM_iterator::TerminationState check = bmit.state();
+ while(!check.IsGeneratorFound() && !check.IsSequenceExceeded()){
+ bmit++;
+ check = bmit.state();
+ }
+ for(list<BlasMatrix<Field> >::iterator it = bmit->begin(); it != bmit->end(); it++)
+ (*it).write(report);
+ if(check.IsSequenceExceeded())
+ report << "Sequence Exceeded" << endl;
+ bmit++;
+ check = bmit.state();
+ if(check.IsSequenceExceeded())
+ report << "Sequence Exceeded" << endl;
+ for(list<BlasMatrix<Field> >::iterator it = bmit->begin(); it != bmit->end(); it++)
+ (*it).write(report);
+ MD.add(S2,D,D);
+ seq.push_back(S2);
+ bmit++;
+ check = bmit.state();
+ if(check.IsSequenceExceeded())
+ report << "Sequence Exceeded" << endl;
+ for(list<BlasMatrix<Field> >::iterator it = bmit->begin(); it != bmit->end(); it++)
+ (*it).write(report);
+ MD.addin(S2,D);
+ seq.push_back(S2);
+ bmit++;
+ check = bmit.state();
+ if(check.IsSequenceExceeded())
+ report << "Sequence Exceeded" << endl;
+ for(list<BlasMatrix<Field> >::iterator it = bmit->begin(); it != bmit->end(); it++)
+ (*it).write(report);
+ if(check.IsGeneratorFound())
+ report << "Generator Found" << endl;
+ report << "mu = " << bmit.get_mu() << endl;
+ report << "sigma = " << bmit.get_sigma() << endl;
+ report << "beta = " << bmit.get_beta() << endl;
+ BM_Seq<Field>::BM_iterator::TerminationState check2 = bmit2.state();
+ while(!check2.IsGeneratorFound() && !check2.IsSequenceExceeded()){
+ ++bmit2;
+ check2 = bmit2.state();
+ }
+ if(bmit==bmit2)
+ report << "Iterators are equal" << endl;
+ if(bmit2==seq.BM_end())
+ report << "bmit2 is equal to end" << endl;
+ for(list<BlasMatrix<Field> >::iterator it = bmit2->begin(); it != bmit2->end(); it++)
+ (*it).write(report);
+ BM_Seq<Field>::BM_iterator bmit3 = seq.BM_begin();
+ bmit3 = bmit;
+ if(bmit==bmit3)
+ report << "Iterators are equal" << endl;
+ vector<BlasMatrix<Field> >gen(bmit.GetGenerator());
+ int d = bmit.get_mu();
+ for(int j = 0; j <= d; j++)
+ gen[j].write(report);
+
+ commentator().stop("dense matrix black box test suite");
+ return pass ? 0 : -1;
+}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-butterfly.C b/tests/test-butterfly.C
index 8d919f0..0e99744 100644
--- a/tests/test-butterfly.C
+++ b/tests/test-butterfly.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-butterfly.C
* Copyright (C) 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
@@ -54,7 +70,7 @@ using namespace std;
template <class Field, class Vector>
static bool testSetButterfly (const Field &F, VectorStream<Vector> &stream, size_t k)
{
- commentator.start ("Testing setButterfly", "testSetButterfly", stream.size ());
+ commentator().start ("Testing setButterfly", "testSetButterfly", stream.size ());
bool ret = true, iter_passed;
@@ -65,7 +81,7 @@ static bool testSetButterfly (const Field &F, VectorStream<Vector> &stream, size
VectorDomain<Field> VD (F);
while (stream) {
- commentator.startIteration (stream.j ());
+ commentator().startIteration ((unsigned int)stream.j ());
stream >> v_p;
typename LinBox::Vector<Field>::Dense v (stream.n ());
@@ -73,7 +89,7 @@ static bool testSetButterfly (const Field &F, VectorStream<Vector> &stream, size
real_k = v_p.first.size ();
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector: ";
VD.write (report, v) << endl;
@@ -104,7 +120,7 @@ static bool testSetButterfly (const Field &F, VectorStream<Vector> &stream, size
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Initial block contains zeros" << endl;
iter_passed = true;
@@ -114,22 +130,22 @@ static bool testSetButterfly (const Field &F, VectorStream<Vector> &stream, size
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Nonzero entries outside initial block" << endl;
if (!VD.areEqual (v, v1)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: P^T != P^-1" << endl;
ret = false;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testSetButterfly");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testSetButterfly");
return ret;
}
@@ -142,7 +158,7 @@ static bool testSetButterfly (const Field &F, VectorStream<Vector> &stream, size
template <class Field>
static bool testCekstvSwitch (const Field &F, unsigned int iterations, size_t n, size_t r)
{
- commentator.start ("Testing cekstv switch", "testCekstvSwitch", iterations);
+ commentator().start ("Testing cekstv switch", "testCekstvSwitch", iterations);
bool ret = true;
@@ -161,14 +177,14 @@ static bool testCekstvSwitch (const Field &F, unsigned int iterations, size_t n,
F.init (one, 1);
while (stream) {
- commentator.startIteration (stream.pos ());
+ commentator().startIteration ((unsigned int)stream.pos ());
stream >> d1;
typename Vector<Field>::Dense d (n);
VD.copy (d, d1);
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector: ";
VD.write (report, d) << endl;
@@ -176,8 +192,8 @@ static bool testCekstvSwitch (const Field &F, unsigned int iterations, size_t n,
report << "Real rank: " << real_r << endl;
- typename Field::RandIter r (F);
- typename CekstvSwitch<Field>::Factory factory (r);
+ typename Field::RandIter rdtr (F);
+ typename CekstvSwitch<Field>::Factory factory (rdtr);
Butterfly<Field, CekstvSwitch<Field> > P (F, n, factory);
Butterfly<Field, CekstvSwitch<Field> > Q (F, n, factory);
typedef Butterfly<Field, CekstvSwitch<Field> > Blackbox1;
@@ -199,26 +215,26 @@ static bool testCekstvSwitch (const Field &F, unsigned int iterations, size_t n,
F.write (report, det_Ap) << endl;
if (F.isZero (det_Ap)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
<< "WARNING: Determinant of r x r leading principal minor is zero" << endl;
++failures;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Total failures: " << failures << endl;
// FIXME: I need a theoretical error bound
if (failures > iterations / 5) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Too many failures. This is likely a bug." << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testCekstvSwitch");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testCekstvSwitch");
return ret;
}
@@ -241,7 +257,7 @@ static bool testRandomLinearity (const Field &F,
VectorStream<typename Vector<Field>::Dense> &v1_stream,
VectorStream<typename Vector<Field>::Dense> &v2_stream)
{
- commentator.start ("Testing random linearity", "testRandomLinearity", v1_stream.size ());
+ commentator().start ("Testing random linearity", "testRandomLinearity", v1_stream.size ());
typename Field::RandIter r (F);
typename CekstvSwitch<Field>::Factory factory (r);
@@ -252,7 +268,7 @@ static bool testRandomLinearity (const Field &F,
v1_stream.reset ();
v2_stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomLinearity");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomLinearity");
return ret;
}
@@ -275,7 +291,7 @@ static bool testRandomTranspose (const Field &F,
VectorStream<typename Vector<Field>::Dense> &v1_stream,
VectorStream<typename Vector<Field>::Dense> &v2_stream)
{
- commentator.start ("Testing random transpose", "testRandomTranspose", v1_stream.size ());
+ commentator().start ("Testing random transpose", "testRandomTranspose", v1_stream.size ());
typename Field::RandIter r (F);
typename CekstvSwitch<Field>::Factory factory (r);
@@ -286,7 +302,7 @@ static bool testRandomTranspose (const Field &F,
v1_stream.reset ();
v2_stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
return ret;
}
@@ -313,11 +329,11 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
Field F (q);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- commentator.start("Butterfly preconditioner test suite", "butterfly preconditioner");
+ commentator().start("Butterfly preconditioner test suite", "butterfly preconditioner");
RandomSparseStream<Field, Vector<Field>::Sparse, NonzeroRandIter<Field> >
stream (F, NonzeroRandIter<Field> (F, Field::RandIter (F)),
@@ -330,6 +346,15 @@ int main (int argc, char **argv)
if (!testRandomLinearity (F, v1_stream, v2_stream)) pass = false;
if (!testRandomTranspose (F, v1_stream, v2_stream)) pass = false;
- commentator.stop("butterfly preconditioner test suite");
+ commentator().stop("butterfly preconditioner test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-charpoly.C b/tests/test-charpoly.C
index b27ac90..b8f8856 100644
--- a/tests/test-charpoly.C
+++ b/tests/test-charpoly.C
@@ -1,10 +1,26 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-charpoly.C
* Copyright (C) LinBox
* Written by bds (starting from test-charpoly.C)
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file tests/test-charpoly.C
@@ -54,7 +70,7 @@ typename Dom::Element eval (const Dom& D,
const typename Dom::Element x)
{
typename Dom::Element tmp = P[P.size()-1];
- for (int i = P.size()-2; i >= 0; --i){
+ for (int i = (int)P.size()-2; i >= 0; --i){
D.mulin (tmp, x);
D.addin (tmp, P[i]);
}
@@ -64,14 +80,14 @@ typename Dom::Element eval (const Dom& D,
template <class Dom>
static bool testIdentityCharpoly (Dom &Z, size_t n, bool symmetrizing=false)
{
- typedef typename Dom::Element Element;
- typedef vector<Element> Vector;
- typedef ScalarMatrix<Dom> Blackbox;
- typedef GivPolynomialRing<Dom, ::Givaro::Dense> PolDom;
- typedef typename PolDom::Element Polynomial;
+ typedef typename Dom::Element Element;
+ typedef vector<Element> Vector;
+ typedef ScalarMatrix<Dom> Blackbox;
+ typedef GivPolynomialRing<Dom, Givaro::Dense> PolDom;
+ typedef typename PolDom::Element Polynomial;
//typedef Vector Polynomial;
- LinBox::commentator.start ("Testing identity Charpoly", "testIdentityCharpoly");
+ LinBox::commentator().start ("Testing identity Charpoly", "testIdentityCharpoly");
bool ret = true;
Element one; Z.init(one, 1);
@@ -85,7 +101,7 @@ static bool testIdentityCharpoly (Dom &Z, size_t n, bool symmetrizing=false)
charpoly (phi, A);
- ostream &report = LinBox::commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = LinBox::commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Characteristic polynomial is: ";
printPolynomial<Dom, Polynomial> (Z, report, phi);
@@ -104,11 +120,11 @@ static bool testIdentityCharpoly (Dom &Z, size_t n, bool symmetrizing=false)
if (! Z.areEqual(val2, pow2)) ret = false;
if (! ret){
- LinBox::commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ LinBox::commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Characteristic polynomial is incorrect" << endl;
}
- LinBox::commentator.stop (MSG_STATUS (ret), (const char *) 0, "testIdentityCharpoly");
+ LinBox::commentator().stop (MSG_STATUS (ret), (const char *) 0, "testIdentityCharpoly");
return ret;
}
@@ -127,13 +143,13 @@ template <class Field>
static bool testNilpotentCharpoly (Field &F, size_t n)
{
typedef vector <typename Field::Element> Vector;
-// typedef GivPolynomialRing<Field, ::Givaro::Dense> PolDom;
+// typedef GivPolynomialRing<Field, Givaro::Dense> PolDom;
// typedef typename PolDom::Element Polynomial;
typedef Vector Polynomial;
typedef pair <vector <size_t>, vector <typename Field::Element> > Row;
typedef SparseMatrix <Field> Blackbox;
- LinBox::commentator.start ("Testing nilpotent charpoly", "testNilpotentCharpoly");
+ LinBox::commentator().start ("Testing nilpotent charpoly", "testNilpotentCharpoly");
bool ret = true;
bool lowerTermsCorrect = true;
@@ -145,7 +161,7 @@ static bool testNilpotentCharpoly (Field &F, size_t n)
stream.next (v);
Blackbox A (F, stream);
- ostream &who = LinBox::commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &who = LinBox::commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
who << "Matrix:" << endl;
A.write (who, FORMAT_PRETTY);
@@ -155,7 +171,7 @@ static bool testNilpotentCharpoly (Field &F, size_t n)
charpoly (phi, A);
- ostream &report = LinBox::commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = LinBox::commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "characteristic polynomial is: ";
printPolynomial (F, report, phi);
@@ -166,11 +182,11 @@ static bool testNilpotentCharpoly (Field &F, size_t n)
if (phi.size () != n + 1 || !F.isOne (phi[n]) || !lowerTermsCorrect) {
ret = false;
- LinBox::commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ LinBox::commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: characteristic polynomial is incorrect (should be x^" << n << ')' << endl;
}
- LinBox::commentator.stop (MSG_STATUS (ret), (const char *) 0, "testNilpotentCharpoly");
+ LinBox::commentator().stop (MSG_STATUS (ret), (const char *) 0, "testNilpotentCharpoly");
return ret;
}
@@ -195,12 +211,12 @@ bool testRandomCharpoly (Field &F,
VectorStream<Row> &A_stream,
VectorStream<Vector> &v_stream)
{
- //typedef GivPolynomialRing<Field, ::Givaro::Dense> PolDom;
+ //typedef GivPolynomialRing<Field, Givaro::Dense> PolDom;
//typedef typename PolDom::Element Polynomial;
typedef std::vector<typename Field::Element> Polynomial;
typedef SparseMatrix <Field> Blackbox;
- LinBox::commentator.start ("Testing sparse random charpoly", "testRandomCharpoly", 1);
+ LinBox::commentator().start ("Testing sparse random charpoly", "testRandomCharpoly", 1);
bool ret = true;
@@ -212,7 +228,7 @@ bool testRandomCharpoly (Field &F,
A_stream.reset ();
Blackbox A (F, A_stream);
- ostream &report = LinBox::commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = LinBox::commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Matrix:" << endl;
A.write (report, FORMAT_PRETTY);
@@ -223,7 +239,7 @@ bool testRandomCharpoly (Field &F,
report << "characteristic polynomial is: ";
printPolynomial (F, report, phi);
- LinBox::commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ LinBox::commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "deg charpoly (A) = " << phi.size () - 1 << endl;
v_stream.reset ();
@@ -240,10 +256,10 @@ bool testRandomCharpoly (Field &F,
}
if (!ret)
- LinBox::commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ LinBox::commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Output vector was incorrect" << endl;
- LinBox::commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomCharpoly");
+ LinBox::commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomCharpoly");
return ret;
}
#endif
@@ -277,13 +293,13 @@ int main (int argc, char **argv)
typedef SparseMatrix<Field>::Row SparseVector;
//typedef pair<vector<size_t>, vector<Field::Element> > SparseVector;
Field F (q);
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- LinBox::commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (10);
- LinBox::commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
- LinBox::commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ LinBox::commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (10);
+ LinBox::commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
+ LinBox::commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- ostream &report = LinBox::commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = LinBox::commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << endl << "Black box characteristic polynomial of a matrix over a prime field test suite" << endl;
RandomDenseStream<Field, DenseVector, NonzeroRandIter<Field> >
@@ -302,11 +318,11 @@ int main (int argc, char **argv)
typedef SparseMatrix<PID_integer>::Row ZSparseVector;
typedef pair<vector<size_t>, vector<Field::Element> > SparseVector;
PID_integer Z;
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- LinBox::commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (10);
- LinBox::commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
- LinBox::commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ LinBox::commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (10);
+ LinBox::commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
+ LinBox::commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
report << endl << "Black box characteristic polynomial of an integer matrix test suite" << endl;
@@ -328,3 +344,12 @@ int main (int argc, char **argv)
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-commentator.C b/tests/test-commentator.C
index d133081..c5878a5 100644
--- a/tests/test-commentator.C
+++ b/tests/test-commentator.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-commentator.C
* Copyright (C) 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*
* N.B. This test differs from the others in that the output is not
* automatically checked for correctness. This is partly because I do not feel
@@ -49,7 +65,7 @@ void outputReportStrings ()
for (unsigned int i = 0; i < sizeof (classes) / sizeof (char *); ++i)
for (unsigned int j = 0; j < sizeof (levels) / sizeof (char *); ++j)
- commentator.report (j, classes[i])
+ commentator().report (j, classes[i])
<< "Test string at " << levels[j] << " of class " << classes[i] << endl;
}
@@ -57,31 +73,31 @@ void outputReportStrings ()
void runTestActivity (bool reportStrings)
{
- commentator.start ("Test activity", "test", 2);
+ commentator().start ("Test activity", "test", 2);
if (reportStrings) outputReportStrings ();
for (int i = 0; i < 2; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
if (reportStrings) outputReportStrings ();
- commentator.start ("Special function 1", "function1");
+ commentator().start ("Special function 1", "function1");
if (reportStrings) outputReportStrings ();
- commentator.stop ("done");
+ commentator().stop ("done");
- commentator.start ("Special function 2", "function2");
+ commentator().start ("Special function 2", "function2");
if (reportStrings) outputReportStrings ();
- commentator.stop ("done");
+ commentator().stop ("done");
- commentator.start ("Special function 3", "function3");
+ commentator().start ("Special function 3", "function3");
if (reportStrings) outputReportStrings ();
- commentator.stop ("done");
+ commentator().stop ("done");
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop ("done", (const char *) 0, "test");
+ commentator().stop ("done", (const char *) 0, "test");
}
/* Test 1: Primary output
@@ -96,28 +112,28 @@ static bool testPrimaryOutput ()
bool ret = true;
// Disable the brief report for now
- commentator.setMessageClassStream (BRIEF_REPORT, commentator.cnull);
+ commentator().setMessageClassStream (BRIEF_REPORT, commentator().cnull);
- commentator.setMaxDepth (1);
+ commentator().setMaxDepth (1);
runTestActivity (true);
- commentator.setMaxDepth (2);
- commentator.setMaxDetailLevel (Commentator::LEVEL_IMPORTANT);
+ commentator().setMaxDepth (2);
+ commentator().setMaxDetailLevel (Commentator::LEVEL_IMPORTANT);
runTestActivity (true);
- commentator.setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
runTestActivity (true);
- commentator.setMaxDepth (3);
+ commentator().setMaxDepth (3);
runTestActivity (true);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_ALWAYS);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_ALWAYS);
runTestActivity (true);
- commentator.setPrintParameters (3, Commentator::LEVEL_IMPORTANT);
- commentator.setPrintParameters (0, Commentator::LEVEL_ALWAYS, "function1");
- commentator.setPrintParameters (10, Commentator::LEVEL_IMPORTANT, "function2");
- commentator.setPrintParameters (10, Commentator::LEVEL_UNIMPORTANT, "function3");
+ commentator().setPrintParameters (3, Commentator::LEVEL_IMPORTANT);
+ commentator().setPrintParameters (0, Commentator::LEVEL_ALWAYS, "function1");
+ commentator().setPrintParameters (10, Commentator::LEVEL_IMPORTANT, "function2");
+ commentator().setPrintParameters (10, Commentator::LEVEL_UNIMPORTANT, "function3");
runTestActivity (true);
//cout << (ret ? "passed" : "FAILED") << endl;
@@ -136,32 +152,32 @@ static bool testBriefReport ()
bool ret = true;
- commentator.setMessageClassStream (BRIEF_REPORT, commentator.report (Commentator::LEVEL_ALWAYS, INTERNAL_DESCRIPTION));
- commentator.setReportStream (commentator.cnull);
+ commentator().setMessageClassStream (BRIEF_REPORT, commentator().report (Commentator::LEVEL_ALWAYS, INTERNAL_DESCRIPTION));
+ commentator().setReportStream (commentator().cnull);
- commentator.setBriefReportParameters (Commentator::OUTPUT_CONSOLE, true, true, true);
+ commentator().setBriefReportParameters (Commentator::OUTPUT_CONSOLE, true, true, true);
- commentator.getMessageClass (BRIEF_REPORT).setMaxDepth (1);
+ commentator().getMessageClass (BRIEF_REPORT).setMaxDepth (1);
//cout << "about to ran a testactivity" << endl;
runTestActivity (false);
//cout << "ran a testactivity" << endl;
- commentator.getMessageClass (BRIEF_REPORT).setMaxDepth (2);
+ commentator().getMessageClass (BRIEF_REPORT).setMaxDepth (2);
runTestActivity (false);
- commentator.getMessageClass (BRIEF_REPORT).setMaxDepth (3);
+ commentator().getMessageClass (BRIEF_REPORT).setMaxDepth (3);
runTestActivity (false);
- commentator.setBriefReportParameters (Commentator::OUTPUT_PIPE, true, true, true);
+ commentator().setBriefReportParameters (Commentator::OUTPUT_PIPE, true, true, true);
- commentator.getMessageClass (BRIEF_REPORT).setMaxDepth (1);
+ commentator().getMessageClass (BRIEF_REPORT).setMaxDepth (1);
runTestActivity (false);
- commentator.getMessageClass (BRIEF_REPORT).setMaxDepth (2);
+ commentator().getMessageClass (BRIEF_REPORT).setMaxDepth (2);
runTestActivity (false);
- commentator.getMessageClass (BRIEF_REPORT).setMaxDepth (3);
+ commentator().getMessageClass (BRIEF_REPORT).setMaxDepth (3);
runTestActivity (false);
//cout << (ret ? "passed" : "FAILED") << endl;
@@ -179,12 +195,21 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("Commentator test suite", "commentator");
+ commentator().start("Commentator test suite", "commentator");
if (!testPrimaryOutput ()) pass = false;
if (!testBriefReport ()) pass = false;
- commentator.stop("commentator test suite");
+ commentator().stop("commentator test suite");
//cout << (pass ? "passed" : "FAILED") << endl;
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-common.C b/tests/test-common.C
index 1756c47..bbb3f45 100644
--- a/tests/test-common.C
+++ b/tests/test-common.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/tests/test-common.C
* Copyright (C) 2001, 2002 Bradford Hovinen
*
* Written by Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -81,3 +82,12 @@ double chiSquaredCDF (double chi_sqr, double df)
}
#endif // __LINBOX_test_common_C
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-common.h b/tests/test-common.h
index 8844f2a..ff9eff1 100644
--- a/tests/test-common.h
+++ b/tests/test-common.h
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/tests/test-common.C
* Copyright (C) 2001, 2002 Bradford Hovinen
*
@@ -14,7 +12,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
#ifndef __LINBOX_test_common_H
@@ -24,18 +40,15 @@
#include <fstream>
#include <vector>
+#include "linbox/linbox-config.h"
#include "linbox/field/archetype.h"
#include "linbox/vector/vector-domain.h"
#include "linbox/integer.h"
using namespace std;
-
#include "linbox/util/commentator.h"
#include "fflas-ffpack/utils/args-parser.h"
-template <class Field, class Vector>
-void printVector (Field &F, ostream &output, const Vector &v)
-{ printVectorSpecialized(F, output, v, typename LinBox::VectorTraits<Vector>::VectorCategory()); }
template <class Field, class Vector>
void printVectorSpecialized(
@@ -109,6 +122,12 @@ void printVectorSpecialized(
}
template <class Field, class Vector>
+void printVector (Field &F, ostream &output, const Vector &v)
+{
+ printVectorSpecialized(F, output, v, typename LinBox::VectorTraits<Vector>::VectorCategory());
+}
+
+template <class Field, class Vector>
bool areVectorsEqual (Field &F, const Vector &v, const Vector &w)
{
return areVectorsEqualSpecialized(F, v, w, LinBox::VectorTraits<Vector>::VectorCategory());
@@ -217,7 +236,7 @@ void printPolynomial (Field &F, ostream &output, const Polynomial &v)
if (v.size () == 0 || val == v.size ())
output << "0";
- for (i = v.size () - 1; i >= 0; i--) {
+ for (i = (int)v.size () - 1; i >= 0; i--) {
if (F.isZero (v[i]))
continue;
@@ -250,7 +269,7 @@ applyPoly (const Field &F,
VD.mul (w, v, phi[phi.size () - 1]);
- for (i = phi.size () - 2; i >= 0; i--) {
+ for (i = (int)phi.size () - 2; i >= 0; i--) {
A.apply (z, w);
VD.axpy (w, phi[i], v, z);
}
@@ -278,7 +297,7 @@ multiEvalPoly (const Field &F,
for (j = 0; j < v.size (); j++)
w[j] = phi[phi.size () - 1];
- for (i = phi.size () - 2; i >= 0; i--) {
+ for (i = (int)phi.size () - 2; i >= 0; i--) {
for (j = 0; j < v.size (); j++) {
F.axpy (tmp, w[j], v[j], phi[i]);
w[j] = tmp;
@@ -366,3 +385,12 @@ double chiSquaredCDF (double chi_sqr, double df);
#include "test-common.C"
#endif
#endif // __LINBOX_test_common_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-companion.C b/tests/test-companion.C
index 586362e..625d36f 100644
--- a/tests/test-companion.C
+++ b/tests/test-companion.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* using generic testBlackbox -bds
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -62,9 +63,9 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- srand (time (NULL));
+ srand ((unsigned int) time (NULL));
- commentator.start("Companion matrix black box test suite", "companion");
+ commentator().start("Companion matrix black box test suite", "companion");
typedef Modular<uint32_t> Field;
typedef vector <Field::Element> Vector;
@@ -85,7 +86,16 @@ int main (int argc, char **argv)
pass = pass && testBlackbox(B);
- commentator.stop("companion matrix black box test suite");
+ commentator().stop("companion matrix black box test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-cra.C b/tests/test-cra.C
index d4bef2b..d3210c7 100644
--- a/tests/test-cra.C
+++ b/tests/test-cra.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Written by Brice Boyer <brice.boyer at imag.fr>
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file tests/test-cra.C
@@ -38,6 +39,8 @@
#include "linbox/algorithms/cra-full-multip.h"
#include "linbox/algorithms/cra-full-multip-fixed.h"
+#include "linbox/field/unparametric.h"
+
#define _LB_REPEAT(command) \
do { for (size_t i = 0 ; pass && i < iters ; ++i) { command } } while(0)
@@ -52,7 +55,7 @@ int test_early_single(std::ostream & report, size_t PrimeSize, size_t Size)
typedef typename std::vector<T> Vect ;
typedef typename Vect::iterator Iterator;
Vect primes(Size) ;
- RandomPrimeIterator RP(PrimeSize);
+ RandomPrimeIterator RP((unsigned )PrimeSize);
/* primes, probably not all coprime... */
for (size_t i = 0 ; i < Size ; ++i) {
primes[i] = RP.randomPrime() ;
@@ -129,7 +132,7 @@ int test_early_multip(std::ostream & report, size_t PrimeSize, size_t Taille, si
/* primes */
Vect primes(Size) ;
- RandomPrimeIterator RP(PrimeSize);
+ RandomPrimeIterator RP((unsigned )PrimeSize);
for (size_t i = 0 ; i < Size ; ++i) {
primes[i] = RP.randomPrime() ;
++RP ;
@@ -197,31 +200,36 @@ int test_early_multip(std::ostream & report, size_t PrimeSize, size_t Taille, si
#if 1 /* testing FullMultipBlasMatCRA */
template< class T>
-int test_full_multip_matrix(std::ostream & report, size_t PrimeSize, size_t Size, std::pair<size_t, size_t> dims)
+int test_full_multip_matrix(std::ostream & report, size_t PrimeSize,
+ size_t Size, std::pair<size_t, size_t> dims)
{
- typedef typename std::vector<T> Vect ;
- typedef typename LinBox::BlasMatrix<T> Matrix ;
- typedef typename std::vector<Matrix> MatVect ;
- typedef typename Vect::iterator Iterator;
- typedef typename MatVect::iterator MatIterator;
- typedef typename LinBox::BlasMatrix<Integer> IntMatrix ;
+ typedef typename LinBox::UnparametricField<T> Unparam ;
+ typedef typename std::vector<T> Vect ;
+ typedef typename LinBox::BlasMatrix<Unparam> Matrix ;
+ typedef typename std::vector<Matrix> MatVect ;
+ typedef typename Vect::iterator Iterator;
+ typedef typename MatVect::iterator MatIterator;
+ typedef typename LinBox::BlasMatrix<PID_integer> IntMatrix ;
- typedef LinBox::Modular<double> ModularField ;
- typedef ModularField::Element Element;
- typedef typename LinBox::BlasMatrix<Element> pMatrix ;
+ typedef LinBox::Modular<double> Field ;
+ typedef Field::Element Element;
+ typedef typename LinBox::BlasMatrix<Field> pMatrix ;
+
+ PID_integer Z ;
Vect primes(Size) ;
/* probably not all coprime... */
- RandomPrimeIterator RP(PrimeSize);
+ RandomPrimeIterator RP((unsigned )PrimeSize);
for (size_t i = 0 ; i < Size ; ++i) {
primes[i] = RP.randomPrime() ;
++RP ;
}
/* residues */
- const Matrix Zero (dims.first,dims.second);
- MatVect residues(Size) ;
+ Unparam U ;
+ const Matrix Zero (U,dims.first,dims.second);
+ MatVect residues(Size,Zero) ;
for (size_t k = 0 ; k < Size ; ++k) {
residues[k] = Zero ;
for (size_t i = 0 ; i < Zero.rowdim() ; ++i)
@@ -232,16 +240,17 @@ int test_full_multip_matrix(std::ostream & report, size_t PrimeSize, size_t Size
Iterator genprime = primes.begin() ; // prime iterator
MatIterator residu = residues.begin() ; // residu iterator
- double LogIntSize = (PrimeSize+1)*std::log(2)+std::log(Size)+1 ;
+ double LogIntSize = (double)(PrimeSize+1)*std::log(2)+std::log((double)Size)+1 ;
std::pair<size_t,double> my_pair(dims.first*dims.second,LogIntSize) ;
report << "FullMultipBlasMatCRA (" << my_pair.first << ", " << my_pair.second << ')' << std::endl;
- FullMultipBlasMatCRA<ModularField> cra( my_pair ) ;
- IntMatrix result(dims.first,dims.second); // the result
- pMatrix residue(dims.first,dims.second) ; // temporary
+ FullMultipBlasMatCRA<Field> cra( my_pair ) ;
+ IntMatrix result(Z,dims.first,dims.second); // the result
{ /* init */
- ModularField F(*genprime);
+ Field F(*genprime);
+ pMatrix residue(F,dims.first,dims.second) ; // temporary
+ //! @bug it is not possible to allocate some memory and use submatrices ?
for (size_t i = 0 ; i < residue.rowdim(); ++i)
for (size_t j = 0 ; j < residue.coldim(); ++j)
F.init(residue.refEntry(i,j),(*residu).getEntry(i,j));
@@ -251,13 +260,13 @@ int test_full_multip_matrix(std::ostream & report, size_t PrimeSize, size_t Size
}
while (genprime < primes.end() /* && !cra.terminated() */ )
{ /* progress */
- if (cra.noncoprime((integer)*genprime))
- {
+ if (cra.noncoprime((integer)*genprime)) {
report << "bad luck, you picked twice the same prime..." <<std::endl;
report << "FullMultipBlasMatCRA exiting successfully." << std::endl;
return EXIT_SUCCESS ; // pas la faute à cra...
}
- ModularField F(*genprime);
+ Field F(*genprime);
+ pMatrix residue(F,dims.first,dims.second) ; // temporary
for (size_t i = 0 ; i < residue.rowdim(); ++i)
for (size_t j = 0 ; j < residue.coldim(); ++j)
F.init(residue.refEntry(i,j),(*residu).getEntry(i,j));
@@ -270,7 +279,7 @@ int test_full_multip_matrix(std::ostream & report, size_t PrimeSize, size_t Size
cra.result(result);
for (size_t i = 0 ; i < Size ; ++i){
- ModularField F(primes[i]);
+ Field F(primes[i]);
for (size_t l = 0 ; l < dims.first ; ++l)
for (size_t m = 0 ; m < dims.second ; ++m) {
Element tmp1,tmp2 ;
@@ -308,7 +317,7 @@ int test_full_multip(std::ostream & report, size_t PrimeSize, size_t Size, size_
Vect primes(Size) ;
/* probably not all coprime... */
- RandomPrimeIterator RP(PrimeSize);
+ RandomPrimeIterator RP((unsigned )PrimeSize);
for (size_t i = 0 ; i < Size ; ++i) {
primes[i] = RP.randomPrime() ;
++RP ;
@@ -326,7 +335,7 @@ int test_full_multip(std::ostream & report, size_t PrimeSize, size_t Size, size_
Iterator genprime = primes.begin() ; // prime iterator
VectIterator residu = residues.begin() ; // residu iterator
- double LogIntSize = PrimeSize*std::log(2)+std::log(Size)+1 ;
+ double LogIntSize = (double)PrimeSize*std::log(2)+std::log((double)Size)+1 ;
report << "FullMultipCRA (" << LogIntSize << ')' << std::endl;
FullMultipCRA<ModularField> cra( LogIntSize ) ;
@@ -398,7 +407,7 @@ int test_full_multip_fixed(std::ostream & report, size_t PrimeSize, size_t Size,
Vect primes(Size) ;
/* probably not all coprime... */
- RandomPrimeIterator RP(PrimeSize);
+ RandomPrimeIterator RP((unsigned )PrimeSize);
for (size_t i = 0 ; i < Size ; ++i) {
primes[i] = RP.randomPrime() ;
++RP ;
@@ -415,7 +424,7 @@ int test_full_multip_fixed(std::ostream & report, size_t PrimeSize, size_t Size,
Iterator genprime = primes.begin() ; // prime iterator
VectIterator residu = residues.begin() ; // residu iterator
- double LogIntSize = PrimeSize*std::log(2)+std::log(Size) ;
+ double LogIntSize = (double)PrimeSize*std::log(2)+std::log((double)Size) ;
std::pair<size_t,double> my_pair(Taille,LogIntSize) ;
@@ -442,10 +451,10 @@ int test_full_multip_fixed(std::ostream & report, size_t PrimeSize, size_t Size,
return EXIT_SUCCESS ; // pas la faute à cra...
}
ModularField F(*genprime);
- pVectIterator residue_it = residue.begin();
+ pVectIterator residue_jt = residue.begin();
for (size_t i = 0 ; i < Taille; ++i)
F.init(residue[i],(*residu)[i]);
- cra.progress(F,residue_it);
+ cra.progress(F,residue_jt);
++genprime;
++residu ;
}
@@ -476,7 +485,7 @@ int test_full_multip_fixed(std::ostream & report, size_t PrimeSize, size_t Size,
bool test_CRA_algos(size_t PrimeSize, size_t Size, size_t Taille, size_t iters)
{
bool pass = true ;
- std::ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT,
+ std::ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT,
INTERNAL_DESCRIPTION);
@@ -551,16 +560,25 @@ int main(int ac, char ** av)
bool pass = true ;
- srand(time(NULL)); // seeding
+ srand((unsigned)time(NULL)); // seeding
size_t PrimeSize = p; // size of the residues/primes
size_t Size = n ; // nb of residues/primes
size_t Taille = 2*Size ; // nb of vectors of residues
- commentator.start("CRA-Algos test suite", "CRA-Algos");
+ commentator().start("CRA-Algos test suite", "CRA-Algos");
pass = test_CRA_algos(PrimeSize,Size,Taille,iters) ;
- commentator.stop(MSG_STATUS (pass), (const char *) 0,"CRA-Algos test suite");
+ commentator().stop(MSG_STATUS (pass), (const char *) 0,"CRA-Algos test suite");
return !pass ;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-cradomain.C b/tests/test-cradomain.C
index 47bc684..d181635 100644
--- a/tests/test-cradomain.C
+++ b/tests/test-cradomain.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2010 LinBox
*
* Time-stamp: <05 Apr 11 11:01:44 Jean-Guillaume.Dumas at imag.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file tests/test-cradomain.C
@@ -27,8 +28,9 @@
* @test tests LinBox::ChineseRemainer (see \ref CRA)
*/
-#include <linbox/algorithms/cra-domain.h>
-#include <linbox/field/modular-double.h>
+
+#include "linbox/algorithms/cra-domain.h"
+#include "linbox/field/modular.h"
#include "linbox/algorithms/blas-domain.h"
#include "linbox/algorithms/cra-early-multip.h"
#include "linbox/algorithms/cra-full-multip.h"
@@ -48,7 +50,7 @@ struct Interator {
{
for(std::vector<integer>::const_iterator it=_v.begin();
it != _v.end(); ++it) {
- double ds = ::Givaro::naturallog(*it);
+ double ds = Givaro::naturallog(*it);
maxsize = (maxsize<ds?ds:maxsize);
}
}
@@ -59,7 +61,7 @@ struct Interator {
for(std::vector<integer>::iterator it=_v.begin();
it != _v.end(); ++it) {
Integer::random<false>(*it, s);
- double ds = ::Givaro::naturallog(*it);
+ double ds = Givaro::naturallog(*it);
maxsize = (maxsize<ds?ds:maxsize);
}
}
@@ -98,25 +100,25 @@ namespace LinBox
struct InteratorIt : public Interator {
- mutable std::vector<double> _C;
+ mutable std::vector<double> _vectC;
InteratorIt(const std::vector<integer>& v) :
- Interator(v), _C(v.size())
+ Interator(v), _vectC(v.size())
{}
InteratorIt(int n, int s) :
- Interator(n,s), _C(n)
+ Interator(n,s), _vectC(n)
{}
template<typename Iterator, typename Field>
Iterator& operator()(Iterator& res, const Field& F) const
{
std::vector<integer>::const_iterator vit=this->_v.begin();
- std::vector<double>::iterator eit=_C.begin();
+ std::vector<double>::iterator eit=_vectC.begin();
for( ; vit != _v.end(); ++vit, ++eit) {
F.init(*eit, *vit);
}
- return res=_C.begin();
+ return res=_vectC.begin();
}
};
@@ -125,28 +127,29 @@ template<typename Field> struct InteratorBlas;
namespace LinBox
{
template<class Element,class Field> struct CRATemporaryVectorTrait<InteratorBlas<Field> , Element> {
- typedef typename LinBox::BlasMatrix<Element>::pointer Type_t;
+ typedef typename LinBox::BlasMatrix<Field>::pointer Type_t;
};
}
template<typename Field>
struct InteratorBlas : public Interator {
typedef typename Field::Element Element;
- typedef LinBox::BlasMatrix<Element> Matrix;
+ typedef LinBox::BlasMatrix<LinBox::UnparametricField<Element> > Matrix;
typedef typename Matrix::pointer Pointer;
- mutable Matrix _C;
+ typename LinBox::UnparametricField<Element> _field;
+ mutable Matrix _vectC;
- InteratorBlas(const std::vector<integer>& v) : Interator(v), _C((int)v.size(), (int)1) {}
- InteratorBlas(int n, int s) : Interator(n,s), _C(n,1) {}
+ InteratorBlas(const std::vector<integer>& v) : Interator(v),_field(), _vectC(_field,(int)v.size(), (int)1) {}
+ InteratorBlas(int n, int s) : Interator(n,s), _field(),_vectC(_field,n,1) {}
Pointer& operator()(Pointer& res, const Field& F) const
{
std::vector<integer>::const_iterator vit=this->_v.begin();
- res = _C.getWritePointer();
+ res = _vectC.getWritePointer();
for( ; vit != _v.end(); ++vit, ++res)
F.init(*res, *vit);
- return res=_C.getWritePointer();
+ return res=_vectC.getWritePointer();
}
};
@@ -202,11 +205,14 @@ bool TestOneCRAWritePointer(std::ostream& report, Iter& iteration, RandGen& genp
{
report << "ChineseRemainder<" << typeid(Builder).name() << ">(" << bound << ')' << std::endl;
LinBox::ChineseRemainder< Builder > cra( bound );
- LinBox::BlasMatrix<integer> Res( (int)N, (int)N);
+ PID_integer Z ;
+ LinBox::BlasMatrix<PID_integer> Res(Z, (int)N, (int)N);
cra( Res.getWritePointer(), iteration, genprime);
bool locpass = std::equal( iteration.getVector().begin(), iteration.getVector().end(), Res.getWritePointer() );
- if (locpass) report << "ChineseRemainder<" << typeid(Builder).name() << ">(" << iteration.getLogSize() << ')' << ", passed." << std::endl;
+ if (locpass) {
+ report << "ChineseRemainder<" << typeid(Builder).name() << ">(" << iteration.getLogSize() << ')' << ", passed." << std::endl;
+ }
else {
report << "***ERROR***: ChineseRemainder<" << typeid(Builder).name() << ">(" << iteration.getLogSize() << ')' << "***ERROR***" << std::endl;
}
@@ -217,7 +223,7 @@ bool TestOneCRAWritePointer(std::ostream& report, Iter& iteration, RandGen& genp
bool TestCra(int N, int S, size_t seed)
{
- std::ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT,
+ std::ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT,
INTERNAL_DESCRIPTION);
// std::ostream &report = std::cout;
@@ -281,7 +287,7 @@ bool TestCra(int N, int S, size_t seed)
for( ; PrimeSize < (iterationIt.getLogSize()+1); ++genprime ) {
if (find(PrimeSet.begin(), PrimeSet.end(), *genprime) == PrimeSet.end()) {
PrimeSet.push_back( *genprime );
- PrimeSize += ::Givaro::naturallog(*genprime);
+ PrimeSize += Givaro::naturallog(*genprime);
}
}
@@ -322,12 +328,21 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- LinBox::commentator.start("CRA-Domain test suite", "CRADom");
+ LinBox::commentator().start("CRA-Domain test suite", "CRADom");
bool pass = true;
for(int i=0; pass && i<iterations; ++i)
- pass &= TestCra(n,s,seed);
+ pass &= TestCra((int)n,(int)s,seed);
- LinBox::commentator.stop(MSG_STATUS (pass), (const char *) 0,"CRA-Domain test suite");
+ LinBox::commentator().stop(MSG_STATUS (pass), "CRA-Domain test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-dense-zero-one.C b/tests/test-dense-zero-one.C
index 9be71a8..d56c0b0 100644
--- a/tests/test-dense-zero-one.C
+++ b/tests/test-dense-zero-one.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -34,8 +35,7 @@
#include "linbox/matrix/blas-matrix.h"
#include "linbox/algorithms/blas-domain.h"
#include "linbox/matrix/matrix-domain.h"
-#include "linbox/field/modular-float.h"
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
#include "linbox/blackbox/dense-zero-one.h"
@@ -53,16 +53,16 @@ struct BlackboxDomain : public _Field
typedef typename _Field::Element Scalar;
typedef typename _Field::Element Element; // transitional
typedef typename _Field::RandIter RandIter;
- typedef BlasMatrix<Element> Block;
- /*struct Block: public BlasMatrix<Element> {
- Block( int m, int n ): BlasMatrix<Element> ( m, n ) {}
+ typedef BlasMatrix<Field> Block;
+ /*struct Block: public BlasMatrix<Field> {
+ Block( int m, int n ): BlasMatrix<Field> ( m, n ) {}
Block& subBlock( Block & B, size_t i, size_t j, size_t m, size_t n ) {
- return B = BlasMatrix<Element>(*this, i, j, m, n);
+ return B = BlasMatrix<Field>(*this, i, j, m, n);
}
const Block& subBlock( const Block & B, size_t i, size_t j, size_t m, size_t n ) {
- return B = BlasMatrix<Element>(static_cast<DenseMatrixBase<Element> >(*this), i, j, m, n);
+ return B = BlasMatrix<Field>(static_cast<BlasMatrix<Field> >(*this), i, j, m, n);
}
- Block & operator= (BlasMatrix<Element> & rhs){
+ Block & operator= (BlasMatrix<Field> & rhs){
*this = rhs;
return *this;
}
@@ -100,7 +100,7 @@ struct BlackboxDomain : public _Field
// Set the entries in a block to zero.
void zero( Block& B ) const {
- for ( typename Block::RawIterator raw = B.rawBegin(); raw != B.rawEnd(); ++raw )
+ for ( typename Block::Iterator raw = B.Begin(); raw != B.End(); ++raw )
init(*raw, 0);
}
@@ -413,3 +413,12 @@ int main (int argc, char* argv[])
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-dense.C b/tests/test-dense.C
index 12f3580..1a781b5 100644
--- a/tests/test-dense.C
+++ b/tests/test-dense.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-dense.C
* Copyright (C) 2001, 2002 Bradford Hovinen
@@ -9,7 +7,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
@@ -31,9 +47,7 @@
#include "linbox/util/commentator.h"
#include "linbox/field/modular.h"
-#include "linbox/matrix/dense.h"
-#include "linbox/blackbox/dense.h"
-#include "linbox/matrix/dense-submatrix.h"
+#include "linbox/matrix/blas-matrix.h"
#include "test-common.h"
#include "test-generic.h"
@@ -53,23 +67,21 @@ using namespace LinBox;
* Return true on success and false on failure
*/
+// using long on purpose
template <class Field>
-static bool testIdentity (Field &F, long n, int iterations)
+static bool testIdentity (Field &F, size_t n, int iterations)
{
typedef typename Vector<Field>::Dense Vector;
- typedef DenseMatrixBase <typename Field::Element> Base;
- typedef DenseSubmatrix <typename Field::Element> Matrix;
- typedef DenseMatrix <Field> Blackbox;
+ typedef BlasMatrix<Field> Base;
+ typedef BlasMatrix<Field> Blackbox;
- commentator.start ("Testing identity apply", "testIdentity", iterations);
+ commentator().start ("Testing identity apply", "testIdentity", iterations);
bool ret = true;
bool iter_passed = true;
- int i, j;
-
Blackbox I(F, n, n);
- Matrix K(I);
+ // Matrix K(I);
//typename Field::Element x; F.init(x);
//F.write(std::cout, K.getEntry(x, i, j)) << std::endl;
//Matrix L(K);
@@ -77,23 +89,23 @@ static bool testIdentity (Field &F, long n, int iterations)
F.init (one, 1);
- for (i = 0; i < n; i++)
+ for (size_t i = 0; i < n; i++)
I.setEntry (i, i, one);
Vector v(n), w(n);
typename Field::RandIter r (F);
- for (i = 0; i < iterations; i++) {
+ for (int i = 0; i < iterations; i++) {
char buf[80];
snprintf (buf, 80, "Iteration %d", i);
- commentator.start (buf);
+ commentator().start (buf);
iter_passed = true;
- for (j = 0; j < n; j++)
+ for (size_t j = 0; j < n; j++)
r.random (v[j]);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector: ";
printVector<Field> (F, report, v);
@@ -101,24 +113,24 @@ static bool testIdentity (Field &F, long n, int iterations)
printVector<Field> (F, report, w);
Base J (I);
- Blackbox K(F, J);
- K.apply (w, v);
+ Blackbox KK( J);
+ KK.apply (w, v);
report << "Output vector: ";
printVector<Field> (F, report, w);
- for (j = 0; j < n; j++)
+ for (size_t j = 0; j < (size_t)n; j++)
if (!F.areEqual (w[j], v[j]))
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vectors are not equal" << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testIdentity");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testIdentity");
return ret;
}
@@ -142,13 +154,13 @@ static bool testIdentity (Field &F, long n, int iterations)
*/
template <class Field>
-static bool testVandermonde (Field &F, long n, int iterations, int N)
+static bool testVandermonde (Field &F, size_t n, int iterations, int N)
{
typedef typename Vector<Field>::Dense Vector;
typedef vector <typename Field::Element> Polynomial;
- typedef DenseMatrix <Field> Blackbox;
+ typedef BlasMatrix <Field> Blackbox;
- commentator.start ("Testing Vandermonde apply", "testVandermonde", iterations);
+ commentator().start ("Testing Vandermonde apply", "testVandermonde", iterations);
bool ret = true;
bool inner_iter_passed;
@@ -164,7 +176,7 @@ static bool testVandermonde (Field &F, long n, int iterations, int N)
for (i = 0; i < iterations; i++) {
char buf[80];
snprintf (buf, 80, "Iteration %d", i);
- commentator.start (buf);
+ commentator().start (buf);
/* Evaluation points */
for (j = 0; j < n; j++) {
@@ -180,7 +192,7 @@ static bool testVandermonde (Field &F, long n, int iterations, int N)
}
}
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Evaluation points: ";
printVector<Field> (F, report, x);
@@ -221,15 +233,15 @@ static bool testVandermonde (Field &F, long n, int iterations, int N)
ret = inner_iter_passed = false;
if (!inner_iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vectors are not equal" << endl;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testVandermonde");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testVandermonde");
return ret;
}
@@ -253,9 +265,9 @@ static bool testRandomLinearity (const Field &F,
VectorStream<typename Vector<Field>::Dense> &v1_stream,
VectorStream<typename Vector<Field>::Dense> &v2_stream)
{
- commentator.start ("Testing random linearity", "testRandomLinearity", v1_stream.size ());
+ commentator().start ("Testing random linearity", "testRandomLinearity", v1_stream.size ());
- DenseMatrix<Field> A (F, A_stream);
+ BlasMatrix<Field> A (F, A_stream);
bool ret = testLinearity (F, A, v1_stream, v2_stream);
@@ -263,7 +275,7 @@ static bool testRandomLinearity (const Field &F,
v1_stream.reset ();
v2_stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomLinearity");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomLinearity");
return ret;
}
@@ -287,9 +299,9 @@ static bool testRandomTranspose (const Field &F,
VectorStream<typename Vector<Field>::Dense> &v1_stream,
VectorStream<typename Vector<Field>::Dense> &v2_stream)
{
- commentator.start ("Testing random transpose", "testRandomTranspose", v1_stream.size ());
+ commentator().start ("Testing random transpose", "testRandomTranspose", v1_stream.size ());
- DenseMatrix<Field> A (F, A_stream);
+ BlasMatrix<Field> A (F, A_stream);
bool ret = testTranspose (F, A, v1_stream, v2_stream);
@@ -297,7 +309,7 @@ static bool testRandomTranspose (const Field &F,
v1_stream.reset ();
v2_stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
return ret;
}
@@ -324,10 +336,10 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
Field F (q);
- commentator.start("Dense matrix black box test suite", "DenseMatrix");
+ commentator().start("Dense matrix black box test suite", "BlasMatrix");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
RandomDenseStream<Field> A_stream (F, n, n);
RandomDenseStream<Field> v1_stream (F, n, iterations);
@@ -338,6 +350,15 @@ int main (int argc, char **argv)
//if (!testRandomLinearity (F, A_stream, v1_stream, v2_stream)) pass = false;
//if (!testRandomTranspose (F, A_stream, v1_stream, v2_stream)) pass = false;
- commentator.stop("dense matrix black box test suite");
+ commentator().stop("dense matrix black box test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-det.C b/tests/test-det.C
index 2179aae..b652324 100644
--- a/tests/test-det.C
+++ b/tests/test-det.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-det.C
* Copyright (C) 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
@@ -33,7 +49,6 @@
#include "linbox/field/gmp-rational.h"
#include "linbox/blackbox/diagonal.h"
#include "linbox/blackbox/sparse.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/solutions/det.h"
#include "linbox/solutions/methods.h"
@@ -61,7 +76,7 @@ static bool testDiagonalDet1 (Field &F, size_t n, int iterations)
typedef vector <pair <size_t, typename Field::Element> > Row;
typedef Diagonal <Field> Blackbox;
- commentator.start ("Testing nonsingular diagonal determinant (1)", "testDiagonalDet1", iterations);
+ commentator().start ("Testing nonsingular diagonal determinant (1)", "testDiagonalDet1", iterations);
bool ret = true;
bool done;
@@ -75,7 +90,7 @@ static bool testDiagonalDet1 (Field &F, size_t n, int iterations)
typename Field::RandIter r (F);
for (i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
F.init (pi, 1);
@@ -95,7 +110,7 @@ static bool testDiagonalDet1 (Field &F, size_t n, int iterations)
F.mulin (pi, d[j]);
}
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal entries: ";
VD.write (report, d);
report << endl;
@@ -122,15 +137,15 @@ static bool testDiagonalDet1 (Field &F, size_t n, int iterations)
if (!F.areEqual (pi, phi_wiedemann) || !F.areEqual (pi, phi_blas_elimination) || !F.areEqual(pi, phi_symm_wied)|| !F.areEqual(pi, phi_sparseelim)) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed determinant is incorrect" << endl;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testDiagonalDet1");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testDiagonalDet1");
return ret;
}
@@ -155,7 +170,7 @@ static bool testDiagonalDet2 (Field &F, size_t n, int iterations)
typedef vector <pair <size_t, typename Field::Element> > Row;
typedef Diagonal <Field> Blackbox;
- commentator.start ("Testing nonsingular diagonal determinant (2)", "testDiagonalDet2", iterations);
+ commentator().start ("Testing nonsingular diagonal determinant (2)", "testDiagonalDet2", iterations);
bool ret = true;
int i, k;
@@ -166,7 +181,7 @@ static bool testDiagonalDet2 (Field &F, size_t n, int iterations)
typename Field::RandIter r (F);
for (i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
F.init (pi, 1);
@@ -176,13 +191,13 @@ static bool testDiagonalDet2 (Field &F, size_t n, int iterations)
}
for (j = n / 2; j < n; j++) {
- k = rand () % (n / 2);
+ k =int( rand () % (n / 2) );
d[j] = d[k];
F.mulin (pi, d[j]);
}
- //ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
- ostream &report = commentator.report ();
+ //ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report ();
report << "Diagonal entries: ";
printVector<Field> (F, report, d);
@@ -215,15 +230,15 @@ static bool testDiagonalDet2 (Field &F, size_t n, int iterations)
if (!F.areEqual (pi, phi_wiedemann) || !F.areEqual (pi, phi_blas_elimination) || !F.areEqual(pi, phi_symm_wied) || !F.areEqual(pi, phi_sparseelim)) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed determinant is incorrect" << endl;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testDiagonalDet2");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testDiagonalDet2");
return ret;
}
@@ -247,7 +262,7 @@ static bool testSingularDiagonalDet (Field &F, size_t n, int iterations)
typedef vector <pair <size_t, typename Field::Element> > Row;
typedef Diagonal <Field> Blackbox;
- commentator.start ("Testing singular diagonal determinant", "testSingularDiagonalDet", iterations);
+ commentator().start ("Testing singular diagonal determinant", "testSingularDiagonalDet", iterations);
bool ret = true;
int i;
@@ -258,7 +273,7 @@ static bool testSingularDiagonalDet (Field &F, size_t n, int iterations)
typename Field::RandIter r (F);
for (i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
for (j = 0; j < n; j++)
r.random (d[j]);
@@ -267,7 +282,7 @@ static bool testSingularDiagonalDet (Field &F, size_t n, int iterations)
F.init (d[1+ rand () % (n-1)], 0);
//F.init (d[rand () % n], 0);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal entries: ";
printVector<Field> (F, report, d);
@@ -297,15 +312,15 @@ static bool testSingularDiagonalDet (Field &F, size_t n, int iterations)
if (!F.isZero (phi_wiedemann) || !F.isZero (phi_blas_elimination) || !F.isZero (phi_symm_wied) || !F.isZero (phi_sparseelim) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed determinant is incorrect" << endl;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testSingularDiagonalDet");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testSingularDiagonalDet");
return ret;
}
@@ -323,12 +338,12 @@ static bool testSingularDiagonalDet (Field &F, size_t n, int iterations)
bool testIntegerDet (size_t n, int iterations)
{
- commentator.start ("Testing integer determinant", "testIntegerDet", iterations);
+ commentator().start ("Testing integer determinant", "testIntegerDet", iterations);
bool ret = true;
for (int i = 0; i < iterations; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
PID_integer R;
SparseMatrix<PID_integer> A (R, n, n);
@@ -354,7 +369,7 @@ bool testIntegerDet (size_t n, int iterations)
//GMP_Integers R;
//A.write(cout,R);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "True determinant: ";
report << pi;
@@ -374,16 +389,16 @@ bool testIntegerDet (size_t n, int iterations)
if ((det_A_wiedemann != pi)||(det_A_blas_elimination != pi)||(det_A_symm_wied != pi)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed determinant is incorrect" << endl;
ret = false;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testIntegerDet");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testIntegerDet");
return ret;
}
@@ -401,12 +416,12 @@ bool testIntegerDet (size_t n, int iterations)
bool testIntegerDetGen (size_t n, int iterations)
{
- commentator.start ("Testing integer determinant, generic methods", "testIntegerDeterminantGeneric", iterations);
+ commentator().start ("Testing integer determinant, generic methods", "testIntegerDeterminantGeneric", iterations);
bool ret = true;
for (int i = 0; i < iterations; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
PID_integer R;
SparseMatrix<PID_integer> A (R, n, n);
@@ -424,22 +439,22 @@ bool testIntegerDetGen (size_t n, int iterations)
integer::negin(pi);
}
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "True determinant: " << pi << endl;
det (det_A, A);
report << "Computed integer determinant (Default): " << det_A << endl;
if (det_A != pi){
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
- << "ERROR: Default Computed determinant is incorrect" << endl;
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ << "ERROR: Default (integer dense) Computed determinant is incorrect" << endl;
ret = false;
}
det (det_A_H, A, Method::Hybrid());
report << "Computed integer determinant (Hybrid): " << det_A_H << endl;
if (det_A_H != pi){
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Hybrid Computed determinant is incorrect" << endl;
ret = false;
}
@@ -447,7 +462,7 @@ bool testIntegerDetGen (size_t n, int iterations)
det (det_A_B, A, Method::Blackbox());
report << "Computed integer determinant (Blackbox): " << det_A_B << endl;
if (det_A_B != pi){
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Blackbox Computed determinant is incorrect" << endl;
ret = false;
}
@@ -455,18 +470,18 @@ bool testIntegerDetGen (size_t n, int iterations)
det (det_A_E, A, Method::Elimination());
report << "Computed integer determinant (Elimination): " << det_A_E << endl;
if (det_A_E != pi){
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Elimination Computed determinant is incorrect" << endl;
ret = false;
}
- commentator.stop ("done");
- commentator.progress ();
- //commentator.progress (i, iterations);
+ commentator().stop ("done");
+ commentator().progress ();
+ //commentator().progress (i, iterations);
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testIntegerDeterminantGeneric");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testIntegerDeterminantGeneric");
return ret;
}
@@ -484,15 +499,15 @@ bool testIntegerDetGen (size_t n, int iterations)
bool testRationalDetGen (size_t n, int iterations)
{
- commentator.start ("Testing rational determinant, generic methods", "testRationalDeterminantGeneric", iterations);
+ commentator().start ("Testing rational determinant, generic methods", "testRationalDeterminantGeneric", iterations);
bool ret = true;
for (int i = 0; i < iterations; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
GMPRationalField Q;
SparseMatrix<GMPRationalField > A (Q, n, n);
- DenseMatrix <GMPRationalField > BB(Q, n, n);
+ BlasMatrix <GMPRationalField > BB(Q, n, n);
GMPRationalField::Element pi(1,1);
GMPRationalField::Element det_A, det_B,det_A_H, det_B_H, det_A_B, det_B_B, det_A_E, det_B_E;
@@ -515,14 +530,14 @@ bool testRationalDetGen (size_t n, int iterations)
Q.negin(pi);
}
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "True determinant: "; Q.write(report,pi); report << endl;
det (det_A, A);
report << "Computed rational determinant (Default): "; Q.write(report, det_A); report << endl;
if (!Q.areEqual(det_A ,pi)){
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Default Computed determinant is incorrect" << endl;
ret = false;
}
@@ -530,7 +545,7 @@ bool testRationalDetGen (size_t n, int iterations)
det (det_A_H, A, Method::Hybrid());
report << "Computed rational determinant (Hybrid): "; Q.write(report, det_A_H); report << endl;
if (!Q.areEqual(det_A_H ,pi)){
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Hybrid Computed determinant is incorrect" << endl;
ret = false;
}
@@ -538,7 +553,7 @@ bool testRationalDetGen (size_t n, int iterations)
det (det_A_B, A, Method::Blackbox());
report << "Computed rational determinant (Blackbox): "; Q.write(report, det_A_B); report<< endl;
if (!Q.areEqual(det_A_B , pi)){
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Blackbox Computed determinant is incorrect" << endl;
ret = false;
}
@@ -546,7 +561,7 @@ bool testRationalDetGen (size_t n, int iterations)
det (det_A_E, A, Method::Elimination());
report << "Computed rational determinant (Elimination): "; Q.write(report, det_A_E); report << endl;
if (!Q.areEqual(det_A_E ,pi)){
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Elimination Computed determinant is incorrect" << endl;
ret = false;
}
@@ -554,7 +569,7 @@ bool testRationalDetGen (size_t n, int iterations)
det (det_B, BB);
report << "Computed rational determinant (Default): "; Q.write(report, det_A); report << endl;
if (!Q.areEqual(det_B ,pi)){
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: (Dense) Default Computed determinant is incorrect" << endl;
ret = false;
}
@@ -562,14 +577,14 @@ bool testRationalDetGen (size_t n, int iterations)
det (det_B_H, BB, Method::Hybrid());
report << "Computed rational determinant (Hybrid): "; Q.write(report, det_A_H); report << endl;
if (!Q.areEqual(det_B_H ,pi)){
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: (Dense) Hybrid Computed determinant is incorrect" << endl;
ret = false;
}
det (det_B_B, BB, Method::Blackbox());
report << "Computed rational determinant (Blackbox): "; Q.write(report, det_A_B); report<< endl;
if (!Q.areEqual(det_B_B , pi)){
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: (Dense) Blackbox Computed determinant is incorrect" << endl;
ret = false;
}
@@ -577,18 +592,18 @@ bool testRationalDetGen (size_t n, int iterations)
det (det_B_E, BB, Method::Elimination());
report << "Computed rational determinant (BlasElimination): "; Q.write(report, det_A_E); report << endl;
if (!Q.areEqual(det_B_E ,pi)){
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: (Dense) Elimination Computed determinant is incorrect" << endl;
ret = false;
}
- commentator.stop ("done");
- commentator.progress ();
- //commentator.progress (i, iterations);
+ commentator().stop ("done");
+ commentator().progress ();
+ //commentator().progress (i, iterations);
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRationalDeterminantGeneric");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRationalDeterminantGeneric");
return ret;
}
@@ -612,11 +627,11 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
Modular<int> F (q);
- commentator.start("Determinant test suite", "det");
+ commentator().start("Determinant test suite", "det");
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (!testDiagonalDet1 (F, n, iterations)) pass = false;
if (!testDiagonalDet2 (F, n, iterations)) pass = false;
@@ -625,6 +640,15 @@ int main (int argc, char **argv)
if (!testIntegerDetGen (n, iterations)) pass = false;
if (!testRationalDetGen (n, iterations)) pass = false;
- commentator.stop("determinant test suite");
+ commentator().stop("determinant test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-diagonal.C b/tests/test-diagonal.C
index 672220c..e3c7931 100644
--- a/tests/test-diagonal.C
+++ b/tests/test-diagonal.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-diagonal.C
* Copyright (C) 2001, 2002 Bradford Hovinen
@@ -9,7 +7,25 @@
* Time-stamp: <22 Jun 10 15:59:39 Jean-Guillaume.Dumas at imag.fr>
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
@@ -59,7 +75,7 @@ static bool testIdentityApply (Field &F, VectorStream<Vector> &stream)
{
typedef LinBox::Diagonal<Field> Blackbox;
- commentator.start ("Testing identity apply", "testIdentityApply", stream.m ());
+ commentator().start ("Testing identity apply", "testIdentityApply", stream.m ());
bool ret = true;
bool iter_passed = true;
@@ -82,13 +98,13 @@ static bool testIdentityApply (Field &F, VectorStream<Vector> &stream)
VectorWrapper::ensureDim (w, stream.n ());
while (stream) {
- commentator.startIteration (i);
+ commentator().startIteration ((unsigned)i);
iter_passed = true;
stream.next (v);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector: ";
VD.write (report, v);
report << endl;
@@ -103,16 +119,16 @@ static bool testIdentityApply (Field &F, VectorStream<Vector> &stream)
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vectors are not equal" << endl;
- commentator.stop (MSG_STATUS (ret));
- commentator.progress ();
+ commentator().stop (MSG_STATUS (ret));
+ commentator().progress ();
}
stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testIdentityApply");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testIdentityApply");
return ret;
}
@@ -136,7 +152,7 @@ static bool testRandomMinpoly (Field &F, VectorStream<Vector> &stream)
typedef vector <typename Field::Element> Polynomial;
typedef LinBox::Diagonal <Field> Blackbox;
- commentator.start ("Testing random minpoly", "testRandomMinpoly", stream.m ());
+ commentator().start ("Testing random minpoly", "testRandomMinpoly", stream.m ());
bool ret = true;
@@ -150,13 +166,13 @@ static bool testRandomMinpoly (Field &F, VectorStream<Vector> &stream)
VectorWrapper::ensureDim (d, stream.n ());
while (stream) {
- commentator.startIteration (stream.j ());
+ commentator().startIteration ((unsigned)stream.j ());
F.init (pi, 1);
stream.next (d);
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal vector: ";
VD.write (report, d);
report << endl;
@@ -175,13 +191,13 @@ static bool testRandomMinpoly (Field &F, VectorStream<Vector> &stream)
printPolynomial (F, report, m_D);
if (!F.areEqual (m_D[0], pi)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: m_D(0) != det(D)" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS(ret));
- commentator.progress ();
+ commentator().stop (MSG_STATUS(ret));
+ commentator().progress ();
}
stream.reset ();
@@ -191,11 +207,11 @@ static bool testRandomMinpoly (Field &F, VectorStream<Vector> &stream)
unsigned long r;
LinBox::rank(r, D, Method::Wiedemann());
if (r != 10)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: zeroes in random diagonal" << endl;
ret = ret && r == 10;
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomMinpoly");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomMinpoly");
return ret;
}
@@ -221,7 +237,7 @@ static bool testRandomLinearity (Field &F,
{
typedef LinBox::Diagonal <Field> Blackbox;
- commentator.start ("Testing random transpose", "testRandomLinearity", stream1.m ());
+ commentator().start ("Testing random transpose", "testRandomLinearity", stream1.m ());
VectorDomain<Field> VD (F);
@@ -231,14 +247,14 @@ static bool testRandomLinearity (Field &F,
d_stream.next (d);
Blackbox D (F, d);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal vector: ";
VD.write (report, d) << endl;
bool ret = testLinearity (F, D, stream1, stream2);
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomLinearity");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomLinearity");
return ret;
}
@@ -263,7 +279,7 @@ static bool testRandomTranspose (Field &F,
{
typedef LinBox::Diagonal <Field> Blackbox;
- commentator.start ("Testing random transpose", "testRandomTranspose", stream1.m ());
+ commentator().start ("Testing random transpose", "testRandomTranspose", stream1.m ());
VectorDomain<Field> VD (F);
@@ -273,14 +289,14 @@ static bool testRandomTranspose (Field &F,
d_stream.next (d);
Blackbox D (F, d);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal vector: ";
VD.write (report, d) << endl;
bool ret = testTranspose (F, D, stream1, stream2);
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
return ret;
}
@@ -306,13 +322,13 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
Field F (q);
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- commentator.start("Diagonal matrix black box test suite", "diagonal");
+ commentator().start("Diagonal matrix black box test suite", "diagonal");
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
RandomDenseStream<Field, Vector> stream1 (F, n, iterations), stream2 (F, n, iterations), d_stream (F, n, 1);
RandomDenseStream<Field, Vector, NonzeroRandIter<Field> >
@@ -327,7 +343,16 @@ int main (int argc, char **argv)
LinBox::Diagonal<Field> D(F, 10, iter);
pass = pass && testBlackbox(D);
- commentator.stop (MSG_STATUS (pass));
+ commentator().stop (MSG_STATUS (pass));
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-dif.C b/tests/test-dif.C
index 45fc2f4..7768f4c 100644
--- a/tests/test-dif.C
+++ b/tests/test-dif.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-dif.C
* Copyright (C) LinBox
* +- modified from tests/test-sum.C
@@ -8,7 +6,25 @@
* It will be desirable to keep test-sum and test-dif in sync.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
@@ -56,7 +72,7 @@ static bool testZeroApply (Field &F, VectorStream<Vector> &stream1, VectorStream
{
typedef Diagonal <Field> Blackbox;
- commentator.start ("Testing zero apply", "testZeroApply", stream1.m ());
+ commentator().start ("Testing zero apply", "testZeroApply", stream1.m ());
bool ret = true;
bool iter_passed = true;
@@ -72,7 +88,7 @@ static bool testZeroApply (Field &F, VectorStream<Vector> &stream1, VectorStream
//F.init (neg_one, -1);
while (stream1) {
- commentator.startIteration (stream1.j ());
+ commentator().startIteration ((unsigned)stream1.j ());
iter_passed = true;
stream1.next (d1);
@@ -81,7 +97,7 @@ static bool testZeroApply (Field &F, VectorStream<Vector> &stream1, VectorStream
Blackbox D1 (F, d1); // , D2 (F, d2);
Dif <Blackbox, Blackbox> A (D1, D1);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal matrix: ";
VD.write (report, d1);
report << endl;
@@ -110,14 +126,14 @@ static bool testZeroApply (Field &F, VectorStream<Vector> &stream1, VectorStream
}
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vector is not zero" << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testZeroApply");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testZeroApply");
return ret;
}
@@ -142,7 +158,7 @@ static bool testRandomTranspose (Field &F, size_t n, int iterations)
typedef vector <typename Field::Element> Vector;
typedef Diagonal <Field> Blackbox;
- commentator.start ("Testing random transpose", "testRandomTranspose", iterations);
+ commentator().start ("Testing random transpose", "testRandomTranspose", iterations);
Vector d(n);
typename Field::RandIter r (F);
@@ -152,14 +168,14 @@ static bool testRandomTranspose (Field &F, size_t n, int iterations)
Blackbox D (F, d);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal vector: ";
printVector<Field> (F, report, d);
bool ret = testTranspose<Field> (F, D, iterations);
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
return ret;
}
@@ -188,15 +204,24 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
Field F (101);
- commentator.start("Matrix dif black box test suite", "dif");
+ commentator().start("Matrix dif black box test suite", "dif");
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
RandomDenseStream<Field> stream1 (F, n, iterations1), stream2 (F, n, iterations2);
if (!testZeroApply (F, stream1, stream2)) pass = false;
- commentator.stop("Matrix dif black box test suite");
+ commentator().stop("Matrix dif black box test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-direct-sum.C b/tests/test-direct-sum.C
index f94b955..0eb4dfc 100644
--- a/tests/test-direct-sum.C
+++ b/tests/test-direct-sum.C
@@ -1,10 +1,26 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-direct-sum.C
* Copyright (C) LinBox
* Written by David Saunders
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file tests/test-direct-sum.C
@@ -53,9 +69,9 @@ int main (int argc, char **argv)
Field F (q);
Field::Element k;
- commentator.start("DirectSum black box test suite", "direct sum");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().start("DirectSum black box test suite", "direct sum");
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
F.init(k, 5);
ScalarMatrix<Field> B(F, 10, k);
@@ -67,6 +83,15 @@ int main (int argc, char **argv)
DirectSum<ScalarMatrix<Field>, ScalarMatrix<Field> > D(B, C);
pass = pass && testBlackbox(D);
- commentator.stop("DirectSum black box test suite");
+ commentator().stop("DirectSum black box test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-dyadic-to-rational.C b/tests/test-dyadic-to-rational.C
index 19ca129..873573e 100644
--- a/tests/test-dyadic-to-rational.C
+++ b/tests/test-dyadic-to-rational.C
@@ -1,20 +1,242 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-template.C
- * LinBox copyright/license applies. See COPYING.
+ * Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
+
#include "linbox/linbox-config.h"
#include "linbox/util/commentator.h"
#include "test-common.h"
-#define TestingDyadicToRational
#include "linbox/algorithms/dyadic-to-rational.h" // can assume commentator and config loaded
-#undef TestingDyadicToRational
-int main (int argc, char **argv) {
+using namespace LinBox;
+
+#include <vector>
+#include <cmath>
+#include "linbox/field/PID-integer.h"
+#include "linbox/util/timer.h"
+#include "linbox/util/commentator.h"
+
+int test1(size_t k, size_t dxa, size_t denBs)
+{
+
+/* Check reconstruction of i/k when it is well approximated
+by something over dxa and when the denominator bound (for k) is denBs.
+Values of numerator i from -k-2 to k+2 are checked.
+When dxa^2 <= denBs, 2 should be returned.
+*/
+ typedef PID_integer Ring; Ring Z;
+ typedef Ring::Element Int;
+
+//std::cout << "test1(k " << k << ", dxa " << dxa << ", denBs " << denBs << ")" << std::endl;
+ // k is our denominator
+ Int denB = denBs; // denominator bound
+ // approximate(i*k^2)/k for i = 0..k-1
+ size_t kp = k+2;
+ size_t kp2 = 2*kp;
+ std::vector<Int> nx(kp2);
+ for (size_t i = 0; i < kp2 ; ++i)
+ Z.init(nx[i],floor(((double(i)-double(kp))*(double)dxa)/(double)k + 0.5));
+ // |nx[i]/dxa - (i-kp)/k| <= 1/2dxa
+ std::vector<Int> n(kp2);
+ Int d;
+ bool pass = true;
+ bool claim;
+ int ret = 2;
+
+ // check of individual reconstructions
+ Int dx; Z.init(dx, dxa);
+ int c;
+ // individual reconstructions
+ for (size_t i = 0; i < kp2 ; ++i) {
+ bool loopclaim = true;
+//std::cout << nx[i] << " " << dx << " " << denB << std::endl;
+ c = dyadicToRational(Z, n[i], d, nx[i], dx, denB);
+//std::cout << " c " << c << " n " << n[i] << " d " << d << " nx " << nx[i] << " dx " << dx << " denB " << denB << std::endl;
+ loopclaim = ((c > 0) && (n[i]*k == ((int(i)-int(kp))*d)));
+ if ( c == 2 ) loopclaim = loopclaim && d*denB < dx;
+ if (c < ret) ret = c;
+ if (! loopclaim) ret = 0;
+//if (! claim) std::cout << "F " << pass << claim << ret << std::endl;
+ //if (! loopclaim)
+//std::cout << "F2 " << loopclaim << " i " << i << " nx/dx " << nx[i] << "/" << dx << ", n/d " << n[i] << "/" << d << std::endl;
+ pass = pass && loopclaim;
+ }
+//std::cout << "result, pass " << pass << " ret " << ret << std::endl;
+
+#if 1
+ // check vector reconstruction
+ c = dyadicToRational(Z, n, d, nx, dx, denB);
+ commentator().report() << "In test1 dyadicToRational returns " << c << std::endl;
+ claim = 0 < c;
+ if (claim) {
+ for (size_t i = 0; i < k ; ++i) claim = claim && (n[i] == (int(i)-int(kp)));
+ }
+ pass = pass && claim;
+ if (!claim) {
+ commentator().report() << "first example fails" << std::endl;
+ commentator().report() << "data for first example" << std::endl;
+ for (size_t i = 0; i < 10 ; ++i)
+ commentator().report() << nx[i] << std::endl;
+ commentator().report() << dx << " den in" << std::endl;
+ commentator().report() << "results for first example" << std::endl;
+ for (size_t i = 0; i < 10 ; ++i)
+ commentator().report() << n[i] << std::endl;
+ commentator().report() << d << " den out" << std::endl;
+ }
+
+ if (c < ret) ret = c;
+ if (! claim) ret = 0;
+ pass = pass && claim;
+//std::cout << "v " << pass << claim << ret << std::endl;
+#endif
+
+ //return pass;
+ return ret;
+}
+
+bool testDyadicToRational(size_t k = 10, bool benchmarking = false)
+{
+ typedef PID_integer Ring; Ring Z;
+ typedef Ring::Element Int;
+ bool pass = true;
+ bool claim = false;
+ size_t pow2 = 1; // upperbound for k.
+ for (size_t i = k; i > 0; i >>= 1) pow2 *= 2;
+
+ UserTimer clock;
+ double totaltime = 0;
+
+ clock.clear(); clock.start();
+ claim = 1 <= test1(k, pow2*pow2, k); // some 1's and some 2's
+ if (!claim) commentator().report() << "failure: 1 !=test1(k, k*k, k)" << std::endl;
+ pass = pass && claim;
+ claim = 1 == test1(k, k*k, k*k); // all 1's
+ if (!claim) commentator().report() << "failure: 1 !=test1(k, k*k, k*k)" << std::endl;
+ pass = pass && claim;
+ claim = 2 == test1(k, k*k+2*k + 1, k+1); // all 2's
+ if (!claim) commentator().report() << "failure: 2 !=test1(k, (k + 1)^2, k+1)" << std::endl;
+ pass = pass && claim;
+ clock.stop(); totaltime += clock.time();
+
+#if 1
+// special case 1
+ Int B; Z.init(B, 1000000000);
+ Int B2; Z.init(B2); B2 = B*B;
+ Int denB = 4*B+294967296; // 2^32
+
+ Int d;
+ Int dxs = denB*denB; // 2^64
+ size_t k2 = 10;
+ std::vector<Int> nx;
+ std::vector<Int> n;
+ nx.resize(k2);
+ n.resize(k2);
+
+ nx[0] =-143*B2-298423624*B-962150784;
+ nx[1] = 239*B2+120348615*B+509085366;
+ nx[2] = -4*B2-959983787*B-562075119;
+ nx[3] = 27*B2+ 8864641*B+551149627;
+ nx[4] = 62*B2+971469325*B+838237476;
+ nx[5] = 190*B2+559070838*B+297135961;
+ nx[6] = 176*B2+172593329*B+811309753;
+ nx[7] = -70*B2-861003759*B-845628342;
+ nx[8] =-228*B2-416339507*B-338896853;
+ nx[9] = -14*B2-398832745*B-762391791;
+
+ claim = 0 < dyadicToRational(Z, n, d, nx, dxs, denB);
+
+ if (!claim) commentator().report() << "in special case 1 failure claimed" << std::endl;
+
+ pass = pass && claim;
+
+ std::vector<Int> ntrue(k2);
+ Int dentrue = 691617936;
+ ntrue[0] = -5*B-372642434;
+ ntrue[1] = 8*B+965263534;
+ ntrue[2] = -185963102;
+ ntrue[3] = 1*B+ 12634812;
+ ntrue[4] = 2*B+360969365;
+ ntrue[5] = 7*B+144570919;
+ ntrue[6] = 6*B+605183272;
+ ntrue[7] = -2*B-656769182;
+ ntrue[8] = -8*B-563941509;
+ ntrue[9] = -539850878;
+ claim = (d == dentrue);
+ for (size_t i = 0; i < k2 ; ++i) claim = claim && (n[i] == ntrue[i]);
+ pass = pass && claim;
+
+ if (!claim)
+ {
+ commentator().report() << "data for failing special case 1" << std::endl;
+ for (size_t i = 0; i < k2 ; ++i)
+ commentator().report() << nx[i] << std::endl;
+ commentator().report() << dxs << " den in" << std::endl;
+ commentator().report() << "results for failing special case 1" << std::endl;
+ for (size_t i = 0; i < k2 ; ++i)
+ commentator().report() << n[i] << std::endl;
+ commentator().report() << d << " den out" << std::endl;
+ }
+
+#endif
+#if 1
+// case where false should be returned.
+ denB = 1023*B+948656640;
+
+ dxs = 4*B2+611686018*B+427387904;
+ size_t k3 = 10;
+ nx.resize(k3);
+ n.resize(k3);
+
+ nx[0] = -4*B2-474720817*B-626139615;
+ nx[1] = -9*B2-632772311*B-132715070;
+ nx[2] = -19*B2-805041562*B-739831073;
+ nx[3] = 35*B2+521355378*B+297487606;
+ nx[4] = 27*B2+922294617*B+624925795;
+ nx[5] = 1*B2+494454325*B+592253092;
+ nx[6] = -27*B2-985233904*B-197462327;
+ nx[7] = -20*B2-336729946*B-917106131;
+ nx[8] = -42*B2-807924857*B-450940124;
+ nx[9] = -27*B2-863559911*B-142533799;
+
+
+ // this should fail
+ claim = dyadicToRational(Z, n, d, nx, dxs, denB);
+//std::cout << "d " << d << " dxs " << dxs << " denB " << denB << std::endl;
+
+ pass = pass && (claim < 2);
+ if (claim == 2) commentator().report() << "third ratrecon in test falsely claims success" << std::endl;
+ if (claim == 1) commentator().report() << "third ratrecon in test (designed to fail) claims speculative success" << std::endl;
+#endif
+
+// done
+ if (benchmarking) commentator().report() << "vec size" << k << ", rat recon time: " << clock << " totaltime " << totaltime << std::endl;
+ return pass;
+}
+
+
+int main (int argc, char **argv)
+{
// customize optional args
size_t n = 10;
@@ -25,14 +247,14 @@ int main (int argc, char **argv) {
};
parseArguments (argc, argv, args);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
// run test
- LinBox::commentator.start("DyadicToRational unit/regression test");
+ LinBox::commentator().start("DyadicToRational unit/regression test");
bool pass = testDyadicToRational(n);
- LinBox::commentator.stop("DyadicToRational unit/regression test");
+ LinBox::commentator().stop("DyadicToRational unit/regression test");
return pass ? 0 : -1;
/* parseArguments sets flags n and q, and arg structure ac, av, where ac, av refer to remaining args after flag processing.
@@ -41,20 +263,29 @@ int main (int argc, char **argv) {
from av. Ac is argc less the arguments thus stripped and handled.
-h, by convention sets ac = -1, indicating that testOBJECT should just explain the args on cout.
- note: options are deliberately limited to these three:
+ note: options are deliberately limited to these three:
-h is conventional for giving a brief help with args (and is widely used).
-n sets a size parameter, a frequent device.
-q often determines the field of computation but may be used in other ways.
- Generally this is as many run time parameters as a test user can reasonably remember and exploit.
- If additional control of testing is desired, usually the easiest and least error prone method
- is to edit the test function and recompile. However, the test function can use the ac and av args
+ Generally this is as many run time parameters as a test user can reasonably remember and exploit.
+ If additional control of testing is desired, usually the easiest and least error prone method
+ is to edit the test function and recompile. However, the test function can use the ac and av args
to exploit further parameters. This ac/av use discouraged absent strong reason for it.
One use pattern of tests is that the unit designer tests with many parameters during development.
- These may turn levels of debugging on and off, explore special cases, etc.). However, when the unit
- is deployed and the test serves only as a unit/regression test, these features are seldom needed,
+ These may turn levels of debugging on and off, explore special cases, etc.). However, when the unit
+ is deployed and the test serves only as a unit/regression test, these features are seldom needed,
if ever. They may be left there just in case, but it is suggested NOT to document them in the -h help.
*/
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-echelon-form.C b/tests/test-echelon-form.C
new file mode 100644
index 0000000..f77fe1c
--- /dev/null
+++ b/tests/test-echelon-form.C
@@ -0,0 +1,327 @@
+/* Copyright (C) 2012 bds
+ * tests/test-echelon-form.C
+ *
+ * adapted by bds from test-blas-domain Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
+ *
+ * ---------------------------------------------------------
+ *
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
+ *
+ *
+ */
+
+
+/*! @file tests/test-echelon-form.C
+ * @ingroup tests
+ * @brief no doc
+ * @test NO DOC
+ */
+
+
+ // where is this used?
+//#define __MINP_CONSTRUCT
+#include <iostream>
+#include <string>
+#include <vector>
+
+//#include "linbox/linbox-config.h"
+#include "test-common.h"
+
+#include "linbox/field/modular.h"
+//#include "linbox/field/givaro.h"
+#include "linbox/matrix/blas-matrix.h"
+#include "linbox/util/commentator.h"
+#include "linbox/algorithms/blas-domain.h"
+#include "linbox/algorithms/echelon-form.h"
+
+using namespace LinBox;
+
+const int maxpretty = 35;
+
+string blank;
+
+const char* pretty(string a)
+{
+
+ blank = " " + a;
+ int msgsize= maxpretty - (int)blank.size();
+ string dot(".");
+ for (int i=0;i<msgsize ;++i)
+ blank+=dot;
+ return blank.c_str();
+}
+#define mycommentator commentator
+
+/*
+ * Testing the rank of dense matrices using BlasDomain
+ * construct a n*n matrices of rank r and compute the rank
+ */
+template <class Field>
+static bool testRank (const Field& F, size_t m, size_t n, int iterations = 1)
+{
+
+ typedef typename Field::Element Element;
+ typedef typename Field::RandIter RandIter;
+
+ //Commentator mycommentator;
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing rank"),"testRank",iterations);
+
+ RandIter G(F);
+ NonzeroRandIter<Field> Gn(F,G);
+ Element tmp;
+ unsigned int r;
+ bool ret = true;
+ BlasMatrixDomain<Field> BMD(F);
+ EchelonFormDomain<Field> EFD(F);
+
+ for (int k=0;k<iterations; ++k) {
+
+ mycommentator().progress(k);
+ BlasMatrix<Field> A(F,m,n),S(F,m,n), L(F,m,m);
+
+ int mn = (m < n) ? m : n;
+ r = (unsigned int)(random() % mn);
+ // create S as an upper triangular matrix with r nonzero rows
+ for (size_t i=0;i<r;++i){
+ S.setEntry(i,i,Gn.random(tmp));
+ for (size_t j=i+1;j<n;++j)
+ S.setEntry(i,j,G.random(tmp));
+ }
+ BMD.write(commentator().report(), S) << " = S" << std::endl;
+
+
+ // create L as a lower triangular matrix with nonzero elements on the diagonal
+ for (size_t i=0;i<m;++i){
+ for (size_t j=0;j<i;++j)
+ L.setEntry(i,j,G.random(tmp));
+ L.setEntry(i,i,Gn.random(tmp));
+ }
+ BMD.write(commentator().report(), L) << " = L" << std::endl;
+
+ // compute A=LS
+ BMD.mul(A,L,S);
+ BMD.write(commentator().report(), A) << " = A" << std::endl;
+
+ // compute the rank of A
+ BlasMatrix<Field> E1(F,m,n), E2(F,m,n), E3(F,m,n), E4(F,m,n);
+ unsigned int rank1= EFD.rowEchelon(E1, A);
+ BMD.write(commentator().report(), E1) << " = rowEchelon(E1, A)" << std::endl;
+
+ unsigned int rank2= EFD.rowReducedEchelon(E2, A);
+ BMD.write(commentator().report(), E2) << " = rowReducedEchelon(E2, A)" << std::endl;
+
+ unsigned int rank3= EFD.columnEchelon(E3, A);
+ BMD.write(commentator().report(), E3) << " = columnEchelon(E3, A)" << std::endl;
+
+ unsigned int rank4= EFD.columnReducedEchelon(E4, A);
+ BMD.write(commentator().report(), E4) << " = columnReducedEchelon(E4, A)" << std::endl;
+
+ unsigned int rank5= EFD.columnEchelon(A);
+ BMD.write(commentator().report(), A) << " = columnEchelon(A)" << std::endl;
+
+ unsigned int rank6= EFD.columnReducedEchelon(E1);
+ BMD.write(commentator().report(), E1) << " = columnReducedEchelon(E1)" << std::endl;
+
+ commentator().report() << "Ranks " << rank1 << " " << rank2 << " " << rank3 << " " << rank4 << " " << rank5 << " " << rank6 << " should be " << r << std::endl;
+
+ if (rank1!=r or rank2 !=r or rank3 !=r or rank4 !=r or rank5 !=r or rank6 !=r)
+ ret=false;
+ }
+
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testRank");
+
+ return ret;
+}
+
+/*
+ * Test of the LQUPMatrix class
+ */
+template <class Field>
+static bool testLQUP (const Field& F, size_t m, size_t n, int iterations = 1)
+{
+
+ typedef typename Field::Element Element;
+ typedef BlasMatrix<Field> Matrix;
+ typedef typename Field::RandIter RandIter;
+
+ //Commentator mycommentator;
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ mycommentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ mycommentator().start (pretty("Testing LQUP factorization"),"testLQUP",iterations);
+
+ RandIter G(F);
+ NonzeroRandIter<Field> Gn(F,G);
+ Element One,zero,tmp;
+ F.init(One,1UL);
+ F.init(zero,0UL);
+
+ bool ret = true;
+ MatrixDomain<Field> MD(F);
+ BlasMatrixDomain<Field> BMD(F);
+
+ for (int k=0;k<iterations;++k) {
+
+ mycommentator().progress(k);
+
+ Matrix A(F, m,n), Abis(F, m,n), B(F, m,m), C(F, m,n);
+
+
+ // Create B a random matrix of rank n/2
+ for (size_t j=0;j<m;++j)
+ if ( j % 2 )
+ for (size_t i=0;i<m;++i)
+ B.setEntry(i,j,G.random(tmp));
+ else
+ for (size_t i=0;i<m;++i)
+ B.setEntry(i,j,zero);
+ // Create C a random matrix of rank n/2
+ for (size_t i=0;i<m;++i)
+ if ( i % 2 )
+ for (size_t j=0;j<n;++j)
+ C.setEntry(i,j,G.random(tmp));
+ else
+ for (size_t j=0;j<n;++j)
+ C.setEntry(i,j,zero);
+
+ // A = B*C
+ BMD.mul(A, B, C);
+
+ Abis = A;
+
+ BlasPermutation<size_t> P(A.coldim()),Q(A.rowdim());
+ LQUPMatrix<Field> X(A,P,Q);
+
+ TriangularBlasMatrix<Field> L(F,m,m,LinBoxTag::Lower,LinBoxTag::Unit);
+ TriangularBlasMatrix<Field> U(F,m,n,LinBoxTag::Upper,LinBoxTag::NonUnit);
+ X.getL(L);
+ X.getU(U);
+ P=X.getP();
+
+ Q=X.getQ();
+
+ // C = U*P
+ BMD.mul( C, U, P);
+ // C = Q*C
+ BMD.mulin_right( Q, C);
+ // A = L*C
+ BMD.mul( A, L, C);
+
+ if (!MD.areEqual(A,Abis))
+ ret=false;
+
+ // Second pass
+ // A = B*C
+ BMD.mul(A, B, C);
+
+ Abis = A;
+
+ LQUPMatrix<Field> Y(A,P,Q);
+
+ TriangularBlasMatrix<Field> L2(F,m,m,LinBoxTag::Lower,LinBoxTag::Unit);
+ TriangularBlasMatrix<Field> U2(F,m,n,LinBoxTag::Upper,LinBoxTag::NonUnit);
+ Y.getL(L2);
+ Y.getU(U2);
+ P=Y.getP();
+
+ Q=Y.getQ();
+
+ // C = Q*U2
+ BMD.mul( C,Q,U2);
+ // C = Q*C
+ BMD.mulin_left( C,P);
+ // A = L*C
+ BMD.mul( A, L2, C);
+
+ if (!MD.areEqual(A,Abis))
+ ret=false;
+ }
+
+ mycommentator().stop(MSG_STATUS (ret), (const char *) 0, "testLQUP");
+
+ return ret;
+}
+
+// returns true if ok, false if not.
+template<class Field>
+int launch_tests(Field & F, int m, int n, int iterations = 1)
+{
+ bool pass = true ;
+ int mn = (m < n) ? n : m;
+ if (!testRank (F, mn, mn, iterations)) pass=false;
+ if (m != n) {
+ if (!testRank (F, n, m, iterations)) pass=false;
+ if (!testRank (F, m, n, iterations)) pass=false;
+ }
+ //if (!testLQUP (F,n,n,iterations)) pass=false;
+ return pass ;
+
+}
+
+int main(int argc, char **argv)
+{
+
+ static size_t n = 20;
+ static size_t m = 10;
+ static integer q = 1000003U;
+ static int iterations = 1;
+
+ static Argument args[] = {
+ { 'm', "-n M", "Set dimension of test matrices to MxN", TYPE_INT, &m },
+ { 'n', "-n N", "Set dimension of test matrices to MxN", TYPE_INT, &n },
+ { 'q', "-q Q", "Operate over the \"field\" GF(Q) [1]", TYPE_INTEGER, &q },
+ { 'i', "-i I", "Perform each test for I iterations", TYPE_INT, &iterations },
+ END_OF_ARGUMENTS
+ };
+
+ parseArguments (argc, argv, args);
+
+ typedef Modular<double> Field;
+ //typedef Modular<int> Field;
+ //typedef Modular<float> Field;
+
+ Field F1 (q);
+ bool pass = true;
+
+ srand ((unsigned)time (NULL));
+
+
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+
+ commentator().start("BlasMatrixDomain test suite", "BlasMatrixDomain");
+
+ pass &= launch_tests(F1,(int)m, (int)n,iterations);
+ commentator().stop(MSG_STATUS (pass), (const char *) 0,"BlasMatrixDomain test suite");
+ return pass ? 0 : -1;
+}
+
+
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-ffpack.C b/tests/test-ffpack.C
index 85e1eac..b04e46d 100644
--- a/tests/test-ffpack.C
+++ b/tests/test-ffpack.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* written by C. Pernet
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -35,9 +36,9 @@
#include <iostream>
#include <vector>
-#include <linbox/integer.h>
-#include <linbox/matrix/matrix-domain.h>
-#include "linbox/field/givaro-zpz.h"
+#include "linbox/integer.h"
+#include "linbox/matrix/matrix-domain.h"
+#include "linbox/field/givaro.h"
#include "linbox/field/modular.h"
#include "linbox/field/modular-balanced.h"
#include "fflas-ffpack/ffpack/ffpack.h"
@@ -56,7 +57,7 @@ const char* pretty(string a)
{
blank = " " + a;
- int msgsize= maxpretty - blank.size();
+ int msgsize= maxpretty - (int)blank.size();
string dot(".");
for (int i=0;i<msgsize ;++i)
blank+=dot;
@@ -75,9 +76,9 @@ static bool testRank (const Field& F,size_t n, int iterations)
typedef typename Field::RandIter RandIter;
//Commentator commentator;
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start (pretty("Testing rank"),"testRank",iterations);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().start (pretty("Testing rank"),"testRank",iterations);
Element one, zero;
F.init( one, 1UL);
@@ -90,12 +91,12 @@ static bool testRank (const Field& F,size_t n, int iterations)
for (int k=0;k<iterations; ++k) {
- commentator.progress(k);
+ commentator().progress(k);
Element * A = new Element[n*n];
Element * S = new Element[n*n];
Element * L = new Element[n*n];
- r = rand() % n;
+ r = (unsigned)( rand() % n );
// create S as an upper triangular matrix with r nonzero rows
for (size_t i=0;i<r;++i){
for (size_t j=0;j<i;++j)
@@ -125,13 +126,13 @@ static bool testRank (const Field& F,size_t n, int iterations)
delete[] S;
// compute the rank of A
- unsigned int rank= FFPACK::Rank( F, n, n, A, n);
+ unsigned int rank= (unsigned int) FFPACK::Rank( F, n, n, A, n);
delete[] A;
if (rank!=r)
ret=false;
}
- commentator.stop(MSG_STATUS (ret), (const char *) 0, "testRank");
+ commentator().stop(MSG_STATUS (ret), (const char *) 0, "testRank");
return ret;
}
@@ -148,9 +149,9 @@ static bool testTURBO (const Field& F,size_t n, int iterations)
typedef typename Field::RandIter RandIter;
//Commentator commentator;
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start (pretty("Testing TURBO"),"testTURBO",iterations);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().start (pretty("Testing TURBO"),"testTURBO",iterations);
Element one, zero;
F.init( one, 1UL);
@@ -163,12 +164,12 @@ static bool testTURBO (const Field& F,size_t n, int iterations)
for (int k=0;k<iterations; ++k) {
- commentator.progress(k);
+ commentator().progress(k);
Element * A = new Element[n*n];
Element * S = new Element[n*n];
Element * L = new Element[n*n];
- r = rand() % n;
+ r = (unsigned)(rand() % n);
// create S as an upper triangular matrix with r nonzero rows
for (size_t i=0;i<r;++i){
for (size_t j=0;j<i;++j)
@@ -199,7 +200,7 @@ static bool testTURBO (const Field& F,size_t n, int iterations)
// compute the rank of A
size_t * P = new size_t[n];
size_t * Q = new size_t[n];
- unsigned int rank= FFPACK::TURBO( F, n, n,
+ unsigned int rank= (unsigned)FFPACK::TURBO( F, n, n,
A,n, P, Q, 100);
// A, n, A+no2,n,
// A+no2*n, n, A+no2*(n+1), n );
@@ -212,7 +213,7 @@ static bool testTURBO (const Field& F,size_t n, int iterations)
ret=false;
}
- commentator.stop(MSG_STATUS (ret), (const char *) 0, "testTURBO");
+ commentator().stop(MSG_STATUS (ret), (const char *) 0, "testTURBO");
return ret;
}
@@ -230,9 +231,9 @@ static bool testDet (const Field& F,size_t n, int iterations)
typedef typename Field::RandIter RandIter;
//Commentator commentator;
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start (pretty("Testing determinant"),"testDet",iterations);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().start (pretty("Testing determinant"),"testDet",iterations);
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
@@ -244,7 +245,7 @@ static bool testDet (const Field& F,size_t n, int iterations)
for (int k=0;k<iterations;++k) {
- commentator.progress(k);
+ commentator().progress(k);
G.random(d);
@@ -291,7 +292,7 @@ static bool testDet (const Field& F,size_t n, int iterations)
ret=false;
}
- commentator.stop(MSG_STATUS (ret), (const char *) 0, "testDet");
+ commentator().stop(MSG_STATUS (ret), (const char *) 0, "testDet");
return ret;
}
@@ -307,9 +308,9 @@ static bool testLUdivine (const Field& F, size_t m, size_t n, int iterations)
typedef typename Field::RandIter RandIter;
//Commentator commentator;
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start (pretty("Testing LQUP factorization"),"testLQUP",iterations);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().start (pretty("Testing LQUP factorization"),"testLQUP",iterations);
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
@@ -321,7 +322,7 @@ static bool testLUdivine (const Field& F, size_t m, size_t n, int iterations)
for (int k=0;k<iterations;++k) {
- commentator.progress(k);
+ commentator().progress(k);
Element * A = new Element[m*n];
@@ -383,8 +384,8 @@ static bool testLUdivine (const Field& F, size_t m, size_t n, int iterations)
for (size_t j = i; j < m; ++j)
F.assign (*(L+i*m+j), zero );
}
- FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasNoTrans, m,
- 0, r, L, m, Q);
+ FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasNoTrans,
+ m, 0,(int) r, L, m, Q);
for (size_t i=0; i<m; ++i)
F.assign( *(L+i*m+i), one);
for (size_t i=0; i<m; ++i){
@@ -398,11 +399,11 @@ static bool testLUdivine (const Field& F, size_t m, size_t n, int iterations)
// write_field (F, cerr<<"U"<<endl, U, m, n, n);
// C = U*P
FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasNoTrans, m,
- 0, r, U, n, P);
+ 0, (int) r, U, n, P);
// write_field (F, cerr<<"UP"<<endl, U, m, n, n);
// C = Q*C
FFPACK::applyP( F, FFLAS::FflasLeft, FFLAS::FflasTrans, n,
- 0, r, U, n, Q);
+ 0, (int) r, U, n, Q);
// write_field (F, cerr<<"QUP"<<endl, U, m, n, n);
delete[] P;
@@ -430,7 +431,7 @@ static bool testLUdivine (const Field& F, size_t m, size_t n, int iterations)
}
- commentator.stop(MSG_STATUS (ret), (const char *) 0, "testLQUP");
+ commentator().stop(MSG_STATUS (ret), (const char *) 0, "testLQUP");
return ret;
}
@@ -442,21 +443,21 @@ static bool testMinPoly (const Field& F, size_t n, int iterations)
typedef typename Field::RandIter RandIter;
typedef vector<Element> Polynomial;
//Commentator commentator;
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start (pretty("Testing minpoly"),"testMinPoly",iterations);
- Element tmp, one, zero,mone;
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().start (pretty("Testing minpoly"),"testMinPoly",iterations);
+ Element tmp, one, zero,mOne;
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
F.init(one, 1UL);
F.init(zero, 0UL);
- F.neg(mone, one);
- //F.neg( mone, one);
+ F.neg(mOne, one);
+ //F.neg( mOne, one);
bool ret = true;
for (int k=0;k<iterations;++k) {
- commentator.progress(k);
+ commentator().progress(k);
Element * A = new Element[n*n];
Element * X = new Element[n*(n+1)];
@@ -474,7 +475,7 @@ static bool testMinPoly (const Field& F, size_t n, int iterations)
if ( P.size() !=2 )
ret = false;
- if ( !F.areEqual(P[0], mone) )
+ if ( !F.areEqual(P[0], mOne) )
ret = false;
if ( !F.areEqual(P[1], one) )
ret = false;
@@ -536,7 +537,7 @@ static bool testMinPoly (const Field& F, size_t n, int iterations)
}
- commentator.stop(MSG_STATUS (ret), (const char *) 0, "testMinPoly");
+ commentator().stop(MSG_STATUS (ret), (const char *) 0, "testMinPoly");
return ret;
}
@@ -548,20 +549,20 @@ static bool testCharPoly (const Field& F, size_t n, int iterations)
typedef typename Field::RandIter RandIter;
typedef vector<Element> Polynomial;
//Commentator commentator;
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start (pretty("Testing charpoly"),"testCharPoly",iterations);
- Element tmp, one, zero,mone;
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().start (pretty("Testing charpoly"),"testCharPoly",iterations);
+ Element tmp, one, zero,mOne;
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
F.init(one, 1UL);
F.init(zero, 0UL);
- F.neg(mone, one);
+ F.neg(mOne, one);
bool ret = true;
for (int k=0;k<iterations;++k) {
- commentator.progress(k);
+ commentator().progress(k);
Element * A = new Element[n*n];
@@ -584,7 +585,7 @@ static bool testCharPoly (const Field& F, size_t n, int iterations)
if ( P_it->size() !=2 ){
ret = false;
}
- if ( !F.areEqual(P_it->operator[](0), mone) ){
+ if ( !F.areEqual(P_it->operator[](0), mOne) ){
ret = false;
}
if ( !F.areEqual(P_it->operator[](1), one) ){
@@ -618,7 +619,7 @@ static bool testCharPoly (const Field& F, size_t n, int iterations)
delete[] A;
}
- commentator.stop(MSG_STATUS (ret), (const char *) 0, "testCharPoly");
+ commentator().stop(MSG_STATUS (ret), (const char *) 0, "testCharPoly");
return ret;
}
@@ -631,9 +632,9 @@ static bool testInv (const Field& F,size_t n, int iterations)
typedef typename Field::RandIter RandIter;
//Commentator commentator;
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start (pretty("Testing inverse"),"testInv",iterations);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().start (pretty("Testing inverse"),"testInv",iterations);
RandIter G(F);
NonzeroRandIter<Field> Gn(F,G);
@@ -651,7 +652,7 @@ static bool testInv (const Field& F,size_t n, int iterations)
}
for (int k=0;k<iterations;++k) {
- commentator.progress(k);
+ commentator().progress(k);
Element * A = new Element[n*n];
@@ -718,7 +719,7 @@ static bool testInv (const Field& F,size_t n, int iterations)
}
delete[] Id;
- commentator.stop(MSG_STATUS (ret), (const char *) 0, "testInv");
+ commentator().stop(MSG_STATUS (ret), (const char *) 0, "testInv");
return ret;
}
@@ -731,9 +732,9 @@ static bool testapplyP (const Field& F,size_t n, int iterations)
typedef typename Field::RandIter RandIter;
//Commentator commentator;
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start (pretty("Testing applyP"),"testapplyP",iterations);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().start (pretty("Testing applyP"),"testapplyP",iterations);
RandIter G(F);
Element zero,one,tmp,tmp2;
@@ -746,7 +747,7 @@ static bool testapplyP (const Field& F,size_t n, int iterations)
for (int k=0;k<iterations;++k) {
- commentator.progress(k);
+ commentator().progress(k);
Element * A = new Element[n*n];
@@ -774,10 +775,14 @@ static bool testapplyP (const Field& F,size_t n, int iterations)
// compute A=LS
- FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasNoTrans, n, 0, n, A, n, P );
- FFPACK::applyP( F, FFLAS::FflasLeft, FFLAS::FflasNoTrans, n, 0, n, A, n, P );
- FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasTrans, n, 0, n, A, n, P );
- FFPACK::applyP( F, FFLAS::FflasLeft, FFLAS::FflasTrans, n, 0, n, A, n, P );
+ FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasNoTrans,
+ n, 0,(int) n, A, n, P );
+ FFPACK::applyP( F, FFLAS::FflasLeft, FFLAS::FflasNoTrans,
+ n, 0,(int) n, A, n, P );
+ FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasTrans,
+ n, 0,(int) n, A, n, P );
+ FFPACK::applyP( F, FFLAS::FflasLeft, FFLAS::FflasTrans,
+ n, 0,(int) n, A, n, P );
for (size_t i=0;i<n*n;++i)
if ( !F.areEqual(*(Ab+i),*(A+i)) )
@@ -787,7 +792,7 @@ static bool testapplyP (const Field& F,size_t n, int iterations)
delete[] P;
}
- commentator.stop(MSG_STATUS (ret), (const char *) 0, "testApplyP");
+ commentator().stop(MSG_STATUS (ret), (const char *) 0, "testApplyP");
return ret;
}
@@ -811,27 +816,36 @@ int main(int argc, char** argv)
parseArguments (argc, argv, args);
+
+ std::ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().start("ffpack test suite", "ffpack");
+
+
/* Modular Double */
{
typedef Modular<double> Field;
Field F (q);
+ F.write(report << "Field : " ) << std::endl;
- srand(time (NULL));
+ srand((unsigned)time (NULL));
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start("ffpack test suite", "ffpack");
+ bool locpass = true ;
- if (!testLUdivine (F, m,n, iterations)) pass = false;
- if (!testRank (F, n, iterations)) pass = false;
- if (!testDet (F, n, iterations)) pass = false;
- if (!testTURBO (F, n, iterations)) pass = false;
- if (!testapplyP (F, n, iterations)) pass = false;
- if (!testInv (F, n, iterations)) pass = false;
- if (!testMinPoly (F,n,iterations)) pass = false;
- if (!testCharPoly (F,n,iterations)) pass = false;
+ if (!testLUdivine (F, m,n, iterations)) locpass = false;
+ if (!testRank (F, n, iterations)) locpass = false;
+ if (!testDet (F, n, iterations)) locpass = false;
+ if (!testTURBO (F, n, iterations)) locpass = false;
+ if (!testapplyP (F, n, iterations)) locpass = false;
+ if (!testInv (F, n, iterations)) locpass = false;
+ if (!testMinPoly (F,n,iterations)) locpass = false;
+ if (!testCharPoly (F,n,iterations)) locpass = false;
+ (!locpass)?(report << "FAIL" << std::endl):(report << "OK"<<std::endl);
+
+ pass &= locpass ;
}
#ifdef _LB_FULL_TEST
@@ -840,22 +854,23 @@ int main(int argc, char** argv)
typedef Modular<float> Field;
Field F (q);
+ F.write(report << "Field : " ) << std::endl;
- srand(time (NULL));
+ srand((unsigned)time (NULL));
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start("ffpack test suite", "ffpack");
+ bool locpass = true ;
- if (!testLUdivine (F, m,n, iterations)) pass = false;
- if (!testRank (F, n, iterations)) pass = false;
- if (!testDet (F, n, iterations)) pass = false;
- if (!testTURBO (F, n, iterations)) pass = false;
- if (!testapplyP (F, n, iterations)) pass = false;
- if (!testInv (F, n, iterations)) pass = false;
- if (!testMinPoly (F,n,iterations)) pass = false;
- if (!testCharPoly (F,n,iterations)) pass = false;
+ if (!testLUdivine (F, m,n, iterations)) locpass = false;
+ if (!testRank (F, n, iterations)) locpass = false;
+ if (!testDet (F, n, iterations)) locpass = false;
+ if (!testTURBO (F, n, iterations)) locpass = false;
+ if (!testapplyP (F, n, iterations)) locpass = false;
+ if (!testInv (F, n, iterations)) locpass = false;
+ if (!testMinPoly (F,n,iterations)) locpass = false;
+ if (!testCharPoly (F,n,iterations)) locpass = false;
+ (!locpass)?(report << "FAIL" << std::endl):(report << "OK"<<std::endl);
+ pass &= locpass ;
}
/* Modular Balanced Double */
@@ -863,22 +878,23 @@ int main(int argc, char** argv)
typedef LinBox::ModularBalanced<double> Field;
Field F (q);
+ F.write(report << "Field : " ) << std::endl;
- srand(time (NULL));
+ srand((unsigned)time (NULL));
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start("ffpack test suite", "ffpack");
+ bool locpass = true ;
- if (!testLUdivine (F, m,n, iterations)) pass = false;
- if (!testRank (F, n, iterations)) pass = false;
- if (!testDet (F, n, iterations)) pass = false;
- if (!testTURBO (F, n, iterations)) pass = false;
- if (!testapplyP (F, n, iterations)) pass = false;
- if (!testInv (F, n, iterations)) pass = false;
- if (!testMinPoly (F,n,iterations)) pass = false;
- if (!testCharPoly (F,n,iterations)) pass = false;
+ if (!testLUdivine (F, m,n, iterations)) locpass = false;
+ if (!testRank (F, n, iterations)) locpass = false;
+ if (!testDet (F, n, iterations)) locpass = false;
+ if (!testTURBO (F, n, iterations)) locpass = false;
+ if (!testapplyP (F, n, iterations)) locpass = false;
+ if (!testInv (F, n, iterations)) locpass = false;
+ if (!testMinPoly (F,n,iterations)) locpass = false;
+ if (!testCharPoly (F,n,iterations)) locpass = false;
+ (!locpass)?(report << "FAIL" << std::endl):(report << "OK"<<std::endl);
+ pass &= locpass ;
}
/* Modular Balanced Float */
@@ -886,44 +902,47 @@ int main(int argc, char** argv)
typedef ModularBalanced<float> Field;
Field F (q);
+ F.write(report << "Field : " ) << std::endl;
- srand(time (NULL));
+ srand((unsigned)time (NULL));
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start("ffpack test suite", "ffpack");
+ bool locpass = true ;
- if (!testLUdivine (F, m,n, iterations)) pass = false;
- if (!testRank (F, n, iterations)) pass = false;
- if (!testDet (F, n, iterations)) pass = false;
- if (!testTURBO (F, n, iterations)) pass = false;
- if (!testapplyP (F, n, iterations)) pass = false;
- if (!testInv (F, n, iterations)) pass = false;
- if (!testMinPoly (F,n,iterations)) pass = false;
- if (!testCharPoly (F,n,iterations)) pass = false;
+ if (!testLUdivine (F, m,n, iterations)) locpass = false;
+ if (!testRank (F, n, iterations)) locpass = false;
+ if (!testDet (F, n, iterations)) locpass = false;
+ if (!testTURBO (F, n, iterations)) locpass = false;
+ if (!testapplyP (F, n, iterations)) locpass = false;
+ if (!testInv (F, n, iterations)) locpass = false;
+ if (!testMinPoly (F,n,iterations)) locpass = false;
+ if (!testCharPoly (F,n,iterations)) locpass = false;
+ (!locpass)?(report << "FAIL" << std::endl):(report << "OK"<<std::endl);
+ pass &= locpass ;
}
-#warning "some tests don't compile or fail"
+#pragma message "#warning some tests don't compile or fail"
/* Modular int32_t */
{
typedef Modular<int32_t> Field;
Field F (q);
+ F.write(report << "Field : " ) << std::endl;
+
+ srand((unsigned)time (NULL));
- srand(time (NULL));
+ bool locpass = true ;
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start("ffpack test suite", "ffpack");
+ if (!testLUdivine (F, m,n, iterations)) locpass = false;
+ if (!testRank (F, n, iterations)) locpass = false;
+ if (!testDet (F, n, iterations)) locpass = false;
+ if (!testTURBO (F, n, iterations)) locpass = false;
+ if (!testapplyP (F, n, iterations)) locpass = false;
+ if (!testInv (F, n, iterations)) locpass = false;
+ if (!testMinPoly (F,n,iterations)) locpass = false;
+ if (!testCharPoly (F,n,iterations)) locpass = false;
- if (!testLUdivine (F, m,n, iterations)) pass = false;
- if (!testRank (F, n, iterations)) pass = false;
- if (!testDet (F, n, iterations)) pass = false;
- if (!testTURBO (F, n, iterations)) pass = false;
- if (!testapplyP (F, n, iterations)) pass = false;
- if (!testInv (F, n, iterations)) pass = false;
- if (!testMinPoly (F,n,iterations)) pass = false;
- if (!testCharPoly (F,n,iterations)) pass = false;
+ (!locpass)?(report << "FAIL" << std::endl):(report << "OK"<<std::endl);
+ pass &= locpass ;
}
@@ -933,73 +952,72 @@ int main(int argc, char** argv)
typedef ModularBalanced<int32_t > Field ;
Field F (q);
-
- srand(time (NULL));
-
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start("ffpack test suite", "ffpack");
-
- if (!testLUdivine (F, m,n, iterations)) pass = false;
- if (!testRank (F, n, iterations)) pass = false;
- if (!testDet (F, n, iterations)) pass = false;
- if (!testTURBO (F, n, iterations)) pass = false;
- if (!testapplyP (F, n, iterations)) pass = false;
- if (!testInv (F, n, iterations)) pass = false;
- if (!testMinPoly (F,n,iterations)) pass = false;
- if (!testCharPoly (F,n,iterations)) pass = false;
+ F.write(report << "Field : " ) << std::endl;
+
+ srand((unsigned)time (NULL));
+
+ bool locpass = true ;
+
+ if (!testLUdivine (F, m,n, iterations)) locpass = false;
+ if (!testRank (F, n, iterations)) locpass = false;
+ if (!testDet (F, n, iterations)) locpass = false;
+ if (!testTURBO (F, n, iterations)) locpass = false;
+ if (!testapplyP (F, n, iterations)) locpass = false;
+ if (!testInv (F, n, iterations)) locpass = false;
+ if (!testMinPoly (F,n,iterations)) locpass = false;
+ if (!testCharPoly (F,n,iterations)) locpass = false;
+ (!locpass)?(report << "FAIL" << std::endl):(report << "OK"<<std::endl);
+ pass &= locpass ;
}
#endif
-#if 0 // no NonZeroRandIter
/* Modular uint32_t */
{
typedef Modular<uint32_t> Field;
Field F (q);
-
- srand(time (NULL));
-
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start("ffpack test suite", "ffpack");
-
- if (!testLUdivine (F, m,n, iterations)) pass=false;
- if (!testRank (F, n, iterations)) pass = false;
- if (!testDet (F, n, iterations)) pass = false;
- if (!testTURBO (F, n, iterations)) pass = false;
- if (!testapplyP (F, n, iterations)) pass = false;
- if (!testInv (F, n, iterations)) pass = false;
- if (!testMinPoly (F,n,iterations)) pass=false;
- if (!testCharPoly (F,n,iterations)) pass=false;
+ F.write(report << "Field : " ) << std::endl;
+
+ srand((unsigned)time (NULL));
+
+ bool locpass = true ;
+
+ if (!testLUdivine (F, m,n, iterations)) locpass = false;
+ if (!testRank (F, n, iterations)) locpass = false;
+ if (!testDet (F, n, iterations)) locpass = false;
+ if (!testTURBO (F, n, iterations)) locpass = false;
+ if (!testapplyP (F, n, iterations)) locpass = false;
+ if (!testInv (F, n, iterations)) locpass = false;
+ if (!testMinPoly (F,n,iterations)) locpass = false;
+ if (!testCharPoly (F,n,iterations)) locpass = false;
+ (!locpass)?(report << "FAIL" << std::endl):(report << "OK"<<std::endl);
+ pass &= locpass ;
}
-#endif
-#if 0 // no NonZeroRandIter
/* GivaroZpz int32_t */
{
- typedef GivaroZpz<Std32> Field;
+ typedef GivaroZpz<Givaro::Std32> Field;
Field F (q);
-
- srand(time (NULL));
-
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start("ffpack test suite", "ffpack");
-
- if (!testLUdivine (F, m,n, iterations)) pass=false;
- if (!testRank (F, n, iterations)) pass = false;
- if (!testDet (F, n, iterations)) pass = false;
- if (!testTURBO (F, n, iterations)) pass = false;
- if (!testapplyP (F, n, iterations)) pass = false;
- if (!testInv (F, n, iterations)) pass = false;
- if (!testMinPoly (F,n,iterations)) pass=false;
- if (!testCharPoly (F,n,iterations)) pass=false;
+ F.write(report << "Field : " ) << std::endl;
+
+ srand((unsigned)time (NULL));
+
+ bool locpass = true ;
+
+ if (!testLUdivine (F, m,n, iterations)) locpass = false;
+ if (!testRank (F, n, iterations)) locpass = false;
+ if (!testDet (F, n, iterations)) locpass = false;
+ if (!testTURBO (F, n, iterations)) locpass = false;
+ if (!testapplyP (F, n, iterations)) locpass = false;
+ if (!testInv (F, n, iterations)) locpass = false;
+ if (!testMinPoly (F,n,iterations)) locpass = false;
+ if (!testCharPoly (F,n,iterations)) locpass = false;
+ (!locpass)?(report << "FAIL" << std::endl):(report << "OK"<<std::endl);
+ pass &= locpass ;
}
#endif
-#endif
- commentator.stop(MSG_STATUS(pass),"ffpack test suite");
+ commentator().stop(MSG_STATUS(pass),"ffpack test suite");
return pass ? 0 : -1;
}
@@ -1008,3 +1026,12 @@ int main(int argc, char** argv)
#undef _LB_FULL_TEST
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-field.h b/tests/test-field.h
index 7e629c5..fa19e6a 100644
--- a/tests/test-field.h
+++ b/tests/test-field.h
@@ -1,8 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/tests/test-field.h
* Copyright (C) 2001, 2002 Bradford Hovinen
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*
* Extracted by bds from test-generic.h, written by Bradford Hovinen <hovinen at cis.udel.edu>
*/
@@ -13,6 +29,34 @@
* @test tests field operations
*/
+/*
+// top level test that doesn't use subtests.
+bool testField
+
+// top level test that uses subtest testRandomIteratorStep.
+bool testRandomIterator
+
+// top level runBasicRingTests calls these subtests.
+bool testFieldNegation
+bool testFieldDistributivity
+bool testFieldAssociativity
+bool testFieldCharacteristic
+bool testGeometricSummation
+bool testArithmeticConsistency
+bool testAxpyConsistency
+bool testRanditerBasic
+
+// top level runFieldTests calls these subtests after runBasicRingTests.
+bool testFieldInversion
+bool testFieldCommutativity
+bool testFreshmansDream
+bool testRingTrivia
+
+//called in subtest testArithmeticConsistency
+bool testRingArithmeticConsistency
+bool testInvDivConsistency
+*/
+
#ifndef __LINBOX_test_field_H
#define __LINBOX_test_field_H
@@ -65,11 +109,12 @@ typename Field::Element& expt (const Field &F, typename Field::Element &res, con
bool reportError(string rep, bool& flag)
{
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR);
+ ostream &report = commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR);
report << "ERROR: " << rep << endl;
return flag = false;
}
+
/** Check each field or ring operation.
*
* Test various field operations
@@ -84,12 +129,14 @@ bool reportError(string rep, bool& flag)
template<class Field>
bool testField (Field &F, const char *title, bool fieldp = true)
{
- commentator.start (title, "testField", 5);
+ commentator().start (title, "testField", 5);
// ostream &report = std::cout ;
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- typename Field::Element zero, one, two, three;
+ typename Field::Element zero, one, mOne, two, three;
F.init(zero, 0); F.init(one, 1); F.init(two, 2); F.init(three, 3);
+ F.init(mOne);
+ F.neg(mOne,one);
typename Field::Element a, b, c, d, e, f;
F.init(a,0); F.init(b,0); F.init(c,0); F.init(d,0); F.init(e,0); F.init(f,0);
@@ -101,20 +148,20 @@ bool testField (Field &F, const char *title, bool fieldp = true)
LinBox::integer n, m;
bool pass = true, part_pass = true;
- commentator.start ("\t--Testing characteristic/cardinality match");
+ commentator().start ("\t--Testing characteristic/cardinality match");
F.characteristic (n);
F.cardinality (m);
if (n > 0 && !isPower (m, n)) part_pass = reportError("Characteristic, cardinality mismatch", pass);
- commentator.stop (MSG_STATUS (part_pass));
- commentator.progress ();
+ commentator().stop (MSG_STATUS (part_pass));
+ commentator().progress ();
/* tests for presence of members with minimal check of semantics */
// these checks need improvement
- commentator.start ("\t--Testing correctness of 0 and 1");
+ commentator().start ("\t--Testing correctness of 0 and 1");
part_pass = true;
if (!F.isZero (zero)) {
@@ -126,11 +173,29 @@ bool testField (Field &F, const char *title, bool fieldp = true)
part_pass = reportError( "isOne (1) is false", pass);
}
+ if (!F.isZero (F.zero)) {
+ part_pass = reportError( "isZero (0) is false", pass);
+ }
+ if (F.isZero (F.one)) part_pass = reportError( "isZero (1) is true", pass);
+ if (F.isOne (F.zero)) part_pass = reportError( "isOne (0) is true", pass);
+ if (!F.isOne (F.one)) {
+ part_pass = reportError( "isOne (1) is false", pass);
+ }
+
+ if ( !F.areEqual(F.mOne,mOne))
+ part_pass = reportError( "isMOne (-One) is false", pass);
- commentator.stop (MSG_STATUS (part_pass));
- commentator.progress ();
+ typename Field::Element mOneFromCst;
+ F.init(mOneFromCst, -1);
- commentator.start ("\t--Testing init/convert");
+ if ( !F.areEqual(F.mOne,mOneFromCst))
+ part_pass = reportError( "isMOne (-1) is false", pass);
+
+
+ commentator().stop (MSG_STATUS (part_pass));
+ commentator().progress ();
+
+ commentator().start ("\t--Testing init/convert");
part_pass = true;
if (F.cardinality (m) <= 0)
@@ -148,10 +213,10 @@ bool testField (Field &F, const char *title, bool fieldp = true)
if (m != n) part_pass = reportError( "F.convert (m, F.init (a, n)) != n", pass);
- commentator.stop (MSG_STATUS (part_pass));
- commentator.progress ();
+ commentator().stop (MSG_STATUS (part_pass));
+ commentator().progress ();
- commentator.start ("\t--Testing field arithmetic");
+ commentator().start ("\t--Testing field arithmetic");
part_pass = true;
F.init (b, n-2);
@@ -211,10 +276,10 @@ bool testField (Field &F, const char *title, bool fieldp = true)
if ( !F.areEqual (a, f) || !F.areEqual (d, a) )
part_pass = reportError( "Results of axpy incorrect", pass);
- commentator.stop (MSG_STATUS (part_pass));
- commentator.progress ();
+ commentator().stop (MSG_STATUS (part_pass));
+ commentator().progress ();
- commentator.start ("\t--Testing summation of powers of 2");
+ commentator().start ("\t--Testing summation of powers of 2");
//,..
// 2^101 - 1 vs 1 + 2 + 4 + ... + 2^100
@@ -244,8 +309,8 @@ bool testField (Field &F, const char *title, bool fieldp = true)
if (!F.areEqual (a, d))
part_pass = reportError( "2^101 - 1 != 1 + 2(1 + ... + 2(1)...), with 100 '+'s: ", pass);
- commentator.stop (MSG_STATUS (part_pass));
- commentator.progress ();
+ commentator().stop (MSG_STATUS (part_pass));
+ commentator().progress ();
/*! @todo untested so far :
* - ostream &write (ostream &os) const
@@ -256,7 +321,7 @@ bool testField (Field &F, const char *title, bool fieldp = true)
* .
*/
- commentator.stop (MSG_STATUS (pass), (const char *) 0, "testField");
+ commentator().stop (MSG_STATUS (pass), (const char *) 0, "testField");
return pass;
}
@@ -264,936 +329,1066 @@ bool testField (Field &F, const char *title, bool fieldp = true)
/** Tests of algebraic properties of fields */
-/* Generic test 6: Negation of elements
- *
- * Negates random elements and checks that they are true negatives
- */
+namespace subtests {
+ /* Generic test 6: Negation of elements
+ *
+ * Negates random elements and checks that they are true negatives
+ */
-template <class Field>
-bool testFieldNegation (const Field &F, const char *name, unsigned int iterations)
-{
- std::ostringstream str;
- str << "\t--Testing " << name << " negation" << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
- commentator.start (st, "testFieldNegation", iterations);
+ template <class Field>
+ bool testFieldNegation (const Field &F, const char *name, unsigned int iterations)
+ {
+ std::ostringstream str;
+ str << "\t--Testing " << name << " negation" << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+ commentator().start (st, "testFieldNegation", iterations);
+
+ typename Field::Element a, neg_a, neg_a_a, zero;
+ F.init(a,0); F.init(neg_a,0); F.init(neg_a_a,0); F.init (zero, 0);
+ typename Field::RandIter r (F);
- typename Field::Element a, neg_a, neg_a_a, zero;
- F.init(a,0); F.init(neg_a,0); F.init(neg_a_a,0); F.init (zero, 0);
- typename Field::RandIter r (F);
+ bool ret = true;
- bool ret = true;
+ for (unsigned int i = 0; i < iterations; i++) {
+ commentator().startIteration (i);
- for (unsigned int i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ r.random (a);
- r.random (a);
+ ostream &report = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ report << "Random element a: ";
+ F.write (report, a) << endl;
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Random element a: ";
- F.write (report, a) << endl;
+ F.neg (neg_a, a);
- F.neg (neg_a, a);
+ report << "-a = ";
+ F.write (report, neg_a) << endl;
- report << "-a = ";
- F.write (report, neg_a) << endl;
+ F.add (neg_a_a, neg_a, a);
- F.add (neg_a_a, neg_a, a);
+ report << "a + -a = ";
+ F.write (report, neg_a_a) << endl;
- report << "a + -a = ";
- F.write (report, neg_a_a) << endl;
+ if (!F.areEqual (neg_a_a, zero)) reportError("a + -a != 0" , ret);
- if (!F.areEqual (neg_a_a, zero)) reportError("a + -a != 0" , ret);
+ commentator().stop ("done");
+ commentator().progress ();
+ }
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testFieldNegation");
+ delete[] st;
+ return ret;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testFieldNegation");
- delete[] st;
- return ret;
-}
+ /** Generic test 5: Inversion of elements
+ *
+ * Inverts random elements and checks that they are true inverses
+ */
-/** Generic test 5: Inversion of elements
- *
- * Inverts random elements and checks that they are true inverses
- */
+ template <class Field>
+ bool testFieldInversion (const Field &F, const char *name, unsigned int iterations)
+ {
+ std::ostringstream str;
+ str << "\t--Testing " << name << " inversion" << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+ commentator().start (st, "testFieldInversion", iterations);
-template <class Field>
-bool testFieldInversion (const Field &F, const char *name, unsigned int iterations)
-{
- std::ostringstream str;
- str << "\t--Testing " << name << " inversion" << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
- commentator.start (st, "testFieldInversion", iterations);
+ typename Field::Element a, ainv, aainv, one;
+ F.init (a,0);
+ F.init (ainv,0);
+ F.init (aainv,0);
+ F.init (one, 1);
+ typename Field::RandIter r (F);
- typename Field::Element a, ainv, aainv, one;
- F.init (a,0); F.init (ainv,0); F.init (aainv,0);
- F.init (one, 1);
- typename Field::RandIter r (F);
+ bool ret = true;
- bool ret = true;
+ for (unsigned int i = 0; i < iterations; i++) {
+ commentator().startIteration (i);
- for (unsigned int i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ do r.random (a); while (F.isZero (a));
- do r.random (a); while (F.isZero (a));
+ ostream &report = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ report << "Random element a: ";
+ F.write (report, a) << endl;
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Random element a: ";
- F.write (report, a) << endl;
+ F.inv (ainv, a);
- F.inv (ainv, a);
+ report << "a^{-1} = "; F.write (report, ainv) << endl;
- report << "a^{-1} = "; F.write (report, ainv) << endl;
+ F.mul (aainv, ainv, a);
- F.mul (aainv, ainv, a);
+ report << "a a^{-1} = "; F.write (report, aainv) << endl;
- report << "a a^{-1} = "; F.write (report, aainv) << endl;
+ if (!F.areEqual (aainv, one)) reportError("a a^-1 != 1", ret);
- if (!F.areEqual (aainv, one)) reportError("a a^-1 != 1", ret);
+ commentator().stop ("done");
+ commentator().progress ();
+ }
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testFieldInversion");
+ delete[] st;
+ return ret;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testFieldInversion");
- delete[] st;
- return ret;
-}
+ /** @brief Generic test 7a: Distributivity of multiplication over addition
-/** @brief Generic test 7a: Distributivity of multiplication over addition
+ * Given random field elements 'a', 'b', and 'c', checks that
+ * (a + b) * c = a * c + b * c and c * (a + b) = c * a + c * b
+ */
- * Given random field elements 'a', 'b', and 'c', checks that
- * (a + b) * c = a * c + b * c and c * (a + b) = c * a + c * b
- */
+ template <class Field>
+ bool testFieldDistributivity(const Field &F, const char *name, unsigned int iterations)
+ {
+ std::ostringstream str;
+ str << "\t--Testing " << name << " distributivity" << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+ commentator().start (st, "testFieldDistributivity", iterations);
+
+ typename Field::Element a, b, c, a_b, a_bc, ac, bc, ac_bc, ca_b, ca, cb, ca_cb;
+ F.init (a,0); F.init (b,0); F.init (c,0);
+ F.init (a_b,0); F.init (a_bc,0); F.init (ac,0); F.init (bc,0);
+ F.init (ac_bc,0);
+ F.init (ca_b,0); F.init (ca,0); F.init (cb,0); F.init (ca_cb,0);
+
+ typename Field::RandIter r (F);
+
+ bool ret = true;
+
+ for (unsigned int i = 0; i < iterations; i++) {
+ commentator().startIteration (i);
+
+ r.random (a);
+ r.random (b);
+ r.random (c);
+
+ ostream &report = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ report << "Random elements a = ";
+ F.write (report, a) << ", b = ";
+ F.write (report, b) << ", c = ";
+ F.write (report, c) << endl;
+
+ F.add (a_b, a, b);//a + b
+ F.mul (a_bc, a_b, c);//(a+b)*c
+ F.mul (ca_b, c, a_b);//c*(a+b)
+ F.mul (ac, a, c); //a*c
+ F.mul (bc, b, c); //b*c
+ F.mul (ca, c, a); //c*a
+ F.mul (cb, c, b); //c*b
+ F.add (ac_bc, ac, bc); //a*c + b*c
+ F.add (ca_cb, ca, cb); //c*a + c*b
+
+ report << "(a + b) * c = ";
+ F.write (report, a_bc) << endl;
+
+ report << "a * c + b * c = ";
+ F.write (report, ac_bc) << endl;
+
+ report << "c * (a + b) = ";
+ F.write (report, ca_b) << endl;
+
+ report << "c * a + c * b = ";
+ F.write (report, ca_cb) << endl;
+ if (!F.areEqual (a_bc, ac_bc) || !F.areEqual (ca_b, ca_cb))
+ reportError("Operations were not distributative", ret);
+
+ commentator().stop ("done");
+ commentator().progress ();
+ }
-template <class Field>
-bool testFieldDistributivity(const Field &F, const char *name, unsigned int iterations)
-{
- std::ostringstream str;
- str << "\t--Testing " << name << " distributivity" << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
- commentator.start (st, "testFieldDistributivity", iterations);
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testFieldDistributivity");
+ delete[] st;
+ return ret;
+ }
- typename Field::Element a, b, c, a_b, a_bc, ac, bc, ac_bc, ca_b, ca, cb, ca_cb;
- F.init (a,0); F.init (b,0); F.init (c,0);
- F.init (a_b,0); F.init (a_bc,0); F.init (ac,0); F.init (bc,0);
- F.init (ac_bc,0);
- F.init (ca_b,0); F.init (ca,0); F.init (cb,0); F.init (ca_cb,0);
- typename Field::RandIter r (F);
+ /** @brief Generic test 7b: Commutativity of multiplication and addition
- bool ret = true;
+ * Given random field elements 'a', 'b', checks that
+ * a*b = b*a
+ * a+b = b+a
+ */
- for (unsigned int i = 0; i < iterations; i++) {
- commentator.startIteration (i);
- r.random (a);
- r.random (b);
- r.random (c);
+ template <class Field>
+ bool testFieldCommutativity (const Field &F, const char *name, unsigned int iterations)
+ {
+ std::ostringstream str;
+ str << "\t--Testing " << name << " commutativity," << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+ commentator().start (st, "testFieldCommutativity", iterations);
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Random elements a = ";
- F.write (report, a) << ", b = ";
- F.write (report, b) << ", c = ";
- F.write (report, c) << endl;
+ typename Field::Element a, b, ab, ba, a_b, b_a;
+ F.init (a,0); F.init (b,0);
+ F.init (ab,0); F.init (ba,0);
+ F.init (a_b,0); F.init (b_a,0);
- F.add (a_b, a, b);//a + b
- F.mul (a_bc, a_b, c);//(a+b)*c
- F.mul (ca_b, c, a_b);//c*(a+b)
- F.mul (ac, a, c); //a*c
- F.mul (bc, b, c); //b*c
- F.mul (ca, c, a); //c*a
- F.mul (cb, c, b); //c*b
- F.add (ac_bc, ac, bc); //a*c + b*c
- F.add (ca_cb, ca, cb); //c*a + c*b
- report << "(a + b) * c = ";
- F.write (report, a_bc) << endl;
+ typename Field::RandIter r (F);
- report << "a * c + b * c = ";
- F.write (report, ac_bc) << endl;
+ bool ret = true;
- report << "c * (a + b) = ";
- F.write (report, ca_b) << endl;
+ for (unsigned int i = 0; i < iterations; i++) {
+ commentator().startIteration (i);
- report << "c * a + c * b = ";
- F.write (report, ca_cb) << endl;
- if (!F.areEqual (a_bc, ac_bc) || !F.areEqual (ca_b, ca_cb))
- reportError("Operations were not distributative", ret);
+ r.random (a);
+ r.random (b);
- commentator.stop ("done");
- commentator.progress ();
- }
+ ostream &report = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ report << "Random elements a = ";
+ F.write (report, a) << ", b = ";
+ F.write (report, b) << endl;
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testFieldDistributivity");
- delete[] st;
- return ret;
-}
+ F.mul (ab, a, b);
+ F.mul (ba, b, a);
+ report << "a*b = ";
+ F.write (report, ab) << endl;
-/** @brief Generic test 7b: Commutativity of multiplication and addition
+ report << "b*a = ";
+ F.write (report, ba) << endl;
- * Given random field elements 'a', 'b', checks that
- * a*b = b*a
- * a+b = b+a
- */
+ if (!F.areEqual (ab, ba))
+ reportError("Multiplication was not commutative", ret);
-template <class Field>
-bool testFieldCommutativity (const Field &F, const char *name, unsigned int iterations)
-{
- std::ostringstream str;
- str << "\t--Testing " << name << " commutativity," << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
- commentator.start (st, "testFieldCommutativity", iterations);
+ F.add (a_b, a, b);
+ F.add (b_a, b, a);
- typename Field::Element a, b, ab, ba, a_b, b_a;
- F.init (a,0); F.init (b,0);
- F.init (ab,0); F.init (ba,0);
- F.init (a_b,0); F.init (b_a,0);
+ report << "a+b = ";
+ F.write (report, a_b) << endl;
+ report << "b+a = ";
+ F.write (report, b_a) << endl;
- typename Field::RandIter r (F);
+ if (!F.areEqual (a_b, b_a))
+ reportError("Addition was not commutative", ret);
- bool ret = true;
- for (unsigned int i = 0; i < iterations; i++) {
- commentator.startIteration (i);
- r.random (a);
- r.random (b);
+ commentator().stop ("done");
+ commentator().progress ();
+ }
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Random elements a = ";
- F.write (report, a) << ", b = ";
- F.write (report, b) << endl;
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testFieldCommutativity");
+ delete[] st;
+ return ret;
+ }
- F.mul (ab, a, b);
- F.mul (ba, b, a);
- report << "a*b = ";
- F.write (report, ab) << endl;
+ /** Generic test 7c: Associativity of addition and multiplication
+ *
+ * Given random field elements 'a', 'b', and 'c', checks that
+ * (a * b) * c = a * (b * c) and (a + b) + c = a + (b + c)
+ */
- report << "b*a = ";
- F.write (report, ba) << endl;
+ template <class Field>
+ bool testFieldAssociativity (const Field &F, const char *name, unsigned int iterations)
+ {
+ std::ostringstream str;
+ str << "\t--Testing " << name << " associativity" << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+ commentator().start (st, "testFieldAssociativity", iterations);
- if (!F.areEqual (ab, ba))
- reportError("Multiplication was not commutative", ret);
+ typename Field::Element a, b, c, a_b, b_c, a_bc, ab_c;
+ F.init (a,0); F.init (b,0); F.init (c,0);
+ F.init (a_b,0); F.init (b_c,0); F.init (a_bc,0); F.init (ab_c,0);
+ typename Field::RandIter r (F);
+ bool ret = true;
- F.add (a_b, a, b);
- F.add (b_a, b, a);
+ for (unsigned int i = 0; i < iterations; i++) {
+ commentator().startIteration (i);
- report << "a+b = ";
- F.write (report, a_b) << endl;
+ r.random (a);
+ r.random (b);
+ r.random (c);
- report << "b+a = ";
- F.write (report, b_a) << endl;
+ ostream &report = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ report << "Random elements a = ";
+ F.write (report, a) << ", b = ";
+ F.write (report, b) << ", c = ";
+ F.write (report, c) << endl;
- if (!F.areEqual (a_b, b_a))
- reportError("Addition was not commutative", ret);
+ F.add (a_b, a, b);
+ F.add (ab_c, a_b, c);
+ F.add (b_c, b, c);
+ F.add (a_bc, a, b_c);
+ report << "(a + b) + c = ";
+ F.write (report, ab_c) << endl;
+ report << "a + (b + c) = ";
+ F.write (report, a_bc) << endl;
- commentator.stop ("done");
- commentator.progress ();
- }
+ if (!F.areEqual (ab_c, a_bc)) reportError( "Results are not equal", ret);
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testFieldCommutativity");
- delete[] st;
- return ret;
-}
+ F.mul (a_b, a, b);
+ F.mul (ab_c, a_b, c);
+ F.mul (b_c, b, c);
+ F.mul (a_bc, a, b_c);
+ report << "(a * b) * c = ";
+ F.write (report, ab_c) << endl;
-/** Generic test 7c: Associativity of addition and multiplication
- *
- * Given random field elements 'a', 'b', and 'c', checks that
- * (a * b) * c = a * (b * c) and (a + b) + c = a + (b + c)
- */
+ report << "a * (b * c) = ";
+ F.write (report, a_bc) << endl;
-template <class Field>
-bool testFieldAssociativity (const Field &F, const char *name, unsigned int iterations)
-{
- std::ostringstream str;
- str << "\t--Testing " << name << " associativity" << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
- commentator.start (st, "testFieldAssociativity", iterations);
+ if (!F.areEqual (ab_c, a_bc)) reportError( "Results are not equal", ret);
- typename Field::Element a, b, c, a_b, b_c, a_bc, ab_c;
- F.init (a,0); F.init (b,0); F.init (c,0);
- F.init (a_b,0); F.init (b_c,0); F.init (a_bc,0); F.init (ab_c,0);
- typename Field::RandIter r (F);
+ commentator().stop ("done");
+ commentator().progress ();
+ }
- bool ret = true;
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testFieldAssociativity");
+ delete[] st;
+ return ret;
+ }
- for (unsigned int i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ /** Generic test 2: Geometric summation
+ *
+ * Generates a random field element 'a' and raises it through repeated
+ * exponentiation to the power n. Takes the sum k of all intermediate values and
+ * checks that a^n = (k-1)/(a-1).
+ */
- r.random (a);
- r.random (b);
- r.random (c);
+ template <class Field>
+ bool testGeometricSummation (const Field &F, const char *name, unsigned int iterations, unsigned int n)
+ {
+ std::ostringstream str;
+ str << "\t--Testing " << name << " geometric summation" << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+ commentator().start (st, "testGeometricSummation", iterations);
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Random elements a = ";
- F.write (report, a) << ", b = ";
- F.write (report, b) << ", c = ";
- F.write (report, c) << endl;
+ typename Field::Element a, a_n, k, zero, one;
+ typename Field::RandIter r (F);
+ typename LinBox::NonzeroRandIter<Field> z(F,r);
- F.add (a_b, a, b);
- F.add (ab_c, a_b, c);
- F.add (b_c, b, c);
- F.add (a_bc, a, b_c);
+ F.init (zero, 0);
+ F.init (one, 1);
+ F.init (a,0); F.init (a_n,0); F.init (k,0);
- report << "(a + b) + c = ";
- F.write (report, ab_c) << endl;
+ bool ret = true;
+ LinBox::Integer card; F.cardinality(card);
- report << "a + (b + c) = ";
- F.write (report, a_bc) << endl;
+ for (unsigned int i = 0; i < iterations; i++) {
+ commentator().startIteration (i);
- if (!F.areEqual (ab_c, a_bc)) reportError( "Results are not equal", ret);
+ size_t no_bad_loop = card+10 ;
+ do z.random (a); while (F.areEqual (a, one) && --no_bad_loop);
+ if (!no_bad_loop) {
+ reportError(" *** ERROR *** could not find an element different form 1...",ret);
+ break;
+ }
- F.mul (a_b, a, b);
- F.mul (ab_c, a_b, c);
- F.mul (b_c, b, c);
- F.mul (a_bc, a, b_c);
+ ostream &report = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ report << "Random element a: ";
+ F.write (report, a) << endl;
- report << "(a * b) * c = ";
- F.write (report, ab_c) << endl;
+ F.assign (k, one);
+ F.assign (a_n, a);
- report << "a * (b * c) = ";
- F.write (report, a_bc) << endl;
+ for (unsigned int j = 0; j < n; ++j) {
+ F.addin (k, a_n);
+ F.mulin (a_n, a);
+ }
- if (!F.areEqual (ab_c, a_bc)) reportError( "Results are not equal", ret);
+ report << "n = " << n << " a^n = ";
+ F. write (report, a_n) << endl;
+ F. write(report);
+ report<<std::endl;
- commentator.stop ("done");
- commentator.progress ();
- }
+ report << "sum(a^i, i = 0..n-1) = ";
+ F.write (report, k) << endl;
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testFieldAssociativity");
- delete[] st;
- return ret;
-}
+ F.subin (a_n, one);
+ report << "(a^n - 1) = ";
+ F.write (report, a_n) << endl;
-/** Generic test 2: Geometric summation
- *
- * Generates a random field element 'a' and raises it through repeated
- * exponentiation to the power n. Takes the sum k of all intermediate values and
- * checks that a^n = (k-1)/(a-1).
- */
+ F.subin (a, one);
+ report << "(a - 1) = ";
+ F.write (report, a) << endl;
-template <class Field>
-bool testGeometricSummation (const Field &F, const char *name, unsigned int iterations, unsigned int n)
-{
- std::ostringstream str;
- str << "\t--Testing " << name << " geometric summation" << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
- commentator.start (st, "testGeometricSummation", iterations);
+ F.divin (a_n, a);
- typename Field::Element a, a_n, k, zero, one;
- typename Field::RandIter r (F);
- typename LinBox::NonzeroRandIter<Field> z(F,r);
+ report << "(a^n - 1) / (a - 1) = ";
+ F.write (report, a_n) << endl;
- F.init (zero, 0);
- F.init (one, 1);
- F.init (a,0); F.init (a_n,0); F.init (k,0);
+ if (!F.areEqual (k, a_n)) reportError("Field elements are not equal", ret);
- bool ret = true;
- LinBox::Integer card; F.cardinality(card);
+ commentator().stop ("done");
+ commentator().progress ();
+ }
- for (unsigned int i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testGeometricSummation");
+ delete[] st;
+ return ret;
+ }
- size_t no_bad_loop = card+10 ;
- do z.random (a); while (F.areEqual (a, one) && --no_bad_loop);
- if (!no_bad_loop) {
- reportError(" *** ERROR *** could not find an element different form 1...",ret);
- break;
- }
+ /** Generic test 3: Test of field characteristic
+ *
+ * Take random field elements and add them p times, where p is the
+ * characteristic of the field. Checks that the sum is 0. The test is not too
+ * useful when the characteristic of the field is 0, but it should still work
+ * correctly.
+ */
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Random element a: ";
- F.write (report, a) << endl;
+ template <class Field>
+ bool testFieldCharacteristic (const Field &F, const char *name, unsigned int iterations)
+ {
+ std::ostringstream str;
+ str << "\t--Testing " << name << " characteristic" << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+ commentator().start (string(str.str()).c_str(), "testFieldCharacteristic", iterations);
- F.assign (k, one);
- F.assign (a_n, a);
+ LinBox::integer p, j;
+ typename Field::Element a, sigma, zero;
+ typename Field::RandIter r (F);
- for (unsigned int j = 0; j < n; ++j) {
- F.addin (k, a_n);
- F.mulin (a_n, a);
- }
+ F.characteristic (p);
+ F.init (zero, 0);
+ F.init (a,0); F.init (sigma,0);
- report << "n = " << n << " a^n = ";
- F. write (report, a_n) << endl;
- F. write(report);
- report<<std::endl;
+ bool ret = true;
- report << "sum(a^i, i = 0..n-1) = ";
- F.write (report, k) << endl;
+ ostream &report = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ report << "Field characteristic: " << p << endl;
- F.subin (a_n, one);
- report << "(a^n - 1) = ";
- F.write (report, a_n) << endl;
+ for (unsigned int i = 0; i < iterations; i++) {
+ commentator().startIteration (i);
- F.subin (a, one);
- report << "(a - 1) = ";
- F.write (report, a) << endl;
+ r.random (a);
- F.divin (a_n, a);
+ ostream &Report = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ Report << "Random element a: ";
+ F.write (Report, a) << endl;
- report << "(a^n - 1) / (a - 1) = ";
- F.write (report, a_n) << endl;
+ F.assign (sigma, zero);
- if (!F.areEqual (k, a_n)) reportError("Field elements are not equal", ret);
+ // suggestion: make this run in time O(lg(p)), then take the conditional out of the run...Tests
+ for (j = 0; j < p; j += 1)
+ F.addin (sigma, a);
- commentator.stop ("done");
- commentator.progress ();
+ Report << "p a = ";
+ F.write (Report, sigma) << endl;
+
+ if (!F.isZero (sigma)) reportError("p a != 0", ret);
+
+ commentator().stop ("done");
+ commentator().progress ();
+ }
+
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testFieldCharacteristic");
+ delete[] st;
+ return ret;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testGeometricSummation");
- delete[] st;
- return ret;
-}
+ /** Generic test 4: The Freshman's Dream
+ *
+ * Generates two random field elements 'a' and 'b', and checks whether
+ * (a + b)^p = a^p + b^p, where p is the characteristic of the field. Bails out
+ * (returning true) if the field is of characteristic 0.
+ */
-/** Generic test 3: Test of field characteristic
- *
- * Take random field elements and add them p times, where p is the
- * characteristic of the field. Checks that the sum is 0. The test is not too
- * useful when the characteristic of the field is 0, but it should still work
- * correctly.
- */
+ template <class Field>
+ bool testFreshmansDream (const Field &F, const char *name, unsigned int iterations)
+ {
+ std::ostringstream str;
+ str << "\t--Testing " << name << " Freshman's Dream" << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+ commentator().start (st, "testFreshmansDream", iterations);
-template <class Field>
-bool testFieldCharacteristic (const Field &F, const char *name, unsigned int iterations)
-{
- std::ostringstream str;
- str << "\t--Testing " << name << " characteristic" << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
- commentator.start (string(str.str()).c_str(), "testFieldCharacteristic", iterations);
+ LinBox::integer c, j;
- LinBox::integer p, j;
- typename Field::Element a, sigma, zero;
- typename Field::RandIter r (F);
+ F.characteristic (c);
- F.characteristic (p);
- F.init (zero, 0);
- F.init (a,0); F.init (sigma,0);
+ if (c == 0) {
+ commentator().stop ("skipping", "Field characteristic is 0, so this test makes no sense", "testFreshmansDream");
+ delete[] st;
+ return true;
+ }
- bool ret = true;
+ bool ret = true;
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Field characteristic: " << p << endl;
+ typename Field::RandIter r (F);
+ typename Field::Element a, b, a_b, a_b_p, a_p, b_p, a_p_b_p;
- for (unsigned int i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ F.init (a,0); F.init (b,0); F.init (a_b,0);
+ F.init (a_b_p,0); F.init (a_p,0); F.init (b_p,0); F.init (a_p_b_p,0);
- r.random (a);
+ for (unsigned int i = 0; i < iterations; i++) {
+ commentator().startIteration (i);
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Random element a: ";
- F.write (report, a) << endl;
+ r.random (a);
+ r.random (b);
- F.assign (sigma, zero);
+ ostream &report = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ report << "Random elements a = ";
+ F.write (report, a) << ", b = ";
+ F.write (report, b) << endl;
- // suggestion: make this run in time O(lg(p)), then take the conditional out of the run...Tests
- for (j = 0; j < p; j += 1)
- F.addin (sigma, a);
+ F.add (a_b, a, b);
- report << "p a = ";
- F.write (report, sigma) << endl;
+ j = c; expt (F, a_b_p, a_b, j);
+ j = c; expt (F, a_p, a, j);
+ j = c; expt (F, b_p, b, j);
- if (!F.isZero (sigma)) reportError("p a != 0", ret);
+ F.add (a_p_b_p, a_p, b_p);
- commentator.stop ("done");
- commentator.progress ();
- }
+ report << "(a + b)^p = ";
+ F.write (report, a_b_p);
+ report << endl;
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testFieldCharacteristic");
- delete[] st;
- return ret;
-}
+ report << " a^p = ";
+ F.write (report, a_p);
+ report << endl;
-/** Generic test 4: The Freshman's Dream
- *
- * Generates two random field elements 'a' and 'b', and checks whether
- * (a + b)^p = a^p + b^p, where p is the characteristic of the field. Bails out
- * (returning true) if the field is of characteristic 0.
- */
+ report << " b^p = ";
+ F.write (report, b_p);
+ report << endl;
-template <class Field>
-bool testFreshmansDream (const Field &F, const char *name, unsigned int iterations)
-{
- std::ostringstream str;
- str << "\t--Testing " << name << " Freshman's Dream" << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
- commentator.start (st, "testFreshmansDream", iterations);
+ report << "a^p + b^p = ";
+ F.write (report, a_p_b_p);
+ report << endl;
- LinBox::integer c, j;
+ if (!F.areEqual (a_b_p, a_p_b_p)) reportError("(a + b)^p != a^p + b^p", ret);
- F.characteristic (c);
+ commentator().stop ("done");
+ commentator().progress ();
+ }
- if (c == 0) {
- commentator.stop ("skipping", "Field characteristic is 0, so this test makes no sense", "testFreshmansDream");
- delete[] st;
- return true;
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testFreshmansDream");
+ delete[] st;
+ return ret;
}
- bool ret = true;
- typename Field::RandIter r (F);
- typename Field::Element a, b, a_b, a_b_p, a_p, b_p, a_p_b_p;
+ /* Tests of field features */
- F.init (a,0); F.init (b,0); F.init (a_b,0);
- F.init (a_b_p,0); F.init (a_p,0); F.init (b_p,0); F.init (a_p_b_p,0);
+ /** Generic test 7: Consistency of in-place and out-of-place arithmetic
+ *
+ * Generates random elements 'a' and 'b' and performs all basic arithmetic
+ * operations in-place and out-of-place, checking for consistency.
+ *
+ * Div and inv are checked in a separate function.
+ */
- for (unsigned int i = 0; i < iterations; i++) {
- commentator.startIteration (i);
- r.random (a);
- r.random (b);
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Random elements a = ";
- F.write (report, a) << ", b = ";
- F.write (report, b) << endl;
+ template <class Field>
+ bool testRingArithmeticConsistency (const Field &F, const char *name, unsigned int iterations)
+ {
+ std::ostringstream str;
+ str << "\t--Testing " << name << " in-place/out-of-place arithmetic consistency" << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+ commentator().start (st, "testRingArithmeticConsistency", iterations);
- F.add (a_b, a, b);
+ bool ret = true;
- j = c; expt (F, a_b_p, a_b, j);
- j = c; expt (F, a_p, a, j);
- j = c; expt (F, b_p, b, j);
+ typename Field::RandIter r (F);
+ typename Field::Element a, b, c1, c2;
+ F.init (a,0); F.init (b,0); F.init (c1,0); F.init (c2,0);
- F.add (a_p_b_p, a_p, b_p);
+ for (unsigned int i = 0; i < iterations; i++) {
+ commentator().startIteration (i);
- report << "(a + b)^p = ";
- F.write (report, a_b_p);
- report << endl;
+ r.random (a);
+ r.random (b);
- report << " a^p = ";
- F.write (report, a_p);
- report << endl;
+ // This should be immaterial, since we have already "proven" commutativity
+ if (F.isZero (a) && !F.isZero (b))
+ std::swap (a, b);
- report << " b^p = ";
- F.write (report, b_p);
- report << endl;
+ ostream &report = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ report << "Random elements a = ";
+ F.write (report, a) << ", b = ";
+ F.write (report, b) << endl;
- report << "a^p + b^p = ";
- F.write (report, a_p_b_p);
- report << endl;
+ F.add (c1, a, b);
+ F.assign (c2, a);
+ F.addin (c2, b);
- if (!F.areEqual (a_b_p, a_p_b_p)) reportError("(a + b)^p != a^p + b^p", ret);
+ report << "a + b = (out-of-place) ";
+ F.write (report, c1) << ", (in-place) ";
+ F.write (report, c2) << endl;
- commentator.stop ("done");
- commentator.progress ();
- }
+ if (!F.areEqual (c1, c2)) reportError("Consistency failure for addition", ret);
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testFreshmansDream");
- delete[] st;
- return ret;
-}
+ F.sub (c1, a, b);
+ F.assign (c2, a);
+ F.subin (c2, b);
+ report << "a - b = (out-of-place) ";
+ F.write (report, c1) << ", (in-place) ";
+ F.write (report, c2) << endl;
-/* Tests of field features */
+ if (!F.areEqual (c1, c2)) reportError("Consistency failure for subtraction", ret);
-/** Generic test 7: Consistency of in-place and out-of-place arithmetic
- *
- * Generates random elements 'a' and 'b' and performs all basic arithmetic
- * operations in-place and out-of-place, checking for consistency.
- *
- * Div and inv are checked in a separate function.
- */
+ F.neg (c1, a);
+ F.assign (c2, a);
+ F.negin (c2);
-template <class Field>
-bool testArithmeticConsistency (const Field &F, const char *name, unsigned int iterations)
-{
- bool ret = true ;
+ report << "-a = (out-of-place) ";
+ F.write (report, c1) << ", (in-place) ";
+ F.write (report, c2) << endl;
- ret &= testRingArithmeticConsistency(F, name, iterations) ;
- ret &= testInvDivConsistency(F, name, iterations);
+ if (!F.areEqual (c1, c2)) reportError("Consistency failure for negation", ret);
- return ret;
-}
+ F.mul (c1, a, b);
+ F.assign (c2, a);
+ F.mulin (c2, b);
-template <class Field>
-bool testRingArithmeticConsistency (const Field &F, const char *name, unsigned int iterations)
-{
- std::ostringstream str;
- str << "\t--Testing " << name << " in-place/out-of-place arithmetic consistency" << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
- commentator.start (st, "testRingArithmeticConsistency", iterations);
+ report << "a * b = (out-of-place) ";
+ F.write (report, c1) << ", (in-place) ";
+ F.write (report, c2) << endl;
- bool ret = true;
+ if (!F.areEqual (c1, c2)) reportError("Consistency failure for multiplication", ret);
- typename Field::RandIter r (F);
- typename Field::Element a, b, c1, c2;
- F.init (a,0); F.init (b,0); F.init (c1,0); F.init (c2,0);
+ commentator().stop ("done");
+ commentator().progress ();
+ }
- for (unsigned int i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRingArithmeticConsistency");
+ delete[] st;
+ return ret;
+ }
- r.random (a);
- r.random (b);
+ template <class Field>
+ bool testInvDivConsistency (const Field &F, const char *name, unsigned int iterations)
+ {
+ std::ostringstream str;
+ str << "\t--Testing " << name << " in-place/out-of-place inv and div consistency" << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+ commentator().start (st, "testInvDivConsistency", iterations);
- // This should be immaterial, since we have already "proven" commutativity
- if (F.isZero (a) && !F.isZero (b))
- std::swap (a, b);
+ bool ret = true;
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Random elements a = ";
- F.write (report, a) << ", b = ";
- F.write (report, b) << endl;
+ typename Field::RandIter r (F);
+ typename Field::Element a, b, c1, c2;
+ F.init (a,0); F.init (b,0); F.init (c1,0); F.init (c2,0);
- F.add (c1, a, b);
- F.assign (c2, a);
- F.addin (c2, b);
+ for (unsigned int i = 0; i < iterations; i++) {
+ commentator().startIteration (i);
- report << "a + b = (out-of-place) ";
- F.write (report, c1) << ", (in-place) ";
- F.write (report, c2) << endl;
+ r.random (a); r.random (b);
- if (!F.areEqual (c1, c2)) reportError("Consistency failure for addition", ret);
+ // This should be immaterial, since we have already "proven" commutativity
+ if (F.isZero (a) && !F.isZero (b))
+ std::swap (a, b);
- F.sub (c1, a, b);
- F.assign (c2, a);
- F.subin (c2, b);
+ ostream &report = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ report << "Random elements a = ";
+ F.write (report, a) << ", b = ";
+ F.write (report, b) << endl;
- report << "a - b = (out-of-place) ";
- F.write (report, c1) << ", (in-place) ";
- F.write (report, c2) << endl;
- if (!F.areEqual (c1, c2)) reportError("Consistency failure for subtraction", ret);
+ if (!F.isZero (a)) {
+ F.div (c1, b, a);
+ F.assign (c2, b);
+ F.divin (c2, a);
- F.neg (c1, a);
- F.assign (c2, a);
- F.negin (c2);
+ report << "b / a = (out-of-place) ";
+ F.write (report, c1) << ", (in-place) ";
+ F.write (report, c2) << endl;
- report << "-a = (out-of-place) ";
- F.write (report, c1) << ", (in-place) ";
- F.write (report, c2) << endl;
+ if (!F.areEqual (c1, c2)) reportError("Consistency failure for division", ret);
- if (!F.areEqual (c1, c2)) reportError("Consistency failure for negation", ret);
+ F.inv (c1, a);
+ F.assign (c2, a);
+ F.invin (c2);
- F.mul (c1, a, b);
- F.assign (c2, a);
- F.mulin (c2, b);
+ report << "a^-1 = (out-of-place) ";
+ F.write (report, c1) << ", (in-place) ";
+ F.write (report, c2) << endl;
- report << "a * b = (out-of-place) ";
- F.write (report, c1) << ", (in-place) ";
- F.write (report, c2) << endl;
+ if (!F.areEqual (c1, c2)) reportError("Consistency failure for inversion", ret);
+ }
- if (!F.areEqual (c1, c2)) reportError("Consistency failure for multiplication", ret);
+ commentator().stop ("done");
+ commentator().progress ();
+ }
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testInvDivConsistency");
+ delete[] st;
+ return ret;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRingArithmeticConsistency");
- delete[] st;
- return ret;
-}
-template <class Field>
-bool testRingTrivia (const Field &F, const char *name)
-{
- //! @bug BlockRing does not know about 0 and 1 !
- std::ostringstream str;
- str << "\t--Testing " << name << " units" << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
- commentator.start (st, "testRingTrivia");
+ template <class Field>
+ bool testArithmeticConsistency (const Field &F, const char *name, unsigned int iterations)
+ {
+ bool ret = true ;
- bool ret = true;
+ ret &= subtests::testRingArithmeticConsistency(F, name, iterations) ;
+ ret &= subtests::testInvDivConsistency(F, name, iterations);
- /* some trivial tests */
+ return ret;
+ }
- ostream &rapport = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ template <class Field>
+ bool testRingTrivia (const Field &F, const char *name)
+ {
+ //! @bug BlockRing does not know about 0 and 1 !
+ std::ostringstream str;
+ str << "\t--Testing " << name << " units" << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+ commentator().start (st, "testRingTrivia");
- //!@todo enable init with 1UL et -1L pour GMPRationalElement
- typename Field::Element one, mone, zero ;
- LinBox::integer pun = 1 ;
- LinBox::integer mun = -1 ;
- LinBox::integer zer = 0 ;
- F.init(one,pun);
- F.init(mone,mun);
- F.neg(mone,one);
- // F.init(mone,-1L);
- F.init(zero,zer);
+ bool ret = true;
- rapport << "1 - 1 = " ;
- typename Field::Element nil ;
+ /* some trivial tests */
- F.add(nil,one,mone);
- F.write(rapport,nil) << std::endl ;
+ ostream &rapport = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- if ( !F.areEqual(nil,zero) ) {
- reportError("1+1!=0", ret);
+ //!@todo enable init with 1UL et -1L pour GMPRationalElement
+ typename Field::Element one, mOne, zero ;
+ LinBox::integer pun = 1 ;
+ LinBox::integer mun = -1 ;
+ LinBox::integer zer = 0 ;
+ F.init(one,pun);
+ F.init(mOne,mun);
+ F.neg(mOne,one);
+ // F.init(mOne,-1L);
+ F.init(zero,zer);
+
+ rapport << "1 - 1 = " ;
+ typename Field::Element nil ;
+
+ F.add(nil,one,mOne);
+
+ F.write(rapport,nil) << std::endl ;
+
+ if ( !F.areEqual(nil,zero) ) {
+ reportError("1+1!=0", ret);
+ }
+
+ typename Field::Element un ;
+ rapport << "-1 * -1 = " ;
+ F.mul(un,mOne,mOne);
+ F.write(rapport,un) << std::endl ;
+
+ if ( !F.areEqual(un,one) ) {
+ reportError("-1 * -1 != 1", ret);
+ }
+
+ F.init(nil,pun);
+ rapport << "-1 + -1 * -1 = " ;
+ F.axpy(nil,mOne,mOne,mOne) ;
+ F.write(rapport,nil) << std::endl ;
+
+ if ( !F.areEqual(nil,zero) ) {
+ reportError("-1+(-1*-1)!=0", ret);
+ }
+
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRingTrivia");
+ delete[] st;
+ return ret;
}
- typename Field::Element un ;
- rapport << "-1 * -1 = " ;
- F.mul(un,mone,mone);
- F.write(rapport,un) << std::endl ;
- if ( !F.areEqual(un,one) ) {
- reportError("-1 * -1 != 1", ret);
+
+
+ /** Generic test 8: Consistency of axpy
+ *
+ * Generates random elements 'a', 'x', and 'y' and checks that a * x + y is the
+ * same for axpy, axpyin, add/mul
+ */
+
+ template <class Field>
+ bool testAxpyConsistency (const Field &F, const char *name, unsigned int iterations)
+ {
+ std::ostringstream str;
+ str << "\t--Testing " << name << " axpy/add-mul consistency" << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+ commentator().start (st, "testAxpyConsistency", iterations);
+
+ bool ret = true;
+
+ typename Field::RandIter r (F);
+ typename Field::Element a, x, y, c1, c2, c3;
+ F.init (a,0); F.init (x,0); F.init (y,0);
+ F.init (c1,0); F.init (c2,0); F.init (c3,0);
+
+ for (unsigned int i = 0; i < iterations; i++) {
+ commentator().startIteration (i);
+
+ r.random (a);
+ r.random (x);
+ r.random (y);
+
+ ostream &report = commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ report << "Random elements a = ";
+ F.write (report, a) << ", x = ";
+ F.write (report, x) << ", y = ";
+ F.write (report, y) << endl;
+
+ F.mul (c1, a, x);
+ F.addin (c1, y);
+ F.axpy (c2, a, x, y);
+ F.assign (c3, y);
+ F.axpyin (c3, a, x);
+
+ report << "a * x + y = (add-mul) ";
+ F.write (report, c1) << ", (out-of-place) ";
+ F.write (report, c2) << ", (in-place) ";
+ F.write (report, c3) << endl;
+
+ if (!F.areEqual (c1, c2) || !F.areEqual (c1, c3)) reportError("Consistency failure for axpy", ret);
+
+ commentator().stop ("done");
+ commentator().progress ();
+ }
+
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testAxpyConsistency");
+ delete[] st;
+ return ret;
}
- F.init(nil,pun);
- rapport << "-1 + -1 * -1 = " ;
- F.axpy(nil,mone,mone,mone) ;
- F.write(rapport,nil) << std::endl ;
+ /** Generic test 9: Basic concept check of RandIter
+ *
+ * In a loop, generates random element 'a', and fails
+ * if it is always zero.
+ */
+ template <class Field>
+ bool testRanditerBasic(const Field &F, const char *name, unsigned int iterations)
+ {
+ bool ret=false;
+ std::ostringstream str;
+ str << "\t--Testing " << name << " randiter basic operation " << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+ commentator().start (st, "testRanditerBasic", iterations);
+
+ typename Field::RandIter r (F);
+ typename Field::Element a;
+ F.init (a,0);
+
+ if (iterations < 20) iterations = 20;
+ for (unsigned int i = 0; i < iterations; i++) {
+ r.random (a);
+ if ( ! F.isZero(a) ) {ret = true; break;}
+
+ }
- if ( !F.areEqual(nil,zero) ) {
- reportError("-1+(-1*-1)!=0", ret);
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRanditerBasic");
+ delete[] st;
+ return ret;
}
+} // namespace subtests
+
+ /* Convenience function to run all of the field tests on a given field */
+ template <class Field>
+ bool runBasicRingTests (const Field &F, const char *desc, unsigned int iterations, bool runCharacteristicTest = true)
+ {
+ bool pass = true;
+ ostringstream str;
+
+ str << "\t--Testing " << desc << " ring" << ends;
+ char * st = new char[str.str().size()];
+ strcpy (st, str.str().c_str());
+
+ commentator().start (st, "runBasicRingTests", runCharacteristicTest ? 11 : 10);
+
+ if (!testField (F, string(str.str()).c_str())) pass = false;
+ commentator().progress ();
+ if (!subtests::testFieldNegation (F, desc, iterations)) pass = false;
+ commentator().progress ();
+ if (!subtests::testFieldDistributivity (F, desc, iterations)) pass = false;
+ commentator().progress ();
+ if (!subtests::testFieldAssociativity (F, desc, iterations)) pass = false;
+ commentator().progress ();
+
+ if (runCharacteristicTest) {
+ if (!subtests::testFieldCharacteristic (F, desc, iterations)) pass = false;
+ commentator().progress ();
+ }
+ LinBox::integer card;
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRingTrivia");
- delete[] st;
- return ret;
-}
+ if (F.cardinality(card) != 2) { // otherwise it is not very interesting to find a element not zero and not one !
+ if (!subtests::testGeometricSummation (F, desc, iterations, 100)) pass = false;
+ commentator().progress ();
+ }
+ if (!subtests::testArithmeticConsistency (F, desc, iterations)) pass = false;
+ commentator().progress ();
+ if (!subtests::testAxpyConsistency (F, desc, iterations)) pass = false;
+ commentator().progress ();
+ if (!subtests::testRanditerBasic (F, desc, iterations)) pass = false;
+ commentator().progress ();
+ commentator().stop (MSG_STATUS (pass), (const char *) 0, "runBasicRingTests");
+ delete[] st;
+ return pass;
+ }
-template <class Field>
-bool testInvDivConsistency (const Field &F, const char *name, unsigned int iterations)
-{
- std::ostringstream str;
- str << "\t--Testing " << name << " in-place/out-of-place inv and div consistency" << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
- commentator.start (st, "testInvDivConsistency", iterations);
+namespace subtests {
+ /* Random number test
+ *
+ * Test that the random iterator over the given field works
+ *
+ * What are good value combinations: num_trials, num_categories, hist_len? -bds
+ *
+ */
+ template <class Field>
+ bool testRandomIteratorStep (const Field &F,
+ const char *text,
+ unsigned int num_trials,
+ unsigned int num_categories,
+ unsigned int hist_len)
+ {
+ //std::ostringstream str;
- bool ret = true;
+ //str << "\t--Testing " << text << "::RandIter" << std::ends;
- typename Field::RandIter r (F);
- typename Field::Element a, b, c1, c2;
- F.init (a,0); F.init (b,0); F.init (c1,0); F.init (c2,0);
+ //commentator().start (str.str ().c_str (), "testRandomIteratorStep");
+ std::ostream &report = commentator().report (LinBox::Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
- for (unsigned int i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ bool ret = true;
- r.random (a); r.random (b);
+ LinBox::integer card;
+ unsigned int i;
+ std::vector<int> categories1 (num_categories, 0);
+ std::vector<int> categories2 (num_categories, 0);
+ std::list<std::vector<int> > diff_categories;
+ std::list<typename Field::Element> x_queue;
- // This should be immaterial, since we have already "proven" commutativity
- if (F.isZero (a) && !F.isZero (b))
- std::swap (a, b);
+ F.cardinality (card);
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Random elements a = ";
- F.write (report, a) << ", b = ";
- F.write (report, b) << endl;
+ typename Field::RandIter iter (F);
+ typename Field::Element x, d;
+ std::list<std::vector<int> >::iterator diff_cat_iter;
- if (!F.isZero (a)) {
- F.div (c1, b, a);
- F.assign (c2, b);
- F.divin (c2, a);
+ for (i = 0; i < hist_len; ++i)
+ diff_categories.push_back (std::vector<int> (num_categories, 0));
- report << "b / a = (out-of-place) ";
- F.write (report, c1) << ", (in-place) ";
- F.write (report, c2) << endl;
+ // I make the simplifying assumption that field elements are actually
+ // C++ ints. Otherwise, I don't know how to place the numbers into
+ // categories in any well-defined manner.
+ for (i = 0; i < num_trials; ++i) {
+ LinBox::integer ix, id;
+ F.convert(ix, iter.random (x));
- if (!F.areEqual (c1, c2)) reportError("Consistency failure for division", ret);
- F.inv (c1, a);
- F.assign (c2, a);
- F.invin (c2);
+ categories1[ix % num_categories]++;
+ categories2[(unsigned int) (double (ix) / double (card) * num_categories)]++;
- report << "a^-1 = (out-of-place) ";
- F.write (report, c1) << ", (in-place) ";
- F.write (report, c2) << endl;
+ typename std::list<typename Field::Element>::iterator x_queue_iter = x_queue.begin ();
+ diff_cat_iter = diff_categories.begin ();
+
+ for (; x_queue_iter != x_queue.end (); ++x_queue_iter, ++diff_cat_iter) {
+ F.convert(id, F.sub (d, *x_queue_iter, x));
+ (*diff_cat_iter)[id % num_categories]++;
+ }
+
+ x_queue.push_front (x);
- if (!F.areEqual (c1, c2)) reportError("Consistency failure for inversion", ret);
+ while (x_queue.size () > hist_len)
+ x_queue.pop_back ();
}
- commentator.stop ("done");
- commentator.progress ();
- }
+ double p, chi_squared = 0.0;
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testInvDivConsistency");
- delete[] st;
- return ret;
-}
+ for (i = 0; i < num_categories; ++i)
+ chi_squared += pow (double (categories1[i]) -
+ double (num_trials) / double (num_categories), 2);
-/** Generic test 8: Consistency of axpy
- *
- * Generates random elements 'a', 'x', and 'y' and checks that a * x + y is the
- * same for axpy, axpyin, add/mul
- */
+ p = chiSquaredCDF (chi_squared * (double)num_categories / (double)num_trials, (double)num_categories - 1.0);
-template <class Field>
-bool testAxpyConsistency (const Field &F, const char *name, unsigned int iterations)
-{
- std::ostringstream str;
- str << "\t--Testing " << name << " axpy/add-mul consistency" << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
- commentator.start (st, "testAxpyConsistency", iterations);
+ report << "Test of distribution uniformity (low-order): chi^2 = "
+ << chi_squared * num_categories / num_trials << std::endl;
+ report << "Test of distribution uniformity (low-order): p = " << p << std::endl;
- bool ret = true;
+ if (p < 0.05 || p > 0.95)
+ reportError("Random iterator's values do not appear to be uniformly distributed", ret);
- typename Field::RandIter r (F);
- typename Field::Element a, x, y, c1, c2, c3;
- F.init (a,0); F.init (x,0); F.init (y,0);
- F.init (c1,0); F.init (c2,0); F.init (c3,0);
+ chi_squared = 0.0;
- for (unsigned int i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ for (i = 0; i < num_categories; ++i)
+ chi_squared += pow (double (categories2[i]) -
+ double (num_trials) / double (num_categories), 2);
- r.random (a);
- r.random (x);
- r.random (y);
+ p = chiSquaredCDF (chi_squared * num_categories / num_trials, num_categories - 1);
- ostream &report = commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Random elements a = ";
- F.write (report, a) << ", x = ";
- F.write (report, x) << ", y = ";
- F.write (report, y) << endl;
+ report << "Test of distribution uniformity (high-order): chi^2 = "
+ << chi_squared * num_categories / num_trials << std::endl;
+ report << "Test of distribution uniformity (high-order): p = " << p << std::endl;
- F.mul (c1, a, x);
- F.addin (c1, y);
- F.axpy (c2, a, x, y);
- F.assign (c3, y);
- F.axpyin (c3, a, x);
+ if (p < 0.05 || p > 0.95)
+ reportError("Random iterator's values do not appear to be uniformly distributed", ret);
+ //reportError("Consistency failure for addition", ret); // I don't understand this report phrase. -bds
- report << "a * x + y = (add-mul) ";
- F.write (report, c1) << ", (out-of-place) ";
- F.write (report, c2) << ", (in-place) ";
- F.write (report, c3) << endl;
+ diff_cat_iter = diff_categories.begin ();
- if (!F.areEqual (c1, c2) || !F.areEqual (c1, c3)) reportError("Consistency failure for axpy", ret);
+ int idx = 0;
- commentator.stop ("done");
- commentator.progress ();
- }
+ for (; diff_cat_iter != diff_categories.end (); ++diff_cat_iter, ++idx) {
+ chi_squared = 0.0;
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testAxpyConsistency");
- delete[] st;
- return ret;
-}
+ for (i = 0; i < num_categories; ++i)
+ chi_squared += pow (double ((*diff_cat_iter)[i]) -
+ double (num_trials) / double (num_categories), 2);
-/** Generic test 9: Basic concept check of RandIter
- *
- * In a loop, generates random element 'a', and fails
- * if it is always zero.
- */
-template <class Field>
-bool testRanditerBasic(const Field &F, const char *name, unsigned int iterations)
-{
- bool ret=false;
- std::ostringstream str;
- str << "\t--Testing " << name << " randiter basic operation " << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
- commentator.start (st, "testRanditerBasic", iterations);
+ p = chiSquaredCDF (chi_squared * num_categories / num_trials, num_categories - 1);
- typename Field::RandIter r (F);
- typename Field::Element a;
- F.init (a,0);
+ report << "Test of " << idx + 1 << " spacing: chi^2 = "
+ << chi_squared * num_categories / num_trials << std::endl;
+ report << "Test of " << idx + 1 << " spacing: p = " << p << std::endl;
- if (iterations < 20) iterations = 20;
- for (unsigned int i = 0; i < iterations; i++) {
- r.random (a);
- if ( ! F.isZero(a) ) {ret = true; break;}
+ if (p < 0.05 || p > 0.95)
+ reportError("Difference values do not appear to be uniformly distributed", ret);
+ }
+ //commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomIteratorStep");
+ return ret;
}
-
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRanditerBasic");
- delete[] st;
- return ret;
}
-
-/* Convenience function to run all of the field tests on a given field */
-
template <class Field>
bool runFieldTests (const Field &F, const char *desc, unsigned int iterations, size_t n, bool runCharacteristicTest = true)
// n is not used.
{
-
ostringstream str;
str << "\t--Testing " << desc << " field" << ends;
char * st = new char[str.str().size()];
strcpy (st, str.str().c_str());
- commentator.start (st, "runFieldTests");
+ commentator().start (st, "runFieldTests");
bool ret = runBasicRingTests(F, desc, iterations, runCharacteristicTest) ;
- ret &= testInvDivConsistency(F, desc, iterations) ;
- ret &= testFieldInversion (F, desc, iterations) ;
- ret &= testFieldCommutativity (F, desc, iterations) ;
- ret &= testFreshmansDream(F, desc, iterations);
- ret &= testRingTrivia(F,desc);
+ //ret &= subtests::testInvDivConsistency(F, desc, iterations) ; // it's called in runBasicRingTests
+ ret &= subtests::testFieldInversion (F, desc, iterations) ;
+ ret &= subtests::testFieldCommutativity (F, desc, iterations) ;
+ ret &= subtests::testFreshmansDream(F, desc, iterations);
+ ret &= subtests::testRingTrivia(F,desc);
- commentator.stop (MSG_STATUS (ret));
+ commentator().stop (MSG_STATUS (ret));
delete[] st;
return ret;
}
-template <class Field>
-bool runBasicRingTests (const Field &F, const char *desc, unsigned int iterations, bool runCharacteristicTest = true)
-{
- bool pass = true;
- ostringstream str;
-
- str << "\t--Testing " << desc << " ring" << ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
-
- commentator.start (st, "runBasicRingTests", runCharacteristicTest ? 11 : 10);
-
- if (!testField (F, string(str.str()).c_str())) pass = false;
- commentator.progress ();
- if (!testFieldNegation (F, desc, iterations)) pass = false;
- commentator.progress ();
- if (!testFieldDistributivity (F, desc, iterations)) pass = false;
- commentator.progress ();
- if (!testFieldAssociativity (F, desc, iterations)) pass = false;
- commentator.progress ();
-
- if (runCharacteristicTest) {
- if (!testFieldCharacteristic (F, desc, iterations)) pass = false;
- commentator.progress ();
- }
- LinBox::integer card;
-
- if (F.cardinality(card) != 2) { // otherwise it is not very interesting to find a element not zero and not one !
- if (!testGeometricSummation (F, desc, iterations, 100)) pass = false;
- commentator.progress ();
- }
-
- if (!testArithmeticConsistency (F, desc, iterations)) pass = false;
- commentator.progress ();
- if (!testAxpyConsistency (F, desc, iterations)) pass = false;
- commentator.progress ();
- if (!testRanditerBasic (F, desc, iterations)) pass = false;
- commentator.progress ();
-
- commentator.stop (MSG_STATUS (pass), (const char *) 0, "runBasicRingTests");
- delete[] st;
- return pass;
-}
-
/// @name Generic field tests
//@{
/** Random number test
*
* Test that the random iterator over the given field works.
*
- * Test up to five times, accepting any one, to increase probability of
- * passing statistical tests.
+ * Test up to two times, accepting either one, to reduce probability of
+ * failing statistical tests.
+ *
*/
template <class Field>
bool testRandomIterator (const Field &F, const char *text,
@@ -1201,147 +1396,40 @@ bool testRandomIterator (const Field &F, const char *text,
unsigned int num_categories,
unsigned int hist_len)
{
+ bool pass = true;
std::ostringstream str;
str << "\t--Testing " << text << "::RandIter" << std::ends;
- char * st = new char[str.str().size()];
- strcpy (st, str.str().c_str());
+ //char * st = new char[str.str().size()];
+ //strcpy (st, str.str().c_str());
- commentator.start (st, "testRandomIterator");
+ commentator().start (str.str().c_str(), "testRandomIterator");
- std::ostream &report = commentator.report (LinBox::Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
/* This test either passes or runs a lot of times */
for (int i = 1;
- (! testRandomIteratorStep (F, text, num_trials, num_categories, hist_len)) && (i < 20) ;
+ (! subtests::testRandomIteratorStep (F, text, num_trials, num_categories, hist_len)) && (i <= 2) ;
++i ){
- if (0 == i % 10)
- report << "Warning! Probable failure of uniformity" << std::endl;
+ //if (0 == i % 5)
+ //std::ostream &report = commentator().report (LinBox::Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION) << "Warning! Probable failure of uniformity" << std::endl;
+ reportError( "Warning! Probable failure of uniformity", pass);
};
- commentator.stop (MSG_STATUS (true), (const char *) 0, "testRandomIterator");
+ commentator().stop (MSG_STATUS (true), (const char *) 0, "testRandomIterator");
- delete[] st;
- return true;
+ //delete[] st;
+ return pass;
}
-/* Random number test
- *
- * Test that the random iterator over the given field works
- */
-
-template <class Field>
-bool testRandomIteratorStep (const Field &F,
- const char *text,
- unsigned int num_trials,
- unsigned int num_categories,
- unsigned int hist_len)
-{
- //std::ostringstream str;
-
- //str << "\t--Testing " << text << "::RandIter" << std::ends;
-
- //commentator.start (str.str ().c_str (), "testRandomIteratorStep");
- std::ostream &report = commentator.report (LinBox::Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
-
- bool ret = true;
-
- LinBox::integer card;
- unsigned int i;
- std::vector<int> categories1 (num_categories, 0);
- std::vector<int> categories2 (num_categories, 0);
- std::list<std::vector<int> > diff_categories;
- std::list<typename Field::Element> x_queue;
-
- F.cardinality (card);
-
- typename Field::RandIter iter (F);
- typename Field::Element x, d;
-
- std::list<std::vector<int> >::iterator diff_cat_iter;
-
- for (i = 0; i < hist_len; ++i)
- diff_categories.push_back (std::vector<int> (num_categories, 0));
-
- // I make the simplifying assumption that field elements are actually
- // C++ ints. Otherwise, I don't know how to place the numbers into
- // categories in any well-defined manner.
- for (i = 0; i < num_trials; ++i) {
- LinBox::integer ix, id;
- F.convert(ix, iter.random (x));
-
-
- categories1[ix % num_categories]++;
- categories2[(unsigned int) (double (ix) / double (card) * num_categories)]++;
-
- typename std::list<typename Field::Element>::iterator x_queue_iter = x_queue.begin ();
- diff_cat_iter = diff_categories.begin ();
-
- for (; x_queue_iter != x_queue.end (); ++x_queue_iter, ++diff_cat_iter) {
- F.convert(id, F.sub (d, *x_queue_iter, x));
- (*diff_cat_iter)[id % num_categories]++;
- }
-
- x_queue.push_front (x);
-
- while (x_queue.size () > hist_len)
- x_queue.pop_back ();
- }
-
- double p, chi_squared = 0.0;
-
- for (i = 0; i < num_categories; ++i)
- chi_squared += pow (double (categories1[i]) -
- double (num_trials) / double (num_categories), 2);
-
- p = chiSquaredCDF (chi_squared * (double)num_categories / (double)num_trials, (double)num_categories - 1.0);
-
- report << "Test of distribution uniformity (low-order): chi^2 = "
- << chi_squared * num_categories / num_trials << std::endl;
- report << "Test of distribution uniformity (low-order): p = " << p << std::endl;
-
- if (p < 0.05 || p > 0.95)
- reportError("Random iterator's values do not appear to be uniformly distributed", ret);
-
- chi_squared = 0.0;
-
- for (i = 0; i < num_categories; ++i)
- chi_squared += pow (double (categories2[i]) -
- double (num_trials) / double (num_categories), 2);
-
- p = chiSquaredCDF (chi_squared * num_categories / num_trials, num_categories - 1);
-
- report << "Test of distribution uniformity (high-order): chi^2 = "
- << chi_squared * num_categories / num_trials << std::endl;
- report << "Test of distribution uniformity (high-order): p = " << p << std::endl;
-
- if (p < 0.05 || p > 0.95)
- reportError("Consistency failure for addition", ret);
-
- diff_cat_iter = diff_categories.begin ();
-
- int idx = 0;
-
- for (; diff_cat_iter != diff_categories.end (); ++diff_cat_iter, ++idx) {
- chi_squared = 0.0;
-
- for (i = 0; i < num_categories; ++i)
- chi_squared += pow (double ((*diff_cat_iter)[i]) -
- double (num_trials) / double (num_categories), 2);
-
- p = chiSquaredCDF (chi_squared * num_categories / num_trials, num_categories - 1);
-
- report << "Test of " << idx + 1 << " spacing: chi^2 = "
- << chi_squared * num_categories / num_trials << std::endl;
- report << "Test of " << idx + 1 << " spacing: p = " << p << std::endl;
-
- if (p < 0.05 || p > 0.95)
- reportError("Difference values do not appear to be uniformly distributed", ret);
- }
-
- //commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomIteratorStep");
- return ret;
-}
//@}
#endif // __LINBOX_test_field_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-frobenius.C b/tests/test-frobenius.C
index 844a64d..67a7b8e 100644
--- a/tests/test-frobenius.C
+++ b/tests/test-frobenius.C
@@ -1,10 +1,26 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-direct-sum.C
* Copyright (C) LinBox
* Written by Austin Lobo, David Saunders
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file tests/test-frobenius.C
@@ -35,14 +51,10 @@ int main (int argc, char **argv)
static size_t n = 10;
static integer q = 101;
- static int iterations1 = 100;
- static int iterations2 = 1;
static Argument args[] = {
{ 'n', "-n N", "Set dimension of test matrices to NxN.", TYPE_INT, &n },
{ 'q', "-q Q", "Operate over the \"field\" GF(Q) [1].", TYPE_INTEGER, &q },
- { 'i', "-i I", "Perform each test for I iterations.", TYPE_INT, &iterations1 },
- { 'j', "-j J", "Apply test matrix to J vectors.", TYPE_INT, &iterations2 },
END_OF_ARGUMENTS
};
@@ -59,24 +71,33 @@ int main (int argc, char **argv)
size_t pdeg = 10;
plist[0].resize(pdeg+1);
- for ( size_t ideg=0; ideg < pdeg; ++ideg) r.random(plist[0][ideg]);
+ for ( size_t i=0; i < pdeg; ++i) r.random(plist[0][i]);
F.init(plist[0][pdeg],1);
pdeg = 6;
plist[1].resize(pdeg+1);
- for ( size_t ideg=0; ideg < pdeg; ++ideg) r.random(plist[1][ideg]);
+ for ( size_t i=0; i < pdeg; ++i) r.random(plist[1][i]);
F.init(plist[1][pdeg],1);
pdeg = 4;
plist[2].resize(pdeg+1);
- for ( size_t ideg=0; ideg < pdeg; ++ideg) r.random(plist[2][ideg]);
+ for ( size_t i=0; i < pdeg; ++i) r.random(plist[2][i]);
F.init(plist[2][pdeg],1);
- commentator.start("Frobenius form black box test suite", "frobenius");
+ commentator().start("Frobenius form black box test suite", "frobenius");
Frobenius<Field> A(F, plist.begin(), plist.end());
pass = pass && testBlackbox(A);
- commentator.stop("Frobenius form black box test suite");
+ commentator().stop("Frobenius form black box test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-ftrmm.C b/tests/test-ftrmm.C
index f4304f6..8389228 100644
--- a/tests/test-ftrmm.C
+++ b/tests/test-ftrmm.C
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* fflas/test-ftrmm.inl
* Copyright (C) 2010 LinBox
*
* Written by Brice Boyer <Brice.Boyer at imag.fr>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
@@ -22,6 +38,7 @@
//#define DEBUG
#include <cassert>
+#include "linbox/field/modular.h"
#include "linbox/linbox-config.h"
#include "fflas-ffpack/fflas/fflas.h"
#include "fflas-ffpack/ffpack/ffpack.h"
@@ -30,15 +47,9 @@
//!@todo !
//#define __LINBOX_HAVE_INT64
-#include "linbox/field/modular-balanced-int32.h"
-#include "linbox/field/modular-int32.h"
-#ifdef __LINBOX_HAVE_INT64
-#include "linbox/field/modular-balanced-int64.h"
-#endif
-#include "linbox/field/modular-balanced-double.h"
-#include "linbox/field/modular-double.h"
-#include "linbox/field/modular-balanced-float.h"
-#include "linbox/field/modular-float.h"
+
+#include "linbox/field/modular-balanced.h"
+#include "linbox/field/modular.h"
#include "fflas-ffpack/utils/Matio.h"
#include "test-common.h"
@@ -636,8 +647,8 @@ int main(int ac, char ** av)
srand(time(NULL));
bool fail = false ;
- LinBox::commentator.start("ftrmm and consorts full test suite", "ftrmm et al");
- std::ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT,
+ LinBox::commentator().start("ftrmm and consorts full test suite", "ftrmm et al");
+ std::ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT,
INTERNAL_DESCRIPTION);
@@ -926,7 +937,7 @@ int main(int ac, char ** av)
#endif
if(our != tot) fail = true;
- commentator.stop(MSG_STATUS (!fail), (const char *) 0,"ftrmm et al full tests suite");
+ commentator().stop(MSG_STATUS (!fail), (const char *) 0,"ftrmm et al full tests suite");
#ifdef DEBUG
if (our != tot)
report << "# \033[1;31m>\033[0m fgemm failed" << std::endl;
@@ -941,3 +952,12 @@ int main(int ac, char ** av)
#undef _LB_ITERS
#undef _LB_DEBUG
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-generic.h b/tests/test-generic.h
index 6cafce6..6a49bb6 100644
--- a/tests/test-generic.h
+++ b/tests/test-generic.h
@@ -1,8 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/tests/test-generic.h
* Copyright (C) 2001, 2002 Bradford Hovinen
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*
* Written by Bradford Hovinen <hovinen at cis.udel.edu>
*
@@ -28,3 +44,12 @@
#include "test-vector-domain.h"
#endif // __LINBOX_test_generic_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-getentry.C b/tests/test-getentry.C
index f105e70..f03d9b1 100644
--- a/tests/test-getentry.C
+++ b/tests/test-getentry.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-getentry.C
* Copyright (C) 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
@@ -30,13 +46,12 @@
#include "test-common.h"
#include "linbox/util/commentator.h"
-#include "linbox/field/modular-int32.h"
+#include "linbox/field/modular.h"
#include "linbox/solutions/getentry.h"
#include "linbox/blackbox/compose.h"
#include "linbox/blackbox/diagonal.h"
#include "linbox/blackbox/scalar-matrix.h"
#include "linbox/blackbox/sparse.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/vector/stream.h"
using namespace LinBox;
@@ -47,7 +62,7 @@ bool testGenericBBgetEntry (const Field &F, size_t n)
{
bool ret = true;
typename Field::Element s, x, z;
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
F.init(x, 0);
F.init(s, 2);
F.init(z, 0);
@@ -65,8 +80,8 @@ template <class Field>
bool testScalarMatrixgetEntry (const Field &F, size_t n)
{
bool ret = true;
- commentator.start ("Testing scalar matrix getEntry", "", 1);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ commentator().start ("Testing scalar matrix getEntry", "", 1);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "scalarmatrix getEntry test (using specialization)" << endl;
typename Field::Element s, t, r, th;
F.init(r, 0);
@@ -86,7 +101,7 @@ bool testScalarMatrixgetEntry (const Field &F, size_t n)
ret= false;
}
else ret= true;
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testScalarMatrixgetEntry");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testScalarMatrixgetEntry");
return ret;
}
@@ -94,9 +109,9 @@ bool testScalarMatrixgetEntry (const Field &F, size_t n)
template <class Field>
bool testSparseMatrixgetEntry (const Field &F, size_t n)
{
- commentator.start ("Building sparse matrix", "", 1);
+ commentator().start ("Building sparse matrix", "", 1);
bool ret = true;
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
typename Field::Element s, t, th;
F.init(s, 2);
size_t m = (n > 10 ? 10 : n);
@@ -105,8 +120,8 @@ bool testSparseMatrixgetEntry (const Field &F, size_t n)
for (size_t i = 0; i < m; ++i)
for (size_t j = 0; j < m; ++j)
B.setEntry(i,j,s);
- commentator.stop ("", "done");
- commentator.start ("Testing sparse matrix getEntry", "", 1);
+ commentator().stop ("", "done");
+ commentator().start ("Testing sparse matrix getEntry", "", 1);
report << "sparse matrix getEntry test (using specialization)" << endl;
ret = true;
getEntry(t, B, 0, 0);
@@ -133,7 +148,7 @@ bool testSparseMatrixgetEntry (const Field &F, size_t n)
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testSparseMatrixgetEntry");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testSparseMatrixgetEntry");
return ret;
}
@@ -146,12 +161,12 @@ static bool testDenseMatrixgetEntry (const Field &F, size_t n)
F.init(s, 2);
size_t m = (n > 10 ? 10 : n);
F.init(th, 2*m);
- DenseMatrix<Field> B(F, n, n);
+ BlasMatrix<Field> B(F, n, n);
for (size_t i = 0; i < m; ++i)
for (size_t j = 0; j < n; ++j)
B.setEntry(i, j, s);
- commentator.start ("Testing dense matrix getEntry", "", 1);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ commentator().start ("Testing dense matrix getEntry", "", 1);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "dense matrix getEntry test (using specialization)" << endl;
ret = true;
getEntry(t, B, 0, 0);
@@ -178,7 +193,7 @@ static bool testDenseMatrixgetEntry (const Field &F, size_t n)
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testDenseMatrixgetEntry");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testDenseMatrixgetEntry");
return ret;
}
@@ -189,8 +204,8 @@ static bool testDiagonalgetEntry (const Field &F, VectorStream<vector<typename F
typedef vector <typename Field::Element> Vector;
typedef Diagonal <Field> Blackbox;
- commentator.start ("Testing diagonal getEntry", "testDiagonalgetEntry", stream.m ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ commentator().start ("Testing diagonal getEntry", "testDiagonalgetEntry", stream.m ());
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
VectorDomain<Field> VD (F);
@@ -203,7 +218,7 @@ static bool testDiagonalgetEntry (const Field &F, VectorStream<vector<typename F
VectorWrapper::ensureDim (d, stream.dim ());
while (stream) {
- commentator.startIteration (stream.j ());
+ commentator().startIteration ((unsigned)stream.j ());
stream.next (d);
@@ -238,11 +253,11 @@ static bool testDiagonalgetEntry (const Field &F, VectorStream<vector<typename F
report << "ERROR: Computed getEntry is incorrect" << endl;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testDiagonalgetEntry");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testDiagonalgetEntry");
return ret;
}
@@ -256,7 +271,7 @@ bool testSpecialCDgetEntry (const Field &F, size_t n)
typedef ScalarMatrix<Field> BB;
typedef Diagonal<Field> DD;
Elt s, x, t, u;
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
F.init(x, 0);
F.init(s, 2);
F.init(t, 0);
@@ -305,8 +320,8 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
Field F (q);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.start("getEntry solution test suite", "getEntry");
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().start("getEntry solution test suite", "getEntry");
RandomDenseStream<Field, Vector> stream (F, n, iterations);
@@ -317,6 +332,15 @@ int main (int argc, char **argv)
if (!testDiagonalgetEntry (F, stream)) pass = false;
if (!testSpecialCDgetEntry (F, n)) pass = false;
- commentator.stop("getEntry solution test suite");
+ commentator().stop("getEntry solution test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-gf2.C b/tests/test-gf2.C
index 2bc3fa1..4ac790d 100644
--- a/tests/test-gf2.C
+++ b/tests/test-gf2.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-gf2.C
* Copyright (C) 2003 Bradford Hovinen,
@@ -13,7 +11,25 @@
* accordance with changes to Modular interace.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
@@ -44,14 +60,14 @@ using namespace LinBox;
//using uint16_t;
//using uint32_t;
-#warning "much of the code is dead here"
+#pragma message "#warning much of the code is dead here"
#if 0 /* dead code */
static bool testDotProductGF2 (const GF2 &F, const char *, //desc,
VectorStream<Vector<GF2>::Dense> &stream1,
VectorStream<Vector<GF2>::Dense> &stream2)
{
- LinBox::commentator.start ("Testing GF2 dot product (dense/dense)", "testDotProduct", stream1.size ());
+ LinBox::commentator().start ("Testing GF2 dot product (dense/dense)", "testDotProduct", stream1.size ());
bool ret = true;
@@ -78,7 +94,7 @@ static bool testDotProductGF2 (const GF2 &F, const char *, //desc,
double totaltime = 0.0;
while (stream1 && stream2) {
- LinBox::commentator.startIteration (stream1.j ());
+ LinBox::commentator().startIteration ((unsigned int)stream1.j ());
stream1.next (v1);
stream2.next (v2);
@@ -98,7 +114,7 @@ static bool testDotProductGF2 (const GF2 &F, const char *, //desc,
*j2 = 0;
}
- std::ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector 1: ";
VD.write (report, v1) << std::endl;
@@ -121,18 +137,18 @@ static bool testDotProductGF2 (const GF2 &F, const char *, //desc,
if ((sigma && !rho) || (rho && !sigma)) {
ret = false;
- LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Dot products are not equal" << std::endl;
}
- LinBox::commentator.stop ("done");
- LinBox::commentator.progress ();
+ LinBox::commentator().stop ("done");
+ LinBox::commentator().progress ();
}
- LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
- << "Average time for dot product: " << totaltime / stream1.m () << std::endl;
+ LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
+ << "Average time for dot product: " << totaltime / (double)stream1.m () << std::endl;
- LinBox::commentator.stop (MSG_STATUS (ret), (const char *) 0, "testDotProduct");
+ LinBox::commentator().stop (MSG_STATUS (ret), (const char *) 0, "testDotProduct");
stream1.reset ();
stream2.reset ();
@@ -144,7 +160,7 @@ static bool testDotProductGF2 (const GF2 &F, const char *, //desc,
VectorStream<Vector<GF2>::Dense> &stream1,
VectorStream<Vector<GF2>::Sparse> &stream2)
{
- LinBox::commentator.start ("Testing GF2 dot product (dense/sparse)", "testDotProduct", stream1.size ());
+ LinBox::commentator().start ("Testing GF2 dot product (dense/sparse)", "testDotProduct", stream1.size ());
bool ret = true;
@@ -172,7 +188,7 @@ static bool testDotProductGF2 (const GF2 &F, const char *, //desc,
double totaltime = 0.0;
while (stream1 && stream2) {
- LinBox::commentator.startIteration (stream1.j ());
+ LinBox::commentator().startIteration ((unsigned int)stream1.j ());
stream1.next (v1);
stream2.next (v2);
@@ -190,7 +206,7 @@ static bool testDotProductGF2 (const GF2 &F, const char *, //desc,
for (i2 = v2.begin (); i2 != v2.end (); ++i2)
w2.push_back (std::pair<size_t, uint16_t> (*i2, 1));
- std::ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector 1: ";
VD.write (report, v1) << std::endl;
@@ -213,18 +229,18 @@ static bool testDotProductGF2 (const GF2 &F, const char *, //desc,
if ((sigma && !rho) || (rho && !sigma)) {
ret = false;
- LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Dot products are not equal" << std::endl;
}
- LinBox::commentator.stop ("done");
- LinBox::commentator.progress ();
+ LinBox::commentator().stop ("done");
+ LinBox::commentator().progress ();
}
- LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
- << "Average time for dot product: " << totaltime / stream1.m () << std::endl;
+ LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
+ << "Average time for dot product: " << totaltime / (double)stream1.m () << std::endl;
- LinBox::commentator.stop (MSG_STATUS (ret), (const char *) 0, "testDotProduct");
+ LinBox::commentator().stop (MSG_STATUS (ret), (const char *) 0, "testDotProduct");
stream1.reset ();
stream2.reset ();
@@ -252,12 +268,12 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("GF2 field test suite", "GF2");
+ commentator().start("GF2 field test suite", "GF2");
bool pass = true;
GF2 F;
- uint32_t seed = time (NULL);
+ uint32_t seed = (unsigned)time (NULL);
RandomDenseStreamGF2 stream1 (F, seed, n, iterations), stream2 (F, seed ^ 0xdeadbeef, n, iterations);
RandomSparseStreamGF2<Vector<GF2>::Sparse>
@@ -265,21 +281,36 @@ int main (int argc, char **argv)
stream4 (F, seed + 3, 0.1, n, iterations);
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- commentator.start ("Testing GF2", "main", 10);
+ commentator().start ("Testing GF2", "main", 10);
- if (!testField (F, "GF2")) pass = false; commentator.progress ();
+ if ( not testField (F, "GF2"))
+ pass = false;
+ commentator().progress ();
+/*
+ if ( not testDotProductGF2 (F, "Testing dot prod", stream1, stream3))
+ pass = false;
+ commentator().progress ();
+*/
#if 0
FieldArchetype K(new LargeModular(101));
-
if (!testField<FieldArchetype> (K, "Testing archetype with envelope of Modular field"))
pass = false;
#endif
- commentator.stop("GF2 field test suite");
+ commentator().stop("GF2 field test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-givaro-fields.C b/tests/test-givaro-fields.C
new file mode 100644
index 0000000..f0c5be4
--- /dev/null
+++ b/tests/test-givaro-fields.C
@@ -0,0 +1,180 @@
+/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+
+/* tests/test-givaro-fields.C
+ * -bds 2012.
+ * Merger of test-givaro-zpz.C and test-givaro-zpzuns.C
+ * written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+/*! @file tests/test-givaro-fields.C
+ * @ingroup tests
+ * @brief test fields build on Givaro
+ * @test NO DOC
+ */
+
+
+
+#include "linbox/linbox-config.h"
+
+#include <iostream>
+#include <fstream>
+#include <vector>
+
+#include "linbox/field/givaro.h"
+
+#include "test-common.h"
+#include "test-field.h"
+
+#ifndef TEST_ARCHETYPES
+#define TEST_ARCHETYPES 1
+#endif
+
+using namespace LinBox;
+
+int main (int argc, char **argv)
+{
+ static integer q = 10733;
+ static size_t n = 10000;
+ static int iterations = 10;
+ static int e = 3;
+ static int trials = 10000;
+ static int categories = 1000;
+ static int hist_level = 10;
+
+
+ static Argument args[] = {
+ { 'q', "-q Q", "Operate over the \"field\" GF(Q) [1].", TYPE_INTEGER, &q },
+ { 'e', "-e E", "Use GF(q^e) for the extension field [1].", TYPE_INT, &e },
+ { 'n', "-n N", "Set dimension of test vectors to NxN.", TYPE_INT, &n },
+ { 'i', "-i I", "Perform each test for I iterations.", TYPE_INT, &iterations },
+ { 't', "-t T", "Number of trials for the random iterator test.", TYPE_INT, &trials },
+ { 'c', "-c C", "Number of categories for the random iterator test.", TYPE_INT, &categories },
+ { 'H', "-H H", "History level for random iterator test.", TYPE_INT, &hist_level },
+ END_OF_ARGUMENTS
+ };
+
+ parseArguments (argc, argv, args);
+
+ //cout << endl << "GivaroZpz< Givaro::Std16> field test suite" << endl;
+ //cout.flush ();
+ bool pass = true;
+
+ GivaroZpz< Givaro::Std16> F1 ( (q<256?q:integer(101)) ); // Does not work with q > 256
+ GivaroZpz< Givaro::Std32> F2 (q);
+ GivaroMontg F3 (39989);
+ GivaroGfq F4 (q, 1);
+ GivaroGfq F5 (11, e);
+ GivaroExtension<GivaroGfq> F6 (F5, e );
+ GivaroExtension<> F7 (103, 4 );
+ GivaroZpz< Givaro::Log16> F8 ( (q<256?q:integer(101)) ); // Does not work with q > 256
+
+ GivaroZpz< Givaro::Unsigned32> F1u (2);
+ GivaroZpz< Givaro::Unsigned32> F2u (q);
+ GivaroZpz< Givaro::Unsigned32> F3u (3);
+ GivaroZpz< Givaro::Unsigned32> F4u (32749);
+ GivaroZpz< Givaro::Unsigned32> F5u (65521);
+
+
+ LinBox::commentator().start("Givaro-zpz test suite", "GivZpz");
+ // Make sure some more detailed messages get printed
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+
+ if (!runFieldTests (F1, "GivaroZpz< Givaro::Std16>", iterations, n, false)) pass = false;
+ if (!runFieldTests (F2, "GivaroZpz< Givaro::Std32>", iterations, n, false)) pass = false;
+ if (!runFieldTests (F3, "GivaroMontg", iterations, n, false)) pass = false;
+ if (!runFieldTests (F4, "GivaroGfq (prime)", iterations, n, false)) pass = false;
+ if (!runFieldTests (F5, "GivaroGfq (simple extension)", iterations, n, false)) pass = false;
+ if (!runFieldTests (F6, "GivaroExtension (small polynomial extension)", iterations, n, false)) pass = false;
+ if (!runFieldTests (F7, "GivaroExtension (large polynomial extension)", iterations, n, false)) pass = false;
+ if (!runFieldTests (F8, "GivaroLog13", iterations, n, false)) pass = false;
+ if (!runFieldTests (F1u, "Unsigned32-2", iterations, n, false)) pass = false;
+ if (!runFieldTests (F2u, "Unsigned32-q", iterations, n, false)) pass = false;
+ if (!runFieldTests (F3u, "Unsigned32-3", iterations, n, false)) pass = false;
+ if (!runFieldTests (F4u, "Unsigned32-32749", iterations, n, false)) pass = false;
+ if (!runFieldTests (F5u, "Unsigned32-65521", iterations, n, false)) pass = false;
+
+
+ if (!testRandomIterator (F1, "GivaroZpz< Givaro::Std16>", trials, categories, hist_level)) pass = false;
+ if (!testRandomIterator (F2, "GivaroZpz< Givaro::Std32>", trials, categories, hist_level)) pass = false;
+ if (!testRandomIterator (F3, "GivaroMontgomery", trials, categories, hist_level)) pass = false;
+ if (!testRandomIterator (F4, "GivaroGfq (prime)", trials, categories, hist_level)) pass = false;
+ if (!testRandomIterator (F5, "GivaroGfq (simple extension)", trials, categories, hist_level)) pass = false;
+ if (!testRandomIterator (F6, "GivaroExtension (small polynomial extension)", trials, categories, hist_level)) pass = false;
+ if (!testRandomIterator (F7, "GivaroExtension (large polynomial extension)", trials, categories, hist_level)) pass = false;
+ if (!testRandomIterator (F1u, "GivaroZpz< Givaro::Unsigned32>(2)", trials, categories, hist_level)) pass = false;
+ if (!testRandomIterator (F2u, "GivaroZpz< Givaro::Unsigned32>(q)", trials, categories, hist_level)) pass = false;
+ if (!testRandomIterator (F3u, "GivaroZpz< Givaro::Unsigned32>(3)", trials, categories, hist_level)) pass = false;
+ if (!testRandomIterator (F4u, "GivaroZpz< Givaro::Unsigned32>(32749)", trials, categories, hist_level)) pass = false;
+ if (!testRandomIterator (F5u, "GivaroZpz< Givaro::Unsigned32>(65521)", trials, categories, hist_level)) pass = false;
+
+
+
+
+#if TEST_ARCHETYPES
+
+ GivaroZpz< Givaro::Std16> * K1g = new GivaroZpz< Givaro::Std16> (101);
+ FieldArchetype K1(K1g);
+ if (!testField<FieldArchetype> (K1, "Testing archetype with envelope of GivaroZpz< Givaro::Std16> field"))
+ pass = false;
+ delete K1g;
+#endif
+
+#if TEST_ARCHETYPES
+ GivaroZpz< Givaro::Std32> * K2g = new GivaroZpz< Givaro::Std32>(101);
+ FieldArchetype K2(K2g);
+
+ if (!testField<FieldArchetype> (K2, "Testing archetype with envelope of GivaroZpz< Givaro::Std32> field"))
+ pass = false;
+ delete K2g;
+#endif
+
+#if TEST_ARCHETYPES
+ GivaroZpz< Givaro::Log16> * K3g = new GivaroZpz< Givaro::Log16>(101);
+ FieldArchetype K3(K3g);
+
+ if (!testField<FieldArchetype> (K3, "Testing archetype with envelope of GivaroZpz< Givaro::Log16> field"))
+ pass = false;
+ delete K3g;
+#endif
+
+#if TEST_ARCHETYPES
+ GivaroZpz< Givaro::Unsigned32> * K2gu = new GivaroZpz< Givaro::Unsigned32> (101);
+ FieldArchetype K2u(K2gu);
+ if (!testField<FieldArchetype> (K2u, "Testing archetype with envelope of GivaroZpz< Givaro::Unsigned32> field"))
+ pass = false;
+ delete K2gu;
+#endif
+
+#if TEST_ARCHETYPES
+ GivaroGfq * K4g = new GivaroGfq (101,1);
+ FieldArchetype K4(K4g);
+
+ if (!testField<FieldArchetype> (K4, "Testing archetype with envelope of GivaroGfq prime field"))
+ pass = false;
+ delete K4g;
+#endif
+
+
+ LinBox::commentator().stop(MSG_STATUS (pass), "GivaroZpz test suite");
+ return pass ? 0 : -1;
+}
+
+
diff --git a/tests/test-givaro-zpz.C b/tests/test-givaro-zpz.C
deleted file mode 100644
index 5fa8915..0000000
--- a/tests/test-givaro-zpz.C
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-
-/* tests/test-givaro-zpz.C
- * Copyright (C) 2002 Pascal Giorgi
- *
- * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-/*! @file tests/test-givaro-zpz.C
- * @ingroup tests
- * @brief no doc
- * @test NO DOC
- */
-
-
-
-#include "linbox/linbox-config.h"
-
-#include <iostream>
-#include <fstream>
-#include <vector>
-
-#include "linbox/field/givaro-zpz.h"
-#include "linbox/field/givaro-montg.h"
-#include "linbox/field/givaro-gfq.h"
-#include "linbox/field/givaro-extension.h"
-
-#include "test-common.h"
-#include "test-generic.h"
-
-#define TEST_ARCHETYPES 1
-
-using namespace LinBox;
-
-int main (int argc, char **argv)
-{
- static integer q = 10733;
- static size_t n = 10000;
- static int iterations = 10;
- static int e = 3;
- static int trials = 1000;
- static int categories = 100;
- static int hist_level = 1;
-
-
- static Argument args[] = {
- { 'q', "-q Q", "Operate over the \"field\" GF(Q) [1].", TYPE_INTEGER, &q },
- { 'e', "-e E", "Use GF(q^e) for the extension field [1].", TYPE_INT, &e },
- { 'n', "-n N", "Set dimension of test vectors to NxN.", TYPE_INT, &n },
- { 'i', "-i I", "Perform each test for I iterations.", TYPE_INT, &iterations },
- { 't', "-t T", "Number of trials for the random iterator test.", TYPE_INT, &trials },
- { 'c', "-c C", "Number of categories for the random iterator test.", TYPE_INT, &categories },
- { 'H', "-H H", "History level for random iterator test.", TYPE_INT, &hist_level },
- END_OF_ARGUMENTS
- };
-
- parseArguments (argc, argv, args);
-
- //cout << endl << "GivaroZpz< ::Givaro::Std16> field test suite" << endl;
- //cout.flush ();
- bool pass = true;
-
-// GivaroZpz< ::Givaro::Std16> F1 (q); // Does not work with q > 256
- GivaroZpz< ::Givaro::Std16> F1 ( (q<256?q:integer(101)) ); // Does not work with q > 256
- GivaroZpz< ::Givaro::Std32> F2 (q);
-// GivaroZpz< ::Givaro::Log16> F3 (q); // Does not work with q > 256
- GivaroMontg F3 (39989);
- GivaroGfq F4 (q, 1);
- GivaroGfq F5 (11, e);
- GivaroExtension<GivaroGfq> F6 (F5, e );
- GivaroExtension<> F7 (103, 4 );
-
- // Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
-
- if (!runFieldTests (F1, "GivaroZpz< ::Givaro::Std16>", iterations, n, false)) pass = false;
- if (!runFieldTests (F2, "GivaroZpz< ::Givaro::Std32>", iterations, n, false)) pass = false;
- if (!runFieldTests (F3, "GivaroMontg", iterations, n, false)) pass = false;
- if (!runFieldTests (F4, "GivaroGfq (prime)", iterations, n, false)) pass = false;
- if (!runFieldTests (F5, "GivaroGfq (simple extension)", iterations, n, false)) pass = false;
- if (!runFieldTests (F6, "GivaroExtension (small polynomial extension)", iterations, n, false)) pass = false;
- if (!runFieldTests (F7, "GivaroExtension (large polynomial extension)", iterations, n, false)) pass = false;
-
-
- if (!testRandomIterator (F1, "GivaroZpz< ::Givaro::Std16>", trials, categories, hist_level)) pass = false;
- if (!testRandomIterator (F2, "GivaroZpz< ::Givaro::Std32>", trials, categories, hist_level)) pass = false;
- if (!testRandomIterator (F3, "GivaroMontgomery", trials, categories, hist_level)) pass = false;
- if (!testRandomIterator (F4, "GivaroGfq (prime)", trials, categories, hist_level)) pass = false;
- if (!testRandomIterator (F5, "GivaroGfq (simple extension)", trials, categories, hist_level)) pass = false;
- if (!testRandomIterator (F6, "GivaroExtension (small polynomial extension)", trials, categories, hist_level)) pass = false;
- if (!testRandomIterator (F7, "GivaroExtension (large polynomial extension)", trials, categories, hist_level)) pass = false;
-
-
-
-#if TEST_ARCHETYPES
-
- GivaroZpz< ::Givaro::Std16> * K1g = new GivaroZpz< ::Givaro::Std16> (101);
- FieldArchetype K1(K1g);
- if (!testField<FieldArchetype> (K1, "Testing archetype with envelope of GivaroZpz< ::Givaro::Std16> field"))
- pass = false;
- delete K1g;
-#endif
-
-#if TEST_ARCHETYPES
- GivaroZpz< ::Givaro::Std32> * K2g = new GivaroZpz< ::Givaro::Std32>(101);
- FieldArchetype K2(K2g);
-
- if (!testField<FieldArchetype> (K2, "Testing archetype with envelope of GivaroZpz< ::Givaro::Std32> field"))
- pass = false;
- delete K2g;
-#endif
-
-#if TEST_ARCHETYPES
- GivaroZpz< ::Givaro::Log16> * K3g = new GivaroZpz< ::Givaro::Log16>(101);
- FieldArchetype K3(K3g);
-
- if (!testField<FieldArchetype> (K3, "Testing archetype with envelope of GivaroZpz< ::Givaro::Log16> field"))
- pass = false;
- delete K3g;
-#endif
-
-#if TEST_ARCHETYPES
- GivaroGfq * K4g = new GivaroGfq (101,1);
- FieldArchetype K4(K4g);
-
- if (!testField<FieldArchetype> (K4, "Testing archetype with envelope of GivaroGfq prime field"))
- pass = false;
- delete K4g;
-#endif
-
-
- return pass ? 0 : -1;
-}
diff --git a/tests/test-givaro-zpzuns.C b/tests/test-givaro-zpzuns.C
deleted file mode 100644
index 193fc8b..0000000
--- a/tests/test-givaro-zpzuns.C
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-
-/* tests/test-givaro-zpz.C
- * Copyright (C) 2002 Pascal Giorgi
- *
- * Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-/*! @file tests/test-givaro-zpzuns.C
- * @ingroup tests
- * @brief no doc
- * @test NO DOC
- */
-
-
-
-#include "linbox/linbox-config.h"
-
-#include <iostream>
-#include <fstream>
-#include <vector>
-
-#include "linbox/field/givaro-zpz.h"
-#include "linbox/field/givaro-gfq.h"
-
-#include "test-common.h"
-#include "test-generic.h"
-
-#define TEST_ARCHETYPES 1
-
-using namespace LinBox;
-
-int main (int argc, char **argv)
-{
- static integer q = 10733;
- static size_t n = 10000;
- static int iterations = 10;
- static int e;
- static int trials = 1000;
- static int categories = 100;
- static int hist_level = 1;
-
-
- static Argument args[] = {
- { 'q', "-q Q", "Operate over the \"field\" GF(Q) [1].", TYPE_INTEGER, &q },
- { 'e', "-e E", "Use GF(q^e) for the extension field [1].", TYPE_INT, &e },
- { 'n', "-n N", "Set dimension of test vectors to NxN.", TYPE_INT, &n },
- { 'i', "-i I", "Perform each test for I iterations.", TYPE_INT, &iterations },
- { 't', "-t T", "Number of trials for the random iterator test.", TYPE_INT, &trials },
- { 'c', "-c C", "Number of categories for the random iterator test.", TYPE_INT, &categories },
- { 'H', "-H H", "History level for random iterator test.", TYPE_INT, &hist_level },
- END_OF_ARGUMENTS
- };
-
- parseArguments (argc, argv, args);
-
- //cout << endl << "GivaroZpz< ::Givaro::Unsigned32> field test suite" << endl;
- //cout.flush ();
- bool pass = true;
-
- GivaroZpz< ::Givaro::Unsigned32> F1 (2);
- GivaroZpz< ::Givaro::Unsigned32> F2 (q);
- GivaroZpz< ::Givaro::Unsigned32> F3 (3);
- GivaroZpz< ::Givaro::Unsigned32> F4 (32749);
- GivaroZpz< ::Givaro::Unsigned32> F5 (65521);
-
- // Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
-
- if (!runFieldTests (F1, "2", iterations, n, false)) pass = false;
- if (!runFieldTests (F2, "10733", iterations, n, false)) pass = false;
- if (!runFieldTests (F3, "3", iterations, n, false)) pass = false;
- if (!runFieldTests (F4, "32749", iterations, n, false)) pass = false;
- if (!runFieldTests (F5, "65521", iterations, n, false)) pass = false;
-
- if (!testRandomIterator (F1, "GivaroZpz< ::Givaro::Unsigned32>(2)", trials, categories, hist_level)) pass = false;
- if (!testRandomIterator (F2, "GivaroZpz< ::Givaro::Unsigned32>(10733)", trials, categories, hist_level)) pass = false;
- if (!testRandomIterator (F3, "GivaroZpz< ::Givaro::Unsigned32>(3)", trials, categories, hist_level)) pass = false;
- if (!testRandomIterator (F4, "GivaroZpz< ::Givaro::Unsigned32>(32749)", trials, categories, hist_level)) pass = false;
- if (!testRandomIterator (F5, "GivaroZpz< ::Givaro::Unsigned32>(65521)", trials, categories, hist_level)) pass = false;
-
-#if TEST_ARCHETYPES
-
- GivaroZpz< ::Givaro::Std16> * K1g = new GivaroZpz< ::Givaro::Std16> (101);
- FieldArchetype K1(K1g);
- if (!testField<FieldArchetype> (K1, "Testing archetype with envelope of GivaroZpz< ::Givaro::Std16> field"))
- pass = false;
- delete K1g;
-#endif
-
-#if TEST_ARCHETYPES
- GivaroZpz< ::Givaro::Unsigned32> * K2g = new GivaroZpz< ::Givaro::Unsigned32> (101);
- FieldArchetype K2(K2g);
- if (!testField<FieldArchetype> (K2, "Testing archetype with envelope of GivaroZpz< ::Givaro::Unsigned32> field"))
- pass = false;
- delete K2g;
-#endif
-
-#if TEST_ARCHETYPES
- GivaroZpz< ::Givaro::Log16> * K3g = new GivaroZpz< ::Givaro::Log16>(101);
- FieldArchetype K3(K3g);
-
- if (!testField<FieldArchetype> (K3, "Testing archetype with envelope of GivaroZpz< ::Givaro::Log16> field"))
- pass = false;
- delete K3g;
-#endif
-
-#if TEST_ARCHETYPES
- GivaroGfq * K4g = new GivaroGfq(101,1);
- FieldArchetype K4(K4g);
-
- if (!testField<FieldArchetype> (K4, "Testing archetype with envelope of GivaroGfq prime field"))
- pass = false;
- delete K4g;
-#endif
-
-
- return pass ? 0 : -1;
-}
diff --git a/tests/test-gmp-rational.C b/tests/test-gmp-rational.C
index 7890fc4..f02bb6f 100644
--- a/tests/test-gmp-rational.C
+++ b/tests/test-gmp-rational.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-gmp-rational.C
* Copyright (C) 2001, 2002 Bradford Hovinen,
@@ -10,7 +8,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
@@ -46,17 +62,26 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("GMP rational field test suite", "GMPRationalField");
+ commentator().start("GMP rational field test suite", "GMPRationalField");
bool pass = true;
GMPRationalField F;
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (!runFieldTests (F, "GMP Rational", iterations, n, false)) pass = false;
- commentator.stop("GMP rational field test suite");
+ commentator().stop("GMP rational field test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-hilbert.C b/tests/test-hilbert.C
index ace7241..2cba3dd 100644
--- a/tests/test-hilbert.C
+++ b/tests/test-hilbert.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* written by bds
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -64,9 +65,9 @@ int main (int argc, char **argv)
typedef Modular<uint32_t> Field;
Field F (q);
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- commentator.start("Hilbert matrix blackbox test suite", "Hilbert");
+ commentator().start("Hilbert matrix blackbox test suite", "Hilbert");
typedef vector<Field::Element> Vector;
typedef Hilbert<Field> BB;
@@ -74,6 +75,15 @@ int main (int argc, char **argv)
pass = pass && testBlackbox (A);
- commentator.stop("Hilbert matrix blackbox test suite");
+ commentator().stop("Hilbert matrix blackbox test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-hom.C b/tests/test-hom.C
index 70fbc96..2dd48c6 100644
--- a/tests/test-hom.C
+++ b/tests/test-hom.C
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-hom.C
* Copyright (C) LinBox
*
* Written by Dave Saunders <saunders at cis.udel.edu>
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
@@ -52,7 +68,7 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("Hom test suite", "Hom");
+ commentator().start("Hom test suite", "Hom");
bool pass = true;
Modular<uint32_t> F_uint32_t ((uint32_t) q);
@@ -83,6 +99,15 @@ int main (int argc, char **argv)
pass = pass && iso.areEqual(z, w);
*/
- commentator.stop("Hom test suite");
+ commentator().stop("Hom test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-inverse.C b/tests/test-inverse.C
index 9f5990c..ba153b3 100644
--- a/tests/test-inverse.C
+++ b/tests/test-inverse.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-inverse.C
* Copyright (C) 2001, 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
@@ -29,7 +45,6 @@
#include "linbox/field/modular.h"
#include "linbox/blackbox/diagonal.h"
#include "linbox/blackbox/hilbert.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/blackbox/inverse.h"
#include "linbox/vector/stream.h"
@@ -57,7 +72,7 @@ static bool testIdentityInverse (const Field &F, VectorStream<Vector> &stream)
{
typedef Diagonal<Field> Blackbox;
- commentator.start ("Testing identity inverse", "testIdentityInverse", stream.m ());
+ commentator().start ("Testing identity inverse", "testIdentityInverse", stream.m ());
bool ret = true;
bool iter_passed = true;
@@ -81,13 +96,13 @@ static bool testIdentityInverse (const Field &F, VectorStream<Vector> &stream)
VectorWrapper::ensureDim (w, stream.n ());
while (stream) {
- commentator.startIteration (stream.j ());
+ commentator().startIteration ((unsigned)stream.j ());
iter_passed = true;
stream.next (v);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector: ";
VD.write (report, v);
report << endl;
@@ -102,16 +117,16 @@ static bool testIdentityInverse (const Field &F, VectorStream<Vector> &stream)
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vectors are not equal" << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testIdentityInverse");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testIdentityInverse");
return ret;
}
@@ -133,7 +148,7 @@ static bool testHilbertInverse (const Field &F, VectorStream<Vector> &stream)
{
typedef Hilbert <Field> Blackbox;
- commentator.start ("Testing Hilbert inverse", "testHilbertInverse", stream.m ());
+ commentator().start ("Testing Hilbert inverse", "testHilbertInverse", stream.m ());
bool ret = true;
bool iter_passed;
@@ -150,13 +165,13 @@ static bool testHilbertInverse (const Field &F, VectorStream<Vector> &stream)
VectorWrapper::ensureDim (z, stream.n ());
while (stream) {
- commentator.startIteration (stream.j ());
+ commentator().startIteration (stream.j ());
iter_passed = true;
stream.next (v);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector: ";
VD.write (report, v);
report << endl;
@@ -172,16 +187,16 @@ static bool testHilbertInverse (const Field &F, VectorStream<Vector> &stream)
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vectors are not equal" << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testHilbertInverse");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testHilbertInverse");
return ret;
}
@@ -208,9 +223,9 @@ static bool testVandermondeInverse (const Field &F,
VectorStream<Vector> &x_stream,
VectorStream<Vector> &v_stream)
{
- typedef DenseMatrix <Field> Blackbox;
+ typedef BlasMatrix <Field> Blackbox;
- commentator.start ("Testing Vandermonde inverse", "testVandermondeInverse", x_stream.m ());
+ commentator().start ("Testing Vandermonde inverse", "testVandermondeInverse", x_stream.m ());
bool ret = true;
bool inner_iter_passed;
@@ -229,12 +244,12 @@ static bool testVandermondeInverse (const Field &F,
VectorWrapper::ensureDim (z, x_stream.n ());
while (x_stream) {
- commentator.startIteration (x_stream.j ());
+ commentator().startIteration ((unsigned)x_stream.j ());
/* Evaluation points */
x_stream.next (x);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Evaluation points: ";
VD.write (report, x);
report << endl;
@@ -282,17 +297,17 @@ static bool testVandermondeInverse (const Field &F,
ret = inner_iter_passed = false;
if (!inner_iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vectors are not equal" << endl;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
x_stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testVandermondeInverse");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testVandermondeInverse");
return ret;
}
@@ -315,7 +330,7 @@ static bool testDiagonalInverse (const Field &F, VectorStream<Vector> &stream)
{
typedef Diagonal <Field> Blackbox;
- commentator.start ("Testing diagonal inverse", "testDiagonalInverse", stream.m ());
+ commentator().start ("Testing diagonal inverse", "testDiagonalInverse", stream.m ());
VectorDomain<Field> VD (F);
@@ -333,7 +348,7 @@ static bool testDiagonalInverse (const Field &F, VectorStream<Vector> &stream)
VectorWrapper::ensureDim (DTe, stream.n ());
while (stream) {
- commentator.startIteration (stream.j ());
+ commentator().startIteration ((unsigned)stream.j ());
iter_passed = true;
@@ -342,7 +357,7 @@ static bool testDiagonalInverse (const Field &F, VectorStream<Vector> &stream)
for (j = 0; j < stream.n (); j++)
F.inv (VectorWrapper::ref<Field> (di, j), VectorWrapper::ref<Field> (d, j));
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal entries: ";
VD.write (report, d);
report << endl;
@@ -369,16 +384,16 @@ static bool testDiagonalInverse (const Field &F, VectorStream<Vector> &stream)
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed inverse does not match expected inverse" << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testDiagonalInverse");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testDiagonalInverse");
return ret;
}
@@ -400,9 +415,9 @@ static bool testRandomTranspose (Field &F,
VectorStream<Vector> &stream1,
VectorStream<Vector> &stream2)
{
- typedef DenseMatrix <Field> Blackbox;
+ typedef BlasMatrix <Field> Blackbox;
- commentator.start ("Testing random transpose", "testRandomTranspose", stream1.m ());
+ commentator().start ("Testing random transpose", "testRandomTranspose", stream1.m ());
size_t i, j;
typename Field::Element x;
@@ -420,7 +435,7 @@ static bool testRandomTranspose (Field &F,
bool ret = testTranspose (F, Ainv, stream1, stream2);
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
return ret;
}
@@ -449,11 +464,11 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
Field F (q);
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- commentator.start("Inverse black box test suite", "Inverse");
+ commentator().start("Inverse black box test suite", "Inverse");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
RandomDenseStream<Field, Vector> stream1 (F, n, iterations), stream2 (F, n, iterations);
RandomDenseStream<Field, Vector> stream3 (F, n, N);
@@ -463,6 +478,15 @@ int main (int argc, char **argv)
if (!testDiagonalInverse (F, stream1)) pass = false;
if (!testRandomTranspose (F, stream1, stream2)) pass = false;
- commentator.stop("Inverse black box test suite");
+ commentator().stop("Inverse black box test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-isposdef.C b/tests/test-isposdef.C
index 72b6b48..8d1c6de 100644
--- a/tests/test-isposdef.C
+++ b/tests/test-isposdef.C
@@ -1,12 +1,26 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-isposdef.C
* Copyright (C) LinBox
*
* -----------------------------------------------------
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox, licensed under the GNU Lesser General
- * Public License. See COPYING for more information.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ * Function definitions for block Lanczos iteration
*/
/*! @file tests/test-isposdef.C
@@ -26,7 +40,6 @@
#include "linbox/util/commentator.h"
#include "linbox/blackbox/sparse.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/solutions/is-positive-definite.h"
#include "test-common.h"
@@ -44,7 +57,7 @@ bool testIsPosDef(const Ring &Z, size_t n, unsigned int iterations, double spars
{
typedef SparseMatrix<Ring> Blackbox;
- commentator.start ("Testing isPositiveDefinite", "testIsPosDef", iterations);
+ commentator().start ("Testing isPositiveDefinite", "testIsPosDef", iterations);
bool ret = true;
unsigned int i;
@@ -52,7 +65,7 @@ bool testIsPosDef(const Ring &Z, size_t n, unsigned int iterations, double spars
typename Ring::RandIter ri (Z);
for (i = 0; i < iterations; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
Blackbox A (Z, n, n);
typename Ring::Element e; Z.init(e, 1);
@@ -60,7 +73,7 @@ bool testIsPosDef(const Ring &Z, size_t n, unsigned int iterations, double spars
A.setEntry(j, j, e);
std::ostream & report =
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
Z.write( report ) << endl;
A.write( report ) << endl;
@@ -79,11 +92,11 @@ bool testIsPosDef(const Ring &Z, size_t n, unsigned int iterations, double spars
report << "Positivedefiniteness on indefinite example computed by default (Hybrid) method: " << p << endl;
if (p) {report << "ERROR: should not be pos def" << endl; ret = false;}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testEliminationRank");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testEliminationRank");
return ret;
}
@@ -93,8 +106,8 @@ bool testIsPosDef(const Ring &Z, size_t n, unsigned int iterations, double spars
int main (int argc, char **argv)
{
-// commentator.setMaxDetailLevel( 100000 );
-// commentator.setMaxDepth( 100000 );
+// commentator().setMaxDetailLevel( 100000 );
+// commentator().setMaxDepth( 100000 );
bool pass = true;
@@ -114,16 +127,25 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- commentator.start("IsPositiveDefinite solution test suite", "IsPositiveDefinite");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().start("IsPositiveDefinite solution test suite", "IsPositiveDefinite");
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
PID_integer R;
if (!testIsPosDef(R, n, iterations, sparsity)) pass = false;
- commentator.stop("IsPositiveDefinite solution test suite");
+ commentator().stop("IsPositiveDefinite solution test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-ispossemidef.C b/tests/test-ispossemidef.C
index 9acbc24..5ac6ee8 100644
--- a/tests/test-ispossemidef.C
+++ b/tests/test-ispossemidef.C
@@ -1,12 +1,26 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-isposdef.C
* Copyright (C) LinBox
*
* -----------------------------------------------------
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox, licensed under the GNU Lesser General
- * Public License. See COPYING for more information.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ * Function definitions for block Lanczos iteration
*/
@@ -27,7 +41,6 @@
#include "linbox/util/commentator.h"
#include "linbox/blackbox/sparse.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/solutions/is-positive-semidefinite.h"
#include "test-common.h"
@@ -45,7 +58,7 @@ bool testIsPosDef(const Ring &Z, size_t n, unsigned int iterations, double spars
{
typedef SparseMatrix<Ring> Blackbox;
- commentator.start ("Testing isPositiveDefinite", "testIsPosDef", iterations);
+ commentator().start ("Testing isPositiveDefinite", "testIsPosDef", iterations);
bool ret = true;
unsigned int i;
@@ -53,7 +66,7 @@ bool testIsPosDef(const Ring &Z, size_t n, unsigned int iterations, double spars
typename Ring::RandIter ri (Z);
for (i = 0; i < iterations; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
Blackbox A (Z, n, n);
typename Ring::Element e; Z.init(e, 1);
@@ -63,7 +76,7 @@ bool testIsPosDef(const Ring &Z, size_t n, unsigned int iterations, double spars
A.setEntry(1, 2, e);
A.setEntry(2, 1, e);
std::ostream & report =
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION);
Z.write( report ) << endl;
A.write( report ) << endl;
@@ -82,11 +95,11 @@ bool testIsPosDef(const Ring &Z, size_t n, unsigned int iterations, double spars
report << "PositiveSemidefiniteness on indefinite example computed by default (Hybrid) method: " << p << endl;
if (p) {report << "ERROR: should not be pos semidef" << endl; ret = false;}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testEliminationRank");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testEliminationRank");
return ret;
}
@@ -96,8 +109,8 @@ bool testIsPosDef(const Ring &Z, size_t n, unsigned int iterations, double spars
int main (int argc, char **argv)
{
-// commentator.setMaxDetailLevel( 100000 );
-// commentator.setMaxDepth( 100000 );
+// commentator().setMaxDetailLevel( 100000 );
+// commentator().setMaxDepth( 100000 );
bool pass = true;
@@ -117,19 +130,28 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- commentator.start("isPositiveSemiDefinite solution test suite", "isPositiveSemiDefinite");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().start("isPositiveSemiDefinite solution test suite", "isPositiveSemiDefinite");
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
-// commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+// commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
PID_integer R;
if (!testIsPosDef(R, n, iterations, sparsity)) pass = false;
- commentator.stop("isPositiveSemiDefinite solution test suite");
+ commentator().stop("isPositiveSemiDefinite solution test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-la-block-lanczos.C b/tests/test-la-block-lanczos.C
index 05f271c..67e7da5 100644
--- a/tests/test-la-block-lanczos.C
+++ b/tests/test-la-block-lanczos.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-la-block-lanczos.C
* Copyright (C) 2004 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
@@ -46,12 +62,12 @@ static bool testRandomSolve (const Field &F,
VectorStream<Vector2> &y_stream,
size_t N)
{
- typedef LABlockLanczosSolver<Field, DenseMatrixBase<typename Field::Element> > LABLSolver;
+ typedef LABlockLanczosSolver<Field, BlasMatrix<Field> > LABLSolver;
- commentator.start ("Testing random solve (Block Lanczos)", "testRandomSolve", y_stream.size ());
+ commentator().start ("Testing random solve (Block Lanczos)", "testRandomSolve", y_stream.size ());
- std::ostream &report1 = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report1 = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
bool ret = true;
@@ -83,29 +99,29 @@ static bool testRandomSolve (const Field &F,
LABLSolver lablsolver (F, traits, ri);
while (y_stream) {
- commentator.startIteration (y_stream.pos ());
+ commentator().startIteration ( (unsigned int) y_stream.pos ());
y_stream >> y;
A.apply (b, y);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Right-hand side b:";
- VD.write (report, b) << endl;
+ std::ostream &raport = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ raport << "Right-hand side b:";
+ VD.write (raport, b) << endl;
if (!lablsolver.solve (A, x2, b)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Solve failed to solve system" << endl;
ret = false;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
A_stream.reset ();
y_stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomSolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomSolve");
return ret;
}
@@ -119,13 +135,13 @@ static bool testSampleNullspace (const Field &F,
size_t N,
unsigned int num_iter)
{
- typedef DenseMatrixBase<typename Field::Element> Matrix;
+ typedef BlasMatrix<Field> Matrix;
typedef LABlockLanczosSolver<Field, Matrix> LABLSolver;
- commentator.start ("Testing sampling from nullspace (Block Lanczos)", "testSampleNullspace", num_iter);
+ commentator().start ("Testing sampling from nullspace (Block Lanczos)", "testSampleNullspace", num_iter);
- std::ostream &report1 = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report1 = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
bool ret = true;
unsigned int number;
@@ -152,20 +168,20 @@ static bool testSampleNullspace (const Field &F,
LABLSolver lablsolver (F, traits, ri);
for (unsigned int i = 0; i < num_iter; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
number = lablsolver.sampleNullspace (A, x);
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Number of nullspace vectors found: " << number << std::endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
A_stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testSampleNullspace");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testSampleNullspace");
return ret;
}
@@ -179,13 +195,13 @@ static bool testRank (const Field &F,
size_t N,
unsigned int num_iter)
{
- typedef DenseMatrixBase<typename Field::Element> Matrix;
+ typedef BlasMatrix<Field> Matrix;
typedef LABlockLanczosSolver<Field, Matrix> LABLSolver;
- commentator.start ("Testing rank (Block Lanczos)", "testRank", num_iter);
+ commentator().start ("Testing rank (Block Lanczos)", "testRank", num_iter);
- std::ostream &report1 = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report1 = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
bool ret = true;
unsigned int rank;
@@ -210,20 +226,20 @@ static bool testRank (const Field &F,
LABLSolver lablsolver (F, traits, ri);
for (unsigned int i = 0; i < num_iter; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
rank = lablsolver.rank (A);
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Rank: " << rank << std::endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
A_stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "rank");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "rank");
return ret;
}
@@ -245,6 +261,8 @@ int main (int argc, char **argv)
END_OF_ARGUMENTS
};
+ bool fail = false ;
+
typedef Modular<uint8_t> Field;
parseArguments (argc, argv, args);
@@ -252,18 +270,27 @@ int main (int argc, char **argv)
std::cout << "Lookahead-based block Lanczos test suite" << std::endl << std::endl;
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (10);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.getMessageClass (PROGRESS_REPORT).setMaxDepth (0);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (10);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().getMessageClass (PROGRESS_REPORT).setMaxDepth (0);
RandomSparseStream<Field> A_stream (F, (double) k / (double) n, n, n);
RandomDenseStream<Field> y_stream (F, n, i);
- testRandomSolve (F, A_stream, y_stream, N);
- testSampleNullspace (F, A_stream, N, i);
- testRank (F, A_stream, N, i);
+ fail |= testRandomSolve (F, A_stream, y_stream, N);
+ fail |= testSampleNullspace (F, A_stream, N, i);
+ fail |= testRank (F, A_stream, N, i);
- return 0;
+ return fail;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-last-invariant-factor.C b/tests/test-last-invariant-factor.C
index 7a18f95..e14856b 100644
--- a/tests/test-last-invariant-factor.C
+++ b/tests/test-last-invariant-factor.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Author: Zhendong Wan
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -31,20 +32,19 @@
-#include <linbox/field/PID-integer.h>
-#include <linbox/randiter/random-prime.h>
-#include <linbox/field/modular-int32.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/algorithms/matrix-rank.h>
-#include <linbox/algorithms/last-invariant-factor.h>
-#include <linbox/blackbox/scompose.h>
-#include <linbox/blackbox/random-matrix.h>
-#include <linbox/algorithms/rational-solver.h>
+#include "linbox/field/PID-integer.h"
+#include "linbox/randiter/random-prime.h"
+#include "linbox/field/modular.h"
+#include "linbox/algorithms/matrix-rank.h"
+#include "linbox/algorithms/last-invariant-factor.h"
+#include "linbox/blackbox/scompose.h"
+#include "linbox/blackbox/random-matrix.h"
+#include "linbox/algorithms/rational-solver.h"
#include <time.h>
-#include <linbox/util/commentator.h>
-#include <linbox/vector/stream.h>
+#include "linbox/util/commentator.h"
+#include "linbox/vector/stream.h"
#include "test-common.h"
using namespace LinBox;
@@ -58,7 +58,7 @@ bool testRandom(const Ring& R,
str << "Testing last invariant factor:";
- commentator.start (str.str ().c_str (), "testRandom", stream1.m ());
+ commentator().start (str.str ().c_str (), "testRandom", stream1.m ());
bool ret = true;
bool iter_passed = true;
@@ -71,13 +71,13 @@ bool testRandom(const Ring& R,
VectorWrapper::ensureDim (d, stream1.n ());
- int n = d. size();
+ int n = int(d. size());
while (stream1) {
- commentator.startIteration (stream1.j ());
+ commentator().startIteration ((unsigned)stream1.j ());
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
iter_passed = true;
@@ -87,7 +87,7 @@ bool testRandom(const Ring& R,
VD.write (report, d);
report << endl;
- DenseMatrix<Ring> D(R, n, n), L(R, n, n), U(R, n, n), A(R,n,n);
+ BlasMatrix<Ring> D(R, n, n), L(R, n, n), U(R, n, n), A(R,n,n);
int i, j;
@@ -108,7 +108,7 @@ bool testRandom(const Ring& R,
std::vector<typename Ring::Element> tmp1(n), tmp2(n), e(n);
- typename DenseMatrix<Ring>::ColIterator col_p;
+ typename BlasMatrix<Ring>::ColIterator col_p;
i = 0;
for (col_p = A.colBegin();
@@ -157,20 +157,20 @@ bool testRandom(const Ring& R,
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed last invariant factor is incorrect" << endl;
- commentator.stop ("done");
+ commentator().stop ("done");
- commentator.progress ();
+ commentator().progress ();
}
//stream1.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandom");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandom");
return ret;
@@ -199,9 +199,9 @@ int main(int argc, char** argv)
Ring R;
- commentator.start("Last invariant factor test suite", "LIF");
+ commentator().start("Last invariant factor test suite", "LIF");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
RandomDenseStream<Ring> s1 (R, n, iterations);
@@ -216,6 +216,15 @@ int main(int argc, char** argv)
if (!testRandom(R, lif, s1)) pass = false;
- commentator.stop("Last invariant factor test suite");
+ commentator().stop("Last invariant factor test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-lidia-gfq.C b/tests/test-lidia-gfq.C
index edc9dae..ad5f5b2 100644
--- a/tests/test-lidia-gfq.C
+++ b/tests/test-lidia-gfq.C
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-lidia-gfq.C
* Copyright (C) 2002 Pascal Giorgi
*
* Written by Pascal Giorgi <pascal.giorgi at ens-lyon.fr>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -67,7 +68,7 @@ int main (int argc, char **argv)
LidiaGfq F (q, 1);
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
if (!runFieldTests (F, "LidiaGfq (prime)", iterations, n, false)) pass = false;
@@ -81,3 +82,12 @@ int main (int argc, char **argv)
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-matrix-domain.C b/tests/test-matrix-domain.C
index 390114a..085089d 100644
--- a/tests/test-matrix-domain.C
+++ b/tests/test-matrix-domain.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-matrix-domain.C
* Copyright (C) 2001, 2002 Bradford Hovinen
@@ -8,9 +6,27 @@
*
* ---------------------------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*
- * Test suite for MatrixDomain. This also effectively tests DenseMatrixBase,
+ * Test suite for MatrixDomain. This also effectively tests BlasMatrix,
* SparseMatrixBase, and TransposeMatrix
*/
@@ -39,13 +55,16 @@
#include "linbox/util/commentator.h"
#include "linbox/field/modular.h"
+#include "linbox/field/modular-balanced.h"
+#include "linbox/field/givaro.h"
#include "linbox/vector/vector-domain.h"
#include "linbox/matrix/matrix-domain.h"
#include "linbox/vector/stream.h"
-#include "linbox/matrix/dense.h"
+#include "linbox/matrix/blas-matrix.h"
#include "linbox/matrix/sparse.h"
#include "linbox/blackbox/matrix-blackbox.h"
-#include "linbox/matrix/dense-submatrix.h"
+
+#include "linbox/solutions/det.h"
#include "test-common.h"
@@ -64,9 +83,9 @@ template <class Field, class Matrix1, class Matrix2>
void eliminate (MatrixDomain<Field> &MD, Matrix1 &M, Matrix2 &pivotRow,
size_t row, size_t col, size_t rowdim, size_t coldim)
{
- DenseMatrixBase<typename Matrix1::Element> pivotCol (rowdim, 1);
- DenseSubmatrix<typename Matrix1::Element> realPivotCol (M, row, col, rowdim, 1);
- DenseSubmatrix<typename Matrix1::Element> block (M, row, col, rowdim, coldim);
+ BlasMatrix<typename Matrix1::Field> pivotCol (M.field(),rowdim, 1);
+ BlasMatrix<typename Matrix1::Field> realPivotCol (M, row, col, rowdim, 1);
+ BlasMatrix<typename Matrix1::Field> block (M, row, col, rowdim, coldim);
MD.neg (pivotCol, realPivotCol);
MD.axpyin (block, pivotCol, pivotRow);
@@ -84,12 +103,12 @@ Matrix1 &inv (MatrixDomain<Field> &MD, Matrix1 &res, const Matrix2 &A)
linbox_check (res.coldim () == A.coldim ());
linbox_check (res.rowdim () == A.rowdim ());
- DenseMatrixBase<typename Matrix1::Element> M (res.rowdim (), res.coldim () * 2);
- DenseSubmatrix<typename Matrix1::Element> M1 (M, 0, 0, res.rowdim (), res.coldim ());
- DenseSubmatrix<typename Matrix1::Element> M2 (M, 0, res.coldim (), res.rowdim (), res.coldim ());
+ BlasMatrix<typename Matrix1::Field> M (MD.field(), res.rowdim (), res.coldim () * 2);
+ BlasMatrix<typename Matrix1::Field> M1 (M, 0, 0, res.rowdim (), res.coldim ());
+ BlasMatrix<typename Matrix1::Field> M2 (M, 0, res.coldim (), res.rowdim (), res.coldim ());
- StandardBasisStream<Field, typename DenseSubmatrix<typename Matrix1::Element>::Row> stream (MD.field (), res.coldim ());
- typename DenseSubmatrix<typename Matrix1::Element>::RowIterator ip = M2.rowBegin ();
+ StandardBasisStream<Field, typename BlasMatrix<typename Matrix1::Field>::Row> stream (MD.field (), res.coldim ());
+ typename BlasMatrix<typename Matrix1::Field>::RowIterator ip = M2.rowBegin ();
for (; ip != M2.rowEnd (); ++ip)
stream >> *ip;
@@ -101,8 +120,8 @@ Matrix1 &inv (MatrixDomain<Field> &MD, Matrix1 &res, const Matrix2 &A)
for (idx = 0; idx < M.rowdim (); ++idx) {
if (MD.field ().isZero (M.getEntry (idx, idx))) {
- typename DenseMatrixBase<typename Matrix1::Element>::ColIterator col;
- typename DenseMatrixBase<typename Matrix1::Element>::Col::iterator i;
+ typename BlasMatrix<typename Matrix1::Field>::ColIterator col;
+ typename BlasMatrix<typename Matrix1::Field>::Col::iterator i;
unsigned int c_idx = idx + 1;
col = M.colBegin () + idx;
@@ -113,7 +132,7 @@ Matrix1 &inv (MatrixDomain<Field> &MD, Matrix1 &res, const Matrix2 &A)
if (i == col->end ())
throw SingularMatrix ();
else {
- typename DenseMatrixBase<typename Matrix1::Element>::RowIterator row1, row2;
+ typename BlasMatrix<typename Matrix1::Field>::RowIterator row1, row2;
row1 = M.rowBegin () + idx;
row2 = M.rowBegin () + c_idx;
@@ -123,7 +142,7 @@ Matrix1 &inv (MatrixDomain<Field> &MD, Matrix1 &res, const Matrix2 &A)
}
MD.field ().inv (Mjj_inv, M.getEntry (idx, idx));
- DenseSubmatrix<typename Matrix1::Element> realPivotRow (M, idx, idx, 1, M.coldim () - idx);
+ BlasMatrix<typename Matrix1::Field> realPivotRow (M, idx, idx, 1, M.coldim () - idx);
MD.mulin (realPivotRow, Mjj_inv);
if (idx > 0)
@@ -149,15 +168,15 @@ static bool testCopyEqual (Field &F, const char *text, const Matrix &M)
ostringstream str;
str << "Testing " << text << " matrix copy, areEqual" << ends;
- commentator.start (str.str ().c_str (), "testCopyEqual");
+ commentator().start (str.str ().c_str (), "testCopyEqual");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> M1 (M.rowdim (), M.coldim ());
+ BlasMatrix<Field> M1 (F,M.rowdim (), M.coldim ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M:" << endl;
MD.write (report, M);
@@ -167,12 +186,12 @@ static bool testCopyEqual (Field &F, const char *text, const Matrix &M)
MD.write (report, M1);
if (!MD.areEqual (M1, M)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrices M and M1 are not equal" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testCopyEqual");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testCopyEqual");
return ret;
}
@@ -188,15 +207,15 @@ static bool testSubinIsZero (Field &F, const char *text, const Matrix &M)
ostringstream str;
str << "Testing " << text << " matrix subin, isZero" << ends;
- commentator.start (str.str ().c_str (), "testSubinIsZero");
+ commentator().start (str.str ().c_str (), "testSubinIsZero");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> M1 (M.rowdim (), M.coldim ());
+ BlasMatrix<Field> M1 (F,M.rowdim (), M.coldim ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M:" << endl;
MD.write (report, M);
@@ -207,12 +226,12 @@ static bool testSubinIsZero (Field &F, const char *text, const Matrix &M)
MD.write (report, M1);
if (!MD.isZero (M1)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrix M1 is not zero" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testSubinIsZero");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testSubinIsZero");
return ret;
}
@@ -228,17 +247,17 @@ static bool testAddNegSub (Field &F, const char *text, const Matrix &M1, const M
ostringstream str;
str << "Testing " << text << " matrix add-neg, sub" << ends;
- commentator.start (str.str ().c_str (), "testAddNegSub");
+ commentator().start (str.str ().c_str (), "testAddNegSub");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> M3 (M1.rowdim (), M1.coldim ());
- DenseMatrixBase<typename Field::Element> M4 (M1.rowdim (), M1.coldim ());
- DenseMatrixBase<typename Field::Element> M5 (M1.rowdim (), M1.coldim ());
+ BlasMatrix<Field> M3 (F,M1.rowdim (), M1.coldim ());
+ BlasMatrix<Field> M4 (F,M1.rowdim (), M1.coldim ());
+ BlasMatrix<Field> M5 (F,M1.rowdim (), M1.coldim ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M1:" << endl;
MD.write (report, M1);
@@ -259,12 +278,12 @@ static bool testAddNegSub (Field &F, const char *text, const Matrix &M1, const M
MD.write (report, M5);
if (!MD.areEqual (M4, M5)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrices M4 and M5 are not equal" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testAddNegSub");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testAddNegSub");
return ret;
}
@@ -280,16 +299,16 @@ static bool testAddinNeginSub (Field &F, const char *text, const Matrix &M1, con
ostringstream str;
str << "Testing " << text << " matrix addin-negin, sub" << ends;
- commentator.start (str.str ().c_str (), "testAddinNeginSub");
+ commentator().start (str.str ().c_str (), "testAddinNeginSub");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> M3 (M1.rowdim (), M1.coldim ());
- DenseMatrixBase<typename Field::Element> M4 (M1.rowdim (), M1.coldim ());
+ BlasMatrix<Field> M3 (F,M1.rowdim (), M1.coldim ());
+ BlasMatrix<Field> M4 (F,M1.rowdim (), M1.coldim ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M1:" << endl;
MD.write (report, M1);
@@ -313,12 +332,12 @@ static bool testAddinNeginSub (Field &F, const char *text, const Matrix &M1, con
MD.write (report, M4);
if (!MD.areEqual (M3, M4)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrices M3 and M4 are not equal" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testAddinNeginSub");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testAddinNeginSub");
return ret;
}
@@ -338,24 +357,24 @@ static bool testInvMulSquare (Field &F, const char *text, const Matrix &M)
ostringstream str;
str << "Testing " << text << " matrix multiplication (square)" << ends;
- commentator.start (str.str ().c_str (), "testInvMulSquare");
+ commentator().start (str.str ().c_str (), "testInvMulSquare");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> Minv (M.rowdim (), M.rowdim ());
- DenseMatrixBase<typename Field::Element> M2 (M.rowdim (), M.rowdim ());
+ BlasMatrix<Field> Minv (F, M.rowdim (), M.rowdim ());
+ BlasMatrix<Field> M2 (F, M.rowdim (), M.rowdim ());
- StandardBasisStream<Field, typename DenseMatrixBase<typename Field::Element>::Row> stream (F, M.rowdim ());
+ StandardBasisStream<Field, typename BlasMatrix<Field>::Row> stream (F, M.rowdim ());
- DenseMatrixBase<typename Field::Element> I (M.rowdim (), M.rowdim ());
- typename DenseMatrixBase<typename Field::Element>::RowIterator i = I.rowBegin ();
+ BlasMatrix<Field> I (F, M.rowdim (), M.rowdim ());
+ typename BlasMatrix<Field>::RowIterator i = I.rowBegin ();
while (i != I.rowEnd ())
stream >> *i++;
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M:" << endl;
MD.write (report, M);
@@ -363,8 +382,8 @@ static bool testInvMulSquare (Field &F, const char *text, const Matrix &M)
inv (MD, Minv, M);
}
catch (SingularMatrix) {
- commentator.stop ("ok", (const char *) 0, "testInvMul");
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
+ commentator().stop ("ok", (const char *) 0, "testInvMul");
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
<< "WARNING: Matrix was found singular" << endl;
return true;
}
@@ -378,7 +397,7 @@ static bool testInvMulSquare (Field &F, const char *text, const Matrix &M)
MD.write (report, M2);
if (!MD.areEqual (M2, I)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrix M Minv is not the identity" << endl;
ret = false;
}
@@ -389,12 +408,12 @@ static bool testInvMulSquare (Field &F, const char *text, const Matrix &M)
MD.write (report, M2);
if (!MD.areEqual (M2, I)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrix Minv M is not the identity" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testInvMulSquare");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testInvMulSquare");
return ret;
}
@@ -409,28 +428,28 @@ static bool testInvMulOver (Field &F, const char *text, Matrix &M)
ostringstream str;
str << "Testing " << text << " matrix multiplication (over-determined)" << ends;
- commentator.start (str.str ().c_str (), "testInvMulOver");
+ commentator().start (str.str ().c_str (), "testInvMulOver");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> Minv (M.coldim (), M.coldim ());
- DenseMatrixBase<typename Field::Element> M2 (M.coldim (), M.coldim ());
- DenseMatrixBase<typename Field::Element> M3 (M.coldim (), M.coldim ());
+ BlasMatrix<Field> Minv (F, M.coldim (), M.coldim ());
+ BlasMatrix<Field> M2 (F, M.coldim (), M.coldim ());
+ BlasMatrix<Field> M3 (F, M.coldim (), M.coldim ());
- DenseMatrixBase<typename Field::Element> MTM (M.coldim (), M.coldim ());
+ BlasMatrix<Field> MTM (F, M.coldim (), M.coldim ());
- StandardBasisStream<Field, typename DenseMatrixBase<typename Field::Element>::Row>
+ StandardBasisStream<Field, typename BlasMatrix<Field>::Row>
stream (F, M.coldim ());
- DenseMatrixBase<typename Field::Element> I (M.coldim (), M.coldim ());
- typename DenseMatrixBase<typename Field::Element>::RowIterator i = I.rowBegin ();
+ BlasMatrix<Field> I (F, M.coldim (), M.coldim ());
+ typename BlasMatrix<Field>::RowIterator i = I.rowBegin ();
while (i != I.rowEnd ())
stream >> *i++;
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M:" << endl;
MD.write (report, M);
@@ -440,8 +459,8 @@ static bool testInvMulOver (Field &F, const char *text, Matrix &M)
inv (MD, Minv, MTM);
}
catch (SingularMatrix) {
- commentator.stop ("ok", (const char *) 0, "testInvMul");
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
+ commentator().stop ("ok", (const char *) 0, "testInvMul");
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
<< "WARNING: Matrix was found singular" << endl;
return true;
}
@@ -456,7 +475,7 @@ static bool testInvMulOver (Field &F, const char *text, Matrix &M)
MD.write (report, M3);
if (!MD.areEqual (M3, I)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrix M^T M Minv is not the identity" << endl;
ret = false;
}
@@ -470,12 +489,12 @@ static bool testInvMulOver (Field &F, const char *text, Matrix &M)
MD.write (report, M3);
if (!MD.areEqual (M3, I)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrix Minv M^T M is not the identity" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testInvMulOver");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testInvMulOver");
return ret;
}
@@ -490,27 +509,27 @@ static bool testInvMulUnder (Field &F, const char *text, Matrix &M)
ostringstream str;
str << "Testing " << text << " matrix multiplication (under-determined)" << ends;
- commentator.start (str.str ().c_str (), "testInvMulUnder");
+ commentator().start (str.str ().c_str (), "testInvMulUnder");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> Minv (M.rowdim (), M.rowdim ());
- DenseMatrixBase<typename Field::Element> M2 (M.rowdim (), M.rowdim ());
- DenseMatrixBase<typename Field::Element> M3 (M.rowdim (), M.rowdim ());
+ BlasMatrix<Field> Minv (F, M.rowdim (), M.rowdim ());
+ BlasMatrix<Field> M2 (F, M.rowdim (), M.rowdim ());
+ BlasMatrix<Field> M3 (F, M.rowdim (), M.rowdim ());
- DenseMatrixBase<typename Field::Element> MMT (M.rowdim (), M.rowdim ());
+ BlasMatrix<Field> MMT (F, M.rowdim (), M.rowdim ());
- StandardBasisStream<Field, typename DenseMatrixBase<typename Field::Element>::Row> stream (F, M.rowdim ());
+ StandardBasisStream<Field, typename BlasMatrix<Field>::Row> stream (F, M.rowdim ());
- DenseMatrixBase<typename Field::Element> I (M.rowdim (), M.rowdim ());
- typename DenseMatrixBase<typename Field::Element>::RowIterator i = I.rowBegin ();
+ BlasMatrix<Field> I (F, M.rowdim (), M.rowdim ());
+ typename BlasMatrix<Field>::RowIterator i = I.rowBegin ();
while (i != I.rowEnd ())
stream >> *i++;
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M:" << endl;
MD.write (report, M);
@@ -520,8 +539,8 @@ static bool testInvMulUnder (Field &F, const char *text, Matrix &M)
inv (MD, Minv, MMT);
}
catch (SingularMatrix) {
- commentator.stop ("ok", (const char *) 0, "testInvMul");
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
+ commentator().stop ("ok", (const char *) 0, "testInvMul");
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
<< "WARNING: Matrix was found singular" << endl;
return true;
}
@@ -536,7 +555,7 @@ static bool testInvMulUnder (Field &F, const char *text, Matrix &M)
MD.write (report, M3);
if (!MD.areEqual (M3, I)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrix M M^T Minv is not the identity" << endl;
ret = false;
}
@@ -550,12 +569,12 @@ static bool testInvMulUnder (Field &F, const char *text, Matrix &M)
MD.write (report, M3);
if (!MD.areEqual (M3, I)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrix Minv M M^T is not the identity" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testInvMulUnder");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testInvMulUnder");
return ret;
}
@@ -575,22 +594,22 @@ static bool testInvLeftMulinSquare (Field &F, const char *text, const Matrix &M)
ostringstream str;
str << "Testing " << text << " left in-place matrix multiplication (square)" << ends;
- commentator.start (str.str ().c_str (), "testInvLeftMulinSquare");
+ commentator().start (str.str ().c_str (), "testInvLeftMulinSquare");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> Minv (M.rowdim (), M.rowdim ());
+ BlasMatrix<Field> Minv (F, M.rowdim (), M.rowdim ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M:" << endl;
MD.write (report, M);
- StandardBasisStream<Field, typename DenseMatrixBase<typename Field::Element>::Row> stream (F, M.rowdim ());
+ StandardBasisStream<Field, typename BlasMatrix<Field>::Row> stream (F, M.rowdim ());
- DenseMatrixBase<typename Field::Element> I (M.rowdim (), M.rowdim ());
- typename DenseMatrixBase<typename Field::Element>::RowIterator i = I.rowBegin ();
+ BlasMatrix<Field> I (F, M.rowdim (), M.rowdim ());
+ typename BlasMatrix<Field>::RowIterator i = I.rowBegin ();
while (i != I.rowEnd ())
stream >> *i++;
@@ -599,10 +618,11 @@ static bool testInvLeftMulinSquare (Field &F, const char *text, const Matrix &M)
inv (MD, Minv, M);
}
catch (SingularMatrix) {
- commentator.stop ("ok", (const char *) 0, "testInvLeftMulin");
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
+ commentator().stop ("ok", (const char *) 0, "testInvLeftMulin");
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
<< "WARNING: Matrix was found singular" << endl;
- return false;
+ //! @bug we should check it is singular indeed
+ return true;
}
report << "Computed inverse Minv:" << endl;
@@ -614,12 +634,12 @@ static bool testInvLeftMulinSquare (Field &F, const char *text, const Matrix &M)
MD.write (report, Minv);
if (!MD.areEqual (Minv, I)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrix Minv M is not the identity" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testInvLeftMulinSquare");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testInvLeftMulinSquare");
return ret;
}
@@ -634,23 +654,23 @@ static bool testInvLeftMulinOver (Field &F, const char *text, Matrix &M)
ostringstream str;
str << "Testing " << text << " left in-place matrix multiplication (over-determined)" << ends;
- commentator.start (str.str ().c_str (), "testInvLeftMulinOver");
+ commentator().start (str.str ().c_str (), "testInvLeftMulinOver");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> Minv (M.coldim (), M.coldim ());
- DenseMatrixBase<typename Field::Element> MTM (M.coldim (), M.coldim ());
+ BlasMatrix<Field> Minv (F, M.coldim (), M.coldim ());
+ BlasMatrix<Field> MTM (F, M.coldim (), M.coldim ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M:" << endl;
MD.write (report, M);
- StandardBasisStream<Field, typename DenseMatrixBase<typename Field::Element>::Row> stream (F, M.coldim ());
+ StandardBasisStream<Field, typename BlasMatrix<Field>::Row> stream (F, M.coldim ());
- DenseMatrixBase<typename Field::Element> I (M.coldim (), M.coldim ());
- typename DenseMatrixBase<typename Field::Element>::RowIterator i = I.rowBegin ();
+ BlasMatrix<Field> I (F, M.coldim (), M.coldim ());
+ typename BlasMatrix<Field>::RowIterator i = I.rowBegin ();
while (i != I.rowEnd ())
stream >> *i++;
@@ -661,10 +681,11 @@ static bool testInvLeftMulinOver (Field &F, const char *text, Matrix &M)
inv (MD, Minv, MTM);
}
catch (SingularMatrix) {
- commentator.stop ("ok", (const char *) 0, "testInvLeftMulin");
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
+ commentator().stop ("ok", (const char *) 0, "testInvLeftMulin");
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
<< "WARNING: Matrix was found singular" << endl;
- return false;
+ //! @bug we should check it is singular indeed
+ return true;
}
report << "Computed inverse Minv:" << endl;
@@ -676,12 +697,12 @@ static bool testInvLeftMulinOver (Field &F, const char *text, Matrix &M)
MD.write (report, MTM);
if (!MD.areEqual (MTM, I)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrix Minv M^T M is not the identity" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testInvLeftMulinOver");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testInvLeftMulinOver");
return ret;
}
@@ -696,23 +717,23 @@ static bool testInvLeftMulinUnder (Field &F, const char *text, Matrix &M)
ostringstream str;
str << "Testing " << text << " left in-place matrix multiplication (under-determined)" << ends;
- commentator.start (str.str ().c_str (), "testInvLeftMulinUnder");
+ commentator().start (str.str ().c_str (), "testInvLeftMulinUnder");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> Minv (M.rowdim (), M.rowdim ());
- DenseMatrixBase<typename Field::Element> MMT (M.rowdim (), M.rowdim ());
+ BlasMatrix<Field> Minv (F, M.rowdim (), M.rowdim ());
+ BlasMatrix<Field> MMT (F, M.rowdim (), M.rowdim ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M:" << endl;
MD.write (report, M);
- StandardBasisStream<Field, typename DenseMatrixBase<typename Field::Element>::Row> stream (F, M.rowdim ());
+ StandardBasisStream<Field, typename BlasMatrix<Field>::Row> stream (F, M.rowdim ());
- DenseMatrixBase<typename Field::Element> I (M.rowdim (), M.rowdim ());
- typename DenseMatrixBase<typename Field::Element>::RowIterator i = I.rowBegin ();
+ BlasMatrix<Field> I (F, M.rowdim (), M.rowdim ());
+ typename BlasMatrix<Field>::RowIterator i = I.rowBegin ();
while (i != I.rowEnd ())
stream >> *i++;
@@ -723,10 +744,16 @@ static bool testInvLeftMulinUnder (Field &F, const char *text, Matrix &M)
inv (MD, Minv, MMT);
}
catch (SingularMatrix) {
- commentator.stop ("ok", (const char *) 0, "testInvLeftMulin");
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
+ commentator().stop ("ok", (const char *) 0, "testInvLeftMulin");
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
<< "WARNING: Matrix was found singular" << endl;
- return false;
+ // BlasMatrix<Field> N(F,MMT) ;
+ // typename Field::Element d;
+ // det(d,N);
+ // if (d != 0) {
+ //! @bug we should check it is singular indeed
+ return true ;
+ // }
}
report << "Computed inverse Minv:" << endl;
@@ -738,12 +765,11 @@ static bool testInvLeftMulinUnder (Field &F, const char *text, Matrix &M)
MD.write (report, MMT);
if (!MD.areEqual (MMT, I)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrix Minv M M^T is not the identity" << endl;
- ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testInvLeftMulinUnder");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testInvLeftMulinUnder");
return ret;
}
@@ -763,22 +789,22 @@ static bool testInvRightMulinSquare (Field &F, const char *text, const Matrix &M
ostringstream str;
str << "Testing " << text << " right in-place matrix multiplication (square)" << ends;
- commentator.start (str.str ().c_str (), "testInvRightMulinSquare");
+ commentator().start (str.str ().c_str (), "testInvRightMulinSquare");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> Minv (M.rowdim (), M.rowdim ());
+ BlasMatrix<Field> Minv (F, M.rowdim (), M.rowdim ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M:" << endl;
MD.write (report, M);
- StandardBasisStream<Field, typename DenseMatrixBase<typename Field::Element>::Row> stream (F, M.rowdim ());
+ StandardBasisStream<Field, typename BlasMatrix<Field>::Row> stream (F, M.rowdim ());
- DenseMatrixBase<typename Field::Element> I (M.rowdim (), M.rowdim ());
- typename DenseMatrixBase<typename Field::Element>::RowIterator i = I.rowBegin ();
+ BlasMatrix<Field> I (F, M.rowdim (), M.rowdim ());
+ typename BlasMatrix<Field>::RowIterator i = I.rowBegin ();
while (i != I.rowEnd ())
stream >> *i++;
@@ -787,8 +813,8 @@ static bool testInvRightMulinSquare (Field &F, const char *text, const Matrix &M
inv (MD, Minv, M);
}
catch (SingularMatrix) {
- commentator.stop ("ok", (const char *) 0, "testInvRightMulin");
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
+ commentator().stop ("ok", (const char *) 0, "testInvRightMulin");
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
<< "WARNING: Matrix was found singular" << endl;
return true;
}
@@ -802,12 +828,12 @@ static bool testInvRightMulinSquare (Field &F, const char *text, const Matrix &M
MD.write (report, Minv);
if (!MD.areEqual (Minv, I)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrix Minv M is not the identity" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testInvRightMulinSquare");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testInvRightMulinSquare");
return ret;
}
@@ -822,23 +848,23 @@ static bool testInvRightMulinOver (Field &F, const char *text, Matrix &M)
ostringstream str;
str << "Testing " << text << " right in-place matrix multiplication (over-determined)" << ends;
- commentator.start (str.str ().c_str (), "testInvRightMulinOver");
+ commentator().start (str.str ().c_str (), "testInvRightMulinOver");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> Minv (M.coldim (), M.coldim ());
- DenseMatrixBase<typename Field::Element> MTM (M.coldim (), M.coldim ());
+ BlasMatrix<Field> Minv (F, M.coldim (), M.coldim ());
+ BlasMatrix<Field> MTM (F, M.coldim (), M.coldim ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M:" << endl;
MD.write (report, M);
- StandardBasisStream<Field, typename DenseMatrixBase<typename Field::Element>::Row> stream (F, M.coldim ());
+ StandardBasisStream<Field, typename BlasMatrix<Field>::Row> stream (F, M.coldim ());
- DenseMatrixBase<typename Field::Element> I (M.coldim (), M.coldim ());
- typename DenseMatrixBase<typename Field::Element>::RowIterator i = I.rowBegin ();
+ BlasMatrix<Field> I (F, M.coldim (), M.coldim ());
+ typename BlasMatrix<Field>::RowIterator i = I.rowBegin ();
while (i != I.rowEnd ())
stream >> *i++;
@@ -849,8 +875,8 @@ static bool testInvRightMulinOver (Field &F, const char *text, Matrix &M)
inv (MD, Minv, MTM);
}
catch (SingularMatrix) {
- commentator.stop ("ok", (const char *) 0, "testInvRightMulin");
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
+ commentator().stop ("ok", (const char *) 0, "testInvRightMulin");
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
<< "WARNING: Matrix was found singular" << endl;
return true;
}
@@ -864,12 +890,12 @@ static bool testInvRightMulinOver (Field &F, const char *text, Matrix &M)
MD.write (report, MTM);
if (!MD.areEqual (MTM, I)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrix M^T M Minv is not the identity" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testInvRightMulinOver");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testInvRightMulinOver");
return ret;
}
@@ -884,23 +910,23 @@ static bool testInvRightMulinUnder (Field &F, const char *text, Matrix &M)
ostringstream str;
str << "Testing " << text << " right in-place matrix multiplication (under-determined)" << ends;
- commentator.start (str.str ().c_str (), "testInvRightMulinUnder");
+ commentator().start (str.str ().c_str (), "testInvRightMulinUnder");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> Minv (M.rowdim (), M.rowdim ());
- DenseMatrixBase<typename Field::Element> MMT (M.rowdim (), M.rowdim ());
+ BlasMatrix<Field> Minv (F, M.rowdim (), M.rowdim ());
+ BlasMatrix<Field> MMT (F, M.rowdim (), M.rowdim ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M:" << endl;
MD.write (report, M);
- StandardBasisStream<Field, typename DenseMatrixBase<typename Field::Element>::Row> stream (F, M.rowdim ());
+ StandardBasisStream<Field, typename BlasMatrix<Field>::Row> stream (F, M.rowdim ());
- DenseMatrixBase<typename Field::Element> I (M.rowdim (), M.rowdim ());
- typename DenseMatrixBase<typename Field::Element>::RowIterator i = I.rowBegin ();
+ BlasMatrix<Field> I (F, M.rowdim (), M.rowdim ());
+ typename BlasMatrix<Field>::RowIterator i = I.rowBegin ();
while (i != I.rowEnd ())
stream >> *i++;
@@ -911,8 +937,8 @@ static bool testInvRightMulinUnder (Field &F, const char *text, Matrix &M)
inv (MD, Minv, MMT);
}
catch (SingularMatrix) {
- commentator.stop ("ok", (const char *) 0, "testInvRightMulin");
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
+ commentator().stop ("ok", (const char *) 0, "testInvRightMulin");
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_WARNING)
<< "WARNING: Matrix was found singular" << endl;
return true;
}
@@ -926,12 +952,12 @@ static bool testInvRightMulinUnder (Field &F, const char *text, Matrix &M)
MD.write (report, MMT);
if (!MD.areEqual (MMT, I)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrix M M^T Minv is not the identity" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testInvRightMulinUnder");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testInvRightMulinUnder");
return ret;
}
@@ -947,17 +973,17 @@ static bool testAddMulAxpyin (Field &F, const char *text, Matrix &M1, Matrix &M2
ostringstream str;
str << "Testing " << text << " matrix add-mul, axpyin" << ends;
- commentator.start (str.str ().c_str (), "testAddMulAxpyin");
+ commentator().start (str.str ().c_str (), "testAddMulAxpyin");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> M4 (M2.rowdim (), M3.coldim ());
- DenseMatrixBase<typename Field::Element> M5 (M1.rowdim (), M1.coldim ());
- DenseMatrixBase<typename Field::Element> M6 (M1.rowdim (), M1.coldim ());
+ BlasMatrix<Field> M4 (F, M2.rowdim (), M3.coldim ());
+ BlasMatrix<Field> M5 (F, M1.rowdim (), M1.coldim ());
+ BlasMatrix<Field> M6 (F, M1.rowdim (), M1.coldim ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M1:" << endl;
MD.write (report, M1);
@@ -980,12 +1006,12 @@ static bool testAddMulAxpyin (Field &F, const char *text, Matrix &M1, Matrix &M2
MD.write (report, M6);
if (!MD.areEqual (M5, M6)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrices M5 and M6 are not equal" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testAddMulAxpyin");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testAddMulAxpyin");
return ret;
}
@@ -1001,21 +1027,21 @@ static bool testMVMulSub (Field &F, const char *text, const Matrix &M)
ostringstream str;
str << "Testing " << text << " matrix-vector mul" << ends;
- commentator.start (str.str ().c_str (), "testMVMulSub");
+ commentator().start (str.str ().c_str (), "testMVMulSub");
bool ret = true;
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> M1 (M.rowdim (), M.coldim ());
+ BlasMatrix<Field> M1 (F, M.rowdim (), M.coldim ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M:" << endl;
MD.write (report, M);
StandardBasisStream<Field, typename LinBox::Vector<Field>::Dense> stream (F, M.rowdim ());
typename LinBox::Vector<Field>::Dense v (M.coldim ());
- typename DenseMatrixBase<typename Field::Element>::ColIterator i = M1.colBegin ();
+ typename BlasMatrix<Field>::ColIterator i = M1.colBegin ();
for (; i != M1.colEnd (); ++i) {
stream >> v;
@@ -1028,12 +1054,12 @@ static bool testMVMulSub (Field &F, const char *text, const Matrix &M)
MD.subin (M1, M);
if (!MD.isZero (M1)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: MatrixDomain reported matrices M and M1 are not equal" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testMVMulSub");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testMVMulSub");
return ret;
}
@@ -1049,22 +1075,22 @@ static bool testMVAxpy (Field &F, const char *text, const Matrix &M)
ostringstream str;
str << "Testing " << text << " matrix-vector axpy" << ends;
- commentator.start (str.str ().c_str (), "testMVAxpy");
+ commentator().start (str.str ().c_str (), "testMVAxpy");
bool ret = true;
VectorDomain<Field> VD (F);
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> M1 (M.rowdim (), M.coldim ());
+ BlasMatrix<Field> M1 (F, M.rowdim (), M.coldim ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix M1:" << endl;
MD.write (report, M1);
StandardBasisStream<Field, typename LinBox::Vector<Field>::Dense> stream (F, M.rowdim ());
typename LinBox::Vector<Field>::Dense v (M.coldim ()), w (M.rowdim ());
- typename DenseMatrixBase<typename Field::Element>::RowIterator i = M1.rowBegin ();
+ typename BlasMatrix<Field>::RowIterator i = M1.rowBegin ();
VD.subin (w, w);
@@ -1086,12 +1112,12 @@ static bool testMVAxpy (Field &F, const char *text, const Matrix &M)
VD.write (report, w1);
if (!VD.areEqual (w, w1)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: VectorDomain reported vectors w and w1 are not equal" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testMVAxpy");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testMVAxpy");
return ret;
}
@@ -1108,25 +1134,25 @@ static bool testLeftBlackboxMul (Field &F, const char *text, const Blackbox &A,
ostringstream str;
str << "Testing " << text << " matrix-black box left mul" << ends;
- commentator.start (str.str ().c_str (), "testLeftBlackboxMul");
+ commentator().start (str.str ().c_str (), "testLeftBlackboxMul");
bool ret = true;
VectorDomain<Field> VD (F);
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> I (A.coldim (), A.coldim ());
- DenseMatrixBase<typename Field::Element> AI (A.rowdim (), A.coldim ());
+ BlasMatrix<Field> I (F, A.coldim (), A.coldim ());
+ BlasMatrix<Field> AI (F, A.rowdim (), A.coldim ());
- StandardBasisStream<Field, typename DenseMatrixBase<typename Field::Element>::Row> Istream (F, A.coldim ());
- typename DenseMatrixBase<typename Field::Element>::RowIterator i;
+ StandardBasisStream<Field, typename BlasMatrix<Field>::Row> Istream (F, A.coldim ());
+ typename BlasMatrix<Field>::RowIterator i;
for (i = I.rowBegin (); i != I.rowEnd (); ++i)
Istream >> *i;
MD.blackboxMulLeft (AI, A, I);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Output matrix AI:" << endl;
MD.write (report, AI);
@@ -1139,13 +1165,13 @@ static bool testLeftBlackboxMul (Field &F, const char *text, const Blackbox &A,
MD.vectorMul (w2, AI, v);
if (!VD.areEqual (w1, w2)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Av != AIv" << endl;
ret = false;
}
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testLeftBlackboxMul");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testLeftBlackboxMul");
return ret;
}
@@ -1162,25 +1188,25 @@ static bool testRightBlackboxMul (Field &F, const char *text, const Blackbox &A,
ostringstream str;
str << "Testing " << text << " matrix-black box right mul" << ends;
- commentator.start (str.str ().c_str (), "testRightBlackboxMul");
+ commentator().start (str.str ().c_str (), "testRightBlackboxMul");
bool ret = true;
VectorDomain<Field> VD (F);
MatrixDomain<Field> MD (F);
- DenseMatrixBase<typename Field::Element> I (A.rowdim (), A.rowdim ());
- DenseMatrixBase<typename Field::Element> IA (A.rowdim (), A.coldim ());
+ BlasMatrix<Field> I (F, A.rowdim (), A.rowdim ());
+ BlasMatrix<Field> IA (F, A.rowdim (), A.coldim ());
- StandardBasisStream<Field, typename DenseMatrixBase<typename Field::Element>::Row> Istream (F, A.rowdim ());
- typename DenseMatrixBase<typename Field::Element>::RowIterator i;
+ StandardBasisStream<Field, typename BlasMatrix<Field>::Row> Istream (F, A.rowdim ());
+ typename BlasMatrix<Field>::RowIterator i;
for (i = I.rowBegin (); i != I.rowEnd (); ++i)
Istream >> *i;
MD.blackboxMulRight (IA, I, A);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Output matrix IA:" << endl;
MD.write (report, IA);
@@ -1193,13 +1219,13 @@ static bool testRightBlackboxMul (Field &F, const char *text, const Blackbox &A,
MD.vectorMul (w2, IA, v);
if (!VD.areEqual (w1, w2)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Av != IAv" << endl;
ret = false;
}
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRightBlackboxMul");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRightBlackboxMul");
return ret;
}
@@ -1222,12 +1248,12 @@ bool testPermutation (const Field &F, const char *text, const Matrix &M)
ostringstream str;
str << "Testing " << text << " permutations" << ends;
- commentator.start (str.str ().c_str (), "testPermutation");
+ commentator().start (str.str ().c_str (), "testPermutation");
bool ret = true;
MatrixDomain<Field> MD (F);
- MersenneTwister MT (time (NULL));
+ MersenneTwister MT ((unsigned)time (NULL));
typename MatrixDomain<Field>::Permutation P, Pinv;
@@ -1236,8 +1262,8 @@ bool testPermutation (const Field &F, const char *text, const Matrix &M)
unsigned int row1, row2;
do {
- row1 = MT.randomInt () % M.rowdim ();
- row2 = MT.randomInt () % M.rowdim ();
+ row1 = (unsigned)(MT.randomInt () % M.rowdim ());
+ row2 = (unsigned)(MT.randomInt () % M.rowdim ());
} while (row1 == row2);
P.push_back (typename MatrixDomain<Field>::Transposition (row1, row2));
@@ -1248,7 +1274,7 @@ bool testPermutation (const Field &F, const char *text, const Matrix &M)
std::copy (P.begin (), P.end (), Pinv.begin ());
std::reverse (Pinv.begin (), Pinv.end ());
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Permutation P: ";
reportPermutation (report, P) << endl;
report << "Permutation P^-1: ";
@@ -1265,7 +1291,7 @@ bool testPermutation (const Field &F, const char *text, const Matrix &M)
// Compare M and M1
if (!MD.areEqual (M, M1)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: M != P^-1 PM" << endl;
ret = false;
}
@@ -1279,8 +1305,8 @@ bool testPermutation (const Field &F, const char *text, const Matrix &M)
unsigned int col1, col2;
do {
- col1 = MT.randomInt () % M.coldim ();
- col2 = MT.randomInt () % M.coldim ();
+ col1 = (unsigned)(MT.randomInt () % M.coldim ());
+ col2 = (unsigned)(MT.randomInt () % M.coldim ());
} while (col1 == col2);
P.push_back (typename MatrixDomain<Field>::Transposition (col1, col2));
@@ -1305,12 +1331,12 @@ bool testPermutation (const Field &F, const char *text, const Matrix &M)
// Compare M and M1
if (!MD.areEqual (M, M1)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: M != MPP^-1" << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testPermutation");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testPermutation");
return ret;
}
@@ -1324,41 +1350,41 @@ bool testMatrixDomain (const Field &F, const char *text,
{
ostringstream str;
str << "Testing MatrixDomain with " << text << " matrices" << ends;
- commentator.start (str.str ().c_str ());
+ commentator().start (str.str ().c_str ());
bool pass = true;
RandomDenseStream<Field, typename LinBox::Vector<Field>::Dense> stream (F, A.coldim (), iterations);
- if (!testCopyEqual (F, text, M1)) pass = false;
- if (!testSubinIsZero (F, text, M1)) pass = false;
- if (!testAddNegSub (F, text, M1, M2)) pass = false;
- if (!testAddinNeginSub (F, text, M1, M2)) pass = false;
+ if (!testCopyEqual (F, text, M1)) pass = false;
+ if (!testSubinIsZero (F, text, M1)) pass = false;
+ if (!testAddNegSub (F, text, M1, M2)) pass = false;
+ if (!testAddinNeginSub (F, text, M1, M2)) pass = false;
if (M1.rowdim () == M1.coldim ()) {
- if (!testInvMulSquare (F, text, M1)) pass = false;
- if (!testInvLeftMulinSquare (F, text, M1)) pass = false;
- if (!testInvRightMulinSquare (F, text, M1)) pass = false;
+ if (!testInvMulSquare (F, text, M1)) pass = false;
+ if (!testInvLeftMulinSquare (F, text, M1)) pass = false;
+ if (!testInvRightMulinSquare (F, text, M1)) pass = false;
}
else if (M1.coldim () < M1.rowdim ()) {
- if (!testInvMulOver (F, text, M1)) pass = false;
- if (!testInvLeftMulinOver (F, text, M1)) pass = false;
- if (!testInvRightMulinOver (F, text, M1)) pass = false;
+ if (!testInvMulOver (F, text, M1)) pass = false;
+ if (!testInvLeftMulinOver (F, text, M1)) pass = false;
+ if (!testInvRightMulinOver (F, text, M1)) pass = false;
}
else if (M1.rowdim () < M1.coldim ()) {
- if (!testInvMulUnder (F, text, M1)) pass = false;
- if (!testInvLeftMulinUnder (F, text, M1)) pass = false;
- if (!testInvRightMulinUnder (F, text, M1)) pass = false;
+ if (!testInvMulUnder (F, text, M1)) pass = false;
+ if (!testInvLeftMulinUnder (F, text, M1)) pass = false;
+ if (!testInvRightMulinUnder (F, text, M1)) pass = false;
}
- if (!testAddMulAxpyin (F, text, M1, M2, M3)) pass = false;
- if (!testMVMulSub (F, text, M1)) pass = false;
- if (!testMVAxpy (F, text, M1)) pass = false;
- if (!testLeftBlackboxMul (F, text, A, stream)) pass = false;
+ if (!testAddMulAxpyin (F, text, M1, M2, M3)) pass = false;
+ if (!testMVMulSub (F, text, M1)) pass = false;
+ if (!testMVAxpy (F, text, M1)) pass = false;
+ if (!testLeftBlackboxMul (F, text, A, stream)) pass = false;
if (!testRightBlackboxMul (F, text, A, stream)) pass = false;
- if (!testPermutation (F, text, M1)) pass = false;
+ if (!testPermutation (F, text, M1)) pass = false;
- commentator.stop (MSG_STATUS (pass));
+ commentator().stop (MSG_STATUS (pass));
return pass;
}
@@ -1372,33 +1398,33 @@ bool testMatrixDomain (const Field &F, const char *text,
{
ostringstream str;
str << "Testing MatrixDomain with " << text << " matrices" << ends;
- commentator.start (str.str ().c_str ());
+ commentator().start (str.str ().c_str ());
bool pass = true;
RandomDenseStream<Field, typename LinBox::Vector<Field>::Dense> stream (F, A.coldim (), iterations);
- if (!testCopyEqual (F, text, M1)) pass = false;
- if (!testSubinIsZero (F, text, M1)) pass = false;
- if (!testAddNegSub (F, text, M1, M2)) pass = false;
- if (!testAddinNeginSub (F, text, M1, M2)) pass = false;
+ if (!testCopyEqual (F, text, M1)) pass = false;
+ if (!testSubinIsZero (F, text, M1)) pass = false;
+ if (!testAddNegSub (F, text, M1, M2)) pass = false;
+ if (!testAddinNeginSub (F, text, M1, M2)) pass = false;
if (M1.rowdim () == M1.coldim ()) {
- if (!testInvMulSquare (F, text, M1)) pass = false;
- if (!testInvLeftMulinSquare (F, text, M1)) pass = false;
+ if (!testInvMulSquare (F, text, M1)) pass = false;
+ if (!testInvLeftMulinSquare (F, text, M1)) pass = false;
}
else if (M1.rowdim () < M1.coldim ()) {
- if (!testInvMulUnder (F, text, M1)) pass = false;
- if (!testInvLeftMulinUnder (F, text, M1)) pass = false;
+ if (!testInvMulUnder (F, text, M1)) pass = false;
+ if (!testInvLeftMulinUnder (F, text, M1)) pass = false;
}
- if (!testAddMulAxpyin (F, text, M1, M2, M3)) pass = false;
- if (!testMVMulSub (F, text, M1)) pass = false;
- if (!testMVAxpy (F, text, M1)) pass = false;
+ if (!testAddMulAxpyin (F, text, M1, M2, M3)) pass = false;
+ if (!testMVMulSub (F, text, M1)) pass = false;
+ if (!testMVAxpy (F, text, M1)) pass = false;
if (!testLeftBlackboxMul (F, text, A, stream)) pass = false;
- if (!testPermutation (F, text, M1)) pass = false;
+ if (!testPermutation (F, text, M1)) pass = false;
- commentator.stop (MSG_STATUS (pass));
+ commentator().stop (MSG_STATUS (pass));
return pass;
}
@@ -1412,78 +1438,50 @@ bool testMatrixDomain (const Field &F, const char *text,
{
ostringstream str;
str << "Testing MatrixDomain with " << text << " matrices" << ends;
- commentator.start (str.str ().c_str ());
+ commentator().start (str.str ().c_str ());
bool pass = true;
RandomDenseStream<Field, typename LinBox::Vector<Field>::Dense> stream (F, A.coldim (), iterations);
- if (!testCopyEqual (F, text, M1)) pass = false;
- if (!testSubinIsZero (F, text, M1)) pass = false;
- if (!testAddNegSub (F, text, M1, M2)) pass = false;
- if (!testAddinNeginSub (F, text, M1, M2)) pass = false;
+ if (!testCopyEqual (F, text, M1)) pass = false;
+ if (!testSubinIsZero (F, text, M1)) pass = false;
+ if (!testAddNegSub (F, text, M1, M2)) pass = false;
+ if (!testAddinNeginSub (F, text, M1, M2)) pass = false;
if (M1.rowdim () == M1.coldim ()) {
- if (!testInvMulSquare (F, text, M1)) pass = false;
- if (!testInvRightMulinSquare (F, text, M1)) pass = false;
+ if (!testInvMulSquare (F, text, M1)) pass = false;
+ if (!testInvRightMulinSquare (F, text, M1)) pass = false;
}
else if (M1.coldim () < M1.rowdim ()) {
- if (!testInvMulOver (F, text, M1)) pass = false;
- if (!testInvRightMulinOver (F, text, M1)) pass = false;
+ if (!testInvMulOver (F, text, M1)) pass = false;
+ if (!testInvRightMulinOver (F, text, M1)) pass = false;
}
- if (!testAddMulAxpyin (F, text, M1, M2, M3)) pass = false;
- if (!testMVMulSub (F, text, M1)) pass = false;
- if (!testMVAxpy (F, text, M1)) pass = false;
+ if (!testAddMulAxpyin (F, text, M1, M2, M3)) pass = false;
+ if (!testMVMulSub (F, text, M1)) pass = false;
+ if (!testMVAxpy (F, text, M1)) pass = false;
if (!testRightBlackboxMul (F, text, A, stream)) pass = false;
- commentator.stop (MSG_STATUS (pass));
+ commentator().stop (MSG_STATUS (pass));
return pass;
}
-int main (int argc, char **argv)
+template <class Field>
+bool launchTestMatrixDomain(const Field &F, size_t m, size_t n, size_t k, int iterations)
{
- bool pass = true;
-
- static long n = 50;
- static long m = 50;
- static long k = 10;
- static integer q = 2147483647U;
- static int iterations = 1;
-
- static Argument args[] = {
- { 'n', "-n N", "Set row of test matrices to N.", TYPE_INT, &n },
- { 'm', "-m M", "Set column of test vectors to M.", TYPE_INT, &m },
- { 'k', "-k K", "K nonzero elements per row/column in sparse matrices.", TYPE_INT, &k },
- { 'q', "-q Q", "Operate over the \"field\" GF(Q) [1] for uint32_t modulus.", TYPE_INTEGER, &q },
- { 'i', "-i I", "Perform each test for I iterations.", TYPE_INT, &iterations },
- END_OF_ARGUMENTS
- };
- parseArguments (argc, argv, args);
+ bool pass = true ;
+ typedef typename Field::Element Element ;
+ BlasMatrix<Field> M1 (F, n, m);
+ BlasMatrix<Field> M2 (F, n, m);
+ BlasMatrix<Field> M3 (F, m, m);
+ MatrixBlackbox<Field, BlasMatrix<Field> > A1 (F, n, m);
- typedef Modular<uint32_t> Field;
- typedef Field::Element Element;
+ RandomDenseStream<Field, typename BlasMatrix<Field>::Row> stream1 (F, m);
- Field F (q);
-
- commentator.start("Matrix domain test suite", "MatrixDomain");
-
- commentator.setBriefReportParameters (Commentator::OUTPUT_CONSOLE, false, false, false);
- commentator.getMessageClass (BRIEF_REPORT).setMaxDepth (2);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (3);
-
- DenseMatrixBase<Element> M1 (n, m);
- DenseMatrixBase<Element> M2 (n, m);
- DenseMatrixBase<Element> M3 (m, m);
- MatrixBlackbox<Field, DenseMatrixBase<Field::Element> > A1 (F, n, m);
-
- RandomDenseStream<Field, DenseMatrixBase<Element>::Row> stream1 (F, m);
-
- DenseMatrixBase<Element>::RowIterator i;
+ typename BlasMatrix<Field>::RowIterator i;
for (i = M1.rowBegin (); i != M1.rowEnd (); ++i)
stream1 >> *i;
@@ -1498,17 +1496,17 @@ int main (int argc, char **argv)
stream1 >> *i;
if (!testMatrixDomain (F, "dense", M1, M2, M3, A1, iterations,
- MatrixTraits<DenseMatrixBase<Element> >::MatrixCategory ()))
+ typename MatrixTraits<BlasMatrix<Field> >::MatrixCategory ()))
pass = false;
SparseMatrixBase<Element> M4 (n, m);
SparseMatrixBase<Element> M5 (n, m);
SparseMatrixBase<Element> M6 (m, m);
- MatrixBlackbox<Field, SparseMatrixBase<Field::Element> > A2 (F, n, m);
+ MatrixBlackbox<Field, SparseMatrixBase<Element> > A2 (F, n, m);
- RandomSparseStream<Field, SparseMatrixBase<Element>::Row> stream2 (F, (double) k / (double) n, m);
+ RandomSparseStream<Field, typename SparseMatrixBase<Element>::Row> stream2 (F, (double) k / (double) n, m);
- SparseMatrixBase<Element>::RowIterator i2;
+ typename SparseMatrixBase<Element>::RowIterator i2;
for (i2 = M4.rowBegin (); i2 != M4.rowEnd (); ++i2)
stream2 >> *i2;
@@ -1523,7 +1521,7 @@ int main (int argc, char **argv)
stream2 >> *i2;
if (!testMatrixDomain (F, "sparse row-wise", M4, M5, M6, A2, iterations,
- MatrixTraits<SparseMatrixBase<Element> >::MatrixCategory ()))
+ typename MatrixTraits<SparseMatrixBase<Element> >::MatrixCategory ()))
pass = false;
TransposeMatrix<SparseMatrixBase<Element> > M7 (M4);
@@ -1531,9 +1529,60 @@ int main (int argc, char **argv)
TransposeMatrix<SparseMatrixBase<Element> > M9 (M6);
if (!testMatrixDomain (F, "sparse column-wise", M7, M8, M9, A2, iterations,
- MatrixTraits<TransposeMatrix<SparseMatrixBase<Element> > >::MatrixCategory ()))
+ typename MatrixTraits<TransposeMatrix<SparseMatrixBase<Element> > >::MatrixCategory ()))
pass = false;
- commentator.stop("Matrix domain test suite");
+ return pass ;
+}
+
+int main (int argc, char **argv)
+{
+ bool pass = true;
+
+ static size_t n = 50;
+ static size_t m = 50;
+ static size_t k = 10;
+ static integer q = 2147483647U;
+ static int iterations = 1;
+
+ static Argument args[] = {
+ { 'n', "-n N", "Set row of test matrices to N.", TYPE_INT, &n },
+ { 'm', "-m M", "Set column of test vectors to M.", TYPE_INT, &m },
+ { 'k', "-k K", "K nonzero elements per row/column in sparse matrices.", TYPE_INT, &k },
+ { 'q', "-q Q", "Operate over the \"field\" GF(Q) [1] for uint32_t modulus.", TYPE_INTEGER, &q },
+ { 'i', "-i I", "Perform each test for I iterations.", TYPE_INT, &iterations },
+ END_OF_ARGUMENTS
+ };
+
+ parseArguments (argc, argv, args);
+ if (k >= m) k = m/2+1 ;
+
+
+ Modular<uint32_t> F1 (q);
+ ModularBalanced<int32_t> F2 (q);
+ GivaroZpz<Givaro::Unsigned32> F3(q);
+
+ commentator().start("Matrix domain test suite", "MatrixDomain");
+
+ commentator().setBriefReportParameters (Commentator::OUTPUT_CONSOLE, false, false, false);
+ commentator().getMessageClass (BRIEF_REPORT).setMaxDepth (2);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (3);
+
+ pass &= launchTestMatrixDomain(F1,m,n,k,iterations);
+ pass &= launchTestMatrixDomain(F2,m,n,k,iterations);
+ pass &= launchTestMatrixDomain(F3,m,n,k,iterations);
+
+ commentator().stop (MSG_STATUS (pass), "Matrix domain test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-matrix-stream.C b/tests/test-matrix-stream.C
index a6e467e..8451a3b 100644
--- a/tests/test-matrix-stream.C
+++ b/tests/test-matrix-stream.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -36,16 +37,14 @@
#include <string>
#include <vector>
#include "test-common.h"
-#include <linbox/field/unparametric.h>
-#include <linbox/util/matrix-stream.h>
-#include <linbox/integer.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/blackbox/sparse.h>
-#include <linbox/blackbox/blas-blackbox.h>
+#include "linbox/field/unparametric.h"
+#include "linbox/util/matrix-stream.h"
+#include "linbox/integer.h"
+#include "linbox/blackbox/sparse.h"
using namespace LinBox;
-#warning "this test leaks memory at matrix-stream.h:134"
+// #warning "this test leaks memory at matrix-stream.h:134"
/** @file tests/test-matrix-stream.C
@todo I would like to see a matrix writer that
@@ -72,8 +71,9 @@ integer matrix[rowDim][colDim] = {
{0, 0, 0, 0, 0, 0, 0, 400, 0, 0, 0},
{1, 0, 0, -13, 0, 1, 0, 300, 0, 10, 1},
{0, 0, 6, 0, 0, 0, 0, 200, 0, 1, 0} };
+
typedef UnparametricField<integer> TestField;
-TestField f;
+TestField ff;
template <class BB>
bool testMatrix( std::ostream& out, const char* filename, const char* BBName ) ;
@@ -81,8 +81,8 @@ bool testMatrixStream(const string& matfile)
{
bool pass = true;
- commentator.start("Testing matrix-stream...", matfile.c_str());
- std::ostream& out = commentator.report();
+ commentator().start("Testing matrix-stream...", matfile.c_str());
+ std::ostream& out = commentator().report();
std::ifstream fin(matfile.c_str());
if( !fin ) {
@@ -90,7 +90,7 @@ bool testMatrixStream(const string& matfile)
pass = false;
}
out << "\tTesting " << matfile << std::endl;
- MatrixStream<TestField > ms(f,fin);
+ MatrixStream<TestField > ms(ff,fin);
int nzCount = nonZeros;
size_t i, j;
integer v;
@@ -112,7 +112,7 @@ bool testMatrixStream(const string& matfile)
pass = false;
}
while( pass && ms.nextTriple(i,j,v) ) {
- if(!f.isZero(v)) --nzCount;
+ if(!ff.isZero(v)) --nzCount;
if( i >= rowDim ) {
out << "Row index out of bounds in "
<< matfile
@@ -165,7 +165,7 @@ bool testMatrixStream(const string& matfile)
}
fin.seekg(0,std::ios::beg);
- MatrixStream<TestField> ms2(f,fin);
+ MatrixStream<TestField> ms2(ff,fin);
std::vector<TestField::Element> array;
if( !ms2.getArray(array) ) {
ms2.reportError("Problem with getArray",ms2.getLineNumber());
@@ -203,21 +203,21 @@ bool testMatrixStream(const string& matfile)
}
/* later
- if( !testMatrix< DenseMatrix<TestField> >
+ if( !testMatrix< BlasMatrix<TestField> >
( out, matfile[0], "Dense BlackBox Matrix" )
) pass = false;
if( !testMatrix< SparseMatrix<TestField> >
( out, matfile[0], "Sparse BlackBox Matrix" )
) pass = false;
- if( !testMatrix< BlasBlackbox<TestField> >
+ if( !testMatrix< BlasMatrix<TestField> >
( out, matfile[0], "BLAS BlackBox Matrix" )
) pass = false;
*/
if( !pass ) out << "FAIL: matrix-stream" << std::endl;
else out << "matrix-stream Passed" << std::endl;
- commentator.stop(ms.getFormat());
- //commentator.stop(MSG_STATUS(pass));
+ commentator().stop(ms.getFormat());
+ //commentator().stop(MSG_STATUS(pass));
return pass;
}
@@ -230,7 +230,7 @@ bool testMatrix( std::ostream& out, const char* filename, const char* BBName )
out << "Could not open " << filename << std::endl;
return false;
}
- MatrixStream<TestField > ms(f, fin);
+ MatrixStream<TestField > ms(ff, fin);
BB m( ms );
if( m.rowdim() != rowDim ) {
out << "Wrong rowDim in " << BBName << std::endl
@@ -279,9 +279,9 @@ int main(int argc, char* argv[])
for (size_t i = 0; i < 19; ++i) {matrix[2][2] *= 10; matrix[2][2] += 8; }
- commentator.start("Matrix stream test suite", "matrix stream");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().start("Matrix stream test suite", "matrix stream");
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
bool pass = true;
pass = pass && testMatrixStream("data/sms.matrix");
pass = pass && testMatrixStream("data/matrix-market-array.matrix");
@@ -290,6 +290,15 @@ int main(int argc, char* argv[])
pass = pass && testMatrixStream("data/generic-dense.matrix");
pass = pass && testMatrixStream("data/sparse-row.matrix");
pass = pass && testMatrixStream("data/matrix-market-coordinate.matrix");
- commentator.stop(MSG_STATUS(pass));
+ commentator().stop(MSG_STATUS(pass));
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-mg-block-lanczos.C b/tests/test-mg-block-lanczos.C
index 30ec5d2..baf0d46 100644
--- a/tests/test-mg-block-lanczos.C
+++ b/tests/test-mg-block-lanczos.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-mg-block-lanczos.C
* Copyright (C) 2004 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
@@ -46,12 +62,12 @@ static bool testRandomSolve (const Field &F,
VectorStream<Vector2> &y_stream,
size_t N)
{
- typedef MGBlockLanczosSolver<Field, DenseMatrixBase<typename Field::Element> > MGBLSolver;
+ typedef MGBlockLanczosSolver<Field, BlasMatrix<Field> > MGBLSolver;
- commentator.start ("Testing random solve (Block Lanczos)", "testRandomSolve", y_stream.size ());
+ commentator().start ("Testing random solve (Block Lanczos)", "testRandomSolve", y_stream.size ());
- std::ostream &report1 = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report1 = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
bool ret = true;
@@ -83,29 +99,29 @@ static bool testRandomSolve (const Field &F,
MGBLSolver mgblsolver (F, traits, ri);
while (y_stream) {
- commentator.startIteration (y_stream.pos ());
+ commentator().startIteration ((unsigned int) y_stream.pos ());
y_stream >> y;
A.apply (b, y);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Right-hand side b:";
- VD.write (report, b) << endl;
+ std::ostream &raport = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ raport << "Right-hand side b:";
+ VD.write (raport, b) << endl;
if (!mgblsolver.solve (A, x2, b)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Solve failed to solve system" << endl;
ret = false;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
A_stream.reset ();
y_stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomSolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomSolve");
return ret;
}
@@ -119,13 +135,13 @@ static bool testSampleNullspace (const Field &F,
size_t N,
unsigned int num_iter)
{
- typedef DenseMatrixBase<typename Field::Element> Matrix;
+ typedef BlasMatrix<Field> Matrix;
typedef MGBlockLanczosSolver<Field, Matrix> MGBLSolver;
- commentator.start ("Testing sampling from nullspace (Block Lanczos)", "testSampleNullspace", num_iter);
+ commentator().start ("Testing sampling from nullspace (Block Lanczos)", "testSampleNullspace", num_iter);
- std::ostream &report1 = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
- std::ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report1 = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
bool ret = true;
unsigned int number;
@@ -152,20 +168,20 @@ static bool testSampleNullspace (const Field &F,
MGBLSolver mgblsolver (F, traits, ri);
for (unsigned int i = 0; i < num_iter; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
number = mgblsolver.sampleNullspace (A, x);
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Number of nullspace vectors found: " << number << std::endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
A_stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testSampleNullspace");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testSampleNullspace");
return ret;
}
@@ -189,27 +205,36 @@ int main (int argc, char **argv)
END_OF_ARGUMENTS
};
- typedef Modular<uint8_t_t> Field;
+ typedef Modular<uint8_t> Field;
parseArguments (argc, argv, args);
Field F (q);
- commentator.start("Montgomery block Lanczos test suite");
+ commentator().start("Montgomery block Lanczos test suite");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (10);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.getMessageClass (PROGRESS_REPORT).setMaxDepth (0);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (10);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().getMessageClass (PROGRESS_REPORT).setMaxDepth (0);
RandomSparseStream<Field> A_stream (F, (double) k / (double) n, n, n);
RandomDenseStream<Field> y_stream (F, n, i);
if (!testRandomSolve (F, A_stream, y_stream, N)) pass=false;;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< " Skipping Sample Nullspace test (which has mem problems)" << std::endl;
//if (!testSampleNullspace (F, A_stream, N, i)) pass=false;;
- commentator.stop("Montgomery block Lanczos test suite");
+ commentator().stop("Montgomery block Lanczos test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-minpoly.C b/tests/test-minpoly.C
index 2d2e95e..4752ed8 100644
--- a/tests/test-minpoly.C
+++ b/tests/test-minpoly.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-minpoly.C
* Copyright (C) 2001, 2002 Bradford Hovinen
@@ -13,7 +11,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
@@ -33,7 +49,7 @@
#include <cstdio>
#include "linbox/field/modular.h"
-#include "linbox/field/givaro-gfq.h"
+#include "linbox/field/givaro.h"
#include "linbox/blackbox/sparse.h"
#include "linbox/util/commentator.h"
#include "linbox/solutions/minpoly.h"
@@ -48,13 +64,13 @@ using namespace LinBox;
template <class Field, class Meth>
static bool testZeroMinpoly (Field &F, size_t n, bool symmetrizing, const Meth& M)
{
- commentator.start ("Testing zero minpoly", "testZeroMinpoly");
+ commentator().start ("Testing zero minpoly", "testZeroMinpoly");
typedef vector <typename Field::Element> Polynomial;
Polynomial phi;
SparseMatrix<Field> A(F, n, n);
minpoly(phi, A, M);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
A.write(report, FORMAT_MAPLE);
report << "Minimal polynomial is: ";
@@ -65,13 +81,13 @@ static bool testZeroMinpoly (Field &F, size_t n, bool symmetrizing, const Meth&
ret = true;
else
{
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: A = 0, should get x, got ";
printPolynomial<Field, Polynomial> (F, report, phi);
report << endl;
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testZeroMinpoly");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testZeroMinpoly");
return ret;
}
template <class Field>
@@ -99,7 +115,7 @@ static bool testIdentityMinpoly (Field &F, size_t n, bool symmetrizing, const Me
typedef SparseMatrix<Field> Blackbox;
typedef typename Blackbox::Row Row;
- commentator.start ("Testing identity minpoly", "testIdentityMinpoly");
+ commentator().start ("Testing identity minpoly", "testIdentityMinpoly");
typename Field::Element c0, c1;
@@ -112,7 +128,7 @@ static bool testIdentityMinpoly (Field &F, size_t n, bool symmetrizing, const Me
//else minpoly (phi, A);
minpoly (phi, A, M );
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Minimal polynomial is: ";
printPolynomial<Field, Polynomial> (F, report, phi);
@@ -125,12 +141,12 @@ static bool testIdentityMinpoly (Field &F, size_t n, bool symmetrizing, const Me
ret = true;
else {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: A = I, should get x-1, got ";
printPolynomial<Field, Polynomial> (F, report, phi);
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testIdentityMinpoly");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testIdentityMinpoly");
return ret;
}
@@ -160,7 +176,7 @@ static bool testNilpotentMinpoly (Field &F, size_t n, const Meth& M)
typedef SparseMatrix <Field> Blackbox;
typedef typename Blackbox::Row Row;
- commentator.start ("Testing nilpotent minpoly", "testNilpotentMinpoly");
+ commentator().start ("Testing nilpotent minpoly", "testNilpotentMinpoly");
bool ret;
bool lowerTermsCorrect = true;
@@ -176,7 +192,7 @@ static bool testNilpotentMinpoly (Field &F, size_t n, const Meth& M)
minpoly (phi, A, M);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
A.write (report, FORMAT_MAPLE);
report << "Minimal polynomial is: ";
printPolynomial (F, report, phi);
@@ -189,12 +205,12 @@ static bool testNilpotentMinpoly (Field &F, size_t n, const Meth& M)
ret = true;
else {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: A^n = 0, should get x^" << n <<", got ";
printPolynomial (F, report, phi);
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testNilpotentMinpoly");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testNilpotentMinpoly");
return ret;
}
@@ -229,7 +245,7 @@ bool testRandomMinpoly (Field &F,
typedef SparseMatrix <Field> Blackbox;
typedef typename VectStream::Vector Vector;
- commentator.start ("Testing sparse random minpoly", "testRandomMinpoly", iterations);
+ commentator().start ("Testing sparse random minpoly", "testRandomMinpoly", iterations);
bool ret = true;
bool iter_passed;
@@ -242,14 +258,14 @@ bool testRandomMinpoly (Field &F,
VectorWrapper::ensureDim (w, v_stream.n ());
for (int i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
iter_passed = true;
A_stream.reset ();
Blackbox A (F, A_stream);
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Matrix:" << endl;
A.write (report, FORMAT_MAPLE);
@@ -260,7 +276,7 @@ bool testRandomMinpoly (Field &F,
report << "Minimal polynomial is: ";
printPolynomial (F, report, phi);
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "deg minpoly (A) = " << phi.size () - 1 << endl;
v_stream.reset ();
@@ -283,13 +299,13 @@ bool testRandomMinpoly (Field &F,
}
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: A = rand, purported-minpoly(A) is not zero." << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomMinpoly");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomMinpoly");
return ret;
}
@@ -315,19 +331,19 @@ bool testRandomMinpoly (Field &F,
template <class Field, class Meth>
static bool testGramMinpoly (Field &F, size_t m, bool symmetrizing, const Meth& M)
{
- commentator.start ("Testing gram minpoly", "testGramMinpoly");
+ commentator().start ("Testing gram minpoly", "testGramMinpoly");
typedef vector <typename Field::Element> Polynomial;
integer n;
F.characteristic(n); n += 1;
if (n > 30) n = 2;
Polynomial phi;
typename Field::Element one, zero, neg1; F.init(one, 1); F.init(zero, 0); F.init(neg1); F.neg(neg1, one);
- DenseMatrix<Field> A(F, n, n);
+ BlasMatrix<Field> A(F, n, n);
for (int i = 0; i < n; ++i) for (int j = 0; j < n; ++j) A.setEntry(i, j, one);
for (int i = 0; i < n; ++i) A.setEntry(i, i, zero);
minpoly(phi, A, M);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
A.write (report);
report << "Minimal polynomial is: ";
printPolynomial<Field, Polynomial> (F, report, phi);
@@ -338,7 +354,7 @@ static bool testGramMinpoly (Field &F, size_t m, bool symmetrizing, const Meth&
ret = true;
else
{
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: A = gram, should get x^2 - x, got ";
printPolynomial<Field, Polynomial> (F, report, phi);
ret = false;
@@ -348,12 +364,12 @@ static bool testGramMinpoly (Field &F, size_t m, bool symmetrizing, const Meth&
ret = true;
else
{
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: A = gram, should get x^2 + x, got ";
printPolynomial<Field, Polynomial> (F, report, phi);
ret = false;
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testGramMinpoly");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testGramMinpoly");
return ret;
}
@@ -366,9 +382,9 @@ static bool testGramMinpoly (Field &F, size_t n)
int main (int argc, char **argv)
{
- commentator.setMaxDetailLevel (-1);
+ commentator().setMaxDetailLevel (-1);
- commentator.setMaxDepth (-1);
+ commentator().setMaxDepth (-1);
bool pass = true;
static size_t n = 10;
@@ -389,9 +405,9 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
// /////////////// finite field part //////////////////
if (q > 5 && q % 2 != 0 && q % 3 != 0 && q % 5 != 0 )
@@ -400,9 +416,9 @@ int main (int argc, char **argv)
//typedef Modular<int> Field;
typedef Modular<double> Field;
Field F (q);
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- commentator.start("Blackbox prime field minpoly test suite", "Wminpoly");
+ commentator().start("Blackbox prime field minpoly test suite", "Wminpoly");
//no symmetrizing
if (!testZeroMinpoly (F, n)) pass = false;
@@ -419,7 +435,7 @@ int main (int argc, char **argv)
//if (!testGramMinpoly (F, n, true)) pass = false;
//need other tests...
- commentator.stop("Blackbox prime field minpoly test suite");
+ commentator().stop("Blackbox prime field minpoly test suite");
}
else{
@@ -430,10 +446,10 @@ int main (int argc, char **argv)
int e = 0; do {++e; q = q/p; } while (q > 1);
typedef GivaroGfq Field;
Field F (p, e);
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- commentator.start("Blackbox non-prime field minpoly test suite", "Wminpoly");
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ commentator().start("Blackbox non-prime field minpoly test suite", "Wminpoly");
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
F.write(report);
//no symmetrizing
@@ -451,7 +467,7 @@ int main (int argc, char **argv)
//if (!testGramMinpoly (F, n, true)) pass = false;
//need other tests...
- commentator.stop("Blackbox non-prime field minpoly test suite");
+ commentator().stop("Blackbox non-prime field minpoly test suite");
}
#if 0
@@ -459,33 +475,33 @@ int main (int argc, char **argv)
Modular<uint32_t> F (q);
- commentator.start("Hybrid prime field minpoly test suite", "Hminpoly");
+ commentator().start("Hybrid prime field minpoly test suite", "Hminpoly");
if (!testIdentityMinpoly (F, n, false, Method::Hybrid())) pass = false;
if (!testNilpotentMinpoly (F, n, Method::Hybrid())) pass = false;
- commentator.stop("Hybrid prime field minpoly test suite");
+ commentator().stop("Hybrid prime field minpoly test suite");
- commentator.start("Blackbox prime field minpoly test suite", "Bminpoly");
+ commentator().start("Blackbox prime field minpoly test suite", "Bminpoly");
if (!testIdentityMinpoly (F, n, false, Method::Blackbox())) pass = false;
if (!testNilpotentMinpoly (F, n, Method::Blackbox())) pass = false;
- commentator.stop("Blackbox prime field minpoly test suite");
+ commentator().stop("Blackbox prime field minpoly test suite");
- commentator.start("Elimination prime field minpoly test suite", "Eminpoly");
+ commentator().start("Elimination prime field minpoly test suite", "Eminpoly");
if (!testIdentityMinpoly (F, n, false, Method::Elimination())) pass = false;
if (!testNilpotentMinpoly (F, n, Method::Elimination())) pass = false;
- commentator.stop("Elimination prime field minpoly test suite");
+ commentator().stop("Elimination prime field minpoly test suite");
// /////////////// integer part //////////////////
typedef vector<PID_integer::Element> ZDenseVector;
typedef SparseMatrix<PID_integer>::Row ZSparseVector;
//typedef pair<vector<size_t>, vector<Field::Element> > SparseVector;
PID_integer Z;
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- commentator.start("Blackbox integer minpoly test suite", "WIminpoly");
+ commentator().start("Blackbox integer minpoly test suite", "WIminpoly");
RandomDenseStream<PID_integer, ZDenseVector, NonzeroRandIter<PID_integer> >
zv_stream (Z, NonzeroRandIter<PID_integer> (Z, PID_integer::RandIter (Z)), n, numVectors);
@@ -502,23 +518,32 @@ int main (int argc, char **argv)
// symmetrizing
if (!testIdentityMinpoly (Z, n, true)) pass = false;
- commentator.stop("Blackbox integer minpoly test suite");
+ commentator().stop("Blackbox integer minpoly test suite");
- commentator.start("Hybrid integer minpoly test suite", "HIminpoly");
+ commentator().start("Hybrid integer minpoly test suite", "HIminpoly");
if (!testIdentityMinpoly (Z, n, false, Method::Hybrid())) pass = false;
if (!testNilpotentMinpoly (Z, n, Method::Hybrid())) pass = false;
- commentator.stop("Hybrid integer minpoly test suite");
+ commentator().stop("Hybrid integer minpoly test suite");
- commentator.start("Blackbox integer minpoly test suite", "BIminpoly");
+ commentator().start("Blackbox integer minpoly test suite", "BIminpoly");
if (!testIdentityMinpoly (Z, n, false, Method::Blackbox())) pass = false;
if (!testNilpotentMinpoly (Z, n, Method::Blackbox())) pass = false;
- commentator.stop("Blackbox integer minpoly test suite");
+ commentator().stop("Blackbox integer minpoly test suite");
- commentator.start("Elimination integer minpoly test suite", "EIminpoly");
+ commentator().start("Elimination integer minpoly test suite", "EIminpoly");
if (!testIdentityMinpoly (Z, n, false, Method::Elimination())) pass = false;
if (!testNilpotentMinpoly (Z, n, Method::Elimination())) pass = false;
- commentator.stop("Elimination integer minpoly test suite");
+ commentator().stop("Elimination integer minpoly test suite");
#endif
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-modular-balanced-double.C b/tests/test-modular-balanced-double.C
index e253018..7bda7fe 100644
--- a/tests/test-modular-balanced-double.C
+++ b/tests/test-modular-balanced-double.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -37,7 +38,7 @@
#include <vector>
#include <queue>
-#include "linbox/field/modular-balanced-double.h"
+#include "linbox/field/modular-balanced.h"
#include "linbox/util/commentator.h"
#include "linbox/util/debug.h"
@@ -54,9 +55,9 @@ int main (int argc, char **argv)
{
static size_t n = 1000;
static int iterations = 1;
- static int trials = 100000;
- static int categories = 100;
- static int hist_level = 1;
+ static int trials = 10000;
+ static int categories = 1000;
+ static int hist_level = 10;
static Argument args[] = {
{ 'n', "-n N", "Set dimension of test vectors to NxN.", TYPE_INT, &n },
@@ -69,7 +70,7 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("ModularBalanced<double> field test suite", "ModularBalanced<double>");
+ commentator().start("ModularBalanced<double> field test suite", "ModularBalanced<double>");
bool pass = true;
ModularBalanced<double> F_int (67108859);
@@ -81,8 +82,8 @@ int main (int argc, char **argv)
ModularBalanced<double> I_int(k);
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (!runFieldTests (F_int, "ModularBalanced<double>", iterations, n, false)) pass = false;
// if (!testRandomIterator (F_int, "ModularBalanced<double>", trials, categories, hist_level)) pass = false;
@@ -97,6 +98,15 @@ int main (int argc, char **argv)
// if (!testRandomIterator (I_int, "ModularBalanced<double>", trials, categories, hist_level)) pass = false;
- commentator.stop("ModularBalanced<double> field test suite");
+ commentator().stop("ModularBalanced<double> field test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-modular-balanced-float.C b/tests/test-modular-balanced-float.C
index 2934251..2c426dd 100644
--- a/tests/test-modular-balanced-float.C
+++ b/tests/test-modular-balanced-float.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -37,7 +38,7 @@
#include <vector>
#include <queue>
-#include "linbox/field/modular-balanced-float.h"
+#include "linbox/field/modular-balanced.h"
#include "test-common.h"
#include "test-generic.h"
@@ -50,9 +51,9 @@ int main (int argc, char **argv)
{
static size_t n = 1000;
static int iterations = 1;
- static int trials = 100000;
- static int categories = 100;
- static int hist_level = 1;
+ static int trials = 10000;
+ static int categories = 1000;
+ static int hist_level = 10;
static Argument args[] = {
{ 'n', "-n N", "Set dimension of test vectors to NxN.", TYPE_INT, &n },
@@ -65,7 +66,7 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("ModularBalanced<float> field test suite", "ModularBalanced<float>");
+ commentator().start("ModularBalanced<float> field test suite", "ModularBalanced<float>");
bool pass = true;
ModularBalanced<float> F_int (4093);//(2147483629);//(2147483647);
@@ -76,8 +77,8 @@ int main (int argc, char **argv)
ModularBalanced<float> I_int(k);
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (!runFieldTests (F_int, "ModularBalanced<float>", iterations, n, false)) pass = false;
// if (!testRandomIterator (F_int, "ModularBalanced<float>", trials, categories, hist_level)) pass = false;
@@ -94,6 +95,15 @@ int main (int argc, char **argv)
- commentator.stop("ModularBalanced<float> field test suite");
+ commentator().stop("ModularBalanced<float> field test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-modular-balanced-int.C b/tests/test-modular-balanced-int.C
index 67600da..968e88a 100644
--- a/tests/test-modular-balanced-int.C
+++ b/tests/test-modular-balanced-int.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -37,7 +38,7 @@
#include <vector>
#include <queue>
-#include "linbox/field/modular-balanced-int32.h"
+#include "linbox/field/modular-balanced.h"
#include "test-common.h"
#include "test-generic.h"
@@ -54,9 +55,9 @@ int main (int argc, char **argv)
static int q4 = 101;
static size_t n = 1000;
static int iterations = 1;
- static int trials = 100000;
- static int categories = 100;
- static int hist_level = 1;
+ static int trials = 10000;
+ static int categories = 1000;
+ static int hist_level = 10;
static Argument args[] = {
{ 'K', "-K Q", "Operate over the \"field\" GF(Q) [1] for integer modulus.", TYPE_INTEGER, &q1 },
@@ -73,7 +74,7 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("ModularBalanced<int32_t> field test suite", "ModularBalanced<int32_t>");
+ commentator().start("ModularBalanced<int32_t> field test suite", "ModularBalanced<int32_t>");
bool pass = true;
ModularBalanced<int32_t> F_int (1073741789);//(2147483629);//(2147483647);
@@ -84,8 +85,8 @@ int main (int argc, char **argv)
ModularBalanced<int32_t> I_int(k);
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (!runFieldTests (F_int, "ModularBalanced<int32_t>", iterations, n, false)) pass = false;
if (!testRandomIterator (F_int, "ModularBalanced<int32_t>", trials, categories, hist_level)) pass = false;
@@ -101,6 +102,15 @@ int main (int argc, char **argv)
// if (!testRandomIterator (I_int, "ModularBalanced<int32_t>", trials, categories, hist_level)) pass = false;
- commentator.stop("ModularBalanced<int32_t> field test suite");
+ commentator().stop("ModularBalanced<int32_t> field test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-modular-byte.C b/tests/test-modular-byte.C
index b1b6a56..61ef15f 100644
--- a/tests/test-modular-byte.C
+++ b/tests/test-modular-byte.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-modular.C
* Copyright (C) 2001, 2002 Bradford Hovinen,
@@ -15,7 +13,25 @@
* accordance with changes to Modular interace.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
@@ -35,7 +51,7 @@
#include <vector>
#include <queue>
-#include "linbox/field/modular-byte.h"
+#include "linbox/field/modular.h"
#include "test-common.h"
#include "test-generic.h"
@@ -47,9 +63,9 @@ int main (int argc, char **argv)
static integer q = 127;
static size_t n = 300;
static int iterations = 1;
- static int trials = 100000;
- static int categories = 100;
- static int hist_level = 1;
+ static int trials = 10000;
+ static int categories = 1000;
+ static int hist_level = 10;
static Argument args[] = {
{ 'p', "-p Q", "Operate over the \"field\" GF(Q) [1] for integer modulus.", TYPE_INTEGER, &q },
@@ -63,7 +79,7 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("Modular<int8_t> field test suite", "Modular<int8_t>");
+ commentator().start("Modular<int8_t> field test suite", "Modular<int8_t>");
bool pass = true;
Modular<int8_t> F(q);
@@ -74,8 +90,8 @@ int main (int argc, char **argv)
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (!runFieldTests (F, "Modular<byte>", iterations, n, false)) pass = false;
if (!testRandomIterator (F, "Modular<byte>", trials, categories, hist_level)) pass = false;
@@ -84,6 +100,15 @@ int main (int argc, char **argv)
if (!testRandomIterator (I_int, "Modular<int8_t>", trials, categories, hist_level)) pass = false;
- commentator.stop("Modular<int8_t> field test suite");
+ commentator().stop("Modular<int8_t> field test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-modular-double.C b/tests/test-modular-double.C
index e98f61e..1a501b6 100644
--- a/tests/test-modular-double.C
+++ b/tests/test-modular-double.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-modular-double.C
* Brazenly stolen by bds from
@@ -19,7 +17,25 @@
* accordance with changes to Modular interace.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file tests/test-modular-double.C
@@ -37,7 +53,7 @@
#include <vector>
#include <queue>
-#include "linbox/field/modular-double.h"
+#include "linbox/field/modular.h"
#include "test-common.h"
#include "test-generic.h"
@@ -57,7 +73,7 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("Modular<double> field test suite", "Modular<double>");
+ commentator().start("Modular<double> field test suite", "Modular<double>");
bool pass = true;
//Modular<double> F2 (2);
@@ -74,9 +90,9 @@ int main (int argc, char **argv)
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- std::ostream& report = commentator.report();
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ std::ostream& report = commentator().report();
report << "Field F2" << std::endl;
//if (!runFieldTests (F2, "Modular<double>", iterations, n, false)) pass = false;
report << "Field F3" << std::endl;
@@ -93,9 +109,16 @@ int main (int argc, char **argv)
if (!runFieldTests (G, "Modular<double>", iterations, n, false)) pass = false;
if (!runFieldTests (I_int, "Modular<double>", iterations, n, false)) pass = false;
- // if (!testRandomIterator (I_int, "Modular<double>", trials, categories, hist_level)) pass = false;
-
- commentator.stop("Modular<double> field test suite");
+ commentator().stop("Modular<double> field test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-modular-float.C b/tests/test-modular-float.C
index ff4c97f..aa4a79f 100644
--- a/tests/test-modular-float.C
+++ b/tests/test-modular-float.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-modular-float.C
* Brazenly stolen by bds from
@@ -19,7 +17,25 @@
* accordance with changes to Modular interace.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file tests/test-modular-float.C
@@ -36,7 +52,7 @@
#include <vector>
#include <queue>
-#include "linbox/field/modular-float.h"
+#include "linbox/field/modular.h"
#include "test-generic.h"
#include "test-common.h"
@@ -56,7 +72,7 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("Modular<float> field test suite", "Modular<float>");
+ commentator().start("Modular<float> field test suite", "Modular<float>");
bool pass = true;
//Modular<float> F2 (2);
@@ -73,9 +89,9 @@ int main (int argc, char **argv)
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- std::ostream& report = commentator.report();
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ std::ostream& report = commentator().report();
// report << "Field F2" << std::endl;
//if (!runFieldTests (F2, "Modular<float>", iterations, n, false)) pass = false;
report << "Field F3" << std::endl;
@@ -92,9 +108,16 @@ int main (int argc, char **argv)
// if (!runFieldTests (G, "Modular<float>", iterations, n, false)) pass = false;
if (!runFieldTests (I_int, "Modular<float>", iterations, n, false)) pass = false;
- // if (!testRandomIterator (I_int, "Modular<float>", trials, categories, hist_level)) pass = false;
-
- commentator.stop("Modular<float> field test suite");
+ commentator().stop("Modular<float> field test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-modular-int.C b/tests/test-modular-int.C
index a08421f..0224a98 100644
--- a/tests/test-modular-int.C
+++ b/tests/test-modular-int.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-modular.C
* Copyright (C) 2001, 2002 Bradford Hovinen,
@@ -15,7 +13,25 @@
* accordance with changes to Modular interace.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file tests/test-modular-int.C
@@ -33,7 +49,7 @@
#include <vector>
#include <queue>
-#include "linbox/field/modular-int32.h"
+#include "linbox/field/modular.h"
#include "test-common.h"
#include "test-generic.h"
@@ -48,9 +64,9 @@ int main (int argc, char **argv)
static int q4 = 101;
static size_t n = 10000;
static int iterations = 1;
- static int trials = 100000;
- static int categories = 100;
- static int hist_level = 1;
+ static int trials = 10000;
+ static int categories = 1000;
+ static int hist_level = 10;
static Argument args[] = {
{ 'K', "-K Q", "Operate over the \"field\" GF(Q) [1] for integer modulus.", TYPE_INTEGER, &q1 },
@@ -67,7 +83,7 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("Modular<int32_t> field test suite", "Modular<int32_t>");
+ commentator().start("Modular<int32_t> field test suite", "Modular<int32_t>");
bool pass = true;
Modular<int32_t> F_int (1073741789);//(2147483629);//(2147483647);
@@ -77,8 +93,8 @@ int main (int argc, char **argv)
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (!runFieldTests (F_int, "Modular<int32_t>", iterations, n, false)) pass = false;
if (!testRandomIterator (F_int, "Modular<int32_t>", trials, categories, hist_level)) pass = false;
@@ -87,6 +103,15 @@ int main (int argc, char **argv)
if (!testRandomIterator (I_int, "Modular<int32_t>", trials, categories, hist_level)) pass = false;
- commentator.stop("Modular<int32_t> field test suite");
+ commentator().stop("Modular<int32_t> field test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-modular-short.C b/tests/test-modular-short.C
index 242029c..ef36030 100644
--- a/tests/test-modular-short.C
+++ b/tests/test-modular-short.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-modular-short.C
* Copyright (C) 2001, 2002 Bradford Hovinen,
@@ -15,7 +13,25 @@
* accordance with changes to Modular interace.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file tests/test-modular-short.C
@@ -34,7 +50,7 @@
#include <vector>
#include <queue>
-#include "linbox/field/modular-short.h"
+#include "linbox/field/modular.h"
#include "test-common.h"
#include "test-field.h"
@@ -49,9 +65,9 @@ int main (int argc, char **argv)
static int q4 = 101;
static size_t n = 10000;
static int iterations = 1;
- static int trials = 100000;
- static int categories = 100;
- static int hist_level = 1;
+ static int trials = 10000;
+ static int categories = 1000;
+ static int hist_level = 10;
static Argument args[] = {
{ 'K', "-K Q", "Operate over the \"field\" GF(Q) [1] for integer modulus.", TYPE_INTEGER, &q1 },
@@ -68,7 +84,7 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("Modular<short> field test suite", "Modular<short>");
+ commentator().start("Modular<short> field test suite", "Modular<short>");
bool pass = true;
Modular<short> F_int (32749);
@@ -78,8 +94,8 @@ int main (int argc, char **argv)
Modular<short> G_int(k);
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (!runFieldTests (F_int, "Modular<short>", iterations, n, false)) pass = false;
if (!testRandomIterator (F_int, "Modular<short>", trials, categories, hist_level)) pass = false;
@@ -89,6 +105,15 @@ int main (int argc, char **argv)
- commentator.stop("Modular<short> field test suite");
+ commentator().stop("Modular<short> field test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-modular.C b/tests/test-modular.C
index 9791507..9b5240c 100644
--- a/tests/test-modular.C
+++ b/tests/test-modular.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-modular.C
* Copyright (C) 2001, 2002 Bradford Hovinen,
* Copyright (C) 2002 Dave Saunders
@@ -14,7 +12,25 @@
* accordance with changes to Modular interace.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
@@ -51,9 +67,9 @@ int main (int argc, char **argv)
static int q4 = 101;
static size_t n = 500;
static int iterations = 1;
- static int trials = 100000;
- static int categories = 100;
- static int hist_level = 1;
+ static int trials = 10000;
+ static int categories = 1000;
+ static int hist_level = 10;
static Argument args[] = {
{ 'K', "-K Q", "Operate over the \"field\" GF(Q) [1] for integer modulus.", TYPE_INTEGER, &q1 },
@@ -70,7 +86,7 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("Modular test suite", "Modular ");
+ commentator().start("Modular test suite", "Modular ");
bool pass = true;
Modular<integer> F_integer (q1);
@@ -81,8 +97,8 @@ int main (int argc, char **argv)
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (!runFieldTests (F_integer,"Modular<integer>", iterations, n, false)) pass = false;
if (!runFieldTests (F_uint32_t, "Modular<uint32_t>", iterations, n, false)) pass = false;
@@ -95,6 +111,15 @@ int main (int argc, char **argv)
if (!testRandomIterator (F_uint16_t, "Modular<uint16_t>", trials, categories, hist_level)) pass = false;
if (!testRandomIterator (F_uint8_t, "Modular<uint8_t>", trials, categories, hist_level)) pass = false;
- commentator.stop("Modular test suite");
+ commentator().stop(MSG_STATUS (pass), "Modular test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-moore-penrose.C b/tests/test-moore-penrose.C
index c8b5e54..794ee80 100644
--- a/tests/test-moore-penrose.C
+++ b/tests/test-moore-penrose.C
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-moore-penrose.C
* Copyright (C) 2001, 2002 Bradford Hovinen
*
* Written by Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file tests/test-moore-penrose.C
@@ -136,7 +137,7 @@ static bool testIdentityApply (Field &
typedef vector <pair <size_t, typename Field::Element> > Row;
typedef SparseMatrix <Field, Row> Blackbox;
- commentator.start ("Testing identity apply", "testIdentityApply", stream.m ());
+ commentator().start ("Testing identity apply", "testIdentityApply", stream.m ());
bool ret = true;
bool iter_passed;
@@ -160,13 +161,13 @@ static bool testIdentityApply (Field &
MoorePenrose<Blackbox> Adagger (&A, r);
while (stream) {
- commentator.startIteration (i);
+ commentator().startIteration ((unsigned)i);
iter_passed = true;
stream.next (v);
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector: ";
printVector<Field> (F, report, v);
@@ -185,14 +186,14 @@ static bool testIdentityApply (Field &
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Output vector is incorrect" << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testIdentityApply");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testIdentityApply");
return ret;
}
@@ -227,7 +228,7 @@ static bool testRandomApply1 (Field &F,
{
typedef SparseMatrix <Field, Row> Blackbox;
- commentator.start ("Testing random apply", "testRandomApply1", iterations);
+ commentator().start ("Testing random apply", "testRandomApply1", iterations);
bool ret = true;
bool iter_passed;
@@ -249,19 +250,19 @@ static bool testRandomApply1 (Field &F,
typename Field::Element x;
for (i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().startIteration ((unsigned)i);
iter_passed = true;
- commentator.start ("Building requisite random sparse matrix");
+ commentator().start ("Building requisite random sparse matrix");
Blackbox *A = buildRandomSparseMatrix<Vector> (F, n, m, r, K, dinv, M_stream1, M_stream2);
- commentator.stop ("done");
+ commentator().stop ("done");
- commentator.start ("Constructing Moore-Penrose inverse");
+ commentator().start ("Constructing Moore-Penrose inverse");
MoorePenrose<Blackbox> Adagger (A, r);
- commentator.stop ("done");
+ commentator().stop ("done");
{
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix" << endl;
A->write (report, FORMAT_PRETTY);
}
@@ -270,18 +271,18 @@ static bool testRandomApply1 (Field &F,
LinBox::rank (rank_A, Aprime, Method::Wiedemann());
if (rank_A == r) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION)
<< "Rank is correct. Good." << endl;
}
else
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "Rank is incorrect (" << rank_A << "). Not good." << endl;
while (stream) {
stream.next (lambda);
A->applyTranspose (x_correct, lambda);
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
A->apply (w, x_correct);
@@ -298,9 +299,9 @@ static bool testRandomApply1 (Field &F,
report << "Right hand side: ";
printVector<Field> (F, report, w);
- commentator.start ("Applying Moore-Penrose inverse");
+ commentator().start ("Applying Moore-Penrose inverse");
Adagger.apply (x_computed, w);
- commentator.stop ("done");
+ commentator().stop ("done");
report << "Correct output: ";
printVector<Field> (F, report, x_correct);
@@ -313,17 +314,17 @@ static bool testRandomApply1 (Field &F,
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vectors are not equal" << endl;
}
delete A;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomApply1");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomApply1");
return ret;
}
@@ -356,12 +357,12 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
Field F (q);
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- commentator.start("MoorePenrose black box test suite", "MoorePenrose");
+ commentator().start("MoorePenrose black box test suite", "MoorePenrose");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_IMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_IMPORTANT);
RandomDenseStream<Field, DenseVector> stream1 (F, n, iterations);
RandomDenseStream<Field, DenseVector> stream2 (F, n, k);
@@ -375,6 +376,15 @@ int main (int argc, char **argv)
if (!testRandomApply2 (F, n, m, r, iterations, stream2)) pass = false;
#endif
- commentator.stop("MoorePenrose black box test suite");
+ commentator().stop("MoorePenrose black box test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-ntl-RR.C b/tests/test-ntl-RR.C
index 0919c6f..d18e455 100644
--- a/tests/test-ntl-RR.C
+++ b/tests/test-ntl-RR.C
@@ -1,12 +1,28 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-ntl-zz_p.cpp
* Copyright (C) 2002 William J. Turner
* Copyright (C) LinBox
*
* Written by William J. Turner <wjturner at math.ncsu.edu>
*
- * see COPYING file for license
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ * Function definitions for block Lanczos iteration
*
*/
@@ -32,7 +48,8 @@
using namespace LinBox;
-int main (int argc, char **argv) {
+int main (int argc, char **argv)
+{
static size_t n = 10000;
static int iterations = 1;
@@ -45,28 +62,37 @@ int main (int argc, char **argv) {
parseArguments (argc, argv, args);
- commentator.start("UnparametricField<NTL::RR> field test suite", "UnparametricField<NTL::RR>");
+ commentator().start("NTL_RR field test suite", "NTL_RR");
bool pass = true;
- UnparametricField<NTL::RR> F;
+ NTL_RR F;
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
- if (!runFieldTests (F, "UnparametricField<NTL::RR>", iterations, n, false)) pass = false;
+ if (!runFieldTests (F, "NTL_RR", iterations, n, false)) pass = false;
#if 0
- FieldArchetype K(new UnparametricField<NTL::RR>);
+ FieldArchetype K(new NTL_RR);
if (!testField<FieldArchetype> (K, "Testing archetype with envelope of UnField<NTL::RR> field"))
pass = false;
#endif
- commentator.stop("UnparametricField<NTL::RR> field test suite");
+ commentator().stop("NTL_RR field test suite");
// We're going to allow failed tests here because the floating-point
// approximation tends to screw things up anyway.
// -bds: Well, compilation is checked at least. Work needed: A meaningful test is falsifyable.
- return 0;
+ return !pass;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-ntl-ZZ_p.C b/tests/test-ntl-ZZ_p.C
index f746d67..4b64ef0 100644
--- a/tests/test-ntl-ZZ_p.C
+++ b/tests/test-ntl-ZZ_p.C
@@ -1,16 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* -*- mode: c; style: linux -*- */
/* tests/test-ntl-ZZ_p.C
* Copyright (C) 2002 William J. Turner
*
* Written by William J. Turner <wjturner at math.ncsu.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -60,19 +60,25 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("UnparametricField<NTL::ZZ_p> field test suite", "UnparametricField<NTL::ZZ_p>");
+ commentator().start("NTL_ZZ_p field test suite", "NTL_ZZ_p");
bool pass = true;
NTL::ZZ_p::init(NTL::to_ZZ(q));
- UnparametricField<NTL::ZZ_p> F;
+ // UnparametricField<NTL::ZZ_p> F;
+ // NTL_ZZ_p F(q); // XXX is there a q ?
+ NTL_ZZ_p F;
+
+ if (F.characteristic() != q)
+ return false ;
+
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
- if (!runFieldTests (F, "UnparametricField<NTL::ZZ_p>", iterations, n, false)) pass = false;
+ if (!runFieldTests (F, "NTL_ZZ_p", iterations, n, false)) pass = false;
#if 0
- FieldArchetype K(new UnparametricField<NTL::ZZ_p>(101));
+ FieldArchetype K(new NTL_ZZ_p(101));
if (!testField<FieldArchetype> (K, "Testing archetype with envelope of UnField<NTL::ZZ_p> field"))
pass = false;
@@ -80,22 +86,33 @@ int main (int argc, char **argv)
// Testing big ints
//
- commentator.start ("\t--Testing init/convert match");
+ commentator().start ("\t--Testing init/convert match");
bool part_pass = true;
- UnparametricField<NTL::ZZ_p> G;
+ // UnparametricField<NTL::ZZ_p> G;
+ // NTL_ZZ_p G(q);
+ NTL_ZZ_p G;
NTL::ZZ_p::init(NTL::to_ZZ("1234567890123456789012345678901234568123"));
- UnparametricField<NTL::ZZ_p>::Element a;
+ NTL_ZZ_p::Element a;
LinBox::integer b, c("123456789012345678901234567890");
// LinBox::integer b, c("34");
G.init(a, c );
G.convert(b, a);
if ( c != b ) {
part_pass = false;
- commentator.report (LinBox::Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION) << "Error : " << b << " != " << c << std::endl;
+ commentator().report (LinBox::Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION) << "Error : " << b << " != " << c << std::endl;
}
- commentator.stop(MSG_STATUS (part_pass));
+ commentator().stop(MSG_STATUS (part_pass));
pass &= part_pass;
- commentator.stop("UnparametricField<NTL::ZZ_p> field test suite");
+ commentator().stop("NTL_ZZ_p field test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-ntl-hankel.C b/tests/test-ntl-hankel.C
index 11695ad..035e8b0 100644
--- a/tests/test-ntl-hankel.C
+++ b/tests/test-ntl-hankel.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Copyright (C) 2003 Austin Lobo, B. David Saunders
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -36,9 +37,9 @@
#include <vector>
#include "linbox/field/ntl.h"
-#include <linbox/field/ntl-ZZ_p.h>
-#include <linbox/integer.h>
-#include <linbox/blackbox/ntl-hankel.h>
+#include "linbox/field/ntl.h"
+#include "linbox/integer.h"
+#include "linbox/blackbox/ntl-hankel.h"
#include "test-generic.h"
@@ -49,8 +50,8 @@ using namespace std;
int main(int argc, char* argv[])
{
- LinBox::commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
- ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ LinBox::commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
+ ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
bool pass = true;
@@ -67,7 +68,7 @@ int main(int argc, char* argv[])
END_OF_ARGUMENTS
};
- parseArguments (argc, argv, args);
+ LinBox::parseArguments (argc, argv, args);
@@ -80,15 +81,16 @@ int main(int argc, char* argv[])
NTL::ZZ_p::init(modulus); // NOTE: This is essential for using NTL
- LinBox::commentator.start("Hankel black box test test suite", "Hankel");
+ LinBox::commentator().start("Hankel black box test test suite", "Hankel");
report << "\tn= " << n << " \tq= " << q << endl ;
- typedef LinBox::UnparametricField<NTL::ZZ_p> Field;
+ // typedef LinBox::UnparametricField<NTL::ZZ_p> Field;
+ typedef LinBox::NTL_ZZ_p Field;
typedef Field::Element element;
typedef std::vector<element> Vector;
// Now we are using the NTL wrapper as the field, call the instance F
- Field F;
+ Field F(q); //!@bug q or not q ?
element zero;
F.init(zero, 0);
@@ -96,7 +98,7 @@ int main(int argc, char* argv[])
LinBox::Hankel<Field> T;
// Use a special constructor to construct a matrix of dim TSIZE
- int TSIZE = 2*n-1;
+ int TSIZE = 2*int(n)-1;
Vector tdata(TSIZE);
report << "The random vector is:" << std::endl;
for (unsigned int i=0; i < tdata.size(); i++) {
@@ -143,8 +145,17 @@ int main(int argc, char* argv[])
pass = testBlackbox(TT);
- LinBox::commentator.stop("Hankel black box test test suite");
+ LinBox::commentator().stop("Hankel black box test test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-ntl-lzz_p.C b/tests/test-ntl-lzz_p.C
index 2837e07..b1a6c2d 100644
--- a/tests/test-ntl-lzz_p.C
+++ b/tests/test-ntl-lzz_p.C
@@ -1,16 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
-/* -*- mode: c; style: linux -*- */
/* tests/test-ntl-lzz_p.cpp
* Copyright (C) 2002 William J. Turner
*
* Written by William J. Turner <wjturner at math.ncsu.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file tests/test-ntl-lzz_p.C
@@ -36,7 +36,7 @@
#include <fstream>
#include <vector>
-#include "linbox/field/ntl-lzz_p.h"
+#include "linbox/field/ntl.h"
#include "test-common.h"
#include "test-generic.h"
@@ -58,25 +58,38 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("UnparametricField<NTL::zz_p> field test suite", "UnparametricField<NTL::zz_p>");
+ commentator().start("NTL_zz_p field test suite", "NTL_zz_p");
bool pass = true;
//NTL::zz_p::init(q);
//UnparametricField<NTL::zz_p> F(q);
- NTL_zz_p F(q);
+ // NTL_zz_p F(q);
+ NTL_zz_p F;
+
+ if (F.characteristic() != q)
+ return false ;
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
- if (!runFieldTests (F, "UnparametricField<NTL::zz_p>", iterations, n, false)) pass = false;
+ if (!runFieldTests (F, "NTL_zz_p", iterations, n, false)) pass = false;
#if 0
- FieldArchetype K(new UnparametricField<NTL::zz_p>(101));
+ FieldArchetype K(new NTL_zz_p(101));
if (!testField<FieldArchetype> (K, "Testing archetype with envelope of UnField<NTL::zz_p> field"))
pass = false;
#endif
- commentator.stop("UnparametricField<NTL::zz_p> field test suite");
+ commentator().stop("NTL_zz_p field test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-ntl-sylvester.C b/tests/test-ntl-sylvester.C
index 355c61f..06b7594 100644
--- a/tests/test-ntl-sylvester.C
+++ b/tests/test-ntl-sylvester.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/*-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* test-ntl-sylvester.C
* Copyright (C) 2003 Austin Lobo, B. David Saunders
@@ -8,7 +6,26 @@
* Tests for Sylvester matrix specification with ntl Arithmetic,
* for 2 polynomials in one variable.
* LinBox version 2003
- * see COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ * Function definitions for block Lanczos iteration
*-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+*/
/*! @file tests/test-ntl-sylvester.C
@@ -23,9 +40,9 @@
#include <vector>
#include "linbox/field/ntl.h"
-#include <linbox/field/ntl-ZZ_p.h>
-#include <linbox/integer.h>
-#include <linbox/blackbox/ntl-sylvester.h>
+#include "linbox/field/ntl.h"
+#include "linbox/integer.h"
+#include "linbox/blackbox/ntl-sylvester.h"
#include "test-generic.h"
@@ -34,8 +51,8 @@ using namespace std;
int main(int argc, char* argv[])
{
- LinBox::commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
- ostream &report = LinBox::commentator.report(
+ LinBox::commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
+ ostream &report = LinBox::commentator().report(
LinBox::Commentator::LEVEL_IMPORTANT,
INTERNAL_DESCRIPTION );
bool pass = true;
@@ -54,7 +71,7 @@ int main(int argc, char* argv[])
END_OF_ARGUMENTS
};
- parseArguments (argc, argv, args);
+ LinBox::parseArguments (argc, argv, args);
@@ -69,15 +86,16 @@ int main(int argc, char* argv[])
report << "Dimension (m+n) is " << m+n << std::endl;
NTL::ZZ_p::init(modulus); // NOTE: This is essential for using NTL
- LinBox::commentator.start("Sylvester black box test suite", "Sylvester");
+ LinBox::commentator().start("Sylvester black box test suite", "Sylvester");
report <<"Dimension(m+n)= " << m+n << "\t modulus= " << q << endl;
- typedef LinBox::UnparametricField<NTL::ZZ_p> Field;
+ // typedef LinBox::UnparametricField<NTL::ZZ_p> Field;
+ typedef LinBox::NTL_ZZ_p Field;
typedef Field::Element element;
typedef std::vector<element> Vector;
// Now we are using the NTL wrapper as the field, call the instance F
- Field F;
+ Field F(q); // XXX same bug ?
element zero;
F.init(zero, 0);
@@ -151,8 +169,17 @@ int main(int argc, char* argv[])
report <<"<====\tDone Sylvester matrix black box test suite" << endl;
- LinBox::commentator.stop("Sylvester black box test suite");
+ LinBox::commentator().stop("Sylvester black box test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-ntl-toeplitz.C b/tests/test-ntl-toeplitz.C
index 86ec407..b4ba98c 100644
--- a/tests/test-ntl-toeplitz.C
+++ b/tests/test-ntl-toeplitz.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Copyright (C) 2002 Austin Lobo, B. David Saunders
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -35,10 +36,10 @@
#include <vector>
#include "linbox/field/ntl.h"
-#include <linbox/field/ntl-ZZ_p.h>
-#include <linbox/integer.h>
-//#include <linbox/blackbox/ntl-toeplitz.h>
-#include <linbox/blackbox/toeplitz.h>
+#include "linbox/field/ntl.h"
+#include "linbox/integer.h"
+//#include "linbox/blackbox/ntl-toeplitz.h"
+#include "linbox/blackbox/toeplitz.h"
#include "test-generic.h"
@@ -49,8 +50,8 @@ using namespace std;
int main(int argc, char* argv[])
{
- LinBox::commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
- ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ LinBox::commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
+ ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
bool pass = true;
@@ -65,7 +66,7 @@ int main(int argc, char* argv[])
END_OF_ARGUMENTS
};
- parseArguments (argc, argv, args);
+ LinBox::parseArguments (argc, argv, args);
//------ Read q and construct F(q)
@@ -79,7 +80,7 @@ int main(int argc, char* argv[])
report << "The modulus is " << q << std::endl;
//NTL::ZZ_p::init(modulus); // NOTE: This is essential for using NTL
- LinBox::commentator.start("Toeplitz black box test suite", "Toeplitz");
+ LinBox::commentator().start("Toeplitz black box test suite", "Toeplitz");
report <<" \tDimension= " << n << "\t modulus= " << q << endl;
typedef LinBox::NTL_ZZ_p Field;
@@ -95,7 +96,7 @@ int main(int argc, char* argv[])
LinBox::Toeplitz<Field> T(F);
// Use a special constructor to construct a matrix of dim TSIZE
- int TSIZE = 2*n-1;
+ int TSIZE = 2*int(n)-1;
Vector tdata(TSIZE);
report << "The random vector is:" << std::endl;
for (unsigned int i=0; i < tdata.size(); i++) {
@@ -140,7 +141,16 @@ int main(int argc, char* argv[])
//TT.print();
pass = testBlackbox(TT);
- LinBox::commentator.stop("Toeplitz black box test suite");
+ LinBox::commentator().stop("Toeplitz black box test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-nullspace.C b/tests/test-nullspace.C
index 6248ccf..6e1f445 100644
--- a/tests/test-nullspace.C
+++ b/tests/test-nullspace.C
@@ -1,9 +1,26 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) 2009 LinBox
* Written by <boyer.brice at gmail.com>
* Inspired and adapted from test-ffpack.C
- * see COPYING for license details
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
+ * Function definitions for block Lanczos iteration
*/
/** \file tests/test-nullspace.C
@@ -12,14 +29,14 @@
* @test dense nullspace
*/
-#include "../linbox/linbox-config.h"
+#include "linbox/linbox-config.h"
#include <iostream>
-#include "../linbox/integer.h"
-#include "../linbox/matrix/matrix-domain.h"
+#include "linbox/integer.h"
+#include "linbox/matrix/matrix-domain.h"
//#include "linbox/field/givaro-zpz.h"
-#include "../linbox/field/modular.h"
+#include "linbox/field/modular.h"
//#include "fflas-ffpack/ffpack/ffpack.h"
-#include "../linbox/algorithms/dense-nullspace.h"
+#include "linbox/algorithms/dense-nullspace.h"
#include <vector>
#include "./test-common.h"
// #include "fflas-ffpack/utils/Matio.h"
@@ -62,6 +79,35 @@ void RandomPermutation ( size_t * P, const size_t & len)
return;
}
+/**
+ * @brief Checks we got the right rank.
+ *
+ * @param F field
+ * @param A matrix
+ * @param m rows
+ * @param n cols
+ * @param lda leadin dimmension
+ * @param alledged_rank supposedly correct rank.
+ *
+ * @return \c alledged_rank==rank(A)
+ */
+template <class Field>
+bool CheckRank( const Field & F,
+ const typename Field::Element * A,
+ const size_t & m,
+ const size_t & n,
+ const size_t & lda,
+ const size_t & alledged_rank)
+{
+ // std::cout << " is rank truely " << alledged_rank << " ?" << std::endl;
+ typename Field::Element * Acopy = new typename Field::Element[m*n] ;
+ FFLAS::fcopy(F,m*n,Acopy,1,A,1);
+ size_t true_rank = FFPACK::Rank(F,m,n,Acopy,lda);
+ delete[] Acopy ;
+ // std::cout << "It is " << true_rank << "." << std::endl;
+ return (alledged_rank == true_rank);
+}
+
/*!
* Builds a \p m x \p n random matrix of rank \p rank over field \p F.
@@ -113,10 +159,12 @@ void RandomMatrixWithRank(const Field & F,
// create Q a random permutation of size \p m
size_t *Q = new size_t[m];
RandomPermutation(Q,m);
- FFPACK::applyP(F, FFLAS::FflasLeft, FFLAS::FflasNoTrans, n, 0, m, C, n, Q );
+ FFPACK::applyP(F, FFLAS::FflasLeft, FFLAS::FflasNoTrans,
+ n, 0, (int)m, C, n, Q );
//PrintLapackPermutation(P,n,std::cout << "P == ");
//write_field (F, std::cout<<"C_perm1="<<std::endl, C, m, n, n);
- FFPACK::applyP(F, FFLAS::FflasRight, FFLAS::FflasNoTrans, m, 0, n, C, n, P );
+ FFPACK::applyP(F, FFLAS::FflasRight, FFLAS::FflasNoTrans,
+ m, 0, (int)n, C, n, P );
//PrintLapackPermutation(Q,m,std::cout << "Q == ");
//write_field (F, std::cout<<"C_perm2="<<std::endl, C, m, n, n);
// A = B*C (m x n format), of rank \p rank
@@ -132,34 +180,6 @@ void RandomMatrixWithRank(const Field & F,
}
-/**
- * @brief Checks we got the right rank.
- *
- * @param F field
- * @param A matrix
- * @param m rows
- * @param n cols
- * @param lda leadin dimmension
- * @param alledged_rank supposedly correct rank.
- *
- * @return \c alledged_rank==rank(A)
- */
-template <class Field>
-bool CheckRank( const Field & F,
- const typename Field::Element * A,
- const size_t & m,
- const size_t & n,
- const size_t & lda,
- const size_t & alledged_rank)
-{
- // std::cout << " is rank truely " << alledged_rank << " ?" << std::endl;
- typename Field::Element * Acopy = new typename Field::Element[m*n] ;
- FFLAS::fcopy(F,m*n,Acopy,1,A,1);
- size_t true_rank = FFPACK::Rank(F,m,n,Acopy,lda);
- delete[] Acopy ;
- // std::cout << "It is " << true_rank << "." << std::endl;
- return (alledged_rank == true_rank);
-}
/*!
* @brief Tests the NullSpace routines.
@@ -177,9 +197,9 @@ static bool testNullSpaceBasis (const Field& F, size_t m, size_t n, size_t rank,
typedef typename Field::Element Element;
//Commentator commentator;
- //commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- //commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- //commentator.start (pretty("Testing NullSpace Decomposition"),"testNullSpace",iterations);
+ //commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ //commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ //commentator().start (pretty("Testing NullSpace Decomposition"),"testNullSpace",iterations);
typename Field::Element one,zero;
F.init(one,1UL);
F.init(zero,0UL);
@@ -193,7 +213,7 @@ static bool testNullSpaceBasis (const Field& F, size_t m, size_t n, size_t rank,
}
for (int k=0; k<iterations; ++k) {
- //commentator.progress(k);
+ //commentator().progress(k);
Element * A = new Element[m*n];
size_t ld_a = n ;
size_t wd_a = m ;
@@ -266,7 +286,7 @@ static bool testNullSpaceBasis (const Field& F, size_t m, size_t n, size_t rank,
//delete[] Kern ;
}
- //commentator.stop(MSG_STATUS (ret), (const char *) 0, "testNullSpace");
+ //commentator().stop(MSG_STATUS (ret), (const char *) 0, "testNullSpace");
return ret;
}
@@ -305,11 +325,11 @@ int main(int argc, char** argv)
//srand(time (NULL));
- //commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- //commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.start("NullSpace test suite", "nullspace");
+ //commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ //commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().start("NullSpace test suite", "nullspace");
- std::ostream& report = commentator.report();
+ std::ostream& report = commentator().report();
report << "\t \033[1;35m>>>\033[0;m \t testing left kernel" << endl ;
if (!testNullSpaceBasis (F, m,n,r, iterations, false))
@@ -323,9 +343,18 @@ int main(int argc, char** argv)
report << "\033[1;32m +++ ALL MY TESTS PASSED +++\033[0;m" << endl;
- commentator.stop("NullSpace test suite");
+ commentator().stop("NullSpace test suite");
return (pass ? 0 : -1);
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-optimization.C b/tests/test-optimization.C
index 79fc366..1c8fdb2 100644
--- a/tests/test-optimization.C
+++ b/tests/test-optimization.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -27,19 +28,25 @@
* @test no doc
*/
+#include "linbox/linbox-config.h"
#include <iostream>
#include <fstream>
-#include <linbox/config-blas.h>
-#include <linbox/linbox-config.h>
-#include <linbox/field/modular-double.h>
+#include "linbox/field/modular.h" /* WHY ?? */
+/* otherwise the compiler says :
+ * /usr/bin/ld: test-optimization.o: undefined reference to symbol 'dtrmm_'
+ * /usr/bin/ld: note: 'dtrmm_' is defined in DSO /usr/lib64/libblas.so.3gf so try adding it to the linker command line
+ */
+#include "linbox/config-blas.h"
#include <fflas-ffpack/fflas/fflas.h>
-#include <linbox/util/timer.h>
+#include "linbox/util/timer.h"
+#include "linbox/util/commentator.h"
#include "test-common.h"
using namespace LinBox;
+
int main (int argc, char ** argv)
{
size_t n=300, nmax=1000, prec=256;
@@ -53,8 +60,8 @@ int main (int argc, char ** argv)
parseArguments (argc, argv, args);
- commentator.start("Optimization suite", "Optim");
- std::ostream& report = commentator.report();
+ commentator().start("Optimization suite", "Optim");
+ std::ostream& report = commentator().report();
Modular<double> F(17);
Timer chrono;
@@ -74,7 +81,7 @@ int main (int argc, char ** argv)
report << std::endl
<< "fgemm " << FFLAS::WinoSteps(n) << "Wino: " << n << "x" << n << ": "
<< chrono.usertime() << " s, "
- << (2.0/chrono.usertime()*n/100.0*n/100.0*n/100.0) << " Mffops"
+ << (2.0/chrono.usertime()*(double)n/100.0*(double)n/100.0*(double)n/100.0) << " Mffops"
<< std::endl;
n+=prec;
@@ -85,3 +92,12 @@ int main (int argc, char ** argv)
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-param-fuzzy.C b/tests/test-param-fuzzy.C
index fd70d7f..732a274 100644
--- a/tests/test-param-fuzzy.C
+++ b/tests/test-param-fuzzy.C
@@ -1,11 +1,27 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-param-fuzzy.C
* Copyright (C) 2002 David Saunders
* shamelessly mutated from one of the other field tests.
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
@@ -49,10 +65,10 @@ int main (int argc, char **argv)
ParamFuzzy F(.0000001);
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << endl << "ParamFuzzy field approximation test suite" << endl;
/* I am distressed that this field passes the testField()
@@ -74,3 +90,12 @@ int main (int argc, char **argv)
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-qlup.C b/tests/test-qlup.C
index b7a86d8..35b16c2 100644
--- a/tests/test-qlup.C
+++ b/tests/test-qlup.C
@@ -1,13 +1,26 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-qlup.C
* Copyright (C) The LinBox group
*
* Time-stamp: <22 Jun 10 15:59:56 Jean-Guillaume.Dumas at imag.fr>
* -----------------------------------------------------
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
*
- * This file is part of LinBox, licensed under the GNU Lesser General
- * Public License. See COPYING for more information.
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -33,7 +46,7 @@
#include "linbox/util/commentator.h"
#include "linbox/field/modular.h"
#include "linbox/field/PID-integer.h"
-#include "linbox/field/givaro-zpz.h"
+#include "linbox/field/givaro.h"
#include "linbox/blackbox/diagonal.h"
#include "linbox/blackbox/sparse.h"
#include "linbox/blackbox/scalar-matrix.h"
@@ -54,7 +67,7 @@ bool testQLUP(const Field &F, size_t n, unsigned int iterations, int rseed, doub
{
bool res = true;
- commentator.start ("Testing Sparse elimination qlup", "testQLUP", iterations);
+ commentator().start ("Testing Sparse elimination qlup", "testQLUP", iterations);
unsigned long Ni = n;
unsigned long Nj = n;
@@ -63,14 +76,14 @@ bool testQLUP(const Field &F, size_t n, unsigned int iterations, int rseed, doub
RandStream stream (F, generator, sparsity, n, n);
for (size_t i = 0; i < iterations; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration ((unsigned)i);
stream.reset();
Blackbox A (F, stream);
- std::ostream & report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream & report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
F.write( report ) << endl;
A.write( report,FORMAT_MAPLE ) << endl;
@@ -89,8 +102,8 @@ bool testQLUP(const Field &F, size_t n, unsigned int iterations, int rseed, doub
GaussDomain<Field> GD ( F );
typename Field::Element determinant;
Blackbox L(F, A.rowdim(), A.coldim());
- Permutation<Field> Q(A.rowdim(),F);
- Permutation<Field> P(A.coldim(),F);
+ Permutation<Field> Q((int)A.rowdim(),F);
+ Permutation<Field> P((int)A.coldim(),F);
GD.QLUPin(rank, determinant,
Q, L, A, P,
@@ -114,33 +127,33 @@ bool testQLUP(const Field &F, size_t n, unsigned int iterations, int rseed, doub
for(typename std::vector<typename Field::Element>::const_iterator itu=u.begin(); itu!=u.end();++itu)
report << *itu << ',';
report << "]);\n[";
- for(typename std::vector<typename Field::Element>::const_iterator itv=v.begin(); itv!=v.end();++itv)
- report << *itv << ' ';
+ for(typename std::vector<typename Field::Element>::const_iterator itv2=v.begin(); itv2!=v.end();++itv2)
+ report << *itv2 << ' ';
report << "] != [";
- for(typename std::vector<typename Field::Element>::const_iterator itw=w.begin(); itw!=w.end();++itw)
- report << *itw << ' ';
+ for(typename std::vector<typename Field::Element>::const_iterator itw2=w.begin(); itw2!=w.end();++itw2)
+ report << *itw2 << ' ';
report << "]" << std::endl;
report << "w1: [";
- for(typename std::vector<typename Field::Element>::const_iterator itw=w1.begin(); itw!=w1.end();++itw)
- report << *itw << ' ';
+ for(typename std::vector<typename Field::Element>::const_iterator itw2=w1.begin(); itw2!=w1.end();++itw2)
+ report << *itw2 << ' ';
report << "]" << std::endl;
report << "w2: [";
- for(typename std::vector<typename Field::Element>::const_iterator itw=w2.begin(); itw!=w2.end();++itw)
- report << *itw << ' ';
+ for(typename std::vector<typename Field::Element>::const_iterator itw2=w2.begin(); itw2!=w2.end();++itw2)
+ report << *itw2 << ' ';
report << "]" << std::endl;
report << "w3: [";
- for(typename std::vector<typename Field::Element>::const_iterator itw=w3.begin(); itw!=w3.end();++itw)
- report << *itw << ' ';
+ for(typename std::vector<typename Field::Element>::const_iterator itw2=w3.begin(); itw2!=w3.end();++itw2)
+ report << *itw2 << ' ';
report << "]" << std::endl;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (res), (const char *) 0, "testQLUP");
+ commentator().stop (MSG_STATUS (res), (const char *) 0, "testQLUP");
return res;
}
@@ -156,7 +169,7 @@ bool testQLUPsolve(const Field &F, size_t n, unsigned int iterations, int rseed,
{
bool res = true;
- commentator.start ("Testing Sparse elimination qlup solve", "testQLUPsolve", iterations);
+ commentator().start ("Testing Sparse elimination qlup solve", "testQLUPsolve", iterations);
unsigned long Ni = n;
unsigned long Nj = n;
@@ -164,15 +177,17 @@ bool testQLUPsolve(const Field &F, size_t n, unsigned int iterations, int rseed,
typename Field::RandIter generator (F,card,rseed);
RandStream stream (F, generator, sparsity, n, n);
- GF2 F2; GF2::RandIter bitgenerator(F2,2,rseed); GF2::Element randomsolve;
+ GF2 F2;
+ GF2::RandIter bitgenerator(F2,2,rseed);
+ // GF2::Element randomsolve;
for (size_t i = 0; i < iterations; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration ((unsigned)i);
stream.reset();
Blackbox A (F, stream);
- std::ostream & report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream & report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
F.write( report ) << endl;
A.write( report, FORMAT_MAPLE ) << endl;
@@ -190,8 +205,8 @@ bool testQLUPsolve(const Field &F, size_t n, unsigned int iterations, int rseed,
Blackbox CopyA ( A );
- GD.solvein(x, A, v, bitgenerator.random(randomsolve) );
- report << "Random solving: " << randomsolve << std::endl;
+ GD.solvein(x, A, v /*, bitgenerator .random(randomsolve) */ );
+ // report << "Random solving: " << randomsolve << std::endl;
CopyA.apply(y, x);
@@ -219,11 +234,11 @@ bool testQLUPsolve(const Field &F, size_t n, unsigned int iterations, int rseed,
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (res), (const char *) 0, "testQLUPsolve");
+ commentator().stop (MSG_STATUS (res), (const char *) 0, "testQLUPsolve");
return res;
}
@@ -239,7 +254,7 @@ bool testQLUPnullspace(const Field &F, size_t n, unsigned int iterations, int rs
{
bool res = true;
- commentator.start ("Testing Sparse elimination qlup nullspacebasis", "testQLUPnullspace", iterations);
+ commentator().start ("Testing Sparse elimination qlup nullspacebasis", "testQLUPnullspace", iterations);
unsigned long Ni = n;
unsigned long Nj = n;
@@ -248,12 +263,12 @@ bool testQLUPnullspace(const Field &F, size_t n, unsigned int iterations, int rs
RandStream stream (F, generator, sparsity, n, n, rseed);
for (size_t i = 0; i < iterations; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration ((unsigned)i);
stream.reset();
Blackbox A (F, stream);
- std::ostream & report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream & report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
F.write( report ) << endl;
A.write( report, FORMAT_MAPLE ) << endl;
@@ -300,11 +315,11 @@ bool testQLUPnullspace(const Field &F, size_t n, unsigned int iterations, int rs
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (res), (const char *) 0, "testQLUPnullspace");
+ commentator().stop (MSG_STATUS (res), (const char *) 0, "testQLUPnullspace");
return res;
}
@@ -312,10 +327,10 @@ bool testQLUPnullspace(const Field &F, size_t n, unsigned int iterations, int rs
int main (int argc, char **argv)
{
- commentator.setMaxDepth (-1);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
-// commentator.setMaxDetailLevel( 100000 );
-// commentator.setMaxDepth( 100000 );
+ commentator().setMaxDepth (-1);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+// commentator().setMaxDetailLevel( 100000 );
+// commentator().setMaxDepth( 100000 );
bool pass = true;
@@ -325,7 +340,7 @@ int main (int argc, char **argv)
//static integer q = 1000003U;
static int iterations = 2;
static double sparsity = 0.05;
- static int rseed = time(NULL);
+ static int rseed = (unsigned)time(NULL);
static Argument args[] = {
{ 'n', "-n N", "Set dimension of test matrices to NxN.", TYPE_INT, &n },
@@ -339,58 +354,78 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
srand (rseed);
- commentator.start("QLUP test suite", "qlup");
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().start("QLUP test suite", "qlup");
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Seed: " << rseed << endl;
{
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "over Modular<uint32_t>" << endl;
typedef Modular<uint32_t> Field;
Field F (q);
typedef SparseMatrix<Field, Sparse_Vector<Field::Element> > Blackbox;
typedef RandomSparseStream<Field, Sparse_Vector<Field::Element> > RandStream;
- if (!testQLUP<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity)) pass = false;
- if (!testQLUPsolve<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity)) pass = false;
- if (!testQLUPnullspace<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity)) pass = false;
+ if (!testQLUP<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity))
+ pass = false;
+ if (!testQLUPsolve<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity))
+ pass = false;
+ if (!testQLUPnullspace<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity))
+ pass = false;
}
{
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "over Modular<double>" << endl;
typedef Modular<double> Field;
Field F (q);
typedef SparseMatrix<Field, Sparse_Vector<Field::Element> > Blackbox;
typedef RandomSparseStream<Field, Sparse_Vector<Field::Element> > RandStream;
- if (!testQLUP<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity)) pass = false;
- if (!testQLUPsolve<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity)) pass = false;
- if (!testQLUPnullspace<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity)) pass = false;
+ if (!testQLUP<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity))
+ pass = false;
+ if (!testQLUPsolve<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity))
+ pass = false;
+ if (!testQLUPnullspace<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity))
+ pass = false;
}
{
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "over GivaroZpz<Integer>" << endl;
typedef GivaroZpz<Integer> Field;
Field F (bigQ);
typedef SparseMatrix<Field, Sparse_Vector<Field::Element> > Blackbox;
typedef RandomSparseStream<Field, Sparse_Vector<Field::Element> > RandStream;
- if (!testQLUP<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity)) pass = false;
- if (!testQLUPsolve<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity)) pass = false;
- if (!testQLUPnullspace<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity)) pass = false;
+ if (!testQLUP<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity))
+ pass = false;
+ if (!testQLUPsolve<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity))
+ pass = false;
+ if (!testQLUPnullspace<Field, Blackbox, RandStream> (F, n, iterations, rseed, sparsity))
+ pass = false;
}
{
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "specialized over GF2>" << endl;
typedef GF2 Field;
Field F2;
typedef LinBox::GaussDomain<LinBox::GF2>::Matrix Blackbox;
typedef RandomSparseStreamGF2<Blackbox::Row_t> RandStream;
- if (!testQLUP<Field, Blackbox, RandStream> (F2, n, iterations, rseed, sparsity)) pass = false;
- if (!testQLUPsolve<Field, Blackbox, RandStream> (F2, n, iterations, rseed, sparsity)) pass = false;
+ if (!testQLUP<Field, Blackbox, RandStream> (F2, n, iterations, rseed, sparsity))
+ pass = false;
+ if (!testQLUPsolve<Field, Blackbox, RandStream> (F2, n, iterations, rseed, sparsity))
+ pass = false;
}
- commentator.stop("QLUP test suite");
+ commentator().stop(MSG_STATUS (pass),"QLUP test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-randiter-nonzero.C b/tests/test-randiter-nonzero.C
index ed8d697..dab05f7 100644
--- a/tests/test-randiter-nonzero.C
+++ b/tests/test-randiter-nonzero.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-randiter-nonzero.C
* Copyright (C) 2001, 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
@@ -52,36 +68,37 @@ static bool testNonzeroRandom (Field &F, int iterations)
{
int i;
- commentator.start ("Testing nonzero random elements", "testNonzeroRandom", iterations);
+ commentator().start ("Testing nonzero random elements", "testNonzeroRandom", iterations);
bool ret = true;
typename Field::Element x;
typename Field::RandIter r (F);
- NonzeroRandIter <Field, typename Field::RandIter> rp (F, r);
+ //NonzeroRandIter <Field, typename Field::RandIter> rp (F, r);
+ NonzeroRandIter <Field> rp (F, r);
for (i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
rp.random (x);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Element: ";
F.write (report, x);
report << endl;
if (F.isZero (x)) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Element is zero" << endl;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testNonzeroRandom");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testNonzeroRandom");
return ret;
}
@@ -102,15 +119,24 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
Modular<uint32_t> F (q);
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- commentator.start("Nonzero random iterator test suite", "NonzeroRandIter");
+ commentator().start("Nonzero random iterator test suite", "NonzeroRandIter");
- commentator.setBriefReportParameters (Commentator::OUTPUT_CONSOLE, false, false, false);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
+ commentator().setBriefReportParameters (Commentator::OUTPUT_CONSOLE, false, false, false);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
if (!testNonzeroRandom (F, iterations)) pass = false;
- commentator.stop("Nonzero random iterator test suite");
+ commentator().stop("Nonzero random iterator test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-rank.C b/tests/test-rank.C
index 1054309..aa24470 100644
--- a/tests/test-rank.C
+++ b/tests/test-rank.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-rank.C
@@ -9,8 +7,23 @@
*
* -----------------------------------------------------
*
- * This file is part of LinBox, licensed under the GNU Lesser General
- * Public License. See COPYING for more information.
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -32,7 +45,8 @@
#include "linbox/util/commentator.h"
#include "linbox/field/modular.h"
#include "linbox/field/PID-integer.h"
-#include "linbox/field/givaro-zpz.h"
+#include "linbox/field/gf2.h"
+#include "linbox/field/givaro.h"
#include "linbox/blackbox/diagonal.h"
#include "linbox/blackbox/sparse.h"
#include "linbox/blackbox/scalar-matrix.h"
@@ -58,7 +72,7 @@ bool testRankMethods(const Field &F, size_t n, unsigned int iterations, double s
{
typedef SparseMatrix<Field,typename Vector<Field>::SparseSeq> Blackbox;
- commentator.start ("Testing elimination-based and blackbox rank", "testRankMethods", iterations);
+ commentator().start ("Testing elimination-based and blackbox rank", "testRankMethods", iterations);
bool ret = true;
unsigned int i;
@@ -69,53 +83,53 @@ bool testRankMethods(const Field &F, size_t n, unsigned int iterations, double s
typename Field::RandIter ri (F);
for (i = 0; i < iterations; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
RandomSparseStream<Field, typename Vector<Field>::SparseSeq> stream (F, ri, sparsity, n, n);
Blackbox A (F, stream);
- F.write( commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)) << endl;
- A.write( commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION),FORMAT_MAPLE ) << endl;
+ F.write( commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)) << endl;
+ A.write( commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION),FORMAT_MAPLE ) << endl;
LinBox::rank (rank_blackbox, A, Method::Blackbox ());
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "blackbox rank " << rank_blackbox << endl;
LinBox::rank (rank_elimination, A, Method::Elimination());
if (rank_blackbox != rank_elimination) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: blackbox rank != elimination rank " << rank_elimination << endl;
ret = false;
}
LinBox::rank (rank_hybrid, A, Method::Hybrid());
if (rank_blackbox != rank_hybrid) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: blackbox rank != hybrid rank " << rank_hybrid << endl;
ret = false;
}
- /*
+#if 0 /* not working */
rank (rank_Wiedemann, A, Method::Wiedemann ());
//rank (rank_elimination, B, Method::SparseElimination());
rank_elimination = rank_Wiedemann;
rank (rank_blas_elimination, A, Method::BlasElimination ());
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "Rank computed by Wiedemann: " << rank_Wiedemann << endl
<< "Rank computed by sparse elimination: " << rank_elimination << endl
<< "Rank computed by blas_elimination: " << rank_blas_elimination << endl;
if (rank_Wiedemann != rank_elimination || rank_elimination != rank_blas_elimination) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Ranks are not equal" << endl;
ret = false;
}
- */
+#endif
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testEliminationRank");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testEliminationRank");
return ret;
}
@@ -130,7 +144,7 @@ bool testRankMethodsGF2(const GF2& F2, size_t n, unsigned int iterations, double
MdF2.init(mdone,1UL);
- commentator.start ("Testing elimination-based and blackbox rank over GF2", "testRankMethodsGF2", iterations);
+ commentator().start ("Testing elimination-based and blackbox rank over GF2", "testRankMethodsGF2", iterations);
bool ret = true;
unsigned int i;
@@ -141,7 +155,7 @@ bool testRankMethodsGF2(const GF2& F2, size_t n, unsigned int iterations, double
GF2::RandIter ri (F2);
for (i = 0; i < iterations; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
Blackbox A(F2,n,n);
MdBlackbox B(MdF2,n,n);
@@ -154,25 +168,25 @@ bool testRankMethodsGF2(const GF2& F2, size_t n, unsigned int iterations, double
}
}
- F2.write( commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)) << endl;
- B.write( commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION),FORMAT_GUILLAUME ) << endl;
- A.write( commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION),FORMAT_GUILLAUME ) << endl;
+ F2.write( commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)) << endl;
+ B.write( commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION),FORMAT_GUILLAUME ) << endl;
+ A.write( commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION),FORMAT_GUILLAUME ) << endl;
- rank (rank_blackbox, A, Method::Blackbox ());
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ LinBox::rank (rank_blackbox, A, Method::Blackbox ());
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "blackbox rank " << rank_blackbox << endl;
- rank (rank_elimination, B, Method::BlasElimination());
+ LinBox::rank (rank_elimination, B, Method::BlasElimination());
if (rank_blackbox != rank_elimination) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: blackbox rank != BLAS elimination rank " << rank_elimination << endl;
ret = false;
}
rankin (rank_sparselimination, A, Method::SparseElimination());
if (rank_blackbox != rank_sparselimination) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: blackbox rank != sparse elimination GF2 rank " << rank_elimination << endl;
ret = false;
}
@@ -181,16 +195,16 @@ bool testRankMethodsGF2(const GF2& F2, size_t n, unsigned int iterations, double
rankin (rank_sparse, B, Method::SparseElimination());
if (rank_sparselimination != rank_sparse) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rank sparse elimination GF2 != sparse rank " << rank_sparse << endl;
ret = false;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testEliminationRank");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testEliminationRank");
return ret;
}
@@ -203,7 +217,7 @@ bool testZeroAndIdentRank (const Field &F, size_t n, unsigned int iterations)
{
typedef ScalarMatrix<Field> Blackbox;
- commentator.start ("Testing rank of zero and Identity and half/half matrices", "testZeroAndIdentRank", iterations);
+ commentator().start ("Testing rank of zero and Identity and half/half matrices", "testZeroAndIdentRank", iterations);
bool ret = true;
unsigned int i;
@@ -211,47 +225,47 @@ bool testZeroAndIdentRank (const Field &F, size_t n, unsigned int iterations)
unsigned long r; // rank
for (i = 0; i < iterations; ++i) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
typename Field::Element zero, one;
F.init(zero, 0);
Blackbox A (F, n, zero);
- rank (r, A, Method::Wiedemann ());
+ LinBox::rank (r, A, Method::Wiedemann ());
if (r != 0) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Wiedemann Rank of 0 is not 0, but is " << r << endl;
ret = false;
}
F.init(one, 1);
Blackbox I (F, n, one);
- rank (r, I, Method::Wiedemann ());
+ LinBox::rank (r, I, Method::Wiedemann ());
if (r != n) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Wiedemann Rank of I is " << r << ", should be " << n << endl;
ret = false;
}
DirectSum<Blackbox> B(A, I);
- rank (r, B, Method::Wiedemann ());
+ LinBox::rank (r, B, Method::Wiedemann ());
if (r != n) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Wiedemann Rank of I+0 is " << r << ", should be " << n << endl;
ret = false;
}
- rank (r, B, Method::Wiedemann(Method::Wiedemann::SYMMETRIC));
+ LinBox::rank (r, B, Method::Wiedemann(Method::Wiedemann::SYMMETRIC));
if (r != n) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Symmetric Wiedemann Rank of I+0 is " << r << ", should be " << n << endl;
ret = false;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testZeroAndIdentRank");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testZeroAndIdentRank");
return ret;
}
@@ -259,8 +273,8 @@ bool testZeroAndIdentRank (const Field &F, size_t n, unsigned int iterations)
int main (int argc, char **argv)
{
-// commentator.setMaxDetailLevel( 100000 );
-// commentator.setMaxDepth( 100000 );
+// commentator().setMaxDetailLevel( 100000 );
+// commentator().setMaxDepth( 100000 );
bool pass = true;
@@ -281,42 +295,51 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- srand (time (NULL));
- // srand48 (time (NULL));
+ srand ((unsigned)time (NULL));
+ // srand48 ((unsigned)time (NULL));
- commentator.start("rank solution test suite", "rank");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().start("rank solution test suite", "rank");
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "over Modular<uint32_t>" << endl;
Modular<uint32_t> F (q);
if (!testRankMethods (F, n, iterations, sparsity)) pass = false;
if (!testZeroAndIdentRank (F, n, 1)) pass = false;
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "over Modular<int>" << endl;
Modular<double> G (q);
if (!testRankMethods (G, n, iterations, sparsity)) pass = false;
if (!testZeroAndIdentRank (G, n, 1)) pass = false;
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "over PID_integer" << endl;
PID_integer R;
if (!testRankMethods (R, n, iterations, sparsity)) pass = false;
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "over GivaroZpz<Integer>" << endl;
GivaroZpz<Integer> Gq(bigQ);
if (!testRankMethods (Gq, n, iterations, sparsity)) pass = false;
if (!testZeroAndIdentRank (Gq, n, 1)) pass = false;
- commentator.report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
+ commentator().report (Commentator::LEVEL_NORMAL, INTERNAL_DESCRIPTION)
<< "over GF2" << endl;
GF2 F2;
if (!testRankMethodsGF2 (F2, n, iterations, sparsity)) pass = false;
- commentator.stop("rank solution test suite");
+ commentator().stop("rank solution test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-rat-charpoly.C b/tests/test-rat-charpoly.C
index bc248ef..d4ce026 100644
--- a/tests/test-rat-charpoly.C
+++ b/tests/test-rat-charpoly.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-solve.C
* Copyright (C) 2001, 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
@@ -29,7 +45,6 @@
#include "linbox/util/commentator.h"
#include "linbox/blackbox/sparse.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/solutions/charpoly.h"
#include "test-common.h"
@@ -47,7 +62,7 @@ using namespace LinBox;
static bool testDiagRatCharpoly (size_t n, int iterations)
{
- commentator.start ("Testing rational charpoly of diagonal matrix ", "testNonsingularRatIntSolve", iterations);
+ commentator().start ("Testing rational charpoly of diagonal matrix ", "testNonsingularRatIntSolve", iterations);
bool ret = true;
int i;
@@ -55,7 +70,7 @@ static bool testDiagRatCharpoly (size_t n, int iterations)
GMPRationalField Q;
SparseMatrix<GMPRationalField > A(Q,n,n);
- DenseMatrix <GMPRationalField > B(Q,n,n);
+ BlasMatrix <GMPRationalField > B(Q,n,n);
std::vector<GMPRationalField::Element> c;
for (i=0; i < iterations; i++) {
@@ -64,7 +79,7 @@ static bool testDiagRatCharpoly (size_t n, int iterations)
Q.init(cn,0,1);
- commentator.startIteration (i);
+ commentator().startIteration (i);
for (j=0; j < n; ++j) {
integer tmp_n, tmp_d;
@@ -84,27 +99,25 @@ static bool testDiagRatCharpoly (size_t n, int iterations)
}
if (n%2==0) Q.negin(cn);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ // ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
charpoly (c, A);
if ((!Q.areEqual(c[0] , c0)) || (!Q.areEqual(c[n-1] , cn) ) ) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
- << "ERROR: Sparse charpoly failed" << endl;
+ commentator().report() << "ERROR: Sparse charpoly failed" << endl;
ret = false;
}
c.clear();
charpoly (c, B);
if ((!Q.areEqual(c[0] , c0)) || (!Q.areEqual(c[n-1] , cn) ) ) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
- << "ERROR: Dense charpoly failed" << endl;
+ commentator().report() << "ERROR: Dense charpoly failed" << endl;
ret = false;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularRatIntSolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularRatIntSolve");
return ret;
}
@@ -123,19 +136,28 @@ int main (int argc, char **argv)
};
parseArguments (argc, argv, args);
- commentator.start("Rational solve test suite", "solve");
+ commentator().start("Rational solve test suite", "solve");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (10);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.getMessageClass (PROGRESS_REPORT).setMaxDepth (5);
- //commentator.getMessageClass (BRIEF_REPORT).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (10);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().getMessageClass (PROGRESS_REPORT).setMaxDepth (5);
+ //commentator().getMessageClass (BRIEF_REPORT).setMaxDepth (4);
if ( ! testDiagRatCharpoly(n,iterations) ) pass = false;
- commentator.stop("solve test suite");
+ commentator().stop("solve test suite");
//std::cout << (pass ? "passed" : "FAILED" ) << std::endl;
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-rat-minpoly.C b/tests/test-rat-minpoly.C
index baacf00..e014fc9 100644
--- a/tests/test-rat-minpoly.C
+++ b/tests/test-rat-minpoly.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-solve.C
* Copyright (C) 2001, 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
@@ -29,7 +45,6 @@
#include "linbox/util/commentator.h"
#include "linbox/blackbox/sparse.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/solutions/charpoly.h"
#include "test-common.h"
@@ -47,7 +62,7 @@ using namespace LinBox;
static bool testDiagRatCharpoly (size_t n, int iterations)
{
- commentator.start ("Testing rational charpoly of diagonal matrix ", "testNonsingularRatIntSolve", iterations);
+ commentator().start ("Testing rational charpoly of diagonal matrix ", "testNonsingularRatIntSolve", iterations);
bool ret = true;
int i;
@@ -55,7 +70,7 @@ static bool testDiagRatCharpoly (size_t n, int iterations)
GMPRationalField Q;
SparseMatrix<GMPRationalField > A(Q,n,n);
- DenseMatrix <GMPRationalField > B(Q,n,n);
+ BlasMatrix <GMPRationalField > B(Q,n,n);
std::vector<GMPRationalField::Element> c;
for (i=0; i < iterations; i++) {
@@ -63,9 +78,9 @@ static bool testDiagRatCharpoly (size_t n, int iterations)
Q.init(c0,1,1);
Q.init(cn,0,1);
- commentator.startIteration (i);
+ commentator().startIteration (i);
- size_t k = ceil(n/2);
+ size_t k = (size_t)ceil((double)n/2);
for (j=0; j < k; ++j) {
integer tmp_n, tmp_d;
GMPRationalField::Element tmp, abstmp;
@@ -89,11 +104,11 @@ static bool testDiagRatCharpoly (size_t n, int iterations)
if (k%2==0) Q.negin(cn);
- // ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ // ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
charpoly (c, A);
if ( (c.size() == k+1) && ((!Q.areEqual(c[0] , c0)) || (!Q.areEqual(c[k-1] , cn) ) ) ) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Sparse charpoly failed" << endl;
ret = false;
}
@@ -101,16 +116,16 @@ static bool testDiagRatCharpoly (size_t n, int iterations)
charpoly (c, B);
if ( (c.size() == k+1) && ((!Q.areEqual(c[0] , c0)) || (!Q.areEqual(c[n-1] , cn) ) ) ) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Dense charpoly failed" << endl;
ret = false;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularRatIntSolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularRatIntSolve");
return ret;
}
@@ -129,19 +144,28 @@ int main (int argc, char **argv)
};
parseArguments (argc, argv, args);
- commentator.start("Rational solve test suite", "solve");
+ commentator().start("Rational solve test suite", "solve");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (10);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.getMessageClass (PROGRESS_REPORT).setMaxDepth (5);
- //commentator.getMessageClass (BRIEF_REPORT).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (10);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().getMessageClass (PROGRESS_REPORT).setMaxDepth (5);
+ //commentator().getMessageClass (BRIEF_REPORT).setMaxDepth (4);
if ( ! testDiagRatCharpoly(n,iterations) ) pass = false;
- commentator.stop("solve test suite");
+ commentator().stop("solve test suite");
//std::cout << (pass ? "passed" : "FAILED" ) << std::endl;
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-rat-solve.C b/tests/test-rat-solve.C
index e3f9239..1d607c1 100644
--- a/tests/test-rat-solve.C
+++ b/tests/test-rat-solve.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-solve.C
* Copyright (C) 2001, 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
@@ -45,7 +61,7 @@ using namespace LinBox;
static bool testNonsingularRatIntSolve (size_t n, int iterations)
{
- commentator.start ("Testing nonsingular solve with integer vector", "testNonsingularRatIntSolve", iterations);
+ commentator().start ("Testing nonsingular solve with integer vector", "testNonsingularRatIntSolve", iterations);
bool ret = true;
int i;
@@ -59,7 +75,7 @@ static bool testNonsingularRatIntSolve (size_t n, int iterations)
std::vector<GMPRationalField::Element> true_x(n),x(n);
for (i=0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
for (j=0; j < n; ++j) {
integer tmp_n, tmp_d, tmp_b;
@@ -74,21 +90,20 @@ static bool testNonsingularRatIntSolve (size_t n, int iterations)
Q.init(true_x[j] , b[j] * tmp_d, tmp_n);
}
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ //ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
solve (x, A, b);
for (j=0; j < n; ++j) {
if (!Q.areEqual(x[j] ,true_x[j])) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
- << "ERROR: System solution failed" << endl;
+ commentator().report() << "ERROR: System solution failed" << endl;
ret = false;
}
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularRatIntSolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularRatIntSolve");
return ret;
}
@@ -103,7 +118,7 @@ static bool testNonsingularRatIntSolve (size_t n, int iterations)
static bool testNonsingularRatRatSolve (size_t n, int iterations)
{
- commentator.start ("Testing nonsingular solve with rational vector", "testNonsingularRatRatSolve", iterations);
+ commentator().start ("Testing nonsingular solve with rational vector", "testNonsingularRatRatSolve", iterations);
bool ret = true;
int i;
@@ -117,7 +132,7 @@ static bool testNonsingularRatRatSolve (size_t n, int iterations)
std::vector<GMPRationalField::Element> true_x(n),x(n);
for (i=0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
for (j=0; j < n; ++j) {
integer tmp_n, tmp_d, tmp_bn, tmp_bd;
@@ -139,22 +154,21 @@ static bool testNonsingularRatRatSolve (size_t n, int iterations)
Q.init(true_x[j] , tmp_bn * tmp_d, tmp_bd * tmp_n);
}
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ // ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
solve (x, A, b);
for (j=0; j < n; ++j) {
if (!Q.areEqual(x[j] ,true_x[j])) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
- << "ERROR: System solution failed" << endl;
+ commentator().report() << "ERROR: System solution failed" << endl;
ret = false;
}
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularRatRatSolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularRatRatSolve");
return ret;
}
@@ -174,20 +188,29 @@ int main (int argc, char **argv)
};
parseArguments (argc, argv, args);
- commentator.start("Rational solve test suite", "solve");
+ commentator().start("Rational solve test suite", "solve");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (10);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.getMessageClass (PROGRESS_REPORT).setMaxDepth (5);
- //commentator.getMessageClass (BRIEF_REPORT).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (10);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().getMessageClass (PROGRESS_REPORT).setMaxDepth (5);
+ //commentator().getMessageClass (BRIEF_REPORT).setMaxDepth (4);
if ( ! testNonsingularRatIntSolve(n,iterations) ) pass = false;
if ( ! testNonsingularRatRatSolve(n,iterations) ) pass = false;
- commentator.stop("solve test suite");
+ commentator().stop("solve test suite");
//std::cout << (pass ? "passed" : "FAILED" ) << std::endl;
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-rational-matrix-factory.C b/tests/test-rational-matrix-factory.C
index 4148944..8c59a64 100644
--- a/tests/test-rational-matrix-factory.C
+++ b/tests/test-rational-matrix-factory.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-det.C
* Copyright (C) 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
/*! @file tests/test-rational-matrix-factory.C
@@ -28,7 +44,7 @@
#include "linbox/util/commentator.h"
#include "linbox/field/PID-integer.h"
#include "linbox/field/gmp-rational.h"
-#include "linbox/blackbox/dense.h"
+#include "linbox/matrix/blas-matrix.h"
#include "linbox/blackbox/rational-matrix-factory.h"
#include "test-common.h"
@@ -51,13 +67,13 @@ using namespace LinBox;
static bool testDiagonalMatrix (size_t n)
{
- commentator.start ("Testing rational matrix factory for dense matrix", "testRationalMatrixFactory");
+ commentator().start ("Testing rational matrix factory for dense matrix", "testRationalMatrixFactory");
bool ret = true;
size_t j;
GMPRationalField Q;
- DenseMatrix<GMPRationalField > A(Q,n,n);
+ BlasMatrix<GMPRationalField > A(Q,n,n);
integer lcm_n=1;
for (j = 0; j < n; j++) {
@@ -68,12 +84,12 @@ static bool testDiagonalMatrix (size_t n)
lcm(lcm_n,lcm_n,j+1);
}
- RationalMatrixFactory<PID_integer, GMPRationalField, DenseMatrix<GMPRationalField > > FA(&A);
+ RationalMatrixFactory<PID_integer, GMPRationalField, BlasMatrix<GMPRationalField > > FA(&A);
integer ratnorm,aprimnorm,atildenorm;
FA.getNorms(ratnorm,aprimnorm,atildenorm);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "True rational norm: " << n << endl;
report << "Computed rational norm: " << ratnorm << endl;
@@ -86,7 +102,7 @@ static bool testDiagonalMatrix (size_t n)
if ( (ratnorm != (Integer)n) || ( aprimnorm != lcm_n) || (atildenorm != 1) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Norms are incorrect" << endl;
}
@@ -101,7 +117,7 @@ static bool testDiagonalMatrix (size_t n)
if ( (omega != n) || (rat_omega != n-1) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Number of rational/non-zero elements is incorrect" << endl;
}
@@ -113,24 +129,24 @@ static bool testDiagonalMatrix (size_t n)
if (d != lcm_n) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Common denominator is incorrect" << endl;
}
for (j=0; j < n; ++j) {
- FA.denominator(d,j);
+ FA.denominator(d,(int)j);
report << "True common denominator for " << j+1 << "th row: " << j+1 << endl;
report << "Computed common denominator for " << j+1 << "th row: " << d << endl;
if (d != (integer)(j+1)) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Common denominator for " << j+1 << "th row is incorrect" << endl;
}
}
PID_integer Z;
- DenseMatrix<PID_integer> Aprim(Z,n,n);
- DenseMatrix<PID_integer> Atilde(Z,n,n);
+ BlasMatrix<PID_integer> Aprim(Z,n,n);
+ BlasMatrix<PID_integer> Atilde(Z,n,n);
FA.makeAprim(Aprim);
FA.makeAtilde(Atilde);
@@ -141,17 +157,17 @@ static bool testDiagonalMatrix (size_t n)
for (j=0; j <n; ++j) {
if (Aprim.getEntry(j,j) != lcm_n/(j+1)) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Aprim is bad at " << j+1 << "diagonal entry" << endl;
}
if (Atilde.getEntry(j,j) != 1) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Atilde is bad at " << j+1 << "diagonal entry" << endl;
}
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRationalMatrixFactory");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRationalMatrixFactory");
return ret;
}
@@ -173,14 +189,23 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("Rational Matrix Factory test suite", "rmf");
+ commentator().start("Rational Matrix Factory test suite", "rmf");
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (!testDiagonalMatrix( n )) pass = false;
- commentator.stop("Rational Matrix Factory test suite");
+ commentator().stop("Rational Matrix Factory test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-rational-reconstruction-base.C b/tests/test-rational-reconstruction-base.C
index 2e1ae74..eab7772 100644
--- a/tests/test-rational-reconstruction-base.C
+++ b/tests/test-rational-reconstruction-base.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-det.C
* Copyright (C) 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
@@ -72,7 +88,7 @@ struct ModularFraction {
static bool testRandomFraction (size_t n, size_t d, int iterations)
{
- commentator.start ("Testing rational reconstruction on random fractions", "testRandFrac", iterations);
+ commentator().start ("Testing rational reconstruction on random fractions", "testRandFrac", iterations);
bool ret = true;
// bool done;
@@ -82,7 +98,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
integer num,den;
for (i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
integer::nonzerorandom(num, n);
integer::nonzerorandom(den, d);
@@ -90,7 +106,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
num /= g; den /= g;
if (i %2 ) integer::negin(num);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "True fraction: " << num << " / " << den;
report << endl;
@@ -113,7 +129,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra1_1(a1_1,b1_1,iteration,genprime);
if ((a1_1 != num) || (b1_1 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (Wang, incremental, fast) failed" << endl;
}
@@ -123,7 +139,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra2_1(a2_1,b2_1,iteration,genprime);
if ((a2_1 != num) || (b2_1 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (MaxQ, incremental, fast) failed" << endl;
}
@@ -133,7 +149,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra3_1(a3_1,b3_1,iteration,genprime);
if ((a3_1 != num) || (b3_1 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (Wang, incremental, classic) failed" << endl;
}
@@ -143,7 +159,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra4_1(a4_1,b4_1,iteration,genprime);
if ((a4_1 != num) || (b4_1 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (MaxQ, incremental, classic) failed" << endl;
}
@@ -153,7 +169,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra1_2(a1_2,b1_2,iteration,genprime);
if ((a1_2 != num) || (b1_2 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (Wang, quadratic, fast) failed" << endl;
}
@@ -163,7 +179,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra2_2(a2_2,b2_2,iteration,genprime);
if ((a2_2 != num) || (b2_2 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (MaxQ, quadratic, fast) failed" << endl;
}
@@ -173,7 +189,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra3_2(a3_2,b3_2,iteration,genprime);
if ((a3_2 != num) || (b3_2 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (Wang, quadratic, classic) failed" << endl;
}
@@ -183,7 +199,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra4_2(a4_2,b4_2,iteration,genprime);
if ((a4_2 != num) || (b4_2 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (MaxQ, quadratic, classic) failed" << endl;
}
@@ -194,7 +210,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra1_3(a1_3,b1_3,iteration,genprime);
if ((a1_3 != num) || (b1_3 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (Wang, geometric, fast) failed" << endl;
}
@@ -204,7 +220,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra2_3(a2_3,b2_3,iteration,genprime);
if ((a2_3 != num) || (b2_3 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (MaxQ, geometric, fast) failed" << endl;
}
@@ -214,7 +230,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra3_3(a3_3,b3_3,iteration,genprime);
if ((a3_3 != num) || (b3_3 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (Wang, geometric, classic) failed" << endl;
}
@@ -224,7 +240,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra4_3(a4_3,b4_3,iteration,genprime);
if ((a4_3 != num) || (b4_3 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (MaxQ, geometric, classic) failed" << endl;
}
@@ -239,7 +255,7 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra1_4(a1_4,b1_4,iteration,genprime);
if ((a1_4 != num) || (b1_4 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (Wang, certified, fast) failed" << endl;
}
@@ -250,18 +266,18 @@ static bool testRandomFraction (size_t n, size_t d, int iterations)
cra3_4(a3_4,b3_4,iteration,genprime);
if ((a3_4 != num) || (b3_4 != den) ) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: rational reconstruction (Wang, certified, classic) failed" << endl;
}
//RReconstruction<PID_integer, ClassicMaxQRationalReconstruction<PID_integer> > RR4_4(RRB2,CERTIFIED);
- commentator.stop ("done");
- commentator.progress ();
- //commentator.progress (i, iterations);
+ commentator().stop ("done");
+ commentator().progress ();
+ //commentator().progress (i, iterations);
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRationalDeterminantGeneric");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRationalDeterminantGeneric");
return ret;
}
@@ -284,14 +300,23 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
//Modular<int> F (q);
- commentator.start("Rational reconstruction test suite", "rr");
+ commentator().start("Rational reconstruction test suite", "rr");
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
if (!testRandomFraction (n, n,iterations)) pass = false;
- commentator.stop("Rational reconstruction test suite");
+ commentator().stop("Rational reconstruction test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-rational-solver-adaptive.C b/tests/test-rational-solver-adaptive.C
index bd96656..106e41b 100644
--- a/tests/test-rational-solver-adaptive.C
+++ b/tests/test-rational-solver-adaptive.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Author: Zhendong Wan
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -31,10 +32,9 @@
-#include <linbox/field/PID-integer.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/blackbox/diagonal.h>
-#include <linbox/algorithms/rational-solver-adaptive.h>
+#include "linbox/field/PID-integer.h"
+#include "linbox/blackbox/diagonal.h"
+#include "linbox/algorithms/rational-solver-adaptive.h"
#include <iostream>
#include "test-common.h"
#include "linbox/vector/stream.h"
@@ -54,7 +54,7 @@ bool testRandomSolve (const Ring& R,
- commentator.start ("Testing Nonsingular Random Diagonal solve ", "testNonsingularRandomDiagonalSolve");
+ commentator().start ("Testing Nonsingular Random Diagonal solve ", "testNonsingularRandomDiagonalSolve");
bool ret = true;
@@ -69,13 +69,13 @@ bool testRandomSolve (const Ring& R,
VectorWrapper::ensureDim (x, stream1.n ());
VectorWrapper::ensureDim (y, stream1.n ());
- int n = d. size();
+ int n = (int)d. size();
while (stream1 && stream2) {
- commentator.startIteration (stream1.j ());
+ commentator().startIteration ((unsigned)stream1.j ());
- //ActivityState state = commentator.saveActivityState ();
+ //ActivityState state = commentator().saveActivityState ();
iter_passed = true;
@@ -89,7 +89,7 @@ bool testRandomSolve (const Ring& R,
stream2.next (b);
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal entries: ";
VD.write (report, d);
report << endl;
@@ -100,7 +100,7 @@ bool testRandomSolve (const Ring& R,
//Diagonal<Ring> D(R, d);
- DenseMatrix<Ring> D(R, n, n);
+ BlasMatrix<Ring> D(R, n, n);
for(int i = 0; i < n; ++i) R.init (D[i][i], d[i]);
@@ -113,7 +113,7 @@ bool testRandomSolve (const Ring& R,
SolverReturnStatus solveResult = rsolver.solveNonsingular(num, den, D, b); //often 5 primes are not enough
- /*
+#if 0
typename Ring::Element lden;
R. init (lden, 1);
@@ -124,10 +124,10 @@ bool testRandomSolve (const Ring& R,
R. lcm (lden, lden, p->second);
typename Vector::iterator p_x;
//typename Vector::iterator p_y;
- */
+#endif
if (solveResult == SS_OK) {
- /*
+#if 0
for (p = answer.begin(), p_x = x. begin();
p != answer.end();
++ p, ++ p_x) {
@@ -139,25 +139,25 @@ bool testRandomSolve (const Ring& R,
}
D. apply (y, x);
- */
+#endif
D. apply (y, num);
VD. mulin(b, den);
if (!VD.areEqual (y, b)) {
ret = iter_passed = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed solution is incorrect" << endl;
}
}
else {
ret = iter_passed = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Did not return OK solving status" << endl;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
@@ -165,7 +165,7 @@ bool testRandomSolve (const Ring& R,
stream1.reset ();
stream2.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularRandomDiagonalSolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularRandomDiagonalSolve");
return ret;
}
@@ -207,3 +207,12 @@ int main(int argc, char** argv)
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-rational-solver.C b/tests/test-rational-solver.C
index 8a825f4..b166bb5 100644
--- a/tests/test-rational-solver.C
+++ b/tests/test-rational-solver.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Author: Zhendong Wan
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -30,12 +31,11 @@
-#include <linbox/field/PID-integer.h>
-#include <linbox/field/modular-int32.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/blackbox/diagonal.h>
-#include <linbox/algorithms/rational-solver.h>
-#include <linbox/randiter/random-prime.h>
+#include "linbox/field/PID-integer.h"
+#include "linbox/field/modular.h"
+#include "linbox/blackbox/diagonal.h"
+#include "linbox/algorithms/rational-solver.h"
+#include "linbox/randiter/random-prime.h"
#include <iostream>
#include "test-common.h"
#include "linbox/vector/stream.h"
@@ -52,7 +52,7 @@ bool testRandomSolve (const Ring& R,
std::ostringstream str;
- commentator.start ("Testing Nonsingular Random Diagonal solve ","testNonsingularRandomDiagonalSolve", stream1.size());// "testNonsingularRandomMatrixSolve", stream1.m ());
+ commentator().start ("Testing Nonsingular Random Diagonal solve ","testNonsingularRandomDiagonalSolve", stream1.size());// "testNonsingularRandomMatrixSolve", stream1.m ());
bool ret = true;
@@ -67,13 +67,13 @@ bool testRandomSolve (const Ring& R,
VectorWrapper::ensureDim (x, stream1.n ());
VectorWrapper::ensureDim (y, stream1.n ());
- int n = d. size();
+ int n = (int)d. size();
while (stream1 && stream2) {
- commentator.startIteration (stream1.j ());
+ commentator().startIteration ((unsigned)stream1.j ());
- //ActivityState state = commentator.saveActivityState ();
+ //ActivityState state = commentator().saveActivityState ();
iter_passed = true;
@@ -87,7 +87,7 @@ bool testRandomSolve (const Ring& R,
stream2.next (b);
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal entries: ";
VD.write (report, d);
report << endl;
@@ -98,7 +98,7 @@ bool testRandomSolve (const Ring& R,
//Diagonal<Ring> D(R, d);
- DenseMatrix<Ring> D(R, n, n);
+ BlasMatrix<Ring> D(R, n, n);
for(int i = 0; i < n; ++i) R.init (D[i][i], d[i]);
@@ -111,7 +111,7 @@ bool testRandomSolve (const Ring& R,
SolverReturnStatus solveResult = rsolver.solve(num, den, D, b, 30); //often 5 primes are not enough
- /*
+#if 0
typename Ring::Element lden;
R. init (lden, 1);
@@ -122,10 +122,10 @@ bool testRandomSolve (const Ring& R,
R. lcm (lden, lden, p->second);
typename Vector::iterator p_x;
//typename Vector::iterator p_y;
- */
+#endif
if (solveResult == SS_OK) {
- /*
+#if 0
for (p = answer.begin(), p_x = x. begin();
p != answer.end();
++ p, ++ p_x) {
@@ -137,25 +137,25 @@ bool testRandomSolve (const Ring& R,
}
D. apply (y, x);
- */
+#endif
D. apply (y, num);
VD. mulin(b, den);
if (!VD.areEqual (y, b)) {
ret = iter_passed = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed solution is incorrect" << endl;
}
}
else {
ret = iter_passed = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Did not return OK solving status" << endl;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
@@ -163,7 +163,7 @@ bool testRandomSolve (const Ring& R,
stream1.reset ();
stream2.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularRandomDiagonalSolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularRandomDiagonalSolve");
return ret;
}
@@ -204,3 +204,12 @@ int main(int argc, char** argv)
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-scalar-matrix.C b/tests/test-scalar-matrix.C
index 8694dde..10c2cab 100644
--- a/tests/test-scalar-matrix.C
+++ b/tests/test-scalar-matrix.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
* using generic testBlackbox -bds
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -61,9 +62,9 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- commentator.start("Scalar black box test suite", "Scalar");
+ commentator().start("Scalar black box test suite", "Scalar");
typedef Modular<uint32_t> Field;
@@ -82,6 +83,15 @@ int main (int argc, char **argv)
//Blackbox C (F, 100000, d); // Test a large one.
//pass = pass && testBlackbox(C);
- commentator.stop(MSG_STATUS(pass));
+ commentator().stop(MSG_STATUS(pass));
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-smith-form-adaptive.C b/tests/test-smith-form-adaptive.C
index e8fcd62..fc7d23f 100644
--- a/tests/test-smith-form-adaptive.C
+++ b/tests/test-smith-form-adaptive.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Author: Zhendong Wan
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -31,14 +32,13 @@
-//#include <linbox/field/ntl-ZZ.h>
-#include <linbox/field/PID-integer.h>
+//#include "linbox/field/ntl-ZZ.h"
+#include "linbox/field/PID-integer.h"
#include <time.h>
-#include <linbox/randiter/random-prime.h>
-#include <linbox/util/commentator.h>
-#include <linbox/vector/stream.h>
-#include <linbox/algorithms/smith-form-adaptive.h>
-#include <linbox/blackbox/dense.h>
+#include "linbox/randiter/random-prime.h"
+#include "linbox/util/commentator.h"
+#include "linbox/vector/stream.h"
+#include "linbox/algorithms/smith-form-adaptive.h"
#include "test-common.h"
using namespace LinBox; // fragile
@@ -54,7 +54,7 @@ bool testRandom(const Ring& R,
str << "Testing the adaptive algorithm for Smith form computation:\n";
- commentator.start (str.str ().c_str (), "testRandom");//, stream1.m ());
+ commentator().start (str.str ().c_str (), "testRandom");//, stream1.m ());
bool ret = true;
bool iter_passed = true;
@@ -68,13 +68,13 @@ bool testRandom(const Ring& R,
VectorWrapper::ensureDim (x, stream1.n ());
- int n = d. size();
+ int n = (int)d. size();
while (stream1) {
- commentator.startIteration (stream1.j ());
+ commentator().startIteration ((unsigned)stream1.j ());
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
iter_passed = true;
@@ -84,7 +84,7 @@ bool testRandom(const Ring& R,
VD.write (report, d);
report << endl;
- DenseMatrix<Ring> D(R, n, n), L(R, n, n), U(R, n, n), A(R,n,n);
+ BlasMatrix<Ring> D(R, n, n), L(R, n, n), U(R, n, n), A(R,n,n);
int i, j;
@@ -105,7 +105,7 @@ bool testRandom(const Ring& R,
std::vector<typename Ring::Element> tmp1(n), tmp2(n), e(n);
- typename DenseMatrix<Ring>::ColIterator col_p;
+ typename BlasMatrix<Ring>::ColIterator col_p;
i = 0;
for (col_p = A.colBegin();
@@ -176,20 +176,20 @@ bool testRandom(const Ring& R,
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed Smith form is incorrect" << endl;
- commentator.stop ("done");
+ commentator().stop ("done");
- commentator.progress ();
+ commentator().progress ();
}
//stream1.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandom");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandom");
return ret;
@@ -210,8 +210,8 @@ int main(int argc, char** argv)
parseArguments (argc, argv, args);
SmithFormAdaptive sf;
- commentator.start("Smith form adaptive algorithm test suite", "EGV++");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
+ commentator().start("Smith form adaptive algorithm test suite", "EGV++");
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
//typedef NTL_ZZ Ring; Ring R;
typedef PID_integer Ring; Ring R;
@@ -222,7 +222,16 @@ int main(int argc, char** argv)
RandomDenseStream<Ring2> s2 (S, n, iterations);
pass = pass && testRandom(S, sf, s2);
- commentator.stop(MSG_STATUS(pass));
+ commentator().stop(MSG_STATUS(pass));
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-smith-form-binary.C b/tests/test-smith-form-binary.C
index 29de3d9..505b3f9 100644
--- a/tests/test-smith-form-binary.C
+++ b/tests/test-smith-form-binary.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
* Author: Zhendong Wan
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -31,24 +32,23 @@
-#include <linbox/field/PID-integer.h>
+#include "linbox/field/PID-integer.h"
#ifdef __LINBOX_HAVE_NTL
-#include "linbox/field/ntl-ZZ.h"
+#include "linbox/field/ntl.h"
#endif
-#include <linbox/field/modular-int32.h>
-#include <linbox/randiter/random-prime.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/algorithms/matrix-rank.h>
-#include <linbox/algorithms/last-invariant-factor.h>
-#include <linbox/algorithms/one-invariant-factor.h>
-#include <linbox/algorithms/smith-form-binary.h>
-#include <linbox/blackbox/scompose.h>
-#include <linbox/blackbox/random-matrix.h>
-#include <linbox/algorithms/rational-solver.h>
+#include "linbox/field/modular.h"
+#include "linbox/randiter/random-prime.h"
+#include "linbox/algorithms/matrix-rank.h"
+#include "linbox/algorithms/last-invariant-factor.h"
+#include "linbox/algorithms/one-invariant-factor.h"
+#include "linbox/algorithms/smith-form-binary.h"
+#include "linbox/blackbox/scompose.h"
+#include "linbox/blackbox/random-matrix.h"
+#include "linbox/algorithms/rational-solver.h"
#include <time.h>
-#include <linbox/util/commentator.h>
-#include <linbox/vector/stream.h>
+#include "linbox/util/commentator.h"
+#include "linbox/vector/stream.h"
#include "test-common.h"
using namespace LinBox;
@@ -62,7 +62,7 @@ bool testRandom(const Ring& R,
str << "Testing Smith Form binary(EGV++):";
- commentator.start (str.str ().c_str (), "testSmithform");//, stream1.m ());
+ commentator().start (str.str ().c_str (), "testSmithform");//, stream1.m ());
bool ret = true;
bool iter_passed = true;
@@ -76,13 +76,13 @@ bool testRandom(const Ring& R,
VectorWrapper::ensureDim (x, stream1.n ());
- int n = d. size();
+ int n = (int)d. size();
while (stream1) {
- commentator.startIteration (stream1.j ());
+ commentator().startIteration ((unsigned)stream1.j ());
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
iter_passed = true;
@@ -92,7 +92,7 @@ bool testRandom(const Ring& R,
VD.write (report, d);
report << endl;
- DenseMatrix<Ring> D(R, n, n), L(R, n, n), U(R, n, n), A(R,n,n);
+ BlasMatrix<Ring> D(R, n, n), L(R, n, n), U(R, n, n), A(R,n,n);
int i, j;
@@ -113,7 +113,7 @@ bool testRandom(const Ring& R,
std::vector<typename Ring::Element> tmp1(n), tmp2(n), e(n);
- typename DenseMatrix<Ring>::ColIterator col_p;
+ typename BlasMatrix<Ring>::ColIterator col_p;
i = 0;
for (col_p = A.colBegin();
@@ -179,20 +179,20 @@ bool testRandom(const Ring& R,
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed Smith form is incorrect" << endl;
- commentator.stop ("done");
+ commentator().stop ("done");
- commentator.progress ();
+ commentator().progress ();
}
//stream1.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testSmithform");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testSmithform");
return ret;
@@ -215,8 +215,8 @@ int main(int argc, char** argv)
parseArguments (argc, argv, args);
- commentator.start("SmithFormBinary test suite", "SmithFormBinary");
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ commentator().start("SmithFormBinary test suite", "SmithFormBinary");
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
{
typedef PID_integer Ring;
@@ -225,7 +225,7 @@ int main(int argc, char** argv)
report << std::endl << "EGV++ algorithm test suite with LinBox/Givaro PID:\n";
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
RandomDenseStream<Ring> s1 (R, n, iterations);
@@ -251,7 +251,7 @@ int main(int argc, char** argv)
Ring R;
report << std::endl << "EGV++ algorithm test suite with NTL_ZZ :\n";
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
RandomDenseStream<Ring> s1 (R, n, iterations);
@@ -269,6 +269,15 @@ int main(int argc, char** argv)
}
#endif
- commentator.stop("SmithFormBinary test suite");
+ commentator().stop("SmithFormBinary test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-smith-form-iliopoulos.C b/tests/test-smith-form-iliopoulos.C
index 1add3e2..079a3cb 100644
--- a/tests/test-smith-form-iliopoulos.C
+++ b/tests/test-smith-form-iliopoulos.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Author: Zhendong Wan
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
@@ -29,26 +30,28 @@
*/
-#include <linbox/field/ntl-ZZ.h>
-#include <linbox/field/modular-int32.h>
-#include <linbox/field/PIR-ntl-ZZ_p.h>
-#include <linbox/field/PIR-modular-int32.h>
-#include <linbox/integer.h>
-#include <linbox/randiter/random-prime.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/algorithms/last-invariant-factor.h>
-#include <linbox/algorithms/smith-form-iliopoulos.h>
-#include <linbox/algorithms/rational-solver.h>
+
+#include "linbox/field/ntl.h"
+#include "linbox/field/modular.h"
+#include "linbox/field/PIR-ntl-ZZ_p.h"
+#include "linbox/field/PIR-modular-int32.h"
+#include "linbox/integer.h"
+#include "linbox/randiter/random-prime.h"
+#include "linbox/algorithms/last-invariant-factor.h"
+#include "linbox/algorithms/smith-form-iliopoulos.h"
+#include "linbox/algorithms/rational-solver.h"
#include <time.h>
-#include <linbox/util/commentator.h>
-#include <linbox/vector/stream.h>
+#include "linbox/util/commentator.h"
+#include "linbox/vector/stream.h"
#include "test-common.h"
-#include <linbox/algorithms/matrix-hom.h>
+#include "linbox/algorithms/matrix-hom.h"
#ifndef __LINBOX_HAVE_NTL
#error "you can't compile this test without NTL enabled. Please make sure you configured Linbox with --with-ntl=path/to/ntl"
#endif
+
+
using namespace LinBox;
template <class Ring, class Vector>
@@ -62,7 +65,7 @@ bool testRandom(const Ring& R,
str << "Testing Iloipoulos elimination:";
- commentator.start (str.str ().c_str (), "testRandom", stream1.m ());
+ commentator().start (str.str ().c_str (), "testRandom", stream1.m ());
bool ret = true;
@@ -76,13 +79,13 @@ bool testRandom(const Ring& R,
VectorWrapper::ensureDim (x, stream1.n ());
- int n = d. size();
+ int n = (int)d. size();
while (stream1) {
- commentator.startIteration (stream1.j ());
+ commentator().startIteration ((unsigned)stream1.j ());
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
iter_passed = true;
@@ -92,7 +95,7 @@ bool testRandom(const Ring& R,
VD.write (report, d);
report << endl;
- DenseMatrix<Ring> D(R, n, n), L(R, n, n), U(R, n, n), A(R,n,n);
+ BlasMatrix<Ring> D(R, n, n), L(R, n, n), U(R, n, n), A(R,n,n);
int i, j;
@@ -110,7 +113,7 @@ bool testRandom(const Ring& R,
std::vector<typename Ring::Element> tmp1(n), tmp2(n), e(n);
- typename DenseMatrix<Ring>::ColIterator col_p;
+ typename BlasMatrix<Ring>::ColIterator col_p;
i = 0;
for (col_p = A.colBegin(); col_p != A.colEnd(); ++ col_p, ++ i) {
@@ -147,7 +150,7 @@ bool testRandom(const Ring& R,
PIR_ntl_ZZ_p PIR(s);
- DenseMatrix<PIR_ntl_ZZ_p> Ap(PIR, A.rowdim(), A.coldim());
+ BlasMatrix<PIR_ntl_ZZ_p> Ap(PIR, A.rowdim(), A.coldim());
MatrixHom::map (Ap, A, PIR);
@@ -155,25 +158,25 @@ bool testRandom(const Ring& R,
report << "Computed Smith form: \n";
- for ( unsigned int i = 0; i < A. rowdim(); ++ i)
- report << Ap[i][i] << " ";
+ for ( unsigned int ii = 0; ii < A. rowdim(); ++ ii)
+ report << Ap[ii][ii] << " ";
report << '\n';
- int i = 0;
+ int ii = 0;
typename std::vector<typename Ring::Element>::iterator p1;
- for (p1 = x. begin(); p1 != x. end(); ++ p1, ++ i) {
+ for (p1 = x. begin(); p1 != x. end(); ++ p1, ++ ii) {
- if (PIR.isZero(Ap[i][i]))
+ if (PIR.isZero(Ap[ii][ii]))
R.assign (*p1, s);
else
- R.assign (*p1, NTL::rep(Ap[i][i]));
+ R.assign (*p1, NTL::rep(Ap[ii][ii]));
}
}
@@ -181,9 +184,9 @@ bool testRandom(const Ring& R,
report << "Using PIRModular<int32_t>\n";
- PIRModular<int32_t> PIR(s % LINBOX_MAX_MODULUS);
+ PIRModular<int32_t> PIR( (int32_t)(s % LINBOX_MAX_MODULUS));
- DenseMatrix<PIRModular<int32_t> > Ap(PIR, A.rowdim(), A.coldim());
+ BlasMatrix<PIRModular<int32_t> > Ap(PIR, A.rowdim(), A.coldim());
MatrixHom::map (Ap, A, PIR);
@@ -192,24 +195,20 @@ bool testRandom(const Ring& R,
report << "Computed Smith form: \n";
- for ( unsigned int i = 0; i < A. rowdim(); ++ i)
- report << Ap[i][i] << " ";
+ for ( unsigned int ii = 0; ii < A. rowdim(); ++ ii)
+ report << Ap[ii][ii] << " ";
report << '\n';
typename std::vector<typename Ring::Element>::iterator p1;
- int i = 0;
-
- for (p1 = x. begin(); p1 != x. end(); ++ p1, ++ i) {
-
- if (PIR.isZero(Ap[i][i]))
+ int ii = 0;
+ for (p1 = x. begin(); p1 != x. end(); ++ p1, ++ ii) {
+ if (PIR.isZero(Ap[ii][ii]))
R.assign (*p1, s);
-
else
-
- R.init (*p1, Ap[i][i]);
+ R.init (*p1, Ap[ii][ii]);
}
}
@@ -255,20 +254,20 @@ bool testRandom(const Ring& R,
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed Smith form is incorrect" << endl;
- commentator.stop ("done");
+ commentator().stop ("done");
- commentator.progress ();
+ commentator().progress ();
}
//stream1.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandom");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandom");
return ret;
@@ -298,16 +297,25 @@ int main(int argc, char** argv)
Ring R;
- commentator.start("Ilioloulos Smith Form test suite", "Ilioloulos");
+ commentator().start("Ilioloulos Smith Form test suite", "Ilioloulos");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
RandomDenseStream<Ring> s1 (R, n, iterations);
if (!testRandom(R, s1)) pass = false;
- commentator.stop("Ilioloulos Smith Form test suite");
+ commentator().stop("Ilioloulos Smith Form test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-smith-form-local.C b/tests/test-smith-form-local.C
index f51b0d3..a9fd850 100644
--- a/tests/test-smith-form-local.C
+++ b/tests/test-smith-form-local.C
@@ -1,12 +1,28 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-local-smith.C
* Copyright (C) LinBox
*
* Written by David Saunders
*
* --------------------------------------------------------
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
@@ -29,10 +45,9 @@
#include "linbox/field/PIR-modular-int32.h"
//#include "linbox/field/PIR-modular-double.h"
#include "linbox/field/local2_32.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/algorithms/smith-form-local.h"
-#include <linbox/matrix/matrix-domain.h>
-#include <linbox/util/timer.h>
+#include "linbox/matrix/matrix-domain.h"
+#include "linbox/util/timer.h"
using namespace LinBox;
@@ -118,9 +133,9 @@ template <class LocalPIR>
static bool testLocalSmith (const LocalPIR &R, vector<typename LocalPIR::Element>& d, string s)
{
typedef typename LocalPIR::Element Elt;
- typedef DenseMatrix<LocalPIR> Blackbox;
+ typedef BlasMatrix<LocalPIR> Blackbox;
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << s << endl;
MatrixDomain<LocalPIR> MR (R);
@@ -136,7 +151,7 @@ static bool testLocalSmith (const LocalPIR &R, vector<typename LocalPIR::Element
// set up A equiv diag d.
Blackbox L (R, n, n), D (R, n, n), U (R, n, n), A (R, n, n);
- for( i = 0; i < n; ++i )
+ for( i = 0; i < n; ++i )
{ D[i][i] = d[i]; L[i][i]=U[i][i]=1; }
for (i = 0; i < n; ++ i)
for ( j = 0; j < i; ++ j) {
@@ -171,15 +186,15 @@ static bool testLocalSmith (const LocalPIR &R, vector<typename LocalPIR::Element
report << "True invariants: ";
VD.write (report, d) << endl; report.flush();
- typename vector<Elt>::iterator q;
- listptr p;
+ typename vector<Elt>::iterator q;
+ listptr p;
for (p = Inv.begin(), q = d.begin(); q != d.end(); ++p, ++q)
{
if ( !R.areEqual (*p, *q ) ) {
report << "ERROR: Computed invariants incorrect" << endl;
ret = false;
}
- commentator.progress();
+ commentator().progress();
}
return ret;
}
@@ -201,9 +216,9 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("Local Smith Form test suite", "LocalSmith");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ commentator().start("Local Smith Form test suite", "LocalSmith");
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
#if 0
//PIRModular does not currently support the local ring interface -bds Mar2011
@@ -214,15 +229,15 @@ int main (int argc, char **argv)
//LocalPID R (32768);
vector<LocalPID::Element> d(n);
- commentator.start ("Testing local smith on singular dense mat over PIRModular", "testSingular");
+ commentator().start ("Testing local smith on singular dense mat over PIRModular", "testSingular");
for( size_t i = 0; i < n; ++i ) d[i] = i;
if (!testLocalSmith<LocalPID> (R, d, "PIRModular<int32_t>")) pass1 = false;
- commentator.stop ("testSingular");
+ commentator().stop ("testSingular");
- commentator.start ("Testing local smith on nonsingular dense mat over PIRModular", "testNonsingular");
+ commentator().start ("Testing local smith on nonsingular dense mat over PIRModular", "testNonsingular");
for( size_t i = 0; i < n; ++i ) d[i] = i+1;
if (!testLocalSmith<LocalPID> (R, d, "PIRModular<int32_t>")) pass1 = false;
- commentator.stop ("testNonsingular");
+ commentator().stop ("testNonsingular");
}
if (not pass1) report << "PIRModular FAIL" << std::endl;
#endif
@@ -232,19 +247,30 @@ int main (int argc, char **argv)
LocalPID R;
vector<LocalPID::Element> d(n);
- commentator.start ("Testing local smith on singular dense mat over Local2_32", "testSingular");
- for( size_t i = 0; i < n; ++i ) d[i] = i;
+ commentator().start ("Testing local smith on singular dense mat over Local2_32", "testSingular");
+ for( size_t i = 0; i < n; ++i )
+ d[i] = (LocalPID::Element) i;
if (!testLocalSmith<LocalPID> (R, d, "Local2_32")) pass = false;
- commentator.stop ("testSingular");
+ commentator().stop ("testSingular");
- commentator.start ("Testing local smith on nonsingular dense mat over Local2_32", "testNonsingular");
- for( size_t i = 0; i < n; ++i ) d[i] = i+1;
+ commentator().start ("Testing local smith on nonsingular dense mat over Local2_32", "testNonsingular");
+ for( size_t i = 0; i < n; ++i )
+ d[i] = (LocalPID::Element) i+1;
if (!testLocalSmith<LocalPID> (R, d, "Local2_32")) pass = false;
- commentator.stop ("testNonsingular");
+ commentator().stop ("testNonsingular");
}
if (not pass) report << "PIRModular FAIL" << std::endl;
- commentator.stop("Local Smith Form test suite");
+ commentator().stop("Local Smith Form test suite");
return pass and pass1 ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-smith-form.C b/tests/test-smith-form.C
index f355e7c..6fcfa96 100644
--- a/tests/test-smith-form.C
+++ b/tests/test-smith-form.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Author: Zhendong Wan
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file tests/test-smith-form.C
@@ -30,18 +31,18 @@
#include <time.h>
//#ifdef __LINBOX_HAVE_NTL
-//#include <linbox/field/ntl-ZZ.h>
+//#include "linbox/field/ntl-ZZ.h"
//#endif
-#include <linbox/field/PID-integer.h>
-#include <linbox/util/commentator.h>
-#include <linbox/vector/stream.h>
+#include "linbox/field/PID-integer.h"
+#include "linbox/util/commentator.h"
+#include "linbox/vector/stream.h"
#include "test-common.h"
-#include <linbox/blackbox/dense.h>
-#include <linbox/solutions/smith-form.h>
+#include "linbox/solutions/smith-form.h"
+using LinBox::parseArguments;
using LinBox::commentator;
using LinBox::Commentator;
-using LinBox::integer;
-using LinBox::DenseMatrix;
+using LinBox::integer;
+using LinBox::BlasMatrix;
template <class Ring, class Vector>
bool testRandom(const Ring& R,
@@ -52,7 +53,7 @@ bool testRandom(const Ring& R,
str << "Testing the smithForm function in solutions directory:\n";
- commentator.start (str.str ().c_str (), "testRandom");//, stream1.m ());
+ commentator().start (str.str ().c_str (), "testRandom");//, stream1.m ());
bool ret = true;
bool iter_passed = true;
@@ -66,13 +67,13 @@ bool testRandom(const Ring& R,
LinBox::VectorWrapper::ensureDim (x, stream1.n ());
- int n = d. size();
+ int n = (int)d. size();
while (stream1) {
- commentator.startIteration (stream1.j ());
+ commentator().startIteration ((unsigned)stream1.j ());
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
iter_passed = true;
@@ -82,7 +83,7 @@ bool testRandom(const Ring& R,
VD.write (report, d);
report << endl;
- DenseMatrix<Ring> D(R, n, n), L(R, n, n), U(R, n, n), A(R,n,n);
+ BlasMatrix<Ring> D(R, n, n), L(R, n, n), U(R, n, n), A(R,n,n);
int i, j;
@@ -103,7 +104,7 @@ bool testRandom(const Ring& R,
std::vector<typename Ring::Element> tmp1(n), tmp2(n), e(n);
- typename DenseMatrix<Ring>::ColIterator col_p;
+ typename BlasMatrix<Ring>::ColIterator col_p;
i = 0;
for (col_p = A.colBegin();
@@ -125,7 +126,7 @@ bool testRandom(const Ring& R,
xi_p = xi. begin();
for (cpt_p = cpt.begin(); cpt_p != cpt.end(); ++ cpt_p) {
- for (size_t i = 0; i < cpt_p -> second; ++ i, ++ xi_p)
+ for (size_t ii = 0; ii < cpt_p -> second; ++ ii, ++ xi_p)
*xi_p = cpt_p -> first;
}
@@ -161,16 +162,16 @@ bool testRandom(const Ring& R,
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed Smith form is incorrect" << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
//stream1.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandom");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandom");
return ret;
}
@@ -195,13 +196,22 @@ int main(int argc, char** argv)
//#endif
Ring R;
- commentator.start("Smith form test suite", "Smith");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
+ commentator().start("Smith form test suite", "Smith");
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
LinBox::RandomDenseStream<Ring> s1 (R, n, iterations);
if (!testRandom(R, s1)) pass = false;
- commentator.stop("Smith form test suite");
+ commentator().stop("Smith form test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-solve-nonsingular.C b/tests/test-solve-nonsingular.C
index c19f5b2..59d7a93 100644
--- a/tests/test-solve-nonsingular.C
+++ b/tests/test-solve-nonsingular.C
@@ -1,4 +1,26 @@
-/* -*- mode:C++ -*- */
+
+/* Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ */
+
+
/* File: solve-nonsigular.C
This file was used to generate solver comparison data for the paper "Symbolic-Numeric Exact Rational Linear System Solver" submitted to ISSAC'11
*/
@@ -7,22 +29,24 @@
#include <fstream>
#include <cstdlib>
-#include <linbox/linbox-config.h>
+#include "linbox/linbox-config.h"
-#include <linbox/algorithms/rational-solver.h>
-#include <linbox/randiter/random-prime.h>
+#include "linbox/algorithms/rational-solver.h"
+#include "linbox/randiter/random-prime.h"
-#include <linbox/field/PID-integer.h>
-#include <linbox/field/param-fuzzy.h>
-#include <linbox/blackbox/blas-blackbox.h>
+#include "linbox/field/PID-integer.h"
+#include "linbox/field/param-fuzzy.h"
#include "tests/test-common.h"
#include "linbox/vector/stream.h"
#include "linbox/util/commentator.h"
#include "linbox/util/timer.h"
-#include <linbox/algorithms/numeric-solver-lapack.h>
+#ifdef __LINBOX_HAVE_LAPACK
+#include "linbox/algorithms/numeric-solver-lapack.h"
+#endif
+
#ifdef __LINBOX_HAVE_MATLAB
- #include <linbox/algorithms/numeric-solver-matlab.h>
+ #include "linbox/algorithms/numeric-solver-matlab.h"
#endif
//or #include "other-numeric-solver.h"
@@ -34,7 +58,7 @@
* 4. apply(y, x) // y <-- Ax, approximately, for vector of double y, x.
*/
-#include <linbox/algorithms/rational-solver-sn.h>
+#include "linbox/algorithms/rational-solver-sn.h"
/* rational-solver provides
* 1. constructor with a numerical solver as argument (call it NS).
* 2. solve(num, den, A, b, NS)
@@ -69,7 +93,8 @@ void generateProblem(const Ring& R, Matrix &D, Vector &b,
LinBox::VectorStream<Vector>& stream1,
LinBox::VectorStream<Vector>& stream2,
MatType mt,
- int k = 10){
+ int k = 10)
+{
Vector d, x, y;
VectorWrapper::ensureDim (d, stream1.n ());
@@ -77,9 +102,9 @@ void generateProblem(const Ring& R, Matrix &D, Vector &b,
VectorWrapper::ensureDim (x, stream1.n ());
VectorWrapper::ensureDim (y, stream1.n ());
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
- int n = d.size();
+ int n =(int) d.size();
bool zeroEntry;
do {
@@ -146,9 +171,9 @@ void generateProblem(const Ring& R, Matrix &D, Vector &b,
//R.init(product, 1);
randLim = 100000;
for(int i = 0; i < n; ++i) {
- int x = d[i]%randLim;
- if (x == 0) x = 1;
- R.init (tmp, x);
+ int xx = d[i]%randLim;
+ if (xx == 0) xx = 1;
+ R.init (tmp, xx);
//R.mulin(product, tmp);
//if (n == 4) tmp = i+1;
//if (tmp == 4) tmp = -4;
@@ -192,7 +217,7 @@ void generateProblem(const Ring& R, Matrix &D, Vector &b,
template <class Ring, class RSolver, class Matrix, class Vector>
bool testRandomSolve (const Ring& R, RSolver& rsolver, Matrix& D, Vector &b) {
- int n = b.size();
+ int n = (int) b.size();
Vector d, tmpb, x, y;
VectorWrapper::ensureDim (d, n);
VectorWrapper::ensureDim (x, n);
@@ -204,7 +229,7 @@ bool testRandomSolve (const Ring& R, RSolver& rsolver, Matrix& D, Vector &b) {
//std::ostringstream str;
//std::ostream &report = cerr;
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
// print small mats
if(n <= 20){
@@ -265,7 +290,8 @@ bool testRandomSolve (const Ring& R, RSolver& rsolver, Matrix& D, Vector &b) {
int main(int argc, char** argv) {
bool pass = true;
- int run = 1;
+ bool part_pass = true;
+ int run = 7;
static size_t n = 10;
static size_t k = 10;
bool e = false;
@@ -286,11 +312,11 @@ int main(int argc, char** argv) {
};
parseArguments (argc, argv, args);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- std::ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
typedef PID_integer Ring; Ring R;
@@ -298,8 +324,8 @@ int main(int argc, char** argv) {
typedef Modular<int32_t> ZField;
typedef Modular<double> DField;
- typedef BlasBlackbox<Field> Matrix;
- typedef BlasBlackbox<Ring> CommonMatrix;
+ typedef BlasMatrix<Field> Matrix;
+ typedef BlasMatrix<Ring> CommonMatrix;
typedef vector<Ring::Element> Vector;
if(mt == Hadamard)
@@ -309,54 +335,72 @@ int main(int argc, char** argv) {
CommonMatrix A(R, n, n);
Vector b(n);
- generateProblem(R, A, b, s1, s2, mt, k);
+ generateProblem(R, A, b, s1, s2, mt, (int) k);
if(run & 1){
+ if (sizeof(int) < 8) {
+
+ report << "numsym: not done. Requires 64 bit architecture." << std::endl << std::endl;
+ } else {
/* choose your numerical solver */
switch (st){
#ifdef __LINBOX_HAVE_LAPACK
case lapack: {
report << "Using lapack numeric solver." << endl;
- typedef LPS<Matrix> NumSolver; NumSolver numSolver;
+ typedef LPS<Matrix> NumSolver;
+ NumSolver numSolver;
RationalSolverSN<Ring, NumSolver > rsolver(R, numSolver, e);
- pass = pass && testRandomSolve(R, rsolver, A, b);
+ part_pass &= testRandomSolve(R, rsolver, A, b);
}
break;
#endif
#ifdef __LINBOX_HAVE_MATLAB
case matlab: {
report << "Using matlab numeric solver." << endl;
- typedef MLS<Matrix> NumSolver; NumSolver numSolver;
+ typedef MLS<Matrix> NumSolver;
+ NumSolver numSolver;
RationalSolverSN<Ring, NumSolver > rsolver(R, numSolver, e);
- pass = pass && testRandomSolve(R, rsolver, A, b);
+ part_pass &= testRandomSolve(R, rsolver, A, b);
}
break;
#endif
- /*
+#if 0 /* NIY */
case superlu: {
report << "Using SuperLU numeric solver." << endl;
typedef SLU<Matrix> NumSolver; NumSolver numSolver(file);
SNRationalSolver<Ring, NumSolver > rsolver(R, numSolver);
- pass = pass && testRandomSolve(R, rsolver, s1, s2, mt, 1, e, k);
+ part_pass &= testRandomSolve(R, rsolver, s1, s2, mt, 1, e, k);
}
break;
- */
+#endif
default:
break;
}
- report << "numsym: " << (pass ? "pass" : "fail") << std::endl << std::endl;
+ report << "numsym: " << (part_pass ? "pass" : "fail") << std::endl << std::endl;
+ }
}
+ pass = pass && part_pass;
if(run & 2){
RationalSolver<Ring, ZField, RandomPrimeIterator, WanTraits> rsolver(R);
- pass = testRandomSolve(R, rsolver, A, b);
- report << "zw: " << (pass ? "pass" : "fail") << std::endl << std::endl;
+ part_pass = testRandomSolve(R, rsolver, A, b);
+ report << "zw: " << (part_pass ? "pass" : "fail") << std::endl << std::endl;
}
+ pass = pass && part_pass;
if(run & 4){
RandomPrimeIterator genprime( 26-(int)ceil(log((double)n)*0.7213475205) );
RationalSolver<Ring, DField, RandomPrimeIterator, DixonTraits> rsolver(R, genprime);
- pass = testRandomSolve(R, rsolver, A, b);
- report << "dixon: " << (pass ? "pass" : "fail") << std::endl << std::endl;
+ part_pass = testRandomSolve(R, rsolver, A, b);
+ report << "dixon: " << (part_pass ? "pass" : "fail") << std::endl << std::endl;
}
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-solve.C b/tests/test-solve.C
index e0b9095..d09d143 100644
--- a/tests/test-solve.C
+++ b/tests/test-solve.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-solve.C
* Copyright (C) 2001, 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
/*! @file tests/test-solve.C
@@ -66,7 +82,7 @@ static bool testIdentitySolve (const Field &F,
ostringstream str;
str << "Testing identity solve (" << text << ")";
- commentator.start (str.str ().c_str (), "testIdentitySolve", stream.m ());
+ commentator().start (str.str ().c_str (), "testIdentitySolve", stream.m ());
bool ret = true;
bool iter_passed = true;
@@ -85,13 +101,13 @@ static bool testIdentitySolve (const Field &F,
MethodTraits traits (method);
while (stream) {
- commentator.startIteration (stream.j ());
+ commentator().startIteration ((unsigned)stream.j ());
iter_passed = true;
stream.next (v);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector: ";
VD.write (report, v);
report << endl;
@@ -100,12 +116,12 @@ static bool testIdentitySolve (const Field &F,
solve (I, w, v, F, traits);
}
catch (SolveFailed) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Solve failed to solve system" << endl;
ret = iter_passed = false;
}
catch (InconsistentSystem<Vector> e) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Solve reported an inconsistent system" << endl;
ret = iter_passed = false;
}
@@ -119,17 +135,17 @@ static bool testIdentitySolve (const Field &F,
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vectors are not equal" << endl;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testIdentitySolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testIdentitySolve");
return ret;
}
@@ -155,12 +171,12 @@ static bool testNonsingularSolve (const Field &F,
const char *text,
MethodTraits method)
{
- typedef Diagonal <Field, Vector> Blackbox;
+ typedef Diagonal <Field> Blackbox;
ostringstream str;
str << "Testing nonsingular solve (" << text << ")";
- commentator.start (str.str ().c_str (), "testNonsingularSolve", stream1.m ());
+ commentator().start (str.str ().c_str (), "testNonsingularSolve", stream1.m ());
VectorDomain<Field> VD (F);
@@ -177,16 +193,16 @@ static bool testNonsingularSolve (const Field &F,
MethodTraits traits (method);
while (stream1 && stream2) {
- commentator.startIteration (stream1.j ());
+ commentator().startIteration ((unsigned)stream1.j ());
- ActivityState state = commentator.saveActivityState ();
+ ActivityState state = commentator().saveActivityState ();
iter_passed = true;
stream1.next (d);
stream2.next (b);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal entries: ";
VD.write (report, d);
report << endl;
@@ -201,14 +217,14 @@ static bool testNonsingularSolve (const Field &F,
solve (D, x, b, F, traits);
}
catch (SolveFailed) {
- commentator.restoreActivityState (state);
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().restoreActivityState (state);
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: System solution failed" << endl;
ret = iter_passed = false;
}
catch (InconsistentSystem<Vector> e) {
- commentator.restoreActivityState (state);
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().restoreActivityState (state);
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: solve reported inconsistent system" << endl;
ret = iter_passed = false;
}
@@ -228,18 +244,18 @@ static bool testNonsingularSolve (const Field &F,
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed solution is incorrect" << endl;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
stream1.reset ();
stream2.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularSolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testNonsingularSolve");
return ret;
}
@@ -273,7 +289,7 @@ static bool testSingularConsistentSolve (const Field &F,
ostringstream str;
str << "Testing singular consistent solve (" << text << ")";
- commentator.start (str.str ().c_str (), "testSingularConsistentSolve", stream1.m ());
+ commentator().start (str.str ().c_str (), "testSingularConsistentSolve", stream1.m ());
VectorDomain<Field> VD (F);
@@ -293,9 +309,9 @@ static bool testSingularConsistentSolve (const Field &F,
traits.preconditioner (MethodTraits::NO_PRECONDITIONER);
while (stream1 && stream2) {
- commentator.startIteration (stream1.j ());
+ commentator().startIteration ((unsigned)stream1.j ());
- ActivityState state = commentator.saveActivityState ();
+ ActivityState state = commentator().saveActivityState ();
iter_passed = true;
@@ -305,7 +321,7 @@ static bool testSingularConsistentSolve (const Field &F,
VD.copy (d, d1);
VD.copy (b, b1);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal entries: ";
VD.write (report, d);
report << endl;
@@ -333,36 +349,36 @@ static bool testSingularConsistentSolve (const Field &F,
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Computed solution is incorrect" << endl;
}
catch (SolveFailed) {
- commentator.restoreActivityState (state);
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().restoreActivityState (state);
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: System solution failed" << endl;
ret = false;
}
catch (InconsistentSystem<Vector> e) {
- commentator.restoreActivityState (state);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR);
- report << "ERROR: Inconsistent system exception" << endl;
+ commentator().restoreActivityState (state);
+ ostream &Report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR);
+ Report << "ERROR: Inconsistent system exception" << endl;
- report << "Certificate is: ";
- VD.write (report, e.u ()) << endl;
+ Report << "Certificate is: ";
+ VD.write (Report, e.u ()) << endl;
ret = false;
- commentator.restoreActivityState (state);
+ commentator().restoreActivityState (state);
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
stream1.reset ();
stream2.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testSingularConsistentSolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testSingularConsistentSolve");
return ret;
}
@@ -394,7 +410,7 @@ static bool testSingularInconsistentSolve (const Field &F,
ostringstream str;
str << "Testing singular inconsistent solve (" << text << ")";
- commentator.start (str.str ().c_str (), "testSingularInconsistentSolve", stream1.m ());
+ commentator().start (str.str ().c_str (), "testSingularInconsistentSolve", stream1.m ());
VectorDomain<Field> VD (F);
@@ -414,14 +430,14 @@ static bool testSingularInconsistentSolve (const Field &F,
traits.preconditioner (MethodTraits::NONE);
while (stream1 && stream2) {
- commentator.startIteration (stream1.j ());
+ commentator().startIteration ((unsigned)stream1.j ());
stream1.next (d1);
stream2.next (b);
VD.copy (d, d1);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal entries: ";
VD.write (report, d);
report << endl;
@@ -451,36 +467,36 @@ static bool testSingularInconsistentSolve (const Field &F,
F.write (report, uTb) << endl;
if (!VD.isZero (y)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: u is not in the right nullspace of D" << endl;
ret = false;
}
if (F.isZero (uTb)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: u^T b = 0" << endl;
ret = false;
}
}
else if (status == WiedemannSolver<Field>::FAILED) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Solver refused to certify inconsistency" << endl;
ret = false;
}
else {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Solver gave solution even though system is inconsistent" << endl;
ret = false;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
stream1.reset ();
stream2.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testSingularInconsistentSolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testSingularInconsistentSolve");
return ret;
}
@@ -512,7 +528,7 @@ static bool testSingularPreconditionedSolve (const Field &F,
ostringstream str;
str << "Testing singular preconditioned solve (" << text << ")";
- commentator.start (str.str ().c_str (), "testSingularPreconditionedSolve", stream1.m ());
+ commentator().start (str.str ().c_str (), "testSingularPreconditionedSolve", stream1.m ());
VectorDomain<Field> VD (F);
@@ -537,14 +553,14 @@ static bool testSingularPreconditionedSolve (const Field &F,
traits.preconditioner (preconditioner);
while (stream1 && stream2) {
- commentator.startIteration (stream1.j ());
+ commentator().startIteration ((unsigned)stream1.j ());
stream1.next (d1);
stream2.next (b);
VD.copy (d, d1);
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal entries: ";
VD.write (report, d);
report << endl;
@@ -574,36 +590,36 @@ static bool testSingularPreconditionedSolve (const Field &F,
F.write (report, uTb) << endl;
if (!VD.isZero (y)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: u is not in the right nullspace of D" << endl;
ret = false;
}
if (F.isZero (uTb)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: u^T b = 0" << endl;
ret = false;
}
}
else if (status == WiedemannSolver<Field>::FAILED) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Solver refused to certify inconsistency" << endl;
ret = false;
}
else {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Solver gave solution even though system is inconsistent" << endl;
ret = false;
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
stream1.reset ();
stream2.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testSingularPreconditionedSolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testSingularPreconditionedSolve");
return ret;
}
@@ -621,7 +637,7 @@ static bool testRandomSolve (const Field &F,
ostringstream str;
str << "Testing random solve (" << text << ")";
- commentator.start (str.str ().c_str (), "testRandomSolve", b_stream.size ());
+ commentator().start (str.str ().c_str (), "testRandomSolve", b_stream.size ());
bool ret = true;
bool iter_passed = true;
@@ -638,13 +654,13 @@ static bool testRandomSolve (const Field &F,
SparseMatrix<Field> A (F, A_stream);
SparseMatrixBase<typename Field::Element> AT (A.coldim (), A.rowdim ());
- DenseMatrixBase<typename Field::Element> ATA (A.coldim (), A.coldim ());
+ BlasMatrix<Field> ATA (A.coldim (), A.coldim ());
A.transpose (AT);
MD.mul (ATA, AT, A);
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix A:" << endl;
A.write (report);
@@ -654,52 +670,52 @@ static bool testRandomSolve (const Field &F,
MethodTraits traits (method);
while (b_stream) {
- commentator.startIteration (b_stream.pos ());
+ commentator().startIteration ((unsigned)b_stream.pos ());
iter_passed = true;
b_stream >> b;
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Right-hand side b:";
- VD.write (report, b) << endl;
+ ostream &Report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ Report << "Right-hand side b:";
+ VD.write (Report, b) << endl;
try {
solve (A, x, b, F, traits);
}
catch (SolveFailed) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Solve failed to solve system" << endl;
ret = iter_passed = false;
}
catch (InconsistentSystem<Vector2> e) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Solve reported an inconsistent system" << endl;
ret = iter_passed = false;
}
if (iter_passed) {
- report << "Output vector x: ";
- VD.write (report, x) << endl;
+ Report << "Output vector x: ";
+ VD.write (Report, x) << endl;
MD.vectorMul (ATAx, ATA, x);
MD.vectorMul (ATb, AT, b);
if (!VD.areEqual (ATAx, ATb)) {
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: A^T Ax != A^T b" << endl;
ret = iter_passed = false;
}
}
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
A_stream.reset ();
b_stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomSolve");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomSolve");
return ret;
}
@@ -710,8 +726,8 @@ static bool testBasicMethodsSolve (const Field &F, size_t n)
{
// tests of Hybrid, Blackbox, Elimination methods
bool ret;
- commentator.start ("Testing Basic Methods Solve");
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ commentator().start ("Testing Basic Methods Solve");
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
typedef typename Field::Element Elt;
Elt one, zero; F.init(one, 1); F.init(zero, 0);
@@ -736,7 +752,7 @@ static bool testBasicMethodsSolve (const Field &F, size_t n)
VD.write(report<<"xe ", xe) << endl;
ret = VD.areEqual(xd, xh) && VD.areEqual(xd, xb) && VD.areEqual(xd, xe);
- commentator.stop (MSG_STATUS (ret));
+ commentator().stop (MSG_STATUS (ret));
return ret;
}
@@ -750,7 +766,7 @@ int main (int argc, char **argv)
static size_t r = 20;
static size_t N = 16;
static integer q = 2147483647U;
- static int iterations = 5;
+ static int iterations = 1;
static Argument args[] = {
{ 'n', "-n N", "Set column dimension of test matrices to N.", TYPE_INT, &n },
@@ -767,14 +783,14 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
Field F (q);
- commentator.start("Solve test suite", "solve");
+ commentator().start("Solve test suite", "solve");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (10);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
- commentator.getMessageClass (PROGRESS_REPORT).setMaxDepth (5);
- //commentator.getMessageClass (BRIEF_REPORT).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (10);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (10);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDetailLevel (Commentator::LEVEL_NORMAL);
+ commentator().getMessageClass (PROGRESS_REPORT).setMaxDepth (5);
+ //commentator().getMessageClass (BRIEF_REPORT).setMaxDepth (4);
RandomDenseStream<Field> stream1 (F, n, iterations), stream2 (F, n, iterations);
RandomDenseStream<Field> stream3 (F, r, iterations), stream4 (F, r, iterations);
@@ -785,10 +801,10 @@ int main (int argc, char **argv)
// "BlockLanczos", Method::BlockLanczos()))
"Wiedemann", Method::Wiedemann ()))
pass = false;
-#if 0
if (!testNonsingularSolve (F, stream1, stream2,
"Wiedemann", Method::Wiedemann ()))
pass = false;
+#if 0
if (!testSingularConsistentSolve (F, n, stream3, stream4,
"Wiedemann", Method::Wiedemann ()))
pass = false;
@@ -825,8 +841,17 @@ int main (int argc, char **argv)
if ( ! testBasicMethodsSolve (F, n) )
pass = false;
- commentator.stop("solve test suite");
+ commentator().stop("solve test suite");
//std::cout << (pass ? "passed" : "FAILED" ) << std::endl;
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-sparse.C b/tests/test-sparse.C
index ed050bb..eab10e3 100644
--- a/tests/test-sparse.C
+++ b/tests/test-sparse.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-sparse.C
* Copyright (C) 2001, 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
/*! @file tests/test-sparse.C
@@ -58,7 +74,7 @@ static bool testIdentityApply (Field &F, const char *text, VectorStream<Vector>
ostringstream str;
str << "Testing identity apply (" << text << ")" << ends;
- commentator.start (str.str ().c_str (), "testIdentityApply", stream.m ());
+ commentator().start (str.str ().c_str (), "testIdentityApply", stream.m ());
bool ret = true;
bool iter_passed = true;
@@ -67,7 +83,7 @@ static bool testIdentityApply (Field &F, const char *text, VectorStream<Vector>
StandardBasisStream<Field, Row> f1 (F, stream.n ());
Blackbox A (F, f1);
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Matrix:" << endl;
A.write (report, FORMAT_PRETTY);
@@ -77,37 +93,37 @@ static bool testIdentityApply (Field &F, const char *text, VectorStream<Vector>
VectorWrapper::ensureDim (w, stream.n ());
while (stream) {
- commentator.startIteration (stream.j ());
+ commentator().startIteration ((unsigned)stream.j ());
iter_passed = true;
stream.next (v);
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Input vector: ";
- VD.write (report, v);
- report << endl;
+ ostream &Report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ Report << "Input vector: ";
+ VD.write (Report, v);
+ Report << endl;
A.apply (w, v);
- report << "Output vector: ";
- VD.write (report, w);
- report << endl;
+ Report << "Output vector: ";
+ VD.write (Report, w);
+ Report << endl;
if (!VD.areEqual (v, w))
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vectors are not equal" << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testIdentityApply");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testIdentityApply");
return ret;
}
@@ -132,7 +148,7 @@ static bool testNilpotentApply (Field &F, const char *text, VectorStream<Vector>
ostringstream str;
str << "Testing nilpotent apply (" << text << ")" << ends;
- commentator.start (str.str ().c_str (), "testNilpotentApply", stream.m ());
+ commentator().start (str.str ().c_str (), "testNilpotentApply", stream.m ());
bool ret = true;
bool even, iter_passed;
@@ -142,7 +158,7 @@ static bool testNilpotentApply (Field &F, const char *text, VectorStream<Vector>
f1.next (tmp); // Small trick: pull the first vector out to shift elements up one row
Blackbox A (F, f1);
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Matrix:" << endl;
A.write (report, FORMAT_PRETTY);
@@ -156,7 +172,7 @@ static bool testNilpotentApply (Field &F, const char *text, VectorStream<Vector>
VectorWrapper::ensureDim (w, stream.n ());
while (stream) {
- commentator.startIteration (stream.j ());
+ commentator().startIteration ((unsigned)stream.j ());
iter_passed = true;
even = false;
@@ -166,12 +182,12 @@ static bool testNilpotentApply (Field &F, const char *text, VectorStream<Vector>
// Make sure last element is nonzero
r.random (VectorWrapper::ref<Field> (v, stream.n () - 1));
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
- report << "Input vector: ";
- VD.write (report, v);
- report << endl;
+ ostream &Report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ Report << "Input vector: ";
+ VD.write (Report, v);
+ Report << endl;
- commentator.start ("Applying vectors");
+ commentator().start ("Applying vectors");
for (j = 0; j < stream.n () - 1; j++, even = !even)
if (even)
@@ -179,15 +195,15 @@ static bool testNilpotentApply (Field &F, const char *text, VectorStream<Vector>
else
A.apply (w, v);
- commentator.stop ("Done");
+ commentator().stop ("Done");
- report << "A^(n-1) v: ";
- VD.write (report, even ? w : v);
- report << endl;
+ Report << "A^(n-1) v: ";
+ VD.write (Report, even ? w : v);
+ Report << endl;
if (VD.isZero (even ? w : v)) {
ret = false;
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: A^(n-1) v is prematurely zero" << endl;
}
@@ -196,24 +212,24 @@ static bool testNilpotentApply (Field &F, const char *text, VectorStream<Vector>
else
A.apply (w, v);
- report << "A^n v: ";
- VD.write (report, even ? v : w);
- report << endl;
+ Report << "A^n v: ";
+ VD.write (Report, even ? v : w);
+ Report << endl;
if (!VD.isZero (even ? v : w))
ret = iter_passed = false;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: A^n v is non-zero" << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testNilpotentApply");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testNilpotentApply");
return ret;
}
@@ -238,7 +254,7 @@ bool testRandomApply1 (Field &F, const char *text, unsigned int iterations, Vect
ostringstream str;
str << "Testing sparse random apply (1, " << text << ")" << ends;
- commentator.start (str.str ().c_str (), "testRandomApply1", iterations);
+ commentator().start (str.str ().c_str (), "testRandomApply1", iterations);
bool ret = true;
bool iter_passed;
@@ -254,14 +270,14 @@ bool testRandomApply1 (Field &F, const char *text, unsigned int iterations, Vect
VectorWrapper::ensureDim (w, A_stream.m ());
for (i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().startIteration ((unsigned)i);
iter_passed = true;
Blackbox A (F, A_stream);
A_stream.reset ();
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Matrix:" << endl;
A.write (report, FORMAT_PRETTY);
@@ -281,14 +297,14 @@ bool testRandomApply1 (Field &F, const char *text, unsigned int iterations, Vect
}
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Output vectors were incorrect" << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomApply1");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomApply1");
return ret;
}
@@ -313,7 +329,7 @@ bool testRandomApply2 (Field &F, const char *text, unsigned int iterations, Vect
ostringstream str;
str << "Testing sparse random apply (2, " << text << ")" << ends;
- commentator.start (str.str ().c_str (), "testRandomApply2", iterations);
+ commentator().start (str.str ().c_str (), "testRandomApply2", iterations);
bool ret = true;
bool iter_passed;
@@ -325,10 +341,10 @@ bool testRandomApply2 (Field &F, const char *text, unsigned int iterations, Vect
typename Field::Element sum;
integer c;
- long width;
+ // long width;
F.characteristic (c);
- width = logp (c, 10) + 1;
+ // width = logp (c, 10) + 1;
Vector v, w;
@@ -339,14 +355,14 @@ bool testRandomApply2 (Field &F, const char *text, unsigned int iterations, Vect
F.init (VectorWrapper::ref<Field> (v, k), 1);
for (i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().startIteration ((unsigned)i);
iter_passed = true;
Blackbox A (F, A_stream);
A_stream.reset ();
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Matrix:" << endl;
A.write (report, FORMAT_PRETTY);
@@ -366,14 +382,14 @@ bool testRandomApply2 (Field &F, const char *text, unsigned int iterations, Vect
VD.write (report, w) << endl;
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Output vector was incorrect" << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomApply2");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomApply2");
return ret;
}
@@ -401,12 +417,12 @@ static bool testRandomTranspose (Field &F,
ostringstream str;
str << "Testing random transpose (" << text << ")" << ends;
- commentator.start (str.str ().c_str (), "testRandomTranspose", stream1.m ());
+ commentator().start (str.str ().c_str (), "testRandomTranspose", stream1.m ());
Blackbox A (F, A_stream);
A_stream.reset ();
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix:" << endl;
A.write (report, FORMAT_PRETTY);
@@ -415,7 +431,7 @@ static bool testRandomTranspose (Field &F,
stream1.reset ();
stream2.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
return ret;
}
@@ -442,12 +458,12 @@ static bool testRandomLinearity (Field &F,
ostringstream str;
str << "Testing linearity (" << text << ")" << ends;
- commentator.start (str.str ().c_str (), "testRandomLinearity", stream1.m ());
+ commentator().start (str.str ().c_str (), "testRandomLinearity", stream1.m ());
Blackbox A (F, A_stream);
A_stream.reset ();
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Input matrix:" << endl;
A.write (report, FORMAT_PRETTY);
@@ -456,7 +472,7 @@ static bool testRandomLinearity (Field &F,
stream1.reset ();
stream2.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomLinearity");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomLinearity");
return ret;
}
@@ -474,16 +490,16 @@ bool runSparseMatrixTestsByVector (const Field &F,
ostringstream str;
str << "Testing " << desc << " sparse matrix" << ends;
- commentator.start (str.str ().c_str (), "runSparseMatrixTestsByVector", 6);
+ commentator().start (str.str ().c_str (), "runSparseMatrixTestsByVector", 6);
- if (!testIdentityApply<Row> (F, desc, v_stream1)) pass = false; commentator.progress ();
- if (!testNilpotentApply<Row> (F, desc, v_stream1)) pass = false; commentator.progress ();
- if (!testRandomApply1<Vector> (F, desc, iterations, A_stream)) pass = false; commentator.progress ();
- if (!testRandomApply2<Vector> (F, desc, iterations, A_stream)) pass = false; commentator.progress ();
- if (!testRandomTranspose (F, desc, A_stream, v_stream1, v_stream2)) pass = false; commentator.progress ();
- if (!testRandomLinearity (F, desc, A_stream, v_stream1, v_stream2)) pass = false; commentator.progress ();
+ if (!testIdentityApply<Row> (F, desc, v_stream1)) pass = false; commentator().progress ();
+ if (!testNilpotentApply<Row> (F, desc, v_stream1)) pass = false; commentator().progress ();
+ if (!testRandomApply1<Vector> (F, desc, iterations, A_stream)) pass = false; commentator().progress ();
+ if (!testRandomApply2<Vector> (F, desc, iterations, A_stream)) pass = false; commentator().progress ();
+ if (!testRandomTranspose (F, desc, A_stream, v_stream1, v_stream2)) pass = false; commentator().progress ();
+ if (!testRandomLinearity (F, desc, A_stream, v_stream1, v_stream2)) pass = false; commentator().progress ();
- commentator.stop (MSG_STATUS (pass), (const char *) 0, "runSparseMatrixTests");
+ commentator().stop (MSG_STATUS (pass), (const char *) 0, "runSparseMatrixTests");
return pass;
}
@@ -504,7 +520,7 @@ bool runSparseMatrixTests (const Field &F,
ostringstream str1, str2, str3, str4, str5;
str1 << "Testing sparse matrix with " << desc << " row type" << ends;
- commentator.start (str1.str ().c_str (), "runSparseMatrixTests", 4);
+ commentator().start (str1.str ().c_str (), "runSparseMatrixTests", 4);
str2 << desc << "/dense" << ends;
str3 << desc << "/sparse sequence" << ends;
@@ -526,22 +542,22 @@ bool runSparseMatrixTests (const Field &F,
dense_stream1, dense_stream2, A_stream))
pass = false;
#if 0
- commentator.progress ();
+ commentator().progress ();
if (!runSparseMatrixTestsByVector (F, str2.str ().c_str (), iterations,
sparse_seq_stream1, sparse_seq_stream2, A_stream))
pass = false;
- commentator.progress ();
+ commentator().progress ();
if (!runSparseMatrixTestsByVector (F, str2.str ().c_str (), iterations,
sparse_map_stream1, sparse_map_stream2, A_stream))
pass = false;
- commentator.progress ();
+ commentator().progress ();
if (!runSparseMatrixTestsByVector (F, str2.str ().c_str (), iterations,
sparse_par_stream1, sparse_par_stream2, A_stream))
pass = false;
- commentator.progress ();
+ commentator().progress ();
#endif
- commentator.stop (MSG_STATUS (pass), (const char *) 0, "runSparseMatrixTests");
+ commentator().stop (MSG_STATUS (pass), (const char *) 0, "runSparseMatrixTests");
return pass;
}
@@ -578,10 +594,10 @@ int main (int argc, char **argv)
Field F (q);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- commentator.start("Sparse matrix black box test suite", "Sparse");
+ commentator().start("Sparse matrix black box test suite", "Sparse");
RandomSparseStream<Field, SparseSeqVector>
stream1 (F, (double) k / (double) n, n, m);
@@ -594,6 +610,15 @@ int main (int argc, char **argv)
if (!runSparseMatrixTests (F, "sparse associative", iterations, stream2)) pass = false;
if (!runSparseMatrixTests (F, "sparse parallel", iterations, stream3)) pass = false;
- commentator.stop("Sparse matrix black box test suite");
+ commentator().stop("Sparse matrix black box test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-subiterator.C b/tests/test-subiterator.C
index 621e6f1..b368371 100644
--- a/tests/test-subiterator.C
+++ b/tests/test-subiterator.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file tests/test-subiterator.C
@@ -31,9 +32,9 @@
#include <iostream>
-#include <linbox/util/commentator.h>
+#include "linbox/util/commentator.h"
#include "test-common.h"
-#include <linbox/vector/subiterator.h>
+#include "linbox/vector/subiterator.h"
using namespace LinBox;
bool test() ;
int main(int argc, char** argv)
@@ -42,18 +43,18 @@ int main(int argc, char** argv)
END_OF_ARGUMENTS
};
parseArguments (argc, argv, args);
- commentator.start("Subiterator test suite", "Subiterator");
+ commentator().start("Subiterator test suite", "Subiterator");
bool pass = test();
- commentator.stop("Subiterator test suite");
+ commentator().stop("Subiterator test suite");
return pass? 0 : -1;
}
bool test()
{
const char* title = "Subiterator test";
- commentator.start(title, title, 1);
- ostream &report = commentator.report
+ commentator().start(title, title, 1);
+ ostream &report = commentator().report
(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
std::vector<int> v;
for (int i = 1; i <= 10; ++i) v.push_back(i);
@@ -91,7 +92,16 @@ bool test()
if (s > t) {report << 21 << endl; res=false;}
- commentator.stop (MSG_STATUS (res), (const char *) 0, title);
+ commentator().stop (MSG_STATUS (res), (const char *) 0, title);
return res;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-submatrix.C b/tests/test-submatrix.C
index b12d462..74b3d9f 100644
--- a/tests/test-submatrix.C
+++ b/tests/test-submatrix.C
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-submatrix.C
* Copyright (C) 2001, 2002 Bradford Hovinen
*
* Written by Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file tests/test-submatrix.C
@@ -38,7 +39,6 @@
#include "linbox/field/archetype.h"
#include "linbox/field/modular.h"
#include "linbox/blackbox/submatrix.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/vector/stream.h"
#include "test-common.h"
@@ -66,9 +66,9 @@ static bool testRandomApply (Field &F,
size_t n,
VectorStream<typename Vector<Field>::Dense> &stream)
{
- typedef DenseMatrix <Field> Blackbox;
+ typedef BlasMatrix <Field> Blackbox;
- commentator.start ("Testing random apply", "testRandomApply", iterations);
+ commentator().start ("Testing random apply", "testRandomApply", iterations);
bool ret = true;
bool iter_passed;
@@ -87,7 +87,7 @@ static bool testRandomApply (Field &F,
typename Field::RandIter r (F);
for (i = 0; i < iterations; i++) {
- commentator.startIteration (i);
+ commentator().startIteration (i);
iter_passed = true;
@@ -104,7 +104,7 @@ static bool testRandomApply (Field &F,
stream.reset ();
while (stream) {
- ostream &report = commentator.report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
stream.next (v);
@@ -132,16 +132,16 @@ static bool testRandomApply (Field &F,
}
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vectors are not equal" << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
}
stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomApply");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomApply");
return ret;
}
@@ -165,10 +165,10 @@ static bool testRandomLinearity (const Field &F,
VectorStream<typename Vector<Field>::Dense> &v1_stream,
VectorStream<typename Vector<Field>::Dense> &v2_stream)
{
- commentator.start ("Testing random linearity", "testRandomLinearity", v1_stream.size ());
+ commentator().start ("Testing random linearity", "testRandomLinearity", v1_stream.size ());
- DenseMatrix<Field> A (F, A_stream);
- Submatrix<DenseMatrix<Field> > Ap (&A, 0, 0, v1_stream.dim (), v2_stream.dim ());
+ BlasMatrix<Field> A (F, A_stream);
+ Submatrix<BlasMatrix<Field> > Ap (&A, 0, 0, v1_stream.dim (), v2_stream.dim ());
bool ret = testLinearity (F, Ap, v1_stream, v2_stream);
@@ -176,7 +176,7 @@ static bool testRandomLinearity (const Field &F,
v1_stream.reset ();
v2_stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomLinearity");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomLinearity");
return ret;
}
@@ -200,10 +200,10 @@ static bool testRandomTranspose (const Field &F,
VectorStream<typename Vector<Field>::Dense> &v1_stream,
VectorStream<typename Vector<Field>::Dense> &v2_stream)
{
- commentator.start ("Testing random transpose", "testRandomTranspose", v1_stream.size ());
+ commentator().start ("Testing random transpose", "testRandomTranspose", v1_stream.size ());
- DenseMatrix<Field> A (F, A_stream);
- Submatrix<DenseMatrix<Field> > Ap (&A, 0, 0, v1_stream.dim (), v2_stream.dim ());
+ BlasMatrix<Field> A (F, A_stream);
+ Submatrix<BlasMatrix<Field> > Ap (&A, 0, 0, v1_stream.dim (), v2_stream.dim ());
bool ret = testTranspose (F, Ap, v1_stream, v2_stream);
@@ -211,7 +211,7 @@ static bool testRandomTranspose (const Field &F,
v1_stream.reset ();
v2_stream.reset ();
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
return ret;
}
@@ -238,10 +238,10 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
Field F (q);
- commentator.start("Submatrix black box test suite", "Submatrix");
+ commentator().start("Submatrix black box test suite", "Submatrix");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (5);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
RandomDenseStream<Field> stream (F, n, N);
RandomDenseStream<Field> A_stream (F, n, n);
@@ -254,6 +254,15 @@ int main (int argc, char **argv)
if (!testRandomLinearity (F, A_stream, v1_stream, v2_stream)) pass = false;
if (!testRandomTranspose (F, A_stream, v1_stream, v2_stream)) pass = false;
- commentator.stop("Submatrix black box test suite");
+ commentator().stop("Submatrix black box test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-subvector.C b/tests/test-subvector.C
index ebb7e26..23ac578 100644
--- a/tests/test-subvector.C
+++ b/tests/test-subvector.C
@@ -1,14 +1,15 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* Evolved from Will Turner's test-subvector.cpp -bds
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +17,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file tests/test-subvector.C
@@ -55,7 +56,7 @@ int main(int argc, char** argv)
parseArguments (argc, argv, args);
// start testing
- commentator.start("Subvector test suite", "Subvector");
+ commentator().start("Subvector test suite", "Subvector");
bool pass = true;
// call tests
@@ -64,7 +65,7 @@ int main(int argc, char** argv)
pass = testSubvector<Field> (F, n);
// finish
- commentator.stop("Subvector test suite");
+ commentator().stop("Subvector test suite");
return pass? 0 : -1;
}
@@ -80,8 +81,8 @@ static bool testSubvector(Field &F, size_t n)
{
// commentator setup
const char * title = "Subvector test";
- commentator.start(title, title, 1);
- ostream &report = commentator.report
+ commentator().start(title, title, 1);
+ ostream &report = commentator().report
(Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "This test currently neglects several members including constructors." << endl;
@@ -99,7 +100,8 @@ static bool testSubvector(Field &F, size_t n)
typedef typename Subvect::reverse_iterator ReverseSubiterator;
Vector v(n);
- for (size_t z = 0; z < n; z++) v[z] = z;
+ for (size_t z = 0; z < n; z++)
+ v[z] = (Element)z;
printVector(F, report, v);
@@ -298,6 +300,15 @@ static bool testSubvector(Field &F, size_t n)
#endif
// finish
- commentator.stop (MSG_STATUS (ret), (const char *) 0, title);
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, title);
return ret;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-sum.C b/tests/test-sum.C
index 82ca895..cba563f 100644
--- a/tests/test-sum.C
+++ b/tests/test-sum.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-sum.C
* Copyright (C) 2002 Bradford Hovinen
@@ -8,7 +6,25 @@
*
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file tests/test-sum.C
@@ -32,7 +48,7 @@
#include "linbox/field/modular.h"
#include "linbox/field/givaro.h"
#ifdef __LINBOX_HAVE_NTL
-#include "linbox/field/ntl-lzz_p.h"
+#include "linbox/field/ntl.h"
#endif
#include "linbox/vector/vector-domain.h"
#include "linbox/blackbox/diagonal.h"
@@ -72,7 +88,7 @@ static bool testBBrebind (const Field2 &F2, const Blackbox& B)
template <class Field1, class Field2, class Vector>
static bool testZeroApply (Field1 &F1, Field2 &F2, VectorStream<Vector> &stream1, VectorStream<Vector> &stream2)
{
- commentator.start ("Testing zero apply", "testZeroApply", stream1.m ());
+ commentator().start ("Testing zero apply", "testZeroApply", stream1.m ());
bool ret = true;
bool iter_passed = true;
@@ -91,7 +107,7 @@ static bool testZeroApply (Field1 &F1, Field2 &F2, VectorStream<Vector> &stream1
F1.init (neg_one, -1);
while (stream1) {
- commentator.startIteration (stream1.j ());
+ commentator().startIteration ((unsigned)stream1.j ());
iter_passed = true;
stream1.next (d1);
@@ -101,7 +117,7 @@ static bool testZeroApply (Field1 &F1, Field2 &F2, VectorStream<Vector> &stream1
Sum <Diagonal<Field1>,Diagonal <Field1> > A (&D1, &D2);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal matrix: ";
VD.write (report, d1);
report << endl;
@@ -130,17 +146,17 @@ static bool testZeroApply (Field1 &F1, Field2 &F2, VectorStream<Vector> &stream1
}
if (!iter_passed)
- commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vector is not zero" << endl;
- commentator.stop ("done");
- commentator.progress ();
+ commentator().stop ("done");
+ commentator().progress ();
ret = ret && testBBrebind(F2, A);
}
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testZeroApply");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testZeroApply");
return ret;
}
@@ -164,7 +180,7 @@ static bool testRandomTranspose (Field &F, size_t n, int iterations)
{
typedef vector <typename Field::Element> Vector;
- commentator.start ("Testing random transpose", "testRandomTranspose", iterations);
+ commentator().start ("Testing random transpose", "testRandomTranspose", iterations);
Vector d(n);
typename Field::RandIter r (F);
@@ -174,14 +190,14 @@ static bool testRandomTranspose (Field &F, size_t n, int iterations)
Diagonal <Field, Vector> D (F, d);
- ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Diagonal vector: ";
printVector<Field> (F, report, d);
bool ret = testTranspose<Field> (F, D, iterations);
- commentator.stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
+ commentator().stop (MSG_STATUS (ret), (const char *) 0, "testRandomTranspose");
return ret;
}
@@ -216,16 +232,16 @@ int main (int argc, char **argv)
#endif
Field F1(q1);
- GivaroZpz< ::Givaro::Std32> F2(q2);
+ GivaroZpz< Givaro::Std32> F2(q2);
typedef vector<Field::Element> Vector;
parseArguments (argc, argv, args);
- commentator.start("Sum black box test suite", "sum");
+ commentator().start("Sum black box test suite", "sum");
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (2);
RandomDenseStream<Field> stream1 (F1, n, iterations1), stream2 (F1, n, iterations2);
@@ -251,6 +267,15 @@ int main (int argc, char **argv)
Sum <Blackbox, Blackbox> Aref (&D1, &D2);
pass = pass && testBlackbox(Aref) && testBBrebind(F2, A);
- commentator.stop("Sum black box test suite");
+ commentator().stop("Sum black box test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-toeplitz-det.C b/tests/test-toeplitz-det.C
index 9bf10a7..4f42cc4 100644
--- a/tests/test-toeplitz-det.C
+++ b/tests/test-toeplitz-det.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file tests/test-toeplitz-det.C
@@ -32,19 +33,17 @@
#include <iostream>
#include <vector>
-#include <linbox/blackbox/toeplitz.h>
+#include "linbox/blackbox/toeplitz.h"
#ifdef __LINBOX_HAVE_NTL
-#include <linbox/field/ntl-lzz_p.h>
-#include <linbox/field/ntl-lzz_pX.h>
+#include "linbox/field/ntl.h"
#endif
-#include <linbox/solutions/det.h>
-#include <linbox/blackbox/dense.h>
-#include <linbox/randiter/random-prime.h>
-#include <linbox/util/commentator.h>
+#include "linbox/solutions/det.h"
+#include "linbox/randiter/random-prime.h"
+#include "linbox/util/commentator.h"
#include "test-common.h"
#include <cstdlib>
#include <ctime>
-#include <linbox/integer.h>
+#include "linbox/integer.h"
using namespace std;
using namespace LinBox;
@@ -59,14 +58,14 @@ int main(int argc, char* argv[])
parseArguments (argc, argv, args);
- commentator.start("Toeplitz determinant test suite", "Toeplitz det");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().start("Toeplitz determinant test suite", "Toeplitz det");
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- ostream& report = commentator.report();
+ ostream& report = commentator().report();
bool pass = true;
#ifdef __LINBOX_HAVE_NTL
- srand(time(0));
+ srand((unsigned)time(0));
RandomPrimeIterator rp;
NTL_zz_p::RandIter randit;
report << "\tUsing random primes and square matrices of size 2 to " << N_BOUND << endl;
@@ -77,7 +76,7 @@ int main(int argc, char* argv[])
NTL_zz_p CF( *rp );
NTL_zz_pX PF(CF);
- DenseMatrix<NTL_zz_p> A(CF,n,n);
+ BlasMatrix<NTL_zz_p> A(CF,n,n);
NTL_zz_p::Element temp;
NTL_zz_pX::Element poly;
@@ -109,7 +108,7 @@ int main(int argc, char* argv[])
report << endl;
if( pass ) report << "<====== Passed!" << endl;
else report << "<====== Failed!" << endl;
- commentator.stop("toeplitz determinant test suite");
+ commentator().stop("toeplitz determinant test suite");
return (pass ? 0 : 1);
#if 0
@@ -142,6 +141,15 @@ int main(int argc, char* argv[])
toeplitz_determinant( F, res, T, 4 );
*/
//cout << res << endl;
- commentator.stop("toeplitz determinant test suite");
+ commentator().stop("toeplitz determinant test suite");
#endif
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-trace.C b/tests/test-trace.C
index 68c335f..7595f9b 100644
--- a/tests/test-trace.C
+++ b/tests/test-trace.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-trace.C
* Copyright (C) -bds
@@ -8,7 +6,25 @@
*
* --------------------------------------------------------
*
- * See COPYING for license information
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *
*/
/*! @file tests/test-trace.C
@@ -27,7 +43,7 @@
#include "test-common.h"
-#include "linbox/field/modular-int32.h"
+#include "linbox/field/modular.h"
#include "linbox/solutions/trace.h"
using namespace LinBox;
@@ -47,8 +63,8 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- commentator.start("Trace test suite", "Trace");
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
+ commentator().start("Trace test suite", "Trace");
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (3);
typedef Modular<int> Field;
typedef Field::Element Element;
@@ -79,6 +95,15 @@ int main (int argc, char **argv)
if (! F.areEqual(t1, t) pass = false;
*/
- commentator.stop("Trace solution test suite");
+ commentator().stop("Trace solution test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-triplesbb.C b/tests/test-triplesbb.C
index c67c1ef..9ce8d93 100644
--- a/tests/test-triplesbb.C
+++ b/tests/test-triplesbb.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
* using generic testBlackbox -bds
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file tests/test-triplesbb.C
@@ -81,9 +82,9 @@ int main (int argc, char **argv)
parseArguments (argc, argv, args);
- srand (time (NULL));
+ srand ((unsigned)time (NULL));
- commentator.start("triplesbb black box test suite", "triplesbb");
+ commentator().start("triplesbb black box test suite", "triplesbb");
typedef Modular<uint32_t> Field;
typedef Field::Element Element;
@@ -128,6 +129,15 @@ int main (int argc, char **argv)
for(size_t i = 0; i < rowP.size(); ++i) C.addEntry(values[i], rowP[i], colP[i]);
pass = pass && testBlackbox(C);
- commentator.stop("triplesbb black box test suite");
+ commentator().stop("triplesbb black box test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-unparametric-field.C b/tests/test-unparametric-field.C
index 71273b0..d72244d 100644
--- a/tests/test-unparametric-field.C
+++ b/tests/test-unparametric-field.C
@@ -1,5 +1,3 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-unparametric-field.C
* Copyright (C) 2002 William J. Turner
@@ -13,7 +11,25 @@
* that we are using the same file naming conventions thoughout the library.
* ------------------------------------
*
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*/
/*! @file tests/test-unparametric-field.C
@@ -39,11 +55,9 @@ using namespace LinBox;
int main (int argc, char **argv)
{
static size_t n = 10000;
- static int iterations = 1 ;
static Argument args[] = {
{ 'n', "-n N", "Set dimension of test vectors to NxN.", TYPE_INT, &n },
- { 'i', "-i I", "Perform each test for I iterations.", TYPE_INT, &iterations },
END_OF_ARGUMENTS
};
@@ -55,19 +69,30 @@ int main (int argc, char **argv)
UnparametricField<double> F;
// Make sure some more detailed messages get printed
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
-ostream &report = commentator.report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ostream &report = commentator().report (Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << endl << "Unparametrix<double> field test suite" << endl;
- if (!runFieldTests (F, "UnparametricField<double>", iterations, n, false)) pass = false;
+ if (!runFieldTests (F, "UnparametricField<double>", 1, n, false)) pass = false;
FieldArchetype K(new UnparametricField<double>(F));
if (!testField<FieldArchetype> (K, "Testing archetype with envelope of UnField field"))
pass = false;
- // We're going to allow failed tests here because the floating-point
- // approximation tends to screw things up anyway
+ // We're going to allow failed tests here.
+ // UnparametricField is a tool for building fields and does not of itself produce a LinBox conforming field.
+ // However compilation serves some limited testing value and data is gleaned when the test is run with a report file argument.
+ //return pass ? 0 : -1;
return 0;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-vector-domain.C b/tests/test-vector-domain.C
index 2cfac5b..6bfb90a 100644
--- a/tests/test-vector-domain.C
+++ b/tests/test-vector-domain.C
@@ -1,15 +1,16 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* tests/test-vector-domain.C
* Copyright (C) 2001, 2002 Bradford Hovinen
*
* Written by Bradford Hovinen <hovinen at cis.udel.edu>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file tests/test-vector-domain.C
@@ -55,7 +56,7 @@ bool testVectorDomain (const Field &F, const char *text, size_t n, unsigned int
ostringstream str;
str << "Testing VectorDomain <" << text << ">" << ends;
- commentator.start (str.str ().c_str ());
+ commentator().start (str.str ().c_str ());
bool pass = true;
@@ -107,7 +108,7 @@ bool testVectorDomain (const Field &F, const char *text, size_t n, unsigned int
if (!testCopyEqual (F, "sparse parallel/sparse associative", stream7, stream5)) pass = false;
if (!testCopyEqual (F, "sparse parallel/sparse parallel", stream7, stream8)) pass = false;
- commentator.stop (MSG_STATUS (pass));
+ commentator().stop (MSG_STATUS (pass));
return pass;
}
@@ -140,18 +141,27 @@ int main (int argc, char **argv)
Modular<uint16_t> F_uint16_t ((uint16_t) q3);
Modular<uint8_t> F_uint8_t ((uint8_t) q4);
- commentator.start("Vector domain test suite", "VectorDomain");
+ commentator().start("Vector domain test suite", "VectorDomain");
- commentator.setBriefReportParameters (Commentator::OUTPUT_CONSOLE, false, false, false);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
- commentator.getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
- commentator.getMessageClass (TIMING_MEASURE).setMaxDepth (3);
+ commentator().setBriefReportParameters (Commentator::OUTPUT_CONSOLE, false, false, false);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDepth (4);
+ commentator().getMessageClass (INTERNAL_DESCRIPTION).setMaxDetailLevel (Commentator::LEVEL_UNIMPORTANT);
+ commentator().getMessageClass (TIMING_MEASURE).setMaxDepth (3);
if (!testVectorDomain (F_integer, "Modular <integer>", n, iterations)) pass = false;
if (!testVectorDomain (F_uint32_t, "Modular <uint32_t>", n, iterations)) pass = false;
if (!testVectorDomain (F_uint16_t, "Modular <uint16_t>", n, iterations)) pass = false;
if (!testVectorDomain (F_uint8_t, "Modular <uint8_t>", n, iterations)) pass = false;
- commentator.stop("Vector domain test suite");
+ commentator().stop("Vector domain test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-vector-domain.h b/tests/test-vector-domain.h
index c6ffc4a..d4f7e3a 100644
--- a/tests/test-vector-domain.h
+++ b/tests/test-vector-domain.h
@@ -1,8 +1,24 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* linbox/tests/test-vector-domain.h
* Copyright (C) 2001, 2002 Bradford Hovinen
- * See COPYING for license information.
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+ *.
*
* Extracted from test-generic by bds.
* test-generic was written by Bradford Hovinen <hovinen at cis.udel.edu>
@@ -21,7 +37,6 @@
#include "linbox/util/field-axpy.h"
#include "linbox/vector/stream.h"
#include "linbox/vector/vector-domain.h"
-#include "linbox/blackbox/dense.h"
#include "linbox/integer.h"
#include "test-common.h"
@@ -45,7 +60,7 @@ static bool testDotProduct (Field &F, const char *text, LinBox::VectorStream<Vec
std::ostringstream str;
str << "\t--Testing " << text << " dot product" << std::ends;
- LinBox::commentator.start (str.str ().c_str (), "testDotProduct", stream1.m ());
+ LinBox::commentator().start (str.str ().c_str (), "testDotProduct", stream1.m ());
bool ret = true;
@@ -60,11 +75,11 @@ static bool testDotProduct (Field &F, const char *text, LinBox::VectorStream<Vec
LinBox::VectorWrapper::ensureDim (v1, stream1.n ());
LinBox::VectorWrapper::ensureDim (v2, stream2.n ());
- ::Givaro::Timer timer;
+ Givaro::Timer timer;
double totaltime = 0.0;
while (stream1 && stream2) {
- LinBox::commentator.startIteration (stream1.j ());
+ LinBox::commentator().startIteration ((unsigned)stream1.j ());
F.init (sigma, 0);
@@ -76,7 +91,7 @@ static bool testDotProduct (Field &F, const char *text, LinBox::VectorStream<Vec
LinBox::VectorWrapper::constRef<Field> (v1, j),
LinBox::VectorWrapper::constRef<Field> (v2, j));
- std::ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_UNIMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector 1 of size " << v1.size() << ": ";
VD.write (report, v1) << std::endl;
@@ -96,18 +111,18 @@ static bool testDotProduct (Field &F, const char *text, LinBox::VectorStream<Vec
if (!F.areEqual (sigma, rho)) {
ret = false;
- LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Dot products are not equal" << std::endl;
}
- LinBox::commentator.stop ("done");
- LinBox::commentator.progress ();
+ LinBox::commentator().stop ("done");
+ LinBox::commentator().progress ();
}
- LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
- << "Average time for dot product: " << totaltime / stream1.m () << std::endl;
+ LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
+ << "Average time for dot product: " << (double)totaltime / (double)stream1.m () << std::endl;
- LinBox::commentator.stop (MSG_STATUS (ret), (const char *) 0, "testDotProduct");
+ LinBox::commentator().stop (MSG_STATUS (ret), (const char *) 0, "testDotProduct");
stream1.reset ();
stream2.reset ();
@@ -134,7 +149,7 @@ static bool testAddMul (Field &F, const char *text, LinBox::VectorStream<Vector>
std::ostringstream str;
str << "\t--Testing " << text << " vector add, mul" << std::ends;
- LinBox::commentator.start (str.str ().c_str (), "testAddMul", stream1.m ());
+ LinBox::commentator().start (str.str ().c_str (), "testAddMul", stream1.m ());
bool ret = true;
bool iter_passed;
@@ -153,7 +168,7 @@ static bool testAddMul (Field &F, const char *text, LinBox::VectorStream<Vector>
LinBox::VectorDomain<Field> VD (F);
while (stream1 && stream2) {
- LinBox::commentator.startIteration (stream1.j ());
+ LinBox::commentator().startIteration ((unsigned)stream1.j ());
iter_passed = true;
@@ -162,7 +177,7 @@ static bool testAddMul (Field &F, const char *text, LinBox::VectorStream<Vector>
do r.random (a); while (F.isZero (a));
- std::ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector 1 of size " << v1.size() << ": ";
VD.write (report, v1) << std::endl;
@@ -203,14 +218,14 @@ static bool testAddMul (Field &F, const char *text, LinBox::VectorStream<Vector>
ret = iter_passed = false;
if (!iter_passed)
- LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: (x + a*y) != a*(y + a^-1*x)" << std::endl;
- LinBox::commentator.stop ("done");
- LinBox::commentator.progress ();
+ LinBox::commentator().stop ("done");
+ LinBox::commentator().progress ();
}
- LinBox::commentator.stop (MSG_STATUS (ret), (const char *) 0, "testAddMul");
+ LinBox::commentator().stop (MSG_STATUS (ret), (const char *) 0, "testAddMul");
stream1.reset ();
stream2.reset ();
@@ -237,7 +252,7 @@ static bool testSubMul (Field &F, const char *text, LinBox::VectorStream<Vector>
std::ostringstream str;
str << "\t--Testing " << text << " vector sub, mul" << std::ends;
- LinBox::commentator.start (str.str ().c_str (), "testSubMul", stream1.m ());
+ LinBox::commentator().start (str.str ().c_str (), "testSubMul", stream1.m ());
bool ret = true;
bool iter_passed;
@@ -256,7 +271,7 @@ static bool testSubMul (Field &F, const char *text, LinBox::VectorStream<Vector>
LinBox::VectorDomain<Field> VD (F);
while (stream1 && stream2) {
- LinBox::commentator.startIteration (stream1.j ());
+ LinBox::commentator().startIteration ((unsigned)stream1.j ());
iter_passed = true;
@@ -265,7 +280,7 @@ static bool testSubMul (Field &F, const char *text, LinBox::VectorStream<Vector>
do r.random (a); while (F.isZero (a));
- std::ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector 1 of size " << v1.size() << ": ";
VD.write (report, v1) << std::endl;
@@ -306,14 +321,14 @@ static bool testSubMul (Field &F, const char *text, LinBox::VectorStream<Vector>
ret = iter_passed = false;
if (!iter_passed)
- LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: (x - a*y) != a*(a^-1*x - y)" << std::endl;
- LinBox::commentator.stop ("done");
- LinBox::commentator.progress ();
+ LinBox::commentator().stop ("done");
+ LinBox::commentator().progress ();
}
- LinBox::commentator.stop (MSG_STATUS (ret), (const char *) 0, "testSubMul");
+ LinBox::commentator().stop (MSG_STATUS (ret), (const char *) 0, "testSubMul");
stream1.reset ();
stream2.reset ();
@@ -338,7 +353,7 @@ static bool testAXPY (Field &F, const char *text, LinBox::VectorStream<Vector> &
{
std::ostringstream str;
str << "\t--Testing " << text << " vector axpy" << std::ends;
- LinBox::commentator.start (str.str ().c_str (), "testAXPY", stream1.m ());
+ LinBox::commentator().start (str.str ().c_str (), "testAXPY", stream1.m ());
bool ret = true;
bool iter_passed;
@@ -357,7 +372,7 @@ static bool testAXPY (Field &F, const char *text, LinBox::VectorStream<Vector> &
LinBox::VectorDomain<Field> VD (F);
while (stream1 && stream2) {
- LinBox::commentator.startIteration (stream1.j ());
+ LinBox::commentator().startIteration ((unsigned)stream1.j ());
iter_passed = true;
@@ -366,7 +381,7 @@ static bool testAXPY (Field &F, const char *text, LinBox::VectorStream<Vector> &
do r.random (a); while (F.isZero (a));
- std::ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector 1 of size " << v1.size() << ": ";
VD.write (report, v1) << std::endl;
@@ -389,14 +404,14 @@ static bool testAXPY (Field &F, const char *text, LinBox::VectorStream<Vector> &
ret = iter_passed = false;
if (!iter_passed)
- LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: (x + a*y) - a*(y + a^-1*x) != 0" << std::endl;
- LinBox::commentator.stop ("done");
- LinBox::commentator.progress ();
+ LinBox::commentator().stop ("done");
+ LinBox::commentator().progress ();
}
- LinBox::commentator.stop (MSG_STATUS (ret), (const char *) 0, "testAXPY");
+ LinBox::commentator().stop (MSG_STATUS (ret), (const char *) 0, "testAXPY");
stream1.reset ();
stream2.reset ();
@@ -421,7 +436,7 @@ static bool testCopyEqual (Field &F, const char *text, LinBox::VectorStream<Vect
std::ostringstream str;
str << "\t--Testing " << text << " vector copy, areEqual" << std::ends;
- LinBox::commentator.start (str.str ().c_str (), "testCopyEqual", stream.m ());
+ LinBox::commentator().start (str.str ().c_str (), "testCopyEqual", stream.m ());
bool ret = true;
bool iter_passed;
@@ -435,14 +450,14 @@ static bool testCopyEqual (Field &F, const char *text, LinBox::VectorStream<Vect
LinBox::VectorDomain<Field> VD (F);
while (stream) {
- LinBox::commentator.startIteration (stream.j ());
+ LinBox::commentator().startIteration ((unsigned)stream.j ());
iter_passed = true;
stream.next (v);
VD.copy (w, v);
- std::ostream &report = LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
+ std::ostream &report = LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_DESCRIPTION);
report << "Input vector: ";
VD.write (report, v) << std::endl;
@@ -453,14 +468,14 @@ static bool testCopyEqual (Field &F, const char *text, LinBox::VectorStream<Vect
ret = iter_passed = false;
if (!iter_passed)
- LinBox::commentator.report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
+ LinBox::commentator().report (LinBox::Commentator::LEVEL_IMPORTANT, INTERNAL_ERROR)
<< "ERROR: Vectors are not equal" << std::endl;
- LinBox::commentator.stop ("done");
- LinBox::commentator.progress ();
+ LinBox::commentator().stop ("done");
+ LinBox::commentator().progress ();
}
- LinBox::commentator.stop (MSG_STATUS (ret), (const char *) 0, "testCopyEqual");
+ LinBox::commentator().stop (MSG_STATUS (ret), (const char *) 0, "testCopyEqual");
stream.reset ();
stream2.reset ();
@@ -469,3 +484,12 @@ static bool testCopyEqual (Field &F, const char *text, LinBox::VectorStream<Vect
}
#endif // __LINBOX_test_vector_domain_H
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-zero-one.C b/tests/test-zero-one.C
index 3998760..77d6f9f 100644
--- a/tests/test-zero-one.C
+++ b/tests/test-zero-one.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file tests/test-zero-one.C
@@ -40,6 +41,7 @@
int main(int argc, char **argv)
{
+ using LinBox::parseArguments;
using LinBox::commentator;
bool pass = true;
uint32_t prime = 31337;
@@ -80,13 +82,22 @@ int main(int argc, char **argv)
*/
- commentator.start("ZeroOne matrix blackbox test suite", "ZeroOne");
+ commentator().start("ZeroOne matrix blackbox test suite", "ZeroOne");
pass = pass && testBlackbox(testMatrix);
delete [] rows;
delete [] cols;
- commentator.stop("ZeroOne matrix blackbox test suite");
+ commentator().stop("ZeroOne matrix blackbox test suite");
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/test-zo.C b/tests/test-zo.C
index 2b37649..858e93a 100644
--- a/tests/test-zo.C
+++ b/tests/test-zo.C
@@ -1,13 +1,14 @@
-/* -*- mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,\:0,t0,+0,=s
/* Copyright (C) LinBox
*
*
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,9 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
*/
/*! @file tests/test-zo.C
@@ -58,7 +59,7 @@ int main(int argc, char **argv)
END_OF_ARGUMENTS
};
- parseArguments(argc, argv, args);
+ LinBox::parseArguments(argc, argv, args);
typedef LinBox::Modular<uint32_t> Field;
//typedef LinBox::Modular<uint32_t> Field;
@@ -125,3 +126,12 @@ int main(int argc, char **argv)
//return pass&&pass2 ? 0 : -1;
return pass ? 0 : -1;
}
+
+// vim:sts=8:sw=8:ts=8:noet:sr:cino=>s,f0,{0,g0,(0,:0,t0,+0,=s
+// Local Variables:
+// mode: C++
+// tab-width: 8
+// indent-tabs-mode: nil
+// c-basic-offset: 8
+// End:
+
diff --git a/tests/tests.doxy b/tests/tests.doxy
index 2e9cf90..1198179 100644
--- a/tests/tests.doxy
+++ b/tests/tests.doxy
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) LinBox
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * ========LICENCE========
+
+ */
+
/** \ingroup linbox
* \defgroup tests tests
*
--
linbox: library for exact linear algebra
More information about the debian-science-commits
mailing list