Changeset fa8420 in git


Ignore:
Timestamp:
Apr 6, 1998, 12:50:46 PM (26 years ago)
Author:
Jens Schmidt <schmidt@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
3ba84ce0237d1edda5eed542f689d3e795661cdb
Parents:
a42239a667454add16526617638435dcc1115d49
Message:
***** merge from branch `factory-gcd' to main trunk


git-svn-id: file:///usr/local/Singular/svn/trunk@1328 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
factory/ftest
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • factory/ftest/degree.m4

    ra42239 rfa8420  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: degree.m4,v 1.2 1997-11-05 16:12:12 schmidt Exp $ */
     2/* $Id: degree.m4,v 1.3 1998-04-06 10:50:28 schmidt Exp $ */
    33
    44ftestSetNameOfGame( degree, `"
    55Usage: degree [<options>] [<envSpec>] <f> [<x>]
    6   returns degree of canonical form f with respect to its main
    7   variable.  If variable x is specified, returns degree of f with
    8   respect to x.
     6  returns degree of canonical form <f> with respect to its main
     7  variable.  If variable <x> is specified, returns degree of <f>
     8  with respect to <x>.
    99"'`' )
    1010
     
    4545
    4646    // do the test!
    47     ftestRun(
    48         if ( ftestArgGiven( x ) )
    49             result = degree( f, x );
    50         else
    51             result = degree( f ); );
     47    if ( ftestArgGiven( x ) ) {
     48        ftestRun( result = degree( f, x ); );
     49    } else {
     50        ftestRun( result = degree( f ); );
     51    }
    5252
    5353    // print results
  • factory/ftest/deriv.m4

    ra42239 rfa8420  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: deriv.m4,v 1.4 1997-11-05 16:13:07 schmidt Exp $ */
     2/* $Id: deriv.m4,v 1.5 1998-04-06 10:50:46 schmidt Exp $ */
    33
    44ftestSetNameOfGame( deriv, `"
    55Usage: deriv [<options>] [<envSpec>] <f> [<x>]
    6   calculates df/dx or derivation of canonical form f with respect
    7   to main variable if variable x is not specified.
     6  calculates df/dx or derivation of canonical form <f> with
     7  respect to main variable if variable <x> is not specified.
    88"'`' )
    99
     
    4444
    4545    // do the test!
    46     ftestRun(
    47         if ( ftestArgGiven( x ) )
    48             result = f.deriv( x );
    49         else
    50             result = f.deriv(); );
     46    if ( ftestArgGiven( x ) ) {
     47        ftestRun( result = f.deriv( x ); );
     48    } else {
     49        ftestRun( result = f.deriv(); );
     50    }
    5151
    5252    // print results
  • factory/ftest/insert.m4

    ra42239 rfa8420  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: insert.m4,v 1.1 1997-11-05 16:10:15 schmidt Exp $ */
     2/* $Id: insert.m4,v 1.2 1998-04-06 10:48:37 schmidt Exp $ */
    33
    44ftestSetNameOfGame( insert, `"
    55Usage: insert [<options>] [<envSpec>] <f> <g> [<v>]
    6   inserts canonical form g for variable v in canonical form f.
    7   v defaults to main variable of f if not explicitely specified.
     6  inserts canonical form <g> for variable <v> in canonical form
     7  <f>.  <v> defaults to main variable of <f> if not explicitely
     8  specified.
    89"'`' )
    910
     
    4647
    4748    // do the test!
    48     ftestRun(
    49         if ( ftestArgGiven( v ) )
    50             result = f( g, v );
    51         else
    52             result = f( g ); );
     49    if ( ftestArgGiven( v ) ) {
     50        ftestRun( result = f( g, v ); );
     51    } else {
     52        ftestRun( result = f( g ); );
     53    }
    5354
    5455    // print results
  • factory/ftest/size.m4

    ra42239 rfa8420  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: size.m4,v 1.3 1997-11-05 16:12:18 schmidt Exp $ */
     2/* $Id: size.m4,v 1.4 1998-04-06 10:49:03 schmidt Exp $ */
    33
    44ftestSetNameOfGame( size, `"
    55Usage: size [<options>] [<envSpec>] <f> [<x>]
    6   calculates number of monomials of canonical form f.  If
    7   variable x is specified, calculates number of monomials of f
    8   with level higher or equal than level of x.
     6  calculates number of monomials of canonical form <f>.  If
     7  variable <x> is specified, calculates number of monomials of
     8  <f> with level higher or equal than level of <x>.
    99"'`' )
    1010
     
    4545
    4646    // do the test!
    47     ftestRun(
    48         if ( ftestArgGiven( x ) )
    49             result = size( f, x );
    50         else
    51             result = size( f ); );
     47    if ( ftestArgGiven( x ) ) {
     48        ftestRun( result = size( f, x ); );
     49    } else {
     50        ftestRun( result = size( f ); );
     51    }
    5252
    5353    // print results
  • factory/ftest/totaldegree.m4

    ra42239 rfa8420  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: totaldegree.m4,v 1.3 1997-11-05 16:12:21 schmidt Exp $ */
     2/* $Id: totaldegree.m4,v 1.4 1998-04-06 10:49:17 schmidt Exp $ */
    33
    44ftestSetNameOfGame( totaldegree, `"
    55Usage: totaldegree [<options>] [<envSpec>] <f> [<x> <y>]
    6   calculates total degree of canonical form f.  If the variables
    7   x and y are specified, calculates total degree of f with
    8   respect to the polynomial variables between x and y
    9   (inclusively).
     6  calculates total degree of canonical form <f>.  If the
     7  variables <x> and <y> are specified, calculates total
     8  degree of <f> with respect to the polynomial variables
     9  between <x> and <y> (inclusively).
    1010"'`' )
    1111
     
    4848
    4949    // do the test!
    50     ftestRun(
    51         if ( ftestArgGiven( x ) )
    52             result = totaldegree( f, x, y );
    53         else
    54             result = totaldegree( f ); );
     50    if ( ftestArgGiven( x ) ) {
     51        ftestRun( result = totaldegree( f, x, y ); );
     52    } else {
     53        ftestRun( result = totaldegree( f ); );
     54    }
    5555
    5656    // print results
Note: See TracChangeset for help on using the changeset viewer.