Mercurial > hg > octave-lyh
changeset 1860:821870c30840
[project @ 1996-02-04 10:04:58 by jwe]
author | jwe |
---|---|
date | Sun, 04 Feb 1996 10:06:30 +0000 |
parents | 43248236fcd9 |
children | 620a65533630 |
files | liboctave/QPSOL.h liboctave/Range.h |
diffstat | 2 files changed, 20 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/QPSOL.h +++ b/liboctave/QPSOL.h @@ -34,9 +34,10 @@ #include "dColVector.h" #include "QP.h" -class QPSOL_options +class +QPSOL_options { - public: +public: QPSOL_options (void); QPSOL_options (const QPSOL_options& opt); @@ -60,7 +61,7 @@ int iteration_limit (void); int print_level (void); - private: +private: double x_feasibility_tolerance; double x_infinite_bound; @@ -68,9 +69,10 @@ int x_print_level; }; -class QPSOL : public QP, public QPSOL_options +class +QPSOL : public QP, public QPSOL_options { - public: +public: QPSOL (void) : QP (), QPSOL_options () { }
--- a/liboctave/Range.h +++ b/liboctave/Range.h @@ -1,7 +1,7 @@ // Range.h -*- C++ -*- /* -Copyright (C) 1992, 1993, 1994, 1995 John W. Eaton +Copyright (C) 1996 John W. Eaton This file is part of Octave. @@ -32,40 +32,25 @@ class ostream; class Matrix; -class Range +class +Range { public: + Range (void) - { - rng_base = -1; - rng_limit = -1; - rng_inc = -1; - rng_nelem = -1; - } + : rng_base (-1), rng_limit (-1), rng_inc (-1), rng_nelem (-1) { } Range (const Range& r) - { - rng_base = r.rng_base; - rng_limit = r.rng_limit; - rng_inc = r.rng_inc; - rng_nelem = r.rng_nelem; - } + : rng_base (r.rng_base), rng_limit (r.rng_limit), rng_inc (r.rng_inc), + rng_nelem (r.rng_nelem) { } Range (double b, double l) - { - rng_base = b; - rng_limit = l; - rng_inc = 1; - rng_nelem = nelem_internal (); - } + : rng_base (b), rng_limit (l), rng_inc (1), + rng_nelem (nelem_internal ()) { } Range (double b, double l, double i) - { - rng_base = b; - rng_limit = l; - rng_inc = i; - rng_nelem = nelem_internal (); - } + : rng_base (b), rng_limit (l), rng_inc (i), + rng_nelem (nelem_internal ()) { } double base (void) const { return rng_base; } double limit (void) const { return rng_limit; } @@ -90,9 +75,11 @@ void print_range (void); private: + double rng_base; double rng_limit; double rng_inc; + int rng_nelem; int nelem_internal (void) const;