Mercurial > octave-nkf

changeset 7000:e87f860624cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-10-10 17:50:59 by jwe]
author jwe
date Wed, 10 Oct 2007 17:51:00 +0000
parents 9325d3f604a3
children 8b0cfeb06365
files liboctave/ChangeLog liboctave/LPsolve.cc liboctave/LPsolve.h liboctave/Makefile.in src/ChangeLog src/DLD-FUNCTIONS/lpsolve.cc src/Makefile.in
diffstat 7 files changed, 13 insertions(+), 192 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Wed Oct 10 17:03:35 2007 +0000
+++ b/liboctave/ChangeLog	Wed Oct 10 17:51:00 2007 +0000
@@ -1,3 +1,9 @@
+2007-10-10  John W. Eaton  <jwe@octave.org>
+
+	* LPsolve.h, LPsolve.cc: Delete.
+	* Makefile.in: Remove them from the INCLUDES and
+	LIBOCTAVE_CXX_SOURCES lists.
+
 2007-10-09  John W. Eaton  <jwe@octave.org>
 
 	* oct-time.cc (octave_strptime::init): Initialize t.tm_mon to -1
--- a/liboctave/LPsolve.cc	Wed Oct 10 17:03:35 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-
-Copyright (C) 1996, 1997 John W. Eaton
-
-This file is part of Octave.
-
-Octave is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-Octave is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Octave; see the file COPYING.  If not, write to the Free
-Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "LPsolve.h"
-#include "dColVector.h"
-#include "lo-error.h"
-
-ColumnVector
-LPsolve::do_minimize (double&, octave_idx_type&, ColumnVector&)
-{
-  (*current_liboctave_error_handler) ("sorry, not implemented");
-  return ColumnVector ();
-}
-
-/*
-;;; Local Variables: ***
-;;; mode: C++ ***
-;;; End: ***
-*/
--- a/liboctave/LPsolve.h	Wed Oct 10 17:03:35 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-
-Copyright (C) 1996, 1997 John W. Eaton
-
-This file is part of Octave.
-
-Octave is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-Octave is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Octave; see the file COPYING.  If not, write to the Free
-Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.
-
-*/
-
-#if !defined (octave_LPsolve_h)
-#define octave_LPsolve_h 1
-
-class ColumnVector;
-
-#include "LP.h"
-
-class
-LPsolve : public octave_LP
-{
-public:
-
-  LPsolve (void)
-    : octave_LP () { }
-
-  LPsolve (const ColumnVector& c)
-    : octave_LP (c) { }
-
-  LPsolve (const ColumnVector& c, const Bounds& b)
-    : octave_LP (c, b) { }
-
-  LPsolve (const ColumnVector& c, const Bounds& b, const LinConst& lc)
-    : octave_LP (c, b, lc) { }
-
-  LPsolve (const ColumnVector& c, const LinConst& lc)
-    : octave_LP (c, lc) { }
-
-  LPsolve (const LPsolve& a)
-    : octave_LP (a) { }
-
-  LPsolve& operator = (const LPsolve& a)
-    {
-      if (this != &a)
-	octave_LP::operator = (a);
-
-      return *this;
-    }
-
-  ~LPsolve (void) { }
-
-  ColumnVector do_minimize (double& objf, octave_idx_type& inform, ColumnVector& lambda);
-};
-
-#endif
-
-/*
-;;; Local Variables: ***
-;;; mode: C++ ***
-;;; End: ***
-*/
--- a/liboctave/Makefile.in	Wed Oct 10 17:03:35 2007 +0000
+++ b/liboctave/Makefile.in	Wed Oct 10 17:51:00 2007 +0000
@@ -60,7 +60,7 @@
 
 INCLUDES := Bounds.h CollocWt.h DAE.h DAEFunc.h DAERT.h \
 	DAERTFunc.h DASPK.h DASRT.h DASSL.h FEGrid.h \
-	LinConst.h LP.h LPsolve.h LSODE.h NLConst.h NLEqn.h \
+	LinConst.h LP.h LSODE.h NLConst.h NLEqn.h \
 	NLFunc.h NLP.h ODE.h ODEFunc.h ODES.h ODESFunc.h \
 	Objective.h QP.h Quad.h Range.h base-dae.h \
 	base-de.h base-min.h byte-swap.h cmd-edit.h cmd-hist.h \
@@ -116,9 +116,8 @@
 
 SPARSE_MX_OP_SRC := $(shell $(AWK) -f $(srcdir)/sparse-mk-ops.awk prefix=smx list_cc_files=1 $(srcdir)/sparse-mx-ops)
 
-LIBOCTAVE_CXX_SOURCES := Bounds.cc CollocWt.cc \
-	DASPK.cc DASRT.cc DASSL.cc FEGrid.cc LinConst.cc \
-	LPsolve.cc LSODE.cc NLEqn.cc ODES.cc \
+LIBOCTAVE_CXX_SOURCES := Bounds.cc CollocWt.cc DASPK.cc DASRT.cc \
+	DASSL.cc FEGrid.cc LinConst.cc LSODE.cc NLEqn.cc ODES.cc \
 	Quad.cc Range.cc data-conv.cc dir-ops.cc \
 	file-ops.cc file-stat.cc glob-match.cc idx-vector.cc \
 	lo-ieee.cc lo-mappers.cc lo-specfun.cc lo-sysdep.cc \
--- a/src/ChangeLog	Wed Oct 10 17:03:35 2007 +0000
+++ b/src/ChangeLog	Wed Oct 10 17:51:00 2007 +0000
@@ -1,5 +1,8 @@
 2007-10-10  Kim Hansen  <kimhanse@gmail.com>
 
+	* DLD-FUNCTIONS/lpsolve.cc: Delete.
+	* Makefile.in (DLD_XSRC): Remove it from the list.
+
         * data.cc (Fsqueeze): Document 2d behaviour.
         * ov-range.h (octave_range::squeeze): New function.
 
--- a/src/DLD-FUNCTIONS/lpsolve.cc	Wed Oct 10 17:03:35 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-
-Copyright (C) 1996, 1997 John W. Eaton
-
-This file is part of Octave.
-
-Octave is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-Octave is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Octave; see the file COPYING.  If not, write to the Free
-Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "LPsolve.h"
-
-#include "defun-dld.h"
-#include "error.h"
-#include "oct-obj.h"
-
-DEFUN_DLD (lpsolve, , ,
-  "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} lpsolve ()\n\
-Not implemented yet...\n\
-@end deftypefn")
-{
-  octave_value_list retval;
-
-  // Force a bad value of inform, and empty matrices for x and phi.
-
-  Matrix m;
-  retval(2) = -1.0;
-  retval(1) = m;
-  retval(0) = m;
-
-  error ("lpsolve: not implemented yet");
-
-  return retval;
-}
-
-DEFUN_DLD (lpsolve_options, , ,
-  "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} lpsolve_options ()\n\
-Not implemented yet...\n\
-@end deftypefn")
-{
-  octave_value_list retval;
-
-  error ("lpsolve_options: not implemented yet");
-
-  return retval;
-}
-
-/*
-;;; Local Variables: ***
-;;; mode: C++ ***
-;;; End: ***
-*/
--- a/src/Makefile.in	Wed Oct 10 17:03:35 2007 +0000
+++ b/src/Makefile.in	Wed Oct 10 17:51:00 2007 +0000
@@ -52,7 +52,7 @@
 	dasrt.cc dassl.cc det.cc dispatch.cc eig.cc expm.cc \
 	fft.cc fft2.cc fftn.cc fftw.cc filter.cc find.cc fsolve.cc \
 	gammainc.cc gcd.cc getgrent.cc getpwent.cc getrusage.cc \
-	givens.cc hess.cc inv.cc kron.cc lpsolve.cc lsode.cc \
+	givens.cc hess.cc inv.cc kron.cc lsode.cc \
 	lu.cc luinc.cc matrix_type.cc md5sum.cc minmax.cc pinv.cc qr.cc \
 	quad.cc qz.cc rand.cc regexp.cc schur.cc sort.cc sparse.cc \
 	spchol.cc spdet.cc spfind.cc spkron.cc splu.cc spparms.cc spqr.cc \