Changeset 806c18 in git for factory/ExtensionInfo.h

Timestamp:

Nov 15, 2010, 4:34:57 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

7c3bca08c96331a56864c1d35b8c2e8ff2e0be89

Parents:

c840d97af622b4e4da8761738b540e21144f716b

Message:

format

git-svn-id: file:///usr/local/Singular/svn/trunk@13655 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• factory/ExtensionInfo.h (modified) (5 diffs)

factory/ExtensionInfo.h

@@ -1 +1 @@
 /*****************************************************************************\
- * Computer Algebra System SINGULAR    
+ * Computer Algebra System SINGULAR
 \*****************************************************************************/
 /** @file ExtensionInfo.h
- * 
+ *
  * This file provides a class to store information about finite fields and
- * extensions thereof.   
- *         
+ * extensions thereof.
+ *
  *
  * @author Martin Lee
@@ -23 +23 @@
 
 /** @class ExtensionInfo ExtensionInfo.h "factory/ExtensionInfo.h"
- *  ExtensionInfo contains information about extension. 
- *  If @a m_extension is true we are in an extension of some initial field. 
- *  If the initial field is \f$ F_p \f$ and we pass to \f$ F_p (\alpha) \f$ 
- *  then @a m_alpha is an algebraic variable, @a m_beta= Variable(1), 
+ *  ExtensionInfo contains information about extension.
+ *  If @a m_extension is true we are in an extension of some initial field.
+ *  If the initial field is \f$ F_p \f$ and we pass to \f$ F_p (\alpha) \f$
+ *  then @a m_alpha is an algebraic variable, @a m_beta= Variable(1),
  *  @a m_gamma= @a m_delta= 1, @a m_GFDegree= 0, @a m_GFName= 'Z'. If we pass
- *  to some GF (p^k) then @a m_alpha= Variable (1), @a m_beta= Variable(1), 
- *  @a m_gamma= @a m_delta= 1, @a m_GFDegree= 1, @a m_GFName= 'Z'.  
- *  @n If the initial field is \f$ F_p (\epsilon) \f$, then @a m_beta= 
- *  \f$ \epsilon \f$, @a m_alpha an algebraic variable defining an extension of 
- *  \f$ F_p (\epsilon) \f$, @a m_gamma is a primitive element of 
- *  \f$ F_p (\alpha) \f$, @a m_delta is a primitive element of 
- *  \f$ F_p (\beta) \f$, @a m_GFDegree= 0, @a m_GFName= 'Z'. 
- *  @n If the initial field is GF(p^k), then @a m_alpha= Variable (1), 
- *  @a m_beta= Variable (1), @a m_gamma= 1, @a m_delta= 1, @a m_GFDegree()= k, 
- *  @a m_GFName= gf_name of the initial field. 
- *  @n If @a m_extension is false and the current field is \f$ F_p \f$ then  
- *  @a m_alpha= Variable (1), @a m_beta= Variable (1), @a m_gamma= 1, 
- *  @a m_delta= 1, @a m_GFDegree= 1, @a m_GFName= 'Z'. 
- *  @n If the current field is \f$ F_p (\alpha) \f$ then 
- *  @a m_alpha is some algebraic variable, @a m_beta= Variable (1), 
- *  @a m_gamma= 1, @a m_delta= 1, @a m_GFDegree= 0, @a m_GFName= 'Z'. 
- *  @n If the current field is GF then @a m_alpha= Variable (1), 
- *  @a m_beta= Variable (1),  @a m_gamma= 1, @a m_delta= 1, 
+ *  to some GF (p^k) then @a m_alpha= Variable (1), @a m_beta= Variable(1),
+ *  @a m_gamma= @a m_delta= 1, @a m_GFDegree= 1, @a m_GFName= 'Z'.
+ *  @n If the initial field is \f$ F_p (\epsilon) \f$, then @a m_beta=
+ *  \f$ \epsilon \f$, @a m_alpha an algebraic variable defining an extension of
+ *  \f$ F_p (\epsilon) \f$, @a m_gamma is a primitive element of
+ *  \f$ F_p (\alpha) \f$, @a m_delta is a primitive element of
+ *  \f$ F_p (\beta) \f$, @a m_GFDegree= 0, @a m_GFName= 'Z'.
+ *  @n If the initial field is GF(p^k), then @a m_alpha= Variable (1),
+ *  @a m_beta= Variable (1), @a m_gamma= 1, @a m_delta= 1, @a m_GFDegree()= k,
+ *  @a m_GFName= gf_name of the initial field.
+ *  @n If @a m_extension is false and the current field is \f$ F_p \f$ then
+ *  @a m_alpha= Variable (1), @a m_beta= Variable (1), @a m_gamma= 1,
+ *  @a m_delta= 1, @a m_GFDegree= 1, @a m_GFName= 'Z'.
+ *  @n If the current field is \f$ F_p (\alpha) \f$ then
+ *  @a m_alpha is some algebraic variable, @a m_beta= Variable (1),
+ *  @a m_gamma= 1, @a m_delta= 1, @a m_GFDegree= 0, @a m_GFName= 'Z'.
+ *  @n If the current field is GF then @a m_alpha= Variable (1),
+ *  @a m_beta= Variable (1),  @a m_gamma= 1, @a m_delta= 1,
  *  @a m_GFDegree= getGFDegree(), @a m_GFName= gf_name.
  *
- *  @sa facFqBivar.h, facFqFactorize.h 
+ *  @sa facFqBivar.h, facFqFactorize.h
  */
 class ExtensionInfo
 {
 private:
-  /// an algebraic variable or Variable (1) 
+  /// an algebraic variable or Variable (1)
   Variable m_alpha;
   /// an algebraic variable or Variable (1)
-  Variable m_beta;  
+  Variable m_beta;
   /// a primitive element of \f$ F_p (\alpha) \f$ or 1
   CanonicalForm m_gamma;
@@ -69 +69 @@
 public:
   /// \f$ F_p \f$ as initial field, if @a extension is true we are in some GF
-  ExtensionInfo (const bool extension  ///< [in] some bool 
+  ExtensionInfo (const bool extension  ///< [in] some bool
                 );
-  /// Construct an @a ExtensionInfo 
-  ExtensionInfo (const Variable& alpha,      ///< [in] some algebraic variable 
+  /// Construct an @a ExtensionInfo
+  ExtensionInfo (const Variable& alpha,      ///< [in] some algebraic variable
                  const Variable& beta,       ///< [in] some algebraic variable
                  const CanonicalForm& gamma, ///< [in] some primitive element
@@ -85 +85 @@
   /// \f$ F_p (\beta) \f$ as initial field and switch to an extension given by
   /// @a alpha, needs primitive elements @a gamma and @a delta for maps
-  /// between \f$ F_p (\alpha) \subset F_p (\beta) \f$ 
+  /// between \f$ F_p (\alpha) \subset F_p (\beta) \f$
   ExtensionInfo (const Variable& alpha,      ///< [in] some algebraic variable
                  const Variable& beta,       ///< [in] some algebraic variable
@@ -94 +94 @@
                 );
   /// \f$ F_p (\alpha) \f$ as initial field, if @a extension is false.
-  /// Else initial field is \f$ F_p \f$ 
+  /// Else initial field is \f$ F_p \f$
   ExtensionInfo (const Variable& alpha, ///< [in] some algebraic variable
                  const bool extension   ///< [in] some bool
-                ); 
+                );
 
-  ExtensionInfo (const Variable& alpha ///< [in] some algebraic variable
+  //ExtensionInfo (const Variable& alpha ///< [in] some algebraic variable
+  //              );
+
+  /// GF as initial field
+  ExtensionInfo (const int nGFDegree,   ///< [in] GF degree of initial field
+                 const char cGFName,    ///< [in] name of GF variable
+                 const bool extension   ///< [in] some bool
                 );
- 
-  /// GF as initial field
-  ExtensionInfo (const int nGFDegree,   ///< [in] GF degree of initial field 
-                 const char cGFName,    ///< [in] name of GF variable 
-                 const bool extension   ///< [in] some bool
-                ); 
 
   /// getter