Changeset e102d4 in git

Timestamp:

Mar 14, 2014, 7:08:00 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

d9184bd7e71c6771eb56c5b567760e3723664237

Parents:

60225f979345d71370e20b6de2fbf545ca0792cb14b690e0515f6e3f6f482f016e14f1f56d2df336

Message:

Merge pull request #541 from mmklee/factory_emsg

fix typo

Files:

• Singular/gentable.cc (modified) (1 diff)
• dox/Doxyfile.in (modified) (15 diffs)
• factory/cf_factor.cc (modified) (3 diffs)
• factory/cf_map_ext.h (modified) (1 diff)

Singular/gentable.cc

@@ -373 +373 @@
           Tok2Cmdname(i), Tok2Cmdname(j));
   #ifdef CONVERT_TABLE
-        fprintf(doctable,
-        "@item\n@   %d. @tab @code{%s}  @tab @expansion{} @code{%s}\n",
+        fprintf(doctable,
+        "@item\n@   %d. @tab @code{%s}  @tab @expansion{} @code{%s}\n",
         doc_nr,Tok2Cmdname(i),Tok2Cmdname(j));
-        doc_nr++;
+        doc_nr++;
   #endif
         if (j==ANY_TYPE) break;

dox/Doxyfile.in

@@ -39 +39 @@
 # a quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          =
+PROJECT_BRIEF          = CAS Singular
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is
@@ -53 +53 @@
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       =
+OUTPUT_DIRECTORY       =  @abs_builddir@
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
@@ -129 +129 @@
 # path to strip.
 
-STRIP_FROM_PATH        = @top_srcdir@
+STRIP_FROM_PATH        = @abs_top_srcdir@
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
@@ -241 +241 @@
 # diagrams that involve STL classes more complete and accurate.
 
-BUILTIN_STL_SUPPORT    = NO
+BUILTIN_STL_SUPPORT    = YES
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
@@ -261 +261 @@
 # methods anyway, you should set this option to NO.
 
-IDL_PROPERTY_SUPPORT   = YES
+IDL_PROPERTY_SUPPORT   = NO
 
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
@@ -292 +292 @@
 # pages) or section (for LaTeX and RTF).
 
-INLINE_SIMPLE_STRUCTS  = NO
+INLINE_SIMPLE_STRUCTS  = YES
 
 # When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
@@ -482 +482 @@
 # commands in the documentation.
 
-GENERATE_TODOLIST      = YES
+GENERATE_TODOLIST      = NO
 
 # The GENERATE_TESTLIST tag can be used to enable (YES) or
@@ -488 +488 @@
 # commands in the documentation.
 
-GENERATE_TESTLIST      = YES
+GENERATE_TESTLIST      = NO
 
 # The GENERATE_BUGLIST tag can be used to enable (YES) or
@@ -494 +494 @@
 # commands in the documentation.
 
-GENERATE_BUGLIST       = YES
+GENERATE_BUGLIST       = NO
 
 # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
@@ -500 +500 @@
 # \deprecated commands in the documentation.
 
-GENERATE_DEPRECATEDLIST= YES
+GENERATE_DEPRECATEDLIST= NO
 
 # The ENABLED_SECTIONS tag can be used to enable conditional
@@ -527 +527 @@
 # in the documentation. The default is NO.
 
-SHOW_DIRECTORIES       = NO
+SHOW_DIRECTORIES       = YES
 
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
@@ -540 +540 @@
 # and from the Folder Tree View (if specified). The default is YES.
 
-SHOW_NAMESPACES        = YES
+SHOW_NAMESPACES        = NO
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
@@ -630 +630 @@
 # with spaces.
 
-INPUT                  = @top_srcdir@
+INPUT                  = @abs_top_srcdir@/omalloc/ \
+@abs_top_srcdir@/resources/ \
+@abs_top_srcdir@/factory/ \
+@abs_top_srcdir@/factory/libfac/ \
+@abs_top_srcdir@/factory/libfac/charset/ \
+@abs_top_srcdir@/factory/libfac/factor/ \
+@abs_top_srcdir@/factory/templates/ \
+@abs_top_srcdir@/factory/include/factory/ \
+@abs_top_srcdir@/factory/include/factory/templates/ \
+@abs_top_srcdir@/kernel/ \
+@abs_top_srcdir@/kernel/numeric/ \
+@abs_top_srcdir@/libpolys/misc/ \
+@abs_top_srcdir@/libpolys/reporter/ \
+@abs_top_srcdir@/libpolys/coeffs/ \
+@abs_top_srcdir@/libpolys/polys/ \
+@abs_top_srcdir@/libpolys/polys/ext_fields/ \
+@abs_top_srcdir@/libpolys/polys/monomials/ \
+@abs_top_srcdir@/libpolys/polys/nc/ \
+@abs_top_srcdir@/libpolys/polys/operations/ \
+@abs_top_srcdir@/libpolys/polys/templates/ \
+@abs_top_srcdir@/libpolys/tests/ \
+@abs_top_srcdir@/libpolys/tests/cxxtest/ \
+@abs_top_srcdir@/dyn_modules/bigintm/ \
+@abs_top_srcdir@/dyn_modules/syzextra/ \
+@abs_top_srcdir@/Singular/ \
+@abs_top_srcdir@/Singular/links/ \
+@abs_top_srcdir@/IntegerProgramming/ \
+@abs_top_srcdir@/gfanlib/ \
+@abs_top_srcdir@/dyn_modules/callgfanlib/ \
+@abs_top_srcdir@/dyn_modules/callpolymake/ 
+
+
 
 # This tag can be used to specify the character encoding of the source files
@@ -648 +679 @@
 # *.f90 *.f *.for *.vhd *.vhdl
 
-FILE_PATTERNS          =
+FILE_PATTERNS          = *.h *.cc *.c *.cpp *.cxx *.inc *.l *.ll *.y *.yy *.dox 
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories
@@ -689 +720 @@
 # the \include command).
 
-EXAMPLE_PATH           =  @top_srcdir@
+EXAMPLE_PATH           =  
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the

factory/cf_factor.cc

@@ -503 +503 @@
         if (CFFactory::gettype() == GaloisFieldDomain)
           factors= GFSqrfFactorize (f);
-        else if (hasFirstAlgVar (f, alpha))
-          factors= FqSqrfFactorize (f, alpha);
         else
           factors= FpSqrfFactorize (f);
@@ -515 +513 @@
         if (CFFactory::gettype() == GaloisFieldDomain)
           F= GFFactorize (f);
-        else if (hasFirstAlgVar (f, alpha))
-          F= FqFactorize (f, alpha);
         else
           F= FpFactorize (f);
@@ -625 +621 @@
   Variable beta;
   if (hasFirstAlgVar(f, beta))
-    ASSERT (hasFirstAlgVar (f, beta) != alpha, "f has an algebraic variable that \
-    does not coincide with alpha");
+    ASSERT (beta == alpha, "f has an algebraic variable that \
+                            does not coincide with alpha");
 #endif
   int ch=getCharacteristic();

factory/cf_map_ext.h

@@ -59 +59 @@
                                    ///< whose minimal polynomial defines a field
                                    ///< extension of \f$ F_p \f$ of degree
-                                   ///< \f$ \[F_p (\alpha):F_p\] \f$
+                                   ///< \f$ F_p (\alpha):F_p \f$
      const Variable& beta          ///< [in] algebraic variable, root of \a F's
                                    ///< minimal polynomial