Changeset a51188 in git


Ignore:
Timestamp:
Sep 30, 2009, 7:05:07 PM (15 years ago)
Author:
Frank Seelisch <seelisch@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '0bc2210f8055033868008a3836878db65ec6f89e')
Children:
4042c2b632b9f788b2327601ac2d0b4d0d60d508
Parents:
5d0d17bdad32f8f9794a7c32b5b6d125c210ebeb
Message:
changes due to Minor tests


git-svn-id: file:///usr/local/Singular/svn/trunk@12143 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/Makefile.in

    r5d0d17 ra51188  
    175175    walk.cc walk_ip.cc \
    176176    cntrlc.cc misc.cc \
    177     calcSVD.cc \
    178     CanonicalPoly.cc \
    179     ObjectFactory.cc \
    180     Poly.cc \
    181     ReferenceCounter.cc \
    182     Wrappers.cc \
    183     TestMinors.cc \
    184     MinorProcessor.cc \
    185     Minor.cc
     177    calcSVD.cc
    186178
    187179# stuff for MP
  • Singular/claptmpl.cc

    r5d0d17 ra51188  
    33*  Computer Algebra System SINGULAR     *
    44****************************************/
    5 // $Id: claptmpl.cc,v 1.46 2009-09-17 10:27:36 seelisch Exp $
     5// $Id: claptmpl.cc,v 1.47 2009-09-30 17:05:07 seelisch Exp $
    66/*
    77* ABSTRACT - instantiation of all templates
     
    257257//std::priority_queue<MonRedRes>
    258258//
     259/*
    259260// begin of template declarations for minor code (Frank Seelisch)
    260261#include <list>
     
    268269template class Cache<MinorKey, PolyMinorValue>;
    269270// end of template declarations for minor code (Frank Seelisch)
     271*/
    270272#endif
    271273//template int pos_helper(kStrategy strat, poly p, int len, intset setL, polyset set);
  • Singular/extra.cc

    r5d0d17 ra51188  
    22*  Computer Algebra System SINGULAR      *
    33*****************************************/
    4 /* $Id: extra.cc,v 1.317 2009-09-18 09:01:34 seelisch Exp $ */
     4/* $Id: extra.cc,v 1.318 2009-09-30 17:05:07 seelisch Exp $ */
    55/*
    66* ABSTRACT: general interface to internals of Singular ("system" command)
     
    5454#include "prCopy.h"
    5555#include "mpr_complex.h"
    56 #include "Wrappers.h" // for testing C++ wrappers (Frank Seelisch)
    57 #include "TestMinors.h" // for testing minor code (Frank Seelisch)
    5856#include "ffields.h" // test GF only
    5957
     
    20962094      else
    20972095#endif
    2098 /*==================== debug C++ wrappers (Frank Seelisch) ========================*/
    2099       if(strcmp(sys_cmd,"c++wrappers")==0)
    2100       {
    2101         testWrappers();
    2102         return FALSE;
    2103       }
    2104       else
    2105 /*==================== debug minor code (Frank Seelisch) ========================*/
    2106       if(strcmp(sys_cmd,"minors")==0)
    2107       {
    2108         if (h == NULL) minorUsageInfo();  /* writes some info to the console
    2109                                              on how to use this experimental code
    2110                                           */
    2111         else if (h->Typ() == INT_CMD)
    2112         {
    2113            testIntMinors(0);  /* effectively no arguments provided:
    2114                                  this starts 5 default tests
    2115                                  with a random matrix with
    2116                                  integer entries;
    2117                                  for that, no ring needs to be
    2118                                  declared
    2119                               */
    2120         }
    2121         else if ((h->Typ() == MATRIX_CMD) &&
    2122                  (h->next->Typ() == INT_CMD) &&
    2123                  (h->next->next->Typ() == INT_CMD) &&
    2124                  (h->next->next->next->Typ() == INT_CMD) &&
    2125                  (h->next->next->next->next->Typ() == INT_CMD) &&
    2126                  (h->next->next->next->next->next->Typ() == INT_CMD) &&
    2127                  (h->next->next->next->next->next->next->Typ() == INT_CMD) &&
    2128                  (h->next->next->next->next->next->next->next->Typ() == INT_CMD))
    2129         {
    2130           const matrix m          = (const matrix)h->Data();
    2131           const int k             = (const int)(long)h->next->Data();
    2132           const int cacheEntries  = (const int)(long)h->next->next->Data();
    2133           const int cacheWeight   = (const int)(long)h->next->next->next->Data();
    2134           const int strategies    = (const int)(long)h->next->next->next->next->Data();
    2135           const int dumpMinors    = (const int)(long)h->next->next->next->next->next->Data();
    2136           const int dumpResults   = (const int)(long)h->next->next->next->next->next->next->Data();
    2137           const int dumpComplete  = (const int)(long)h->next->next->next->next->next->next->next->Data();
    2138           const int dumpConsole   = (const int)(long)h->next->next->next->next->next->next->next->next->Data();
    2139           testAllPolyMinors(m, k, cacheEntries, cacheWeight, strategies, dumpMinors, dumpResults, dumpComplete, dumpConsole);
    2140             /* starts the computation of all k x k minors in the
    2141                provided matrix m (which is assumed to have polynomial
    2142                entries) using a cache with a maximum number of
    2143                'cacheEntries' entries and a maximum weight of 'cacheWeight';
    2144                when calling this method, a ring must be declared before;
    2145                strategy = "310" means that the code is run first without a
    2146                cache ("0") and then afterwards with the caching strategies
    2147                1 and 3
    2148             */
    2149         }
    2150         else if (h->Typ() == POLY_CMD)
    2151         { // for quick tests
    2152           const poly p = (const poly)h->Data();
    2153           testStuff(p);
    2154         }
    2155         return FALSE;
    2156       }
    2157       else
    21582096/*==================== generic debug ==================================*/
    21592097//#ifdef PDEBUG
Note: See TracChangeset for help on using the changeset viewer.