# HG changeset patch # User jwe # Date 1066952994 0 # Node ID 74c92e375b5454e42ed9cd130e24c3f6e4909b52 # Parent 79df15d4470cb7ea2cbae4764773f685b4976278 [project @ 2003-10-23 23:48:29 by jwe] diff -r 79df15d4470c -r 74c92e375b54 ChangeLog --- a/ChangeLog Sat Oct 18 03:53:53 2003 +0000 +++ b/ChangeLog Thu Oct 23 23:49:54 2003 +0000 @@ -1,3 +1,8 @@ +2003-10-23 John W. Eaton + + * Makeconf.in (AWK): Substitute and export it. + * configure.in: Also check for AWK. + 2003-10-07 John W. Eaton * configure.in (AC_PREREQ): Require 2.57. diff -r 79df15d4470c -r 74c92e375b54 Makeconf.in --- a/Makeconf.in Sat Oct 18 03:53:53 2003 +0000 +++ b/Makeconf.in Thu Oct 23 23:49:54 2003 +0000 @@ -9,6 +9,9 @@ SHELL = /bin/sh +AWK = @AWK@ +export AWK + SED = @SED@ export SED diff -r 79df15d4470c -r 74c92e375b54 configure.in --- a/configure.in Sat Oct 18 03:53:53 2003 +0000 +++ b/configure.in Thu Oct 23 23:49:54 2003 +0000 @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.433 $) +AC_REVISION($Revision: 1.434 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -1235,6 +1235,7 @@ ### Checks for other programs used for building, testing, installing, ### and running Octave. +AC_PROG_AWK OCTAVE_PROG_SED OCTAVE_PROG_FLEX diff -r 79df15d4470c -r 74c92e375b54 liboctave/ChangeLog --- a/liboctave/ChangeLog Sat Oct 18 03:53:53 2003 +0000 +++ b/liboctave/ChangeLog Thu Oct 23 23:49:54 2003 +0000 @@ -1,3 +1,30 @@ +2003-10-23 John W. Eaton + + * mx-cdm-cm.cc, mx-cdm-cm.h, mx-cdm-cs.cc, mx-cdm-cs.h, + mx-cdm-dm.cc, mx-cdm-dm.h, mx-cdm-m.cc, mx-cdm-m.h, mx-cdm-s.cc, + mx-cdm-s.h, mx-cm-cdm.cc, mx-cm-cdm.h, mx-cm-dm.cc, mx-cm-dm.h, + mx-cm-m.cc, mx-cm-m.h, mx-cm-s.cc, mx-cm-s.h, mx-cs-cdm.cc, + mx-cs-cdm.h, mx-cs-dm.cc, mx-cs-dm.h, mx-cs-m.cc, mx-cs-m.h, + mx-dm-cdm.cc, mx-dm-cdm.h, mx-dm-cm.cc, mx-dm-cm.h, mx-dm-cs.cc, + mx-dm-cs.h, mx-dm-m.cc, mx-dm-m.h, mx-dm-s.cc, mx-dm-s.h, + mx-m-cdm.cc, mx-m-cdm.h, mx-m-cm.cc, mx-m-cm.h, mx-m-cs.cc, + mx-m-cs.h, mx-m-dm.cc, mx-m-dm.h, mx-ops.h, mx-s-cdm.cc, + mx-s-cdm.h, mx-s-cm.cc, mx-s-cm.h, mx-s-dm.cc, mx-s-dm.h, + vx-ccv-cv.cc, vx-ccv-cv.h, vx-ccv-s.cc, vx-ccv-s.h, vx-crv-rv.cc, + vx-crv-rv.h, vx-crv-s.cc, vx-crv-s.h, vx-cs-cv.cc, vx-cs-cv.h, + vx-cs-rv.cc, vx-cs-rv.h, vx-cv-ccv.cc, vx-cv-ccv.h, vx-cv-cs.cc, + vx-cv-cs.h, vx-rv-crv.cc, vx-rv-crv.h, vx-rv-cs.cc, vx-rv-cs.h, + vx-s-ccv.cc, vx-s-ccv.h, vx-s-crv.cc, vx-s-crv.h: Delete. These + files are now automatically generated. + + * Makefile.in ($(VX_OP_INC), $(VX_OP_SRC), $(MX_OP_INC), + $(MX_OP_SRC)): Generate lists with new mk-ops.awk script. + Add rules to generate these files and mx-ops.h. + (stamp-prereq): Depend on these files. + + * mx-ops, vx-ops, mk-ops.awk: New files. + * Makefile.in (DISTFILES): Add them to the list. + 2003-10-17 John W. Eaton * NDArray.cc (NDArray::NDArray (const boolNDArray), diff -r 79df15d4470c -r 74c92e375b54 liboctave/Makefile.in --- a/liboctave/Makefile.in Sat Oct 18 03:53:53 2003 +0000 +++ b/liboctave/Makefile.in Thu Oct 23 23:49:54 2003 +0000 @@ -37,15 +37,9 @@ dNDArray.h dRowVector.h dbleAEPBAL.h dbleCHOL.h dbleDET.h \ dbleHESS.h dbleLU.h dbleQR.h dbleQRP.h dbleSCHUR.h dbleSVD.h -MX_OP_INC := mx-cdm-cm.h mx-cdm-cs.h mx-cdm-dm.h mx-cdm-m.h \ - mx-cdm-s.h mx-cm-cdm.h mx-cm-dm.h mx-cm-m.h mx-cm-s.h \ - mx-cs-cdm.h mx-cs-dm.h mx-cs-m.h mx-dm-cdm.h mx-dm-cm.h \ - mx-dm-cs.h mx-dm-m.h mx-dm-s.h mx-m-cdm.h mx-m-cm.h \ - mx-m-cs.h mx-m-dm.h mx-s-cdm.h mx-s-cm.h mx-s-dm.h +MX_OP_INC := $(shell $(AWK) -f $(srcdir)/mk-ops.awk prefix=mx list_h_files=1 $(srcdir)/mx-ops) -VX_OP_INC := vx-ccv-s.h vx-crv-s.h vx-cs-cv.h vx-cs-rv.h vx-cv-cs.h \ - vx-rv-cs.h vx-s-ccv.h vx-s-crv.h \ - vx-rv-crv.h vx-cv-ccv.h vx-crv-rv.h vx-ccv-cv.h +VX_OP_INC := $(shell $(AWK) -f $(srcdir)/mk-ops.awk prefix=vx list_h_files=1 $(srcdir)/vx-ops) OPTS_INC_DATA := DASPK-opts.in DASRT-opts.in DASSL-opts.in \ LSODE-opts.in NLEqn-opts.in ODESSA-opts.in Quad-opts.in @@ -89,15 +83,9 @@ dbleCHOL.cc dbleDET.cc dbleHESS.cc dbleLU.cc \ dbleQR.cc dbleQRP.cc dbleSCHUR.cc dbleSVD.cc -MX_OP_SRC := mx-cdm-cm.cc mx-cdm-cs.cc mx-cdm-dm.cc mx-cdm-m.cc \ - mx-cdm-s.cc mx-cm-cdm.cc mx-cm-dm.cc mx-cm-m.cc mx-cm-s.cc \ - mx-cs-cdm.cc mx-cs-dm.cc mx-cs-m.cc mx-dm-cdm.cc mx-dm-cm.cc \ - mx-dm-cs.cc mx-dm-m.cc mx-dm-s.cc mx-m-cdm.cc mx-m-cm.cc \ - mx-m-cs.cc mx-m-dm.cc mx-s-cdm.cc mx-s-cm.cc mx-s-dm.cc +MX_OP_SRC := $(shell $(AWK) -f $(srcdir)/mk-ops.awk prefix=mx list_cc_files=1 $(srcdir)/mx-ops) -VX_OP_SRC := vx-ccv-s.cc vx-crv-s.cc vx-cs-cv.cc vx-cs-rv.cc vx-cv-cs.cc \ - vx-rv-cs.cc vx-s-ccv.cc vx-s-crv.cc \ - vx-rv-crv.cc vx-cv-ccv.cc vx-crv-rv.cc vx-ccv-cv.cc +VX_OP_SRC := $(shell $(AWK) -f $(srcdir)/mk-ops.awk prefix=vx list_cc_files=1 $(srcdir)/vx-ops) LIBOCTAVE_CXX_SOURCES := Bounds.cc CollocWt.cc \ DASPK.cc DASRT.cc DASSL.cc FEGrid.cc LinConst.cc \ @@ -142,8 +130,8 @@ INCLUDES_FOR_INSTALL := $(INCLUDES) $(TEMPLATE_SRC) $(EXTRAS) -DISTFILES := Makefile.in ChangeLog $(SOURCES) $(INCLUDES) $(EXTRAS) \ - $(OPTS_INC_DATA) +DISTFILES := Makefile.in ChangeLog mk-ops.awk mx-ops vx-ops \ + $(SOURCES) $(INCLUDES) $(EXTRAS) $(OPTS_INC_DATA) ifeq ($(SHARED_LIBS), true) BINDISTLIBS = liboctave/liboctave @@ -190,7 +178,7 @@ mkdir pic; \ fi -stamp-prereq: $(OPTS_INC) +stamp-prereq: $(OPTS_INC) $(VX_OP_INC) $(VX_OP_SRC) $(MX_OP_INC) $(MX_OP_SRC) touch stamp-prereq ifeq ($(SHARED_LIBS), true) @@ -327,6 +315,17 @@ @perl $(top_srcdir)/mk-opts.pl --opt-class-header $< > $@-t @$(top_srcdir)/move-if-change $@-t $@ +$(VX_OP_INC) $(VX_OP_SRC) : $(srcdir)/mk-ops.awk vx-ops + $(AWK) -f $(srcdir)/mk-ops.awk prefix=vx $(srcdir)/vx-ops + +$(MX_OP_INC) $(MX_OP_SRC) : $(srcdir)/mk-ops.awk mx-ops + $(AWK) -f $(srcdir)/mk-ops.awk prefix=mx $(srcdir)/mx-ops + +mx-ops.h : $(srcdir)/mk-ops.awk mx-ops + $(AWK) -f $(srcdir)/mk-ops.awk make_inclusive_header=mx-ops.h > $@.t + @$(top_srcdir)/move-if-change $@-t $@ + + # If missing, GNU make attempts to create them in the reverse of the # order in which they are listed here. We rely on that fact to ensure # that defaults.h is created before trying to create the .d files. diff -r 79df15d4470c -r 74c92e375b54 liboctave/mk-ops.awk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/liboctave/mk-ops.awk Thu Oct 23 23:49:54 2003 +0000 @@ -0,0 +1,195 @@ +BEGIN { + declare_types = 0; + generate_ops = 0; + ntypes = 0; + if (make_inclusive_header) + { + tmp = make_inclusive_header; + gsub ("\\.-", "_", tmp); + printf ("#if !defined (octave_%s)\n", tmp); + printf ("#define octave_%s 1\n", tmp); + } +} + /^#/ { + if ($2 == "types") + declare_types = 1; + else if ($2 == "ops") + { + generate_ops = 1; + declare_types = 0; + } + next; + } +{ + if (declare_types) + { + ntypes++; + + if (NF == 5) + { + fwd_decl_ok[ntypes] = $5 == "YES"; + header[ntypes] = $4 == "NONE" ? "" : $4; + class[ntypes] = $3; + type[ntypes] = $2; + tag[ntypes] = $1; + rev_tag[$1] = ntypes; + } + else + printf ("skipping line %d: %s\n", NR, $0); + } + else if (generate_ops) + { + if (NF >= 4) + { + result_tag = $1; + lhs_tag = $2; + rhs_tag = $3; + op_type = $4; + + bin_ops = index (op_type, "B") != 0; + cmp_ops = index (op_type, "C") != 0; + bool_ops = index (op_type, "L") != 0; + + n = 4; + + lhs_conv = cmp_ops ? $(++n) : ""; + rhs_conv = cmp_ops ? $(++n) : ""; + + if (lhs_conv == "NONE") + lhs_conv = ""; + + if (rhs_conv == "NONE") + rhs_conv = ""; + + zero_val = (NF > n) ? $(++n) : ""; + + delete bool_headers; + k = 0 + while (NF > n) + bool_headers[k++] = $(++n); + + cc_file = sprintf ("%s-%s-%s.cc", prefix, lhs_tag, rhs_tag); + h_file = sprintf ("%s-%s-%s.h", prefix, lhs_tag, rhs_tag); + + if (list_cc_files) + { + print cc_file; + next; + } + + if (list_h_files) + { + print h_file; + next; + } + + if (make_inclusive_header) + printf ("#include \"%s\"\n", h_file); + + h_guard = sprintf ("octave_%s_%s_%s_h", prefix, lhs_tag, rhs_tag); + + result_num = rev_tag[result_tag]; + lhs_num = rev_tag[lhs_tag]; + rhs_num = rev_tag[rhs_tag]; + + result_type = type[result_num]; + lhs_type = type[lhs_num]; + rhs_type = type[rhs_num]; + + result_header = header[result_num]; + lhs_header = header[lhs_num]; + rhs_header = header[rhs_num]; + + lhs_class = class[lhs_num]; + rhs_class = class[rhs_num]; + + print "// DO NOT EDIT -- generated by mk-ops" > h_file; + + printf ("#if !defined (%s)\n", h_guard) >> h_file; + printf ("#define %s 1\n", h_guard) >> h_file; + + if (result_header) + { + if (result_fwd_decl_ok) + printf ("class %s\n", result_type) >> h_file; + else + printf ("#include \"%s\"\n", result_header) >> h_file; + } + + if (lhs_header && ! (lhs_header == result_header)) + { + if (result_fwd_decl_ok) + printf ("class %s\n", lhs_type) >> h_file; + else + printf ("#include \"%s\"\n", lhs_header) >> h_file; + } + + if (rhs_header && ! (rhs_header == lhs_header || rhs_header == result_header)) + { + if (result_fwd_decl_ok) + printf ("class %s\n", rhs_type) >> h_file; + else + printf ("#include \"%s\"\n", rhs_header) >> h_file; + } + + printf ("#include \"mx-op-defs.h\"\n") >> h_file; + + printf ("%s%s_OP_DECLS (%s, %s, %s)\n", lhs_class, + rhs_class, result_type, lhs_type, rhs_type) >> h_file + + print "#endif" >> h_file; + + close (h_file); + + + print "// DO NOT EDIT -- generated by mk-ops" > cc_file; + + print "#ifdef HAVE_CONFIG_H" >> cc_file; + print "#include " >> cc_file; + print "#endif" >> cc_file; + + printf ("#include \"%s\"\n", h_file) >> cc_file; + + for (i in bool_headers) + printf ("#include \"%s\"\n", bool_headers[i]) >> cc_file; + + if (result_header) + printf ("#include \"%s\"\n", result_header) >> cc_file; + + if (lhs_header && ! (lhs_header == result_header)) + printf ("#include \"%s\"\n", lhs_header) >> cc_file; + + if (rhs_header && ! (rhs_header == lhs_header || rhs_header == result_header)) + printf ("#include \"%s\"\n", rhs_header) >> cc_file; + + if (bin_ops) + { + if ((lhs_class == "DM" && rhs_class == "M") || (lhs_class == "M" && rhs_class == "DM")) + printf ("%s%s_BIN_OPS (%s, %s, %s, %s)\n", + lhs_class, rhs_class, result_type, + lhs_type, rhs_type, zero_val) >> cc_file + else + printf ("%s%s_BIN_OPS (%s, %s, %s)\n", + lhs_class, rhs_class, result_type, + lhs_type, rhs_type) >> cc_file + } + + if (cmp_ops) + printf ("%s%s_CMP_OPS (%s, %s, %s, %s)\n", lhs_class, rhs_class, + lhs_type, lhs_conv, rhs_type, rhs_conv) >> cc_file + + if (bool_ops) + printf ("%s%s_BOOL_OPS (%s, %s, %s)\n", lhs_class, rhs_class, + lhs_type, rhs_type, zero_val) >> cc_file + + + close (cc_file); + } + else + printf ("skipping line %d: %s\n", NR, $0); + } +} +END { + if (make_inclusive_header) + print "#endif"; +} \ No newline at end of file diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cdm-cm.cc --- a/liboctave/mx-cdm-cm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-cdm-cm.h" - -#include "CMatrix.h" -#include "CDiagMatrix.h" - -DMM_BIN_OPS (ComplexMatrix, ComplexDiagMatrix, ComplexMatrix, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cdm-cm.h --- a/liboctave/mx-cdm-cm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_cdm_cm_h) -#define octave_cdm_cm_h 1 - -class ComplexMatrix; -class ComplexDiagMatrix; - -#include "mx-op-defs.h" - -DMM_OP_DECLS (ComplexMatrix, ComplexDiagMatrix, ComplexMatrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cdm-cs.cc --- a/liboctave/mx-cdm-cs.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-cdm-cs.h" - -#include "CMatrix.h" -#include "CDiagMatrix.h" - -DMS_BIN_OPS (ComplexMatrix, ComplexDiagMatrix, Complex) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cdm-cs.h --- a/liboctave/mx-cdm-cs.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_cdm_cs_h) -#define octave_cdm_cs_h 1 - -class ComplexMatrix; -class ComplexDiagMatrix; - -#include "oct-cmplx.h" - -#include "mx-op-defs.h" - -DMS_OP_DECLS (ComplexMatrix, ComplexDiagMatrix, Complex) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cdm-dm.cc --- a/liboctave/mx-cdm-dm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-cdm-dm.h" - -#include "dDiagMatrix.h" -#include "CDiagMatrix.h" - -DMDM_BIN_OPS (ComplexDiagMatrix, ComplexDiagMatrix, DiagMatrix) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cdm-dm.h --- a/liboctave/mx-cdm-dm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_cdm_dm_h) -#define octave_cdm_dm_h 1 - -class ComplexDiagMatrix; -class DiagMatrix; - -#include "mx-op-defs.h" - -DMDM_OP_DECLS (ComplexDiagMatrix, ComplexDiagMatrix, DiagMatrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cdm-m.cc --- a/liboctave/mx-cdm-m.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-cdm-m.h" - -#include "dMatrix.h" -#include "CMatrix.h" -#include "CDiagMatrix.h" - -DMM_BIN_OPS (ComplexMatrix, ComplexDiagMatrix, Matrix, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cdm-m.h --- a/liboctave/mx-cdm-m.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_cdm_m_h) -#define octave_cdm_m_h 1 - -class Matrix; -class ComplexMatrix; -class ComplexDiagMatrix; - -#include "mx-op-defs.h" - -DMM_OP_DECLS (ComplexMatrix, ComplexDiagMatrix, Matrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cdm-s.cc --- a/liboctave/mx-cdm-s.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-cdm-s.h" - -#include "CMatrix.h" -#include "CDiagMatrix.h" - -DMS_BIN_OPS (ComplexMatrix, ComplexDiagMatrix, double) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cdm-s.h --- a/liboctave/mx-cdm-s.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_cdm_s_h) -#define octave_cdm_s_h 1 - -class ComplexMatrix; -class ComplexDiagMatrix; - -#include "mx-op-defs.h" - -DMS_OP_DECLS (ComplexMatrix, ComplexDiagMatrix, double) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cm-cdm.cc --- a/liboctave/mx-cm-cdm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-cm-cdm.h" - -#include "CMatrix.h" -#include "CDiagMatrix.h" - -MDM_BIN_OPS (ComplexMatrix, ComplexMatrix, ComplexDiagMatrix, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cm-cdm.h --- a/liboctave/mx-cm-cdm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_cm_cdm_h) -#define octave_cm_cdm_h 1 - -class ComplexMatrix; -class ComplexDiagMatrix; - -#include "mx-op-defs.h" - -MDM_OP_DECLS (ComplexMatrix, ComplexMatrix, ComplexDiagMatrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cm-dm.cc --- a/liboctave/mx-cm-dm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-cm-dm.h" - -#include "CMatrix.h" -#include "dDiagMatrix.h" - -MDM_BIN_OPS (ComplexMatrix, ComplexMatrix, DiagMatrix, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cm-dm.h --- a/liboctave/mx-cm-dm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_cm_dm_h) -#define octave_cm_dm_h 1 - -class DiagMatrix; -class ComplexMatrix; - -#include "mx-op-defs.h" - -MDM_OP_DECLS (ComplexMatrix, ComplexMatrix, DiagMatrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cm-m.cc --- a/liboctave/mx-cm-m.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-cm-m.h" - -#include "boolMatrix.h" -#include "dMatrix.h" -#include "CMatrix.h" -#include "boolNDArray.h" -#include "dNDArray.h" -#include "CNDArray.h" - -MM_BIN_OPS (ComplexMatrix, ComplexMatrix, Matrix) -NDND_BIN_OPS (ComplexNDArray, ComplexNDArray, NDArray) - -MM_CMP_OPS (ComplexMatrix, real, Matrix, ) -NDND_CMP_OPS (ComplexNDArray, real, NDArray, ) - -MM_BOOL_OPS (ComplexMatrix, Matrix, 0.0) -NDND_BOOL_OPS (ComplexNDArray, NDArray, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cm-m.h --- a/liboctave/mx-cm-m.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_cm_m_h) -#define octave_cm_m_h 1 - -class Matrix; -class ComplexMatrix; -class NDArray; -class ComplexNDArray; - -#include "mx-op-defs.h" - -MM_OP_DECLS (ComplexMatrix, ComplexMatrix, Matrix) -NDND_OP_DECLS (ComplexNDArray, ComplexNDArray, NDArray) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cm-s.cc --- a/liboctave/mx-cm-s.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-cm-s.h" - -#include "boolMatrix.h" -#include "CMatrix.h" -#include "boolNDArray.h" -#include "CNDArray.h" - -MS_BIN_OPS (ComplexMatrix, ComplexMatrix, double) -NDS_BIN_OPS (ComplexNDArray, ComplexNDArray, double) - -MS_CMP_OPS (ComplexMatrix, real, double, ) -NDS_CMP_OPS (ComplexNDArray, real, double, ) - -MS_BOOL_OPS (ComplexMatrix, double, 0.0) -NDS_BOOL_OPS (ComplexNDArray, double, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cm-s.h --- a/liboctave/mx-cm-s.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_cm_s_h) -#define octave_cm_s_h 1 - -class ComplexMatrix; -class ComplexNDArray; - -#include "mx-op-defs.h" - -MS_OP_DECLS (ComplexMatrix, ComplexMatrix, double) -NDS_OP_DECLS (ComplexNDArray, ComplexNDArray, double) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cs-cdm.cc --- a/liboctave/mx-cs-cdm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-cs-cdm.h" - -#include "CMatrix.h" -#include "CDiagMatrix.h" - -SDM_BIN_OPS (ComplexMatrix, Complex, ComplexDiagMatrix) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cs-cdm.h --- a/liboctave/mx-cs-cdm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_cs_cdm_h) -#define octave_cs_cdm_h 1 - -class ComplexMatrix; -class ComplexDiagMatrix; - -#include "oct-cmplx.h" - -#include "mx-op-defs.h" - -SDM_OP_DECLS (ComplexMatrix, Complex, ComplexDiagMatrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cs-dm.cc --- a/liboctave/mx-cs-dm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-cs-dm.h" - -#include "CMatrix.h" -#include "dDiagMatrix.h" - -SDM_BIN_OPS (ComplexMatrix, Complex, DiagMatrix) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cs-dm.h --- a/liboctave/mx-cs-dm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_cs_dm_h) -#define octave_cs_dm_h 1 - -class DiagMatrix; -class ComplexMatrix; - -#include "oct-cmplx.h" - -#include "mx-op-defs.h" - -SDM_OP_DECLS (ComplexMatrix, Complex, DiagMatrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cs-m.cc --- a/liboctave/mx-cs-m.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-cs-m.h" - -#include "boolMatrix.h" -#include "dMatrix.h" -#include "CMatrix.h" -#include "boolNDArray.h" -#include "dNDArray.h" -#include "CNDArray.h" - -SM_BIN_OPS (ComplexMatrix, Complex, Matrix) -SND_BIN_OPS (ComplexNDArray, Complex, NDArray) - -SM_CMP_OPS (Complex, real, Matrix, ) -SND_CMP_OPS (Complex, real, NDArray, ) - -SM_BOOL_OPS (Complex, Matrix, 0.0) -SND_BOOL_OPS (Complex, NDArray, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-cs-m.h --- a/liboctave/mx-cs-m.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_cs_m_h) -#define octave_cs_m_h 1 - -class Matrix; -class ComplexMatrix; -class NDArray; -class ComplexNDArray; - -#include "oct-cmplx.h" - -#include "mx-op-defs.h" - -SM_OP_DECLS (ComplexMatrix, Complex, Matrix) -SND_OP_DECLS (ComplexNDArray, Complex, NDArray) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-dm-cdm.cc --- a/liboctave/mx-dm-cdm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-dm-cdm.h" - -#include "dDiagMatrix.h" -#include "CDiagMatrix.h" - -DMDM_BIN_OPS (ComplexDiagMatrix, DiagMatrix, ComplexDiagMatrix) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-dm-cdm.h --- a/liboctave/mx-dm-cdm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_dm_cdm_h) -#define octave_dm_cdm_h 1 - -class DiagMatrix; -class ComplexDiagMatrix; - -#include "mx-op-defs.h" - -DMDM_OP_DECLS (ComplexDiagMatrix, DiagMatrix, ComplexDiagMatrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-dm-cm.cc --- a/liboctave/mx-dm-cm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-dm-cm.h" - -#include "CMatrix.h" -#include "dDiagMatrix.h" - -DMM_BIN_OPS (ComplexMatrix, DiagMatrix, ComplexMatrix, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-dm-cm.h --- a/liboctave/mx-dm-cm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_dm_cm_h) -#define octave_dm_cm_h 1 - -class DiagMatrix; -class ComplexMatrix; - -#include "mx-op-defs.h" - -DMM_OP_DECLS (ComplexMatrix, DiagMatrix, ComplexMatrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-dm-cs.cc --- a/liboctave/mx-dm-cs.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-dm-cs.h" - -#include "CMatrix.h" -#include "dDiagMatrix.h" - -DMS_BIN_OPS (ComplexMatrix, DiagMatrix, Complex) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-dm-cs.h --- a/liboctave/mx-dm-cs.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_dm_cs_h) -#define octave_dm_cs_h 1 - -class DiagMatrix; -class ComplexMatrix; - -#include "oct-cmplx.h" - -#include "mx-op-defs.h" - -DMS_OP_DECLS (ComplexMatrix, DiagMatrix, Complex) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-dm-m.cc --- a/liboctave/mx-dm-m.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-dm-m.h" - -#include "dMatrix.h" -#include "dDiagMatrix.h" - -DMM_BIN_OPS (Matrix, DiagMatrix, Matrix, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-dm-m.h --- a/liboctave/mx-dm-m.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_dm_m_h) -#define octave_dm_m_h 1 - -class Matrix; -class DiagMatrix; - -#include "mx-op-defs.h" - -DMM_OP_DECLS (Matrix, DiagMatrix, Matrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-dm-s.cc --- a/liboctave/mx-dm-s.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-dm-s.h" - -#include "dMatrix.h" -#include "dDiagMatrix.h" - -DMS_BIN_OPS (Matrix, DiagMatrix, double) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-dm-s.h --- a/liboctave/mx-dm-s.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_dm_s_h) -#define octave_dm_s_h 1 - -class Matrix; -class DiagMatrix; - -#include "mx-op-defs.h" - -DMS_OP_DECLS (Matrix, DiagMatrix, double) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-m-cdm.cc --- a/liboctave/mx-m-cdm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-m-cdm.h" - -#include "dMatrix.h" -#include "CMatrix.h" -#include "CDiagMatrix.h" - -MDM_BIN_OPS (ComplexMatrix, Matrix, ComplexDiagMatrix, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-m-cdm.h --- a/liboctave/mx-m-cdm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_m_cdm_h) -#define octave_m_cdm_h 1 - -class Matrix; -class ComplexMatrix; -class ComplexDiagMatrix; - -#include "mx-op-defs.h" - -MDM_OP_DECLS (ComplexMatrix, Matrix, ComplexDiagMatrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-m-cm.cc --- a/liboctave/mx-m-cm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-m-cm.h" - -#include "boolMatrix.h" -#include "dMatrix.h" -#include "CMatrix.h" -#include "boolNDArray.h" -#include "dNDArray.h" -#include "CNDArray.h" - -MM_BIN_OPS (ComplexMatrix, Matrix, ComplexMatrix) -NDND_BIN_OPS (ComplexNDArray, NDArray, ComplexNDArray) - -MM_CMP_OPS (Matrix, , ComplexMatrix, real) -NDND_CMP_OPS (NDArray, , ComplexNDArray, real) - -MM_BOOL_OPS (Matrix, ComplexMatrix, 0.0) -NDND_BOOL_OPS (NDArray, ComplexNDArray, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-m-cm.h --- a/liboctave/mx-m-cm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_m_cm_h) -#define octave_m_cm_h 1 - -class Matrix; -class ComplexMatrix; -class NDArray; -class ComplexNDArray; - -#include "mx-op-defs.h" - -MM_OP_DECLS (ComplexMatrix, Matrix, ComplexMatrix) -NDND_OP_DECLS (ComplexNDArray, NDArray, ComplexNDArray) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-m-cs.cc --- a/liboctave/mx-m-cs.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-m-cs.h" - -#include "boolMatrix.h" -#include "dMatrix.h" -#include "CMatrix.h" -#include "boolNDArray.h" -#include "dNDArray.h" -#include "CNDArray.h" - -MS_BIN_OPS (ComplexMatrix, Matrix, Complex) -NDS_BIN_OPS (ComplexNDArray, NDArray, Complex) - -MS_CMP_OPS (Matrix, , Complex, real) -NDS_CMP_OPS (NDArray, , Complex, real) - -MS_BOOL_OPS (Matrix, Complex, 0.0) -NDS_BOOL_OPS (NDArray, Complex, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-m-cs.h --- a/liboctave/mx-m-cs.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_m_cs_h) -#define octave_m_cs_h 1 - -class Matrix; -class ComplexMatrix; -class NDArray; -class ComplexNDArray; - -#include "oct-cmplx.h" - -#include "mx-op-defs.h" - -MS_OP_DECLS (ComplexMatrix, Matrix, Complex) -NDS_OP_DECLS (ComplexNDArray, NDArray, Complex) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-m-dm.cc --- a/liboctave/mx-m-dm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-m-dm.h" - -#include "dMatrix.h" -#include "dDiagMatrix.h" - -MDM_BIN_OPS (Matrix, Matrix, DiagMatrix, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-m-dm.h --- a/liboctave/mx-m-dm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_m_dm_h) -#define octave_m_dm_h 1 - -class Matrix; -class DiagMatrix; - -#include "mx-op-defs.h" - -MDM_OP_DECLS (Matrix, Matrix, DiagMatrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-ops --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/liboctave/mx-ops Thu Oct 23 23:49:54 2003 +0000 @@ -0,0 +1,40 @@ +# types +cdm ComplexDiagMatrix DM CDiagMatrix.h YES +cm ComplexMatrix M CMatrix.h YES +cnda ComplexNDArray ND CNDArray.h YES +cs Complex S oct-cmplx.h NO +dm DiagMatrix DM dDiagMatrix.h YES +m Matrix M dMatrix.h YES +nda NDArray ND dNDArray.h YES +s double S NONE NO +# ops +cdm cdm dm B +cdm dm cdm B +cm cs cdm B +cm cs dm B +cm cs m BCL real NONE 0.0 boolMatrix.h +cnda cs nda BCL real NONE 0.0 boolMatrix.h boolNDArray.h +cm cdm cs B +cm cdm cm B 0.0 +cm cdm m B 0.0 +cm cdm s B +cm cm cdm B 0.0 +cm cm dm B 0.0 +cm cm m BCL real NONE 0.0 boolMatrix.h +cnda cnda nda BCL real NONE 0.0 boolMatrix.h boolNDArray.h +cm cm s BCL real NONE 0.0 boolMatrix.h +cnda cnda s BCL real NONE 0.0 boolMatrix.h boolNDArray.h +cm dm cs B +cm dm cm B 0.0 +cm m cs BCL NONE real 0.0 boolMatrix.h +cnda nda cs BCL NONE real 0.0 boolMatrix.h boolNDArray.h +cm m cdm B 0.0 +cm m cm BCL NONE real 0.0 boolMatrix.h +cnda nda cnda BCL NONE real 0.0 boolMatrix.h boolNDArray.h +cm s cdm B +cm s cm BCL NONE real 0.0 boolMatrix.h +cnda s cnda BCL NONE real 0.0 boolMatrix.h boolNDArray.h +m dm m B 0.0 +m dm s B +m m dm B 0.0 +m s dm B diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-ops.h --- a/liboctave/mx-ops.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -/* - -Copyright (C) 2002 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_mx_base_h) -#define octave_mx_base_h 1 - -// Declarations for operators that work on matrix objects. - -// ComplexDiagMatrix by X ops. - -#include "mx-cdm-cm.h" -#include "mx-cdm-cs.h" -#include "mx-cdm-dm.h" -#include "mx-cdm-m.h" -#include "mx-cdm-s.h" - -// ComplexMatrix by X ops. - -#include "mx-cm-cdm.h" -#include "mx-cm-dm.h" -#include "mx-cm-m.h" -#include "mx-cm-s.h" - -// Complex scalar by X ops. - -#include "mx-cs-cdm.h" -#include "mx-cs-dm.h" -#include "mx-cs-m.h" - -// DiagMatrix by X ops. - -#include "mx-dm-cdm.h" -#include "mx-dm-cm.h" -#include "mx-dm-cs.h" -#include "mx-dm-m.h" -#include "mx-dm-s.h" - -// Matrix by X ops. - -#include "mx-m-cdm.h" -#include "mx-m-cm.h" -#include "mx-m-cs.h" -#include "mx-m-dm.h" - -// Real scalar by X ops. - -#include "mx-s-cdm.h" -#include "mx-s-cm.h" -#include "mx-s-dm.h" - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-s-cdm.cc --- a/liboctave/mx-s-cdm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-s-cdm.h" - -#include "CMatrix.h" -#include "CDiagMatrix.h" - -SDM_BIN_OPS (ComplexMatrix, double, ComplexDiagMatrix) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-s-cdm.h --- a/liboctave/mx-s-cdm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_s_cdm_h) -#define octave_s_cdm_h 1 - -class ComplexMatrix; -class ComplexDiagMatrix; - -#include "mx-op-defs.h" - -SDM_OP_DECLS (ComplexMatrix, double, ComplexDiagMatrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-s-cm.cc --- a/liboctave/mx-s-cm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-s-cm.h" - -#include "boolMatrix.h" -#include "CMatrix.h" -#include "boolNDArray.h" -#include "CNDArray.h" - -SM_BIN_OPS (ComplexMatrix, double, ComplexMatrix) -SND_BIN_OPS (ComplexNDArray, double, ComplexNDArray) - -SM_CMP_OPS (double, , ComplexMatrix, real) -SND_CMP_OPS (double, , ComplexNDArray, real) - -SM_BOOL_OPS (double, ComplexMatrix, 0.0) -SND_BOOL_OPS (double, ComplexNDArray, 0.0) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-s-cm.h --- a/liboctave/mx-s-cm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_s_cm_h) -#define octave_s_cm_h 1 - -class ComplexMatrix; -class ComplexNDArray; - -#include "mx-op-defs.h" - -SM_OP_DECLS (ComplexMatrix, double, ComplexMatrix) -SND_OP_DECLS (ComplexNDArray, double, ComplexNDArray) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-s-dm.cc --- a/liboctave/mx-s-dm.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "mx-s-dm.h" - -#include "dMatrix.h" -#include "dDiagMatrix.h" - -SDM_BIN_OPS (Matrix, double, DiagMatrix) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/mx-s-dm.h --- a/liboctave/mx-s-dm.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_s_dm_h) -#define octave_s_dm_h 1 - -class Matrix; -class DiagMatrix; - -#include "mx-op-defs.h" - -SDM_OP_DECLS (Matrix, double, DiagMatrix) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-ccv-cv.cc --- a/liboctave/vx-ccv-cv.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "vx-ccv-cv.h" - -#include "dColVector.h" -#include "CColVector.h" - -VV_BIN_OPS (ComplexColumnVector, ComplexColumnVector, ColumnVector) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-ccv-cv.h --- a/liboctave/vx-ccv-cv.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_vx_ccv_cv_h) -#define octave_vx_ccv_cv_h 1 - -class ColumnVector; -class ComplexColumnVector; - -#include "mx-op-defs.h" - -VV_OP_DECLS (ComplexColumnVector, ComplexColumnVector, ColumnVector) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-ccv-s.cc --- a/liboctave/vx-ccv-s.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "vx-ccv-s.h" - -#include "dColVector.h" -#include "CColVector.h" - -VS_BIN_OPS (ComplexColumnVector, ComplexColumnVector, double) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-ccv-s.h --- a/liboctave/vx-ccv-s.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_vx_ccv_s_h) -#define octave_vx_ccv_s_h 1 - -class ComplexColumnVector; - -#include "mx-op-defs.h" - -VS_OP_DECLS (ComplexColumnVector, ComplexColumnVector, double) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-crv-rv.cc --- a/liboctave/vx-crv-rv.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "vx-crv-rv.h" - -#include "dRowVector.h" -#include "CRowVector.h" - -VV_BIN_OPS (ComplexRowVector, ComplexRowVector, RowVector) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-crv-rv.h --- a/liboctave/vx-crv-rv.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_vx_crv_rv_h) -#define octave_vx_crv_rv_h 1 - -class RowVector; -class ComplexRowVector; - -#include "mx-op-defs.h" - -VV_OP_DECLS (ComplexRowVector, ComplexRowVector, RowVector) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ - diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-crv-s.cc --- a/liboctave/vx-crv-s.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "vx-crv-s.h" - -#include "dRowVector.h" -#include "CRowVector.h" - -VS_BIN_OPS (ComplexRowVector, ComplexRowVector, double) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-crv-s.h --- a/liboctave/vx-crv-s.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_vx_crv_s_h) -#define octave_vx_crv_s_h 1 - -class ComplexRowVector; - -#include "mx-op-defs.h" - -VS_OP_DECLS (ComplexRowVector, ComplexRowVector, double) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-cs-cv.cc --- a/liboctave/vx-cs-cv.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "vx-cs-cv.h" - -#include "dColVector.h" -#include "CColVector.h" - -SV_BIN_OPS (ComplexColumnVector, Complex, ColumnVector) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-cs-cv.h --- a/liboctave/vx-cs-cv.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_vx_cs_cv_h) -#define octave_vx_cs_cv_h 1 - -class ColumnVector; -class ComplexColumnVector; - -#include "mx-op-defs.h" - -SV_OP_DECLS (ComplexColumnVector, Complex, ColumnVector) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-cs-rv.cc --- a/liboctave/vx-cs-rv.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "vx-cs-rv.h" - -#include "dRowVector.h" -#include "CRowVector.h" - -SV_BIN_OPS (ComplexRowVector, Complex, RowVector) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-cs-rv.h --- a/liboctave/vx-cs-rv.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_vx_cs_rv_h) -#define octave_vx_cs_rv_h 1 - -class RowVector; -class ComplexRowVector; - -#include "mx-op-defs.h" - -SV_OP_DECLS (ComplexRowVector, Complex, RowVector) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-cv-ccv.cc --- a/liboctave/vx-cv-ccv.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "vx-cv-ccv.h" - -#include "dColVector.h" -#include "CColVector.h" - -VV_BIN_OPS (ComplexColumnVector, ColumnVector, ComplexColumnVector) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-cv-ccv.h --- a/liboctave/vx-cv-ccv.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_vx_cv_ccv_h) -#define octave_vx_cv_ccv_h 1 - -class ColumnVector; -class ComplexColumnVector; - -#include "mx-op-defs.h" - -VV_OP_DECLS (ComplexColumnVector, ColumnVector, ComplexColumnVector) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-cv-cs.cc --- a/liboctave/vx-cv-cs.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "vx-cv-cs.h" - -#include "dColVector.h" -#include "CColVector.h" - -VS_BIN_OPS (ComplexColumnVector, ColumnVector, Complex) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-cv-cs.h --- a/liboctave/vx-cv-cs.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_vx_cv_cs_h) -#define octave_vx_cv_cs_h 1 - -class ColumnVector; -class ComplexColumnVector; - -#include "mx-op-defs.h" - -VS_OP_DECLS (ComplexColumnVector, ColumnVector, Complex) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-ops --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/liboctave/vx-ops Thu Oct 23 23:49:54 2003 +0000 @@ -0,0 +1,20 @@ +# types +ccv ComplexColumnVector V CColVector.h YES +crv ComplexRowVector V CRowVector.h YES +cs Complex S oct-cmplx.h NO +cv ColumnVector V dColVector.h YES +rv RowVector V dRowVector.h YES +s double S NONE NO +# ops +ccv ccv cv B +ccv ccv s B +crv crv rv B +crv crv s B +ccv cs cv B +crv cs rv B +ccv cv ccv B +ccv cv cs B +crv rv crv B +crv rv cs B +ccv s ccv B +crv s crv B diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-rv-crv.cc --- a/liboctave/vx-rv-crv.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "vx-rv-crv.h" - -#include "dRowVector.h" -#include "CRowVector.h" - -VV_BIN_OPS (ComplexRowVector, RowVector, ComplexRowVector) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-rv-crv.h --- a/liboctave/vx-rv-crv.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_vx_rv_crv_h) -#define octave_vx_rv_crv_h 1 - -class RowVector; -class ComplexRowVector; - -#include "mx-op-defs.h" - -VV_OP_DECLS (ComplexRowVector, RowVector, ComplexRowVector) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-rv-cs.cc --- a/liboctave/vx-rv-cs.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "vx-rv-cs.h" - -#include "dRowVector.h" -#include "CRowVector.h" - -VS_BIN_OPS (ComplexRowVector, RowVector, Complex) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-rv-cs.h --- a/liboctave/vx-rv-cs.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_vx_rv_cs_h) -#define octave_vx_rv_cs_h 1 - -class RowVector; -class ComplexRowVector; - -#include "mx-op-defs.h" - -VS_OP_DECLS (ComplexRowVector, RowVector, Complex) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-s-ccv.cc --- a/liboctave/vx-s-ccv.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "vx-s-ccv.h" - -#include "dColVector.h" -#include "CColVector.h" - -SV_BIN_OPS (ComplexColumnVector, double, ComplexColumnVector) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-s-ccv.h --- a/liboctave/vx-s-ccv.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_vx_s_ccv_h) -#define octave_vx_s_ccv_h 1 - -class ComplexColumnVector; - -#include "mx-op-defs.h" - -SV_OP_DECLS (ComplexColumnVector, double, ComplexColumnVector) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-s-crv.cc --- a/liboctave/vx-s-crv.cc Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "vx-s-crv.h" - -#include "dRowVector.h" -#include "CRowVector.h" - -SV_BIN_OPS (ComplexRowVector, double, ComplexRowVector) - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 liboctave/vx-s-crv.h --- a/liboctave/vx-s-crv.h Sat Oct 18 03:53:53 2003 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - -Copyright (C) 2000 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -#if !defined (octave_vx_s_crv_h) -#define octave_vx_s_crv_h 1 - -class ComplexRowVector; - -#include "mx-op-defs.h" - -SV_OP_DECLS (ComplexRowVector, double, ComplexRowVector) - -#endif - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/ diff -r 79df15d4470c -r 74c92e375b54 src/ChangeLog --- a/src/ChangeLog Sat Oct 18 03:53:53 2003 +0000 +++ b/src/ChangeLog Thu Oct 23 23:49:54 2003 +0000 @@ -1,3 +1,9 @@ +2003-10-23 John W. Eaton + + * OPERATORS/op-cm-m.cc, OPERATORS/op-cm-s.cc, + OPERATORS/op-cs-m.cc, OPERATORS/op-m-cm.cc, OPERATORS/op-s-cm.cc: + Include headers for N-d operators. + 2003-10-17 John W. Eaton * ops.h (DEFNDUNOP_OP, DEFNDUNOP_FN, DEFNDBINOP_OP, diff -r 79df15d4470c -r 74c92e375b54 src/OPERATORS/op-cm-m.cc --- a/src/OPERATORS/op-cm-m.cc Sat Oct 18 03:53:53 2003 +0000 +++ b/src/OPERATORS/op-cm-m.cc Thu Oct 23 23:49:54 2003 +0000 @@ -30,6 +30,8 @@ #include "mx-cm-m.h" #include "mx-m-cm.h" +#include "mx-cnda-nda.h" +#include "mx-nda-cnda.h" #include "gripes.h" #include "oct-obj.h" diff -r 79df15d4470c -r 74c92e375b54 src/OPERATORS/op-cm-s.cc --- a/src/OPERATORS/op-cm-s.cc Sat Oct 18 03:53:53 2003 +0000 +++ b/src/OPERATORS/op-cm-s.cc Thu Oct 23 23:49:54 2003 +0000 @@ -29,6 +29,7 @@ #endif #include "mx-cm-s.h" +#include "mx-cnda-s.h" #include "gripes.h" #include "oct-obj.h" diff -r 79df15d4470c -r 74c92e375b54 src/OPERATORS/op-cs-m.cc --- a/src/OPERATORS/op-cs-m.cc Sat Oct 18 03:53:53 2003 +0000 +++ b/src/OPERATORS/op-cs-m.cc Thu Oct 23 23:49:54 2003 +0000 @@ -28,8 +28,10 @@ #include #endif -#include "mx-cs-m.h" -#include "mx-m-cs.h" +#include "mx-cs-nda.h" +#include "mx-nda-cs.h" +#include "mx-cs-nda.h" +#include "mx-nda-cs.h" #include "gripes.h" #include "oct-obj.h" diff -r 79df15d4470c -r 74c92e375b54 src/OPERATORS/op-m-cm.cc --- a/src/OPERATORS/op-m-cm.cc Sat Oct 18 03:53:53 2003 +0000 +++ b/src/OPERATORS/op-m-cm.cc Thu Oct 23 23:49:54 2003 +0000 @@ -30,6 +30,8 @@ #include "mx-m-cm.h" #include "mx-cm-m.h" +#include "mx-nda-cnda.h" +#include "mx-cnda-nda.h" #include "gripes.h" #include "oct-obj.h" diff -r 79df15d4470c -r 74c92e375b54 src/OPERATORS/op-m-cs.cc --- a/src/OPERATORS/op-m-cs.cc Sat Oct 18 03:53:53 2003 +0000 +++ b/src/OPERATORS/op-m-cs.cc Thu Oct 23 23:49:54 2003 +0000 @@ -30,6 +30,8 @@ #include "mx-m-cs.h" #include "mx-cs-m.h" +#include "mx-nda-cs.h" +#include "mx-cs-nda.h" #include "gripes.h" #include "oct-obj.h" diff -r 79df15d4470c -r 74c92e375b54 src/OPERATORS/op-s-cm.cc --- a/src/OPERATORS/op-s-cm.cc Sat Oct 18 03:53:53 2003 +0000 +++ b/src/OPERATORS/op-s-cm.cc Thu Oct 23 23:49:54 2003 +0000 @@ -30,6 +30,8 @@ #include "mx-s-cm.h" #include "mx-cm-s.h" +#include "mx-s-cnda.h" +#include "mx-cnda-s.h" #include "gripes.h" #include "oct-obj.h"