Changeset 194c2e7 in git for IntegerProgramming/matrix.h


Ignore:
Timestamp:
Feb 9, 2010, 6:50:36 PM (14 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
6c939eebfd221f2512b1e27d158d1b5457206987
Parents:
a477f80136c773f8acffd73512f53bf88a7c6fe8
Message:
short -> int

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

Legend:

Unmodified
Added
Removed

  • IntegerProgramming/matrix.h

    ra477f80 r194c2e7  
    3232private:
    3333
    34   short rows;
     34  int rows;
    3535
    36   short columns;
     36  int columns;
    3737  // Also used as error flag (values <0):
    3838  // -1 indicates a "semantic" error (which occurs e.g. if some constructor
    … …  
    4848  // allocated if such a basis is really computed.
    4949
    50   short _kernel_dimension;
     50  int _kernel_dimension;
    5151  // the number of vectors stored in H (the size of these vectors is columns)
    5252  // If _kernel_dimension==-2, no kernel basis has been computed yet.
    … …  
    6262// constructors and destructor
    6363
    64   matrix(const short& row_number, const short& column_number);
     64  matrix(const int& row_number, const int& column_number);
    6565  // Creates a zero matrix of the specified size.
    6666
    67   matrix(const short& row_number, const short& column_number,
     67  matrix(const int& row_number, const int& column_number,
    6868         Integer** entries);
    6969  // Builds a matrix from its coefficient array.
    … …  
    8080  //    coefficients 0..n-1 of row m
    8181
    82   matrix(const short& m, const short& n, ifstream& input);
     82  matrix(const int& m, const int& n, ifstream& input);
    8383  // Reads a (m x n)-matrix from the given ifstream.
    8484  // The input stream must have the following format:
    … …  
    102102  // Returns TRUE, if all entries of the matrix are >=0, else FALSE.
    103103
    104   short error_status() const;
     104  int error_status() const;
    105105  // Returns columns iff columns<0 (this is the "error flag"), else 0.
    106106
    107   short row_number() const;
     107  int row_number() const;
    108108  // Retuns the row number.
    109109
    110   short column_number() const;
     110  int column_number() const;
    111111  // Returns the column number.
    112112
    113   short kernel_dimension() const;
     113  int kernel_dimension() const;
    114114  // Returns the kernel dimension.
    115115
    … …  
    118118// special routines for the IP-algorithms
    119119
    120   short LLL_kernel_basis();
     120  int LLL_kernel_basis();
    121121  // Computes a LLL-reduced integer basis of the matrix kernel and returns
    122122  // the kernel dimension (-1 if an error has occurred).
    123123  // This dimension is also stored in the member kernel_dimension.
    124124
    125   short compute_nonzero_kernel_vector();
     125  int compute_nonzero_kernel_vector();
    126126  // Transforms the kernel lattice basis stored in H so that it contains
    127127  // a vector whose components are all !=0;
    … …  
    129129  // If no such basis has been computed before, this is done now.
    130130
    131   short compute_flip_variables(short*&);
     131  int compute_flip_variables(int*&);
    132132  // Computes a set of flip variables for the algorithm of DiBiase and
    133133  // Urbanke from a kernel vector with no zero components.
    … …  
    137137  // is done in the routine) to be accessible for the calling function.
    138138
    139   short hosten_shapiro(short*& sat_var);
     139  int hosten_shapiro(int*& sat_var);
    140140  // Computes a set of saturation variables for the ideal defined by the
    141141  // kernel lattice and returns the size of that set.
Note: See TracChangeset for help on using the changeset viewer.