Mercurial > hg > octave-lyh
changeset 1844:dca09b766816
[project @ 1996-02-03 11:44:20 by jwe]
author | jwe |
---|---|
date | Sat, 03 Feb 1996 11:44:49 +0000 |
parents | 88c5728ae7ae |
children | c1c5b28e8ef6 |
files | liboctave/Makefile.in liboctave/ODEFunc.h |
diffstat | 2 files changed, 20 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -27,9 +27,9 @@ dbleCHOL.h dbleDET.h dbleGEPBAL.h dbleHESS.h dbleLU.h dbleQR.h \ dbleQRP.h dbleSCHUR.h dbleSVD.h -INCLUDES := Bounds.h CollocWt.h DAE.h DAEFunc.h FEGrid.h FSQP.h \ - LinConst.h LP.h LPsolve.h NLConst.h NLEqn.h NLFunc.h NLP.h \ - NPSOL.h ODE.h ODEFunc.h Objective.h QP.h QPSOL.h Quad.h \ +INCLUDES := Bounds.h CollocWt.h DAE.h DAEFunc.h DASSL.h FEGrid.h FSQP.h \ + LinConst.h LP.h LPsolve.h LSODE.h NLConst.h NLEqn.h NLFunc.h \ + NLP.h NPSOL.h ODE.h ODEFunc.h Objective.h QP.h QPSOL.h Quad.h \ Range.h base-de.h base-min.h cmd-hist.h dir-ops.h file-ops.h \ f77-uscore.h getopt.h idx-vector.h lo-error.h oct-cmplx.h \ oct-glob.h oct-math.h oct-term.h pathsearch.h prog-args.h \ @@ -50,13 +50,13 @@ dbleDET.cc dbleGEPBAL.cc dbleHESS.cc dbleLU.cc dbleQR.cc \ dbleQRP.cc dbleSCHUR.cc dbleSVD.cc -SOURCES := Bounds.cc CollocWt.cc DAE.cc FEGrid.cc FSQP.cc LinConst.cc \ - LPsolve.cc NLEqn.cc NPSOL.cc ODE.cc QPSOL.cc Quad.cc Range.cc \ - acosh.c asinh.c atanh.c cmd-hist.cc dir-ops.cc erf.c erfc.c \ - file-ops.cc filemode.c gamma.c getopt.c getopt1.c idx-vector.cc \ - lo-error.cc lgamma.c mkdir.c oct-glob.cc oct-term.cc \ - pathsearch.cc prog-args.cc rename.c rmdir.c str-vec.cc \ - sun-utils.cc tempname.c tempnam.c \ +SOURCES := Bounds.cc CollocWt.cc DAE.cc DASSL.cc FEGrid.cc FSQP.cc \ + LinConst.cc LPsolve.cc LSODE.cc NLEqn.cc NPSOL.cc QPSOL.cc \ + Quad.cc Range.cc acosh.c asinh.c atanh.c cmd-hist.cc \ + dir-ops.cc erf.c erfc.c file-ops.cc filemode.c gamma.c \ + getopt.c getopt1.c idx-vector.cc lo-error.cc lgamma.c \ + mkdir.c oct-glob.cc oct-term.cc pathsearch.cc prog-args.cc \ + rename.c rmdir.c str-vec.cc sun-utils.cc tempname.c tempnam.c \ $(TEMPLATE_SRC) \ $(TI_SRC) \ $(MATRIX_SRC)
--- a/liboctave/ODEFunc.h +++ b/liboctave/ODEFunc.h @@ -1,7 +1,7 @@ // ODEFunc.h -*- C++ -*- /* -Copyright (C) 1992, 1993, 1994, 1995 John W. Eaton +Copyright (C) 1996 John W. Eaton This file is part of Octave. @@ -35,34 +35,24 @@ typedef Matrix (*ODEJacFunc) (const ColumnVector&, double); ODEFunc (void) - { - fun = 0; - jac = 0; - } + : fun (0), jac (0) { } ODEFunc (ODERHSFunc f) - { - fun = f; - jac = 0; - } + : fun (f), jac (0) { } ODEFunc (ODERHSFunc f, ODEJacFunc j) - { - fun = f; - jac = j; - } + : fun (f), jac (j) { } ODEFunc (const ODEFunc& a) - { - fun = a.function (); - jac = a.jacobian_function (); - } + : fun (a.fun), jac (a.jac) { } ODEFunc& operator = (const ODEFunc& a) { - fun = a.function (); - jac = a.jacobian_function (); - + if (this != &a) + { + fun = a.fun; + jac = a.jac; + } return *this; }