diff options
author | torset | 2009-01-20 10:53:46 +0000 |
---|---|---|
committer | torset | 2009-01-20 10:53:46 +0000 |
commit | e329ccf8391f7ce500f66d495da964fb518a7067 (patch) | |
tree | 712a420c3e6b3c0f09f8432aeb7d62cc668eeba9 | |
parent | b229bf5b69c14b0fae11389433cc2bff3a683832 (diff) | |
download | scilab2c-e329ccf8391f7ce500f66d495da964fb518a7067.tar.gz scilab2c-e329ccf8391f7ce500f66d495da964fb518a7067.tar.bz2 scilab2c-e329ccf8391f7ce500f66d495da964fb518a7067.zip |
rm addm and diffm cause they are equal to add and diff, up expm cause it used addm and diffm and now is using add and diff
26 files changed, 29 insertions, 2147 deletions
diff --git a/src/matrixOperations/Makefile.am b/src/matrixOperations/Makefile.am index 4f3ae352..d9ac75bd 100644 --- a/src/matrixOperations/Makefile.am +++ b/src/matrixOperations/Makefile.am @@ -10,15 +10,13 @@ ## ## -SUBDIRS= addition \ - cat \ +SUBDIRS= cat \ division \ expm \ eye \ hilbert \ infiniteNorm \ multiplication \ - subtraction \ trace \ transpose \ ones \ diff --git a/src/matrixOperations/addition/Makefile.am b/src/matrixOperations/addition/Makefile.am deleted file mode 100644 index a83e23d4..00000000 --- a/src/matrixOperations/addition/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -## -## Scilab ( http://www.scilab.org/ ) - This file is part of Scilab -## Copyright (C) 2006-2008 - INRIA - Bruno JOFRET -## -## This file must be used under the terms of the CeCILL. -## This source file is licensed as described in the file COPYING, which -## you should have received as part of this distribution. The terms -## are also available at -## http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -## -## - -libMatrixAddition_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes - -instdir = $(top_builddir)/lib - -pkglib_LTLIBRARIES = libMatrixAddition.la - -HEAD = ../includes/matrixAddition.h - -libMatrixAddition_la_SOURCES = $(HEAD) \ - saddma.c \ - daddma.c \ - caddma.c \ - zaddma.c - -check_PROGRAMS = testMatrixAddition - -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/addition/libAddition.la \ - libMatrixAddition.la - -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes - -testMatrixAddition_SOURCES = testMatrixAddition.c -testMatrixAddition_LDADD = $(check_LDADD) -testMatrixAddition_CFLAGS = $(check_INCLUDES) - -TESTS = testMatrixAddition
\ No newline at end of file diff --git a/src/matrixOperations/addition/Makefile.in b/src/matrixOperations/addition/Makefile.in deleted file mode 100644 index 4e4d2ac4..00000000 --- a/src/matrixOperations/addition/Makefile.in +++ /dev/null @@ -1,638 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -check_PROGRAMS = testMatrixAddition$(EXEEXT) -TESTS = testMatrixAddition$(EXEEXT) -subdir = matrixOperations/addition -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/includes/machine.h -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pkglibdir)" -pkglibLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(pkglib_LTLIBRARIES) -libMatrixAddition_la_LIBADD = -am__objects_1 = -am_libMatrixAddition_la_OBJECTS = $(am__objects_1) \ - libMatrixAddition_la-saddma.lo libMatrixAddition_la-daddma.lo \ - libMatrixAddition_la-caddma.lo libMatrixAddition_la-zaddma.lo -libMatrixAddition_la_OBJECTS = $(am_libMatrixAddition_la_OBJECTS) -libMatrixAddition_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libMatrixAddition_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -am_testMatrixAddition_OBJECTS = \ - testMatrixAddition-testMatrixAddition.$(OBJEXT) -testMatrixAddition_OBJECTS = $(am_testMatrixAddition_OBJECTS) -testMatrixAddition_DEPENDENCIES = $(check_LDADD) -testMatrixAddition_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(testMatrixAddition_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/includes -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libMatrixAddition_la_SOURCES) \ - $(testMatrixAddition_SOURCES) -DIST_SOURCES = $(libMatrixAddition_la_SOURCES) \ - $(testMatrixAddition_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBMATH = @LIBMATH@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libMatrixAddition_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes - -instdir = $(top_builddir)/lib -pkglib_LTLIBRARIES = libMatrixAddition.la -HEAD = ../includes/matrixAddition.h -libMatrixAddition_la_SOURCES = $(HEAD) \ - saddma.c \ - daddma.c \ - caddma.c \ - zaddma.c - -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/addition/libAddition.la \ - libMatrixAddition.la - -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes - -testMatrixAddition_SOURCES = testMatrixAddition.c -testMatrixAddition_LDADD = $(check_LDADD) -testMatrixAddition_CFLAGS = $(check_INCLUDES) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign matrixOperations/addition/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign matrixOperations/addition/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \ - else :; fi; \ - done - -uninstall-pkglibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \ - done - -clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libMatrixAddition.la: $(libMatrixAddition_la_OBJECTS) $(libMatrixAddition_la_DEPENDENCIES) - $(libMatrixAddition_la_LINK) -rpath $(pkglibdir) $(libMatrixAddition_la_OBJECTS) $(libMatrixAddition_la_LIBADD) $(LIBS) - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -testMatrixAddition$(EXEEXT): $(testMatrixAddition_OBJECTS) $(testMatrixAddition_DEPENDENCIES) - @rm -f testMatrixAddition$(EXEEXT) - $(testMatrixAddition_LINK) $(testMatrixAddition_OBJECTS) $(testMatrixAddition_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixAddition_la-caddma.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixAddition_la-daddma.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixAddition_la-saddma.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixAddition_la-zaddma.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testMatrixAddition-testMatrixAddition.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -libMatrixAddition_la-saddma.lo: saddma.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -MT libMatrixAddition_la-saddma.lo -MD -MP -MF $(DEPDIR)/libMatrixAddition_la-saddma.Tpo -c -o libMatrixAddition_la-saddma.lo `test -f 'saddma.c' || echo '$(srcdir)/'`saddma.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixAddition_la-saddma.Tpo $(DEPDIR)/libMatrixAddition_la-saddma.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='saddma.c' object='libMatrixAddition_la-saddma.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -c -o libMatrixAddition_la-saddma.lo `test -f 'saddma.c' || echo '$(srcdir)/'`saddma.c - -libMatrixAddition_la-daddma.lo: daddma.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -MT libMatrixAddition_la-daddma.lo -MD -MP -MF $(DEPDIR)/libMatrixAddition_la-daddma.Tpo -c -o libMatrixAddition_la-daddma.lo `test -f 'daddma.c' || echo '$(srcdir)/'`daddma.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixAddition_la-daddma.Tpo $(DEPDIR)/libMatrixAddition_la-daddma.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='daddma.c' object='libMatrixAddition_la-daddma.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -c -o libMatrixAddition_la-daddma.lo `test -f 'daddma.c' || echo '$(srcdir)/'`daddma.c - -libMatrixAddition_la-caddma.lo: caddma.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -MT libMatrixAddition_la-caddma.lo -MD -MP -MF $(DEPDIR)/libMatrixAddition_la-caddma.Tpo -c -o libMatrixAddition_la-caddma.lo `test -f 'caddma.c' || echo '$(srcdir)/'`caddma.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixAddition_la-caddma.Tpo $(DEPDIR)/libMatrixAddition_la-caddma.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='caddma.c' object='libMatrixAddition_la-caddma.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -c -o libMatrixAddition_la-caddma.lo `test -f 'caddma.c' || echo '$(srcdir)/'`caddma.c - -libMatrixAddition_la-zaddma.lo: zaddma.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -MT libMatrixAddition_la-zaddma.lo -MD -MP -MF $(DEPDIR)/libMatrixAddition_la-zaddma.Tpo -c -o libMatrixAddition_la-zaddma.lo `test -f 'zaddma.c' || echo '$(srcdir)/'`zaddma.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixAddition_la-zaddma.Tpo $(DEPDIR)/libMatrixAddition_la-zaddma.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zaddma.c' object='libMatrixAddition_la-zaddma.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixAddition_la_CFLAGS) $(CFLAGS) -c -o libMatrixAddition_la-zaddma.lo `test -f 'zaddma.c' || echo '$(srcdir)/'`zaddma.c - -testMatrixAddition-testMatrixAddition.o: testMatrixAddition.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testMatrixAddition_CFLAGS) $(CFLAGS) -MT testMatrixAddition-testMatrixAddition.o -MD -MP -MF $(DEPDIR)/testMatrixAddition-testMatrixAddition.Tpo -c -o testMatrixAddition-testMatrixAddition.o `test -f 'testMatrixAddition.c' || echo '$(srcdir)/'`testMatrixAddition.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testMatrixAddition-testMatrixAddition.Tpo $(DEPDIR)/testMatrixAddition-testMatrixAddition.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testMatrixAddition.c' object='testMatrixAddition-testMatrixAddition.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testMatrixAddition_CFLAGS) $(CFLAGS) -c -o testMatrixAddition-testMatrixAddition.o `test -f 'testMatrixAddition.c' || echo '$(srcdir)/'`testMatrixAddition.c - -testMatrixAddition-testMatrixAddition.obj: testMatrixAddition.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testMatrixAddition_CFLAGS) $(CFLAGS) -MT testMatrixAddition-testMatrixAddition.obj -MD -MP -MF $(DEPDIR)/testMatrixAddition-testMatrixAddition.Tpo -c -o testMatrixAddition-testMatrixAddition.obj `if test -f 'testMatrixAddition.c'; then $(CYGPATH_W) 'testMatrixAddition.c'; else $(CYGPATH_W) '$(srcdir)/testMatrixAddition.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testMatrixAddition-testMatrixAddition.Tpo $(DEPDIR)/testMatrixAddition-testMatrixAddition.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testMatrixAddition.c' object='testMatrixAddition-testMatrixAddition.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testMatrixAddition_CFLAGS) $(CFLAGS) -c -o testMatrixAddition-testMatrixAddition.obj `if test -f 'testMatrixAddition.c'; then $(CYGPATH_W) 'testMatrixAddition.c'; else $(CYGPATH_W) '$(srcdir)/testMatrixAddition.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ - ;; \ - *) \ - echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - echo "SKIP: $$tst"; \ - fi; \ - done; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all tests failed"; \ - else \ - banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(pkglibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - clean-pkglibLTLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: install-pkglibLTLIBRARIES - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pkglibLTLIBRARIES - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool \ - clean-pkglibLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkglibLTLIBRARIES install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-pkglibLTLIBRARIES - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/matrixOperations/addition/caddma.c b/src/matrixOperations/addition/caddma.c deleted file mode 100644 index 74311c68..00000000 --- a/src/matrixOperations/addition/caddma.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include "matrixAddition.h" - -/* -** \brief Compute an addition element ways for complex single precision. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains the addition in1 + in2. -*/ -void caddma(floatComplex *in1, int size1, - floatComplex *in2, int size2, - floatComplex *out) -{ - int i = 0; - - for(i = 0 ; i < size1 && i < size2 ; ++i) - { - out[i] = cadds(in1[i], in2[i]); - } -} diff --git a/src/matrixOperations/addition/daddma.c b/src/matrixOperations/addition/daddma.c deleted file mode 100644 index 868a4988..00000000 --- a/src/matrixOperations/addition/daddma.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include "matrixAddition.h" - -/* -** \brief Compute an addition element ways for double. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains the addition in1 + in2. -*/ -void daddma(double *in1, int size1, - double *in2, int size2, - double * out) -{ - int i = 0; - - for(i = 0 ; i < size1 && i < size2 ; ++i) - { - out[i] = in1[i] + in2[i]; - } -} diff --git a/src/matrixOperations/addition/saddma.c b/src/matrixOperations/addition/saddma.c deleted file mode 100644 index 15a4f342..00000000 --- a/src/matrixOperations/addition/saddma.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include "matrixAddition.h" - -/* -** \brief Compute an addition element ways for floats. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains the addition in1 + in2. -*/ -void saddma(float *in1, int size1, - float *in2, int size2, - float *out) -{ - int i = 0; - - for(i = 0 ; i < size1 && i < size2 ; ++i) - { - out[i] = in1[i] + in2[i]; - } -} diff --git a/src/matrixOperations/addition/testMatrixAddition.c b/src/matrixOperations/addition/testMatrixAddition.c deleted file mode 100644 index ceb922b9..00000000 --- a/src/matrixOperations/addition/testMatrixAddition.c +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include <stdio.h> -#include <assert.h> -#include <math.h> -#include "matrixAddition.h" - -#define SIZE 10000 - -/* #define LOCAL_DEBUG */ - -static void zaddmaTest(void) { - doubleComplex M1[SIZE]; - doubleComplex M2[SIZE]; - doubleComplex M1_and_M2[SIZE]; - - int i = 0; - - srand(1); - for (i = 0; i < SIZE; ++i) { - M1[i] = DoubleComplex((double) rand(), (double) rand()); - M2[i] = DoubleComplex((double) rand(), (double) rand()); - } - zaddma(M1, SIZE, M2, SIZE, M1_and_M2); - for (i = 0; i < SIZE; ++i) { -#ifdef LOCAL_DEBUG - printf("M1_and_M2 = %e + %e i\n", zreals(M1_and_M2[i]), zimags(M1_and_M2[i])); -#endif - assert(zreals(M1_and_M2[i]) - (zreals(M1[i]) + zreals(M2[i])) == 0); - assert(zimags(M1_and_M2[i]) - (zimags(M1[i]) + zimags(M2[i])) == 0); - } -} - -static void caddmaTest(void) { - floatComplex M1[SIZE]; - floatComplex M2[SIZE]; - floatComplex M1_and_M2[SIZE]; - - int i = 0; - - srand(1); - for (i = 0; i < SIZE; ++i) { - M1[i] = FloatComplex((float) rand(), (float) rand()); - M2[i] = FloatComplex((float) rand(), (float) rand()); - } - caddma(M1, SIZE, M2, SIZE, M1_and_M2); - for (i = 0; i < SIZE; ++i) { -#ifdef LOCAL_DEBUG - printf("M1_and_M2 = %e + %e i\n", creals(M1_and_M2[i]), cimags(M1_and_M2[i])); -#endif - assert(fabsf(creals(M1_and_M2[i]) - (creals(M1[i]) + creals(M2[i]))) / creals(M1_and_M2[i]) < 1e-07); - assert(fabsf(cimags(M1_and_M2[i]) - (cimags(M1[i]) + cimags(M2[i]))) / cimags(M1_and_M2[i]) < 1e-07); - } -} - -static void saddmaTest(void) { - float M1[SIZE]; - float M2[SIZE]; - float M1_and_M2[SIZE]; - - int i = 0; - - srand(1); - for (i = 0; i < SIZE; ++i) { - M1[i] = (float) rand(); - M2[i] = (float) rand(); - } - saddma(M1, SIZE, M2, SIZE, M1_and_M2); - for (i = 0; i < SIZE; ++i) { -#ifdef LOCAL_DEBUG - printf("M1_and_M2 = %e\n", M1_and_M2[i]); - printf("M1[i] + M2[i] = %e\n", (M1[i] + M2[i])); - printf("Error = %e\n",(float) fabsf(M1_and_M2[i] - (M1[i] + M2[i])) / M1_and_M2[i]); -#endif - assert(fabsf(M1_and_M2[i] - (M1[i] + M2[i])) / M1_and_M2[i] < 1e-07); - } -} - -static void daddmaTest(void) { - double M1[SIZE]; - double M2[SIZE]; - double M1_and_M2[SIZE]; - - int i = 0; - - srand(1); - for (i = 0; i < SIZE; ++i) { - M1[i] = (double) rand(); - M2[i] = (double) rand(); - } - daddma(M1, SIZE, M2, SIZE, M1_and_M2); - for (i = 0; i < SIZE; ++i) { -#ifdef LOCAL_DEBUG - printf("M1_and_M2 = %e\n", M1_and_M2[i]); -#endif - assert(fabs(M1_and_M2[i] - (M1[i] + M2[i])) == 0); - } - -} - -static int testAddition(void) { - - printf("\n>>>> Matrix Addition Tests\n"); - saddmaTest(); - daddmaTest(); - caddmaTest(); - zaddmaTest(); - - return 0; -} - - - -int main(void) { - assert(testAddition() == 0); - return 0; -} diff --git a/src/matrixOperations/addition/zaddma.c b/src/matrixOperations/addition/zaddma.c deleted file mode 100644 index 65efa959..00000000 --- a/src/matrixOperations/addition/zaddma.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include "matrixAddition.h" - -/* -** \brief Compute an addition element ways for complex double precision. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains the addition in1 + in2. -*/ -void zaddma(doubleComplex *in1, int size1, - doubleComplex *in2, int size2, - doubleComplex *out) -{ - int i = 0; - - for(i = 0 ; i < size1 && i < size2 ; ++i) - { - out[i] = zadds(in1[i], in2[i]); - } -} diff --git a/src/matrixOperations/expm/cexpma.c b/src/matrixOperations/expm/cexpma.c index 76014415..7da0fc70 100644 --- a/src/matrixOperations/expm/cexpma.c +++ b/src/matrixOperations/expm/cexpma.c @@ -77,15 +77,15 @@ void cexpma(floatComplex * in, floatComplex * out, int _iLeadDim) /* cA = A * c */ for ( iIndex1 = 0 ; iIndex1 < iSquare ; iIndex1++ ) - pfltMatrixcA[iIndex1] = ctimess ( pfltMatrixA[iIndex1] , FloatComplex((float) fltCst , 0) ) ; + pfltMatrixcA[iIndex1] = cmuls ( pfltMatrixA[iIndex1] , FloatComplex((float) fltCst , 0) ) ; /*E = Eye + cA*/ - caddma (pfltMatrixEye , iSquare, pfltMatrixcA ,iSquare, out ) ; + cadda (pfltMatrixEye , iSquare, pfltMatrixcA ,iSquare, out ) ; /* D = Eye - cA */ - cdiffma (pfltMatrixEye , iSquare, pfltMatrixcA ,iSquare,pfltMatrixD ) ; + cdiffa (pfltMatrixEye , iSquare, pfltMatrixcA ,iSquare,pfltMatrixD ) ; iMax = 6; iFlag = 1; @@ -110,19 +110,19 @@ void cexpma(floatComplex * in, floatComplex * out, int _iLeadDim) pfltMatrixcX);*/ for ( iIndex1 = 0 ; iIndex1 < iSquare ; iIndex1++ ) - pfltMatrixcX[iIndex1] = ctimess ( pfltMatrixX[iIndex1] , FloatComplex((float) fltCst , 0) ) ; + pfltMatrixcX[iIndex1] = cmuls ( pfltMatrixX[iIndex1] , FloatComplex((float) fltCst , 0) ) ; /* E = E + cX */ - caddma ( out, iSquare , pfltMatrixcX , iSquare , out ) ; + cadda ( out, iSquare , pfltMatrixcX , iSquare , out ) ; if(iFlag == 1) /* D = D + cX */ { - caddma ( pfltMatrixD, iSquare , pfltMatrixcX , iSquare , pfltMatrixD ) ; + cadda ( pfltMatrixD, iSquare , pfltMatrixcX , iSquare , pfltMatrixD ) ; } else /* D = D - cX */ { - cdiffma ( pfltMatrixD, iSquare , pfltMatrixcX , iSquare , pfltMatrixD ); + cdiffa ( pfltMatrixD, iSquare , pfltMatrixcX , iSquare , pfltMatrixD ); } /* Toggle iFlag */ diff --git a/src/matrixOperations/expm/dexpma.c b/src/matrixOperations/expm/dexpma.c index df25146c..d9b42327 100644 --- a/src/matrixOperations/expm/dexpma.c +++ b/src/matrixOperations/expm/dexpma.c @@ -78,10 +78,10 @@ void dexpma (double* in, double* out, int _iLeadDim){ /*E = Eye + cA*/ - daddma (pdblMatrixEye , iSquare, pdblMatrixcA ,iSquare, out ) ; + dadda (pdblMatrixEye , iSquare, pdblMatrixcA ,iSquare, out ) ; /*D = Eye - cA*/ - ddiffma (pdblMatrixEye , iSquare, pdblMatrixcA ,iSquare,pdblMatrixD ) ; + ddiffa (pdblMatrixEye , iSquare, pdblMatrixcA ,iSquare,pdblMatrixD ) ; iMax = 6; iFlag = 1; @@ -106,15 +106,15 @@ void dexpma (double* in, double* out, int _iLeadDim){ pdblMatrixcX[iIndex1] = pdblMatrixX[iIndex1] * dblCst ; /*E = E + cX*/ - daddma ( out, iSquare , pdblMatrixcX , iSquare , out ) ; + dadda ( out, iSquare , pdblMatrixcX , iSquare , out ) ; if(iFlag == 1) /*D = D + cX*/ { - daddma ( pdblMatrixD, iSquare , pdblMatrixcX , iSquare , pdblMatrixD ) ; + dadda ( pdblMatrixD, iSquare , pdblMatrixcX , iSquare , pdblMatrixD ) ; } else /*D = D - cX*/ { - ddiffma ( pdblMatrixD, iSquare , pdblMatrixcX , iSquare , pdblMatrixD ); + ddiffa ( pdblMatrixD, iSquare , pdblMatrixcX , iSquare , pdblMatrixD ); } /*Toggle iFlag*/ diff --git a/src/matrixOperations/expm/sexpma.c b/src/matrixOperations/expm/sexpma.c index 77a1e43a..cd969981 100644 --- a/src/matrixOperations/expm/sexpma.c +++ b/src/matrixOperations/expm/sexpma.c @@ -79,10 +79,10 @@ void sexpma (float* in, float* out, int _iLeadDim){ /*E = Eye + cA*/ - saddma (pfltMatrixEye , iSquare, pfltMatrixcA ,iSquare, out ) ; + sadda (pfltMatrixEye , iSquare, pfltMatrixcA ,iSquare, out ) ; /*D = Eye - cA*/ - sdiffma (pfltMatrixEye , iSquare, pfltMatrixcA ,iSquare,pfltMatrixD ) ; + sdiffa (pfltMatrixEye , iSquare, pfltMatrixcA ,iSquare,pfltMatrixD ) ; iMax = 6; iFlag = 1; @@ -110,15 +110,15 @@ void sexpma (float* in, float* out, int _iLeadDim){ pfltMatrixcX[iIndex1] = pfltMatrixX[iIndex1] * (float) dblCst ; /*E = E + cX*/ - saddma ( out, iSquare , pfltMatrixcX , iSquare , out ) ; + sadda ( out, iSquare , pfltMatrixcX , iSquare , out ) ; if(iFlag == 1) /*D = D + cX*/ { - saddma ( pfltMatrixD, iSquare , pfltMatrixcX , iSquare , pfltMatrixD ) ; + sadda ( pfltMatrixD, iSquare , pfltMatrixcX , iSquare , pfltMatrixD ) ; } else /*D = D - cX*/ { - sdiffma ( pfltMatrixD, iSquare , pfltMatrixcX , iSquare , pfltMatrixD ); + sdiffa ( pfltMatrixD, iSquare , pfltMatrixcX , iSquare , pfltMatrixD ); } /*Toggle iFlag*/ diff --git a/src/matrixOperations/expm/zexpma.c b/src/matrixOperations/expm/zexpma.c index a0290abe..3de35e02 100644 --- a/src/matrixOperations/expm/zexpma.c +++ b/src/matrixOperations/expm/zexpma.c @@ -78,18 +78,18 @@ void zexpma(doubleComplex * in, doubleComplex * out, int _iLeadDim) pdblMatrixcA);*/ for ( iIndex1 = 0 ; iIndex1 < iSquare ; iIndex1++ ) - pdblMatrixcA[iIndex1] = ztimess ( pdblMatrixA[iIndex1] , zdblCst ) ; + pdblMatrixcA[iIndex1] = zmuls ( pdblMatrixA[iIndex1] , zdblCst ) ; /* cA = A * c */ /*E = Eye + cA*/ - zaddma (pdblMatrixEye , iSquare, pdblMatrixcA ,iSquare, out ) ; + zadda (pdblMatrixEye , iSquare, pdblMatrixcA ,iSquare, out ) ; /* D = Eye - cA */ - zdiffma (pdblMatrixEye , iSquare, pdblMatrixcA ,iSquare,pdblMatrixD ) ; + zdiffa (pdblMatrixEye , iSquare, pdblMatrixcA ,iSquare,pdblMatrixD ) ; iMax = 6; iFlag = 1; @@ -115,19 +115,19 @@ void zexpma(doubleComplex * in, doubleComplex * out, int _iLeadDim) pdblMatrixcX);*/ for ( iIndex1 = 0 ; iIndex1 < iSquare ; iIndex1++ ) - pdblMatrixcX[iIndex1] = ztimess ( pdblMatrixX[iIndex1] , zdblCst ) ; + pdblMatrixcX[iIndex1] = zmuls ( pdblMatrixX[iIndex1] , zdblCst ) ; /* E = E + cX */ - zaddma ( out, iSquare , pdblMatrixcX , iSquare , out ) ; + zadda ( out, iSquare , pdblMatrixcX , iSquare , out ) ; if(iFlag == 1) /* D = D + cX */ { - zaddma ( pdblMatrixD, iSquare , pdblMatrixcX , iSquare , pdblMatrixD ) ; + zadda ( pdblMatrixD, iSquare , pdblMatrixcX , iSquare , pdblMatrixD ) ; } else /* D = D - cX */ { - zdiffma ( pdblMatrixD, iSquare , pdblMatrixcX , iSquare , pdblMatrixD ); + zdiffa ( pdblMatrixD, iSquare , pdblMatrixcX , iSquare , pdblMatrixD ); } /* Toggle iFlag */ diff --git a/src/matrixOperations/includes/matrixAddition.h b/src/matrixOperations/includes/matrixAddition.h deleted file mode 100644 index 979af7f8..00000000 --- a/src/matrixOperations/includes/matrixAddition.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#ifndef __MATRIXADDITION_H__ -#define __MATRIXADDITION_H__ - -#include "floatComplex.h" -#include "doubleComplex.h" -#include "addition.h" - -/* -** -** WARNING WE ASSUME MATRIXES TO BE CONSCISTENT -** size1 = size2; -** -*/ - - -/* -** \brief Compute an addition element ways for floats. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains the addition in1 + in2. -*/ -void saddma(float *in1, int size1, - float *in2, int size2, - float *out); -/* -** \brief Compute an addition element ways for double. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains the addition in1 + in2. -*/ -void daddma(double *in1, int size1, - double *in2, int size2, - double * out); - -/* -** \brief Compute an addition element ways for complex single precision. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains the addition in1 + in2. -*/ -void caddma(floatComplex *in1, int size1, - floatComplex *in2, int size2, - floatComplex *out); - -/* -** \brief Compute an addition element ways for complex double precision. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains the addition in1 + in2. -*/ -void zaddma(doubleComplex *in1, int size1, - doubleComplex *in2, int size2, - doubleComplex *out); - -#endif /* !__MATRIXADDITION_H__ */ diff --git a/src/matrixOperations/includes/matrixExponential.h b/src/matrixOperations/includes/matrixExponential.h index 44b89a68..0626bf17 100644 --- a/src/matrixOperations/includes/matrixExponential.h +++ b/src/matrixOperations/includes/matrixExponential.h @@ -23,8 +23,8 @@ #include "pow.h" #include "matrixDivision.h" #include "matrixMultiplication.h" -#include "matrixAddition.h" -#include "matrixSubtraction.h" +#include "addition.h" +#include "subtraction.h" #include "eye.h" #include "infiniteNorm.h" #include "frexp.h" diff --git a/src/matrixOperations/includes/matrixSubtraction.h b/src/matrixOperations/includes/matrixSubtraction.h deleted file mode 100644 index f55a8e6c..00000000 --- a/src/matrixOperations/includes/matrixSubtraction.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2006-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#ifndef __MATRIXSUBSTRACTION_H__ -#define __MATRIXSUBSTRACTION_H__ - -#include "floatComplex.h" -#include "doubleComplex.h" - -#include "subtraction.h" - -/* -** -** WARNING WE ASSUME MATRIXES TO BE CONSCISTENT -** size1 = size2; -** -*/ - - -/* -** \brief Compute an substraction element ways for floats. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains in1 - in2. -*/ -void sdiffma(float *in1, int size1, - float *in2, int size2, - float *out); -/* -** \brief Compute an substraction element ways for double. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains in1 - in2. -*/ -void ddiffma(double *in1, int size1, - double *in2, int size2, - double * out); - -/* -** \brief Compute an substraction element ways for complex single precision. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains in1 - in2. -*/ -void cdiffma(floatComplex *in1, int size1, - floatComplex *in2, int size2, - floatComplex *out); - -/* -** \brief Compute an substraction element ways for complex double precision. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains in1 - in2. -*/ -void zdiffma(doubleComplex *in1, int size1, - doubleComplex *in2, int size2, - doubleComplex *out); - -#endif /* !__MATRIXSUBSTRACTION_H__ */ diff --git a/src/matrixOperations/interfaces/int_OpMinus.h b/src/matrixOperations/interfaces/int_OpMinus.h deleted file mode 100644 index b5697403..00000000 --- a/src/matrixOperations/interfaces/int_OpMinus.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */ - -#ifndef __INT_OPMINUS_H__ -#define __INT_OPMINUS_H__ - -/* Matrix-Matrix */ - -#define s2s2OpMinuss2(in1,size1,in2,size2,out) sdiffma(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out) - -#define d2d2OpMinusd2(in1,size1,in2,size2,out) ddiffma(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out) - -#define c2c2OpMinusc2(in1,size1,in2,size2,out) cdiffma(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out) - -#define c2s2OpMinusc2(in1,size1,in2,size2,out) cdiffma(in1, size1[0]*size1[1], FloatComplexMatrix(in2,0,size2[0]*size2[1]), size2[0]*size2[1], out) - -#define s2c2OpMinusc2(in1,size1,in2,size2,out) cdiffma(FloatComplexMatrix(in1,0,size1[0]*size1[1]), size1[0]*size1[1], in2, size2[0]*size2[1], out) - -#define z2z2OpMinusz2(in1,size1,in2,size2,out) zdiffma(in1, size1[0]*size1[1], in2, size2[0]*size2[1], out) - -#define z2d2OpMinusz2(in1,size1,in2,size2,out) zdiffma(in1, size1[0]*size1[1], DoubleComplexMatrix(in2,0,size2[0]*size2[1]), size2[0]*size2[1], out) - -#define d2z2OpMinusz2(in1,size1,in2,size2,out) zdiffma(DoubleComplexMatrix(in1,0,size1[0]*size1[1]), size1[0]*size1[1], in2, size2[0]*size2[1], out) - - -#endif /* !__INT_OPMINUS_H__ */ diff --git a/src/matrixOperations/interfaces/int_OpPlus.h b/src/matrixOperations/interfaces/int_OpPlus.h deleted file mode 100644 index 13917a89..00000000 --- a/src/matrixOperations/interfaces/int_OpPlus.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */ - -#ifndef __INT_OPPLUS_H__ -#define __INT_OPPLUS_H__ - - - -/* Matrix + Matrix */ - -#define s2s2OpPluss2(in1,size,in2,size,out) saddma(in1, size[0]*size[1], in2, size[0]*size[1], out) - -#define d2d2OpPlusd2(in1,size,in2,size,out) daddma(in1, size[0]*size[1], in2, size[0]*size[1], out) - -#define c2c2OpPlusc2(in1,size,in2,size,out) caddma(in1, size[0]*size[1], in2, size[0]*size[1], out) - -#define s2c2OpPlusc2(in1,size,in2,size,out) caddma(FloatComplex(in1,0), size[0]*size[1], in2, size[0]*size[1], out) - -#define c2s2OpPlusc2(in1,size,in2,size,out) caddma(in1, size[0]*size[1], FloatComplex(in2,0), size[0]*size[1], out) - -#define z2z2OpPlusz2(in1,size,in2,size,out) zaddma(in1, size[0]*size[1], in2, size[0]*size[1], out) - -#define d2z2OpPlusz2(in1,size,in2,size,out) zaddma(DoubleComplex(in1,0), size[0]*size[1], in2, size[0]*size[1], out) - -#define z2d2OpPlusz2(in1,size,in2,size,out) zaddma(in1, size[0]*size[1], DoubleComplex(in2,0), size[0]*size[1], out) - - - - -#endif /* !__INT_OPPLUS_H__ */ diff --git a/src/matrixOperations/multiplication/cmulma.c b/src/matrixOperations/multiplication/cmulma.c index 58742d99..33eab648 100644 --- a/src/matrixOperations/multiplication/cmulma.c +++ b/src/matrixOperations/multiplication/cmulma.c @@ -36,7 +36,7 @@ void cmulma(floatComplex *in1, int lines1, int columns1, for (k = 0; k < columns1 ; ++k) { accu = cadds(accu, - ctimess(in1[i % lines1 + k *lines1] , + cmuls(in1[i % lines1 + k *lines1] , in2[k + (i / lines1) *lines2] )); } out[i] = accu; diff --git a/src/matrixOperations/multiplication/zmulma.c b/src/matrixOperations/multiplication/zmulma.c index d1552ca6..73df3d52 100644 --- a/src/matrixOperations/multiplication/zmulma.c +++ b/src/matrixOperations/multiplication/zmulma.c @@ -94,7 +94,7 @@ void zmulma(doubleComplex *in1, int lines1, int columns1, for (k = 0; k < columns1 ; ++k) { accu = zadds(accu, - ztimess(in1[i % lines1 + k *lines1] , + zmuls(in1[i % lines1 + k *lines1] , in2[k + (i / lines1) *lines2] )); } out[i] = accu; diff --git a/src/matrixOperations/subtraction/Makefile.am b/src/matrixOperations/subtraction/Makefile.am deleted file mode 100644 index 56968dad..00000000 --- a/src/matrixOperations/subtraction/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -## -## Scilab ( http://www.scilab.org/ ) - This file is part of Scilab -## Copyright (C) 2006-2008 - INRIA - Bruno JOFRET -## -## This file must be used under the terms of the CeCILL. -## This source file is licensed as described in the file COPYING, which -## you should have received as part of this distribution. The terms -## are also available at -## http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -## -## - -libMatrixSubtraction_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes - -instdir = $(top_builddir)/lib - -pkglib_LTLIBRARIES = libMatrixSubtraction.la - -HEAD = ../includes/matrixSubtraction.h - -libMatrixSubtraction_la_SOURCES = $(HEAD) \ - sdiffma.c \ - ddiffma.c \ - cdiffma.c \ - zdiffma.c - -check_PROGRAMS = testMatrixSubtraction - -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - libMatrixSubtraction.la - -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes - -testMatrixSubtraction_SOURCES = testMatrixSubtraction.c -testMatrixSubtraction_LDADD = $(check_LDADD) -testMatrixSubtraction_CFLAGS = $(check_INCLUDES) - -TESTS = testMatrixSubtraction
\ No newline at end of file diff --git a/src/matrixOperations/subtraction/Makefile.in b/src/matrixOperations/subtraction/Makefile.in deleted file mode 100644 index 61e1dfbe..00000000 --- a/src/matrixOperations/subtraction/Makefile.in +++ /dev/null @@ -1,641 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -check_PROGRAMS = testMatrixSubtraction$(EXEEXT) -TESTS = testMatrixSubtraction$(EXEEXT) -subdir = matrixOperations/subtraction -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/includes/machine.h -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pkglibdir)" -pkglibLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(pkglib_LTLIBRARIES) -libMatrixSubtraction_la_LIBADD = -am__objects_1 = -am_libMatrixSubtraction_la_OBJECTS = $(am__objects_1) \ - libMatrixSubtraction_la-sdiffma.lo \ - libMatrixSubtraction_la-ddiffma.lo \ - libMatrixSubtraction_la-cdiffma.lo \ - libMatrixSubtraction_la-zdiffma.lo -libMatrixSubtraction_la_OBJECTS = \ - $(am_libMatrixSubtraction_la_OBJECTS) -libMatrixSubtraction_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -am_testMatrixSubtraction_OBJECTS = \ - testMatrixSubtraction-testMatrixSubtraction.$(OBJEXT) -testMatrixSubtraction_OBJECTS = $(am_testMatrixSubtraction_OBJECTS) -testMatrixSubtraction_DEPENDENCIES = $(check_LDADD) -testMatrixSubtraction_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(testMatrixSubtraction_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/includes -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libMatrixSubtraction_la_SOURCES) \ - $(testMatrixSubtraction_SOURCES) -DIST_SOURCES = $(libMatrixSubtraction_la_SOURCES) \ - $(testMatrixSubtraction_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBMATH = @LIBMATH@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libMatrixSubtraction_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes - -instdir = $(top_builddir)/lib -pkglib_LTLIBRARIES = libMatrixSubtraction.la -HEAD = ../includes/matrixSubtraction.h -libMatrixSubtraction_la_SOURCES = $(HEAD) \ - sdiffma.c \ - ddiffma.c \ - cdiffma.c \ - zdiffma.c - -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - libMatrixSubtraction.la - -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes - -testMatrixSubtraction_SOURCES = testMatrixSubtraction.c -testMatrixSubtraction_LDADD = $(check_LDADD) -testMatrixSubtraction_CFLAGS = $(check_INCLUDES) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign matrixOperations/subtraction/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign matrixOperations/subtraction/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \ - else :; fi; \ - done - -uninstall-pkglibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \ - done - -clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libMatrixSubtraction.la: $(libMatrixSubtraction_la_OBJECTS) $(libMatrixSubtraction_la_DEPENDENCIES) - $(libMatrixSubtraction_la_LINK) -rpath $(pkglibdir) $(libMatrixSubtraction_la_OBJECTS) $(libMatrixSubtraction_la_LIBADD) $(LIBS) - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -testMatrixSubtraction$(EXEEXT): $(testMatrixSubtraction_OBJECTS) $(testMatrixSubtraction_DEPENDENCIES) - @rm -f testMatrixSubtraction$(EXEEXT) - $(testMatrixSubtraction_LINK) $(testMatrixSubtraction_OBJECTS) $(testMatrixSubtraction_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixSubtraction_la-cdiffma.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixSubtraction_la-ddiffma.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixSubtraction_la-sdiffma.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixSubtraction_la-zdiffma.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testMatrixSubtraction-testMatrixSubtraction.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -libMatrixSubtraction_la-sdiffma.lo: sdiffma.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -MT libMatrixSubtraction_la-sdiffma.lo -MD -MP -MF $(DEPDIR)/libMatrixSubtraction_la-sdiffma.Tpo -c -o libMatrixSubtraction_la-sdiffma.lo `test -f 'sdiffma.c' || echo '$(srcdir)/'`sdiffma.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixSubtraction_la-sdiffma.Tpo $(DEPDIR)/libMatrixSubtraction_la-sdiffma.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sdiffma.c' object='libMatrixSubtraction_la-sdiffma.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -c -o libMatrixSubtraction_la-sdiffma.lo `test -f 'sdiffma.c' || echo '$(srcdir)/'`sdiffma.c - -libMatrixSubtraction_la-ddiffma.lo: ddiffma.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -MT libMatrixSubtraction_la-ddiffma.lo -MD -MP -MF $(DEPDIR)/libMatrixSubtraction_la-ddiffma.Tpo -c -o libMatrixSubtraction_la-ddiffma.lo `test -f 'ddiffma.c' || echo '$(srcdir)/'`ddiffma.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixSubtraction_la-ddiffma.Tpo $(DEPDIR)/libMatrixSubtraction_la-ddiffma.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddiffma.c' object='libMatrixSubtraction_la-ddiffma.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -c -o libMatrixSubtraction_la-ddiffma.lo `test -f 'ddiffma.c' || echo '$(srcdir)/'`ddiffma.c - -libMatrixSubtraction_la-cdiffma.lo: cdiffma.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -MT libMatrixSubtraction_la-cdiffma.lo -MD -MP -MF $(DEPDIR)/libMatrixSubtraction_la-cdiffma.Tpo -c -o libMatrixSubtraction_la-cdiffma.lo `test -f 'cdiffma.c' || echo '$(srcdir)/'`cdiffma.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixSubtraction_la-cdiffma.Tpo $(DEPDIR)/libMatrixSubtraction_la-cdiffma.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cdiffma.c' object='libMatrixSubtraction_la-cdiffma.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -c -o libMatrixSubtraction_la-cdiffma.lo `test -f 'cdiffma.c' || echo '$(srcdir)/'`cdiffma.c - -libMatrixSubtraction_la-zdiffma.lo: zdiffma.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -MT libMatrixSubtraction_la-zdiffma.lo -MD -MP -MF $(DEPDIR)/libMatrixSubtraction_la-zdiffma.Tpo -c -o libMatrixSubtraction_la-zdiffma.lo `test -f 'zdiffma.c' || echo '$(srcdir)/'`zdiffma.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixSubtraction_la-zdiffma.Tpo $(DEPDIR)/libMatrixSubtraction_la-zdiffma.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zdiffma.c' object='libMatrixSubtraction_la-zdiffma.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -c -o libMatrixSubtraction_la-zdiffma.lo `test -f 'zdiffma.c' || echo '$(srcdir)/'`zdiffma.c - -testMatrixSubtraction-testMatrixSubtraction.o: testMatrixSubtraction.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testMatrixSubtraction_CFLAGS) $(CFLAGS) -MT testMatrixSubtraction-testMatrixSubtraction.o -MD -MP -MF $(DEPDIR)/testMatrixSubtraction-testMatrixSubtraction.Tpo -c -o testMatrixSubtraction-testMatrixSubtraction.o `test -f 'testMatrixSubtraction.c' || echo '$(srcdir)/'`testMatrixSubtraction.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testMatrixSubtraction-testMatrixSubtraction.Tpo $(DEPDIR)/testMatrixSubtraction-testMatrixSubtraction.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testMatrixSubtraction.c' object='testMatrixSubtraction-testMatrixSubtraction.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testMatrixSubtraction_CFLAGS) $(CFLAGS) -c -o testMatrixSubtraction-testMatrixSubtraction.o `test -f 'testMatrixSubtraction.c' || echo '$(srcdir)/'`testMatrixSubtraction.c - -testMatrixSubtraction-testMatrixSubtraction.obj: testMatrixSubtraction.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testMatrixSubtraction_CFLAGS) $(CFLAGS) -MT testMatrixSubtraction-testMatrixSubtraction.obj -MD -MP -MF $(DEPDIR)/testMatrixSubtraction-testMatrixSubtraction.Tpo -c -o testMatrixSubtraction-testMatrixSubtraction.obj `if test -f 'testMatrixSubtraction.c'; then $(CYGPATH_W) 'testMatrixSubtraction.c'; else $(CYGPATH_W) '$(srcdir)/testMatrixSubtraction.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testMatrixSubtraction-testMatrixSubtraction.Tpo $(DEPDIR)/testMatrixSubtraction-testMatrixSubtraction.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testMatrixSubtraction.c' object='testMatrixSubtraction-testMatrixSubtraction.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testMatrixSubtraction_CFLAGS) $(CFLAGS) -c -o testMatrixSubtraction-testMatrixSubtraction.obj `if test -f 'testMatrixSubtraction.c'; then $(CYGPATH_W) 'testMatrixSubtraction.c'; else $(CYGPATH_W) '$(srcdir)/testMatrixSubtraction.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ - ;; \ - *) \ - echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *$$ws$$tst$$ws*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - echo "SKIP: $$tst"; \ - fi; \ - done; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all tests failed"; \ - else \ - banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(pkglibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - clean-pkglibLTLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: install-pkglibLTLIBRARIES - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pkglibLTLIBRARIES - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool \ - clean-pkglibLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkglibLTLIBRARIES install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-pkglibLTLIBRARIES - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/matrixOperations/subtraction/cdiffma.c b/src/matrixOperations/subtraction/cdiffma.c deleted file mode 100644 index d97e5e1a..00000000 --- a/src/matrixOperations/subtraction/cdiffma.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include "matrixSubtraction.h" - -/* -** \brief Compute an substraction element ways for complex single precision. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains in1 - in2. -*/ -void cdiffma(floatComplex *in1, int size1, - floatComplex *in2, int size2, - floatComplex *out) -{ - int i = 0; - - for(i = 0 ; i < size1 && i < size2 ; ++i) - { - out[i] = cdiffs(in1[i], in2[i]); - } -} diff --git a/src/matrixOperations/subtraction/ddiffma.c b/src/matrixOperations/subtraction/ddiffma.c deleted file mode 100644 index 4af091be..00000000 --- a/src/matrixOperations/subtraction/ddiffma.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include "matrixSubtraction.h" - -/* -** \brief Compute an substraction element ways for double. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains in1 - in2. -*/ -void ddiffma(double *in1, int size1, - double *in2, int size2, - double * out) -{ - int i = 0; - - for(i = 0 ; i < size1 && i < size2 ; ++i) - { - out[i] = in1[i] - in2[i]; - } -} diff --git a/src/matrixOperations/subtraction/sdiffma.c b/src/matrixOperations/subtraction/sdiffma.c deleted file mode 100644 index fb8d6127..00000000 --- a/src/matrixOperations/subtraction/sdiffma.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include "matrixSubtraction.h" - -/* -** \brief Compute an substraction element ways for floats. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains in1 - in2. -*/ -void sdiffma(float *in1, int size1, - float *in2, int size2, - float *out) -{ - int i = 0; - - for(i = 0 ; i < size1 && i < size2 ; ++i) - { - out[i] = in1[i] - in2[i]; - } -} diff --git a/src/matrixOperations/subtraction/testMatrixSubtraction.c b/src/matrixOperations/subtraction/testMatrixSubtraction.c deleted file mode 100644 index 5c30c4e0..00000000 --- a/src/matrixOperations/subtraction/testMatrixSubtraction.c +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include <stdio.h> -#include <assert.h> -#include <math.h> -#include "matrixSubtraction.h" - -#define SIZE 10000 - -/* #define LOCAL_DEBUG */ - -static void zdiffmaTest(void) { - doubleComplex M1[SIZE]; - doubleComplex M2[SIZE]; - doubleComplex M1_but_M2[SIZE]; - - int i = 0; - - srand(1); - for (i = 0; i < SIZE; ++i) { - M1[i] = DoubleComplex((double) rand(), (double) rand()); - M2[i] = DoubleComplex((double) rand(), (double) rand()); - } - zdiffma(M1, SIZE, M2, SIZE, M1_but_M2); - for (i = 0; i < SIZE; ++i) { -#ifdef LOCAL_DEBUG - printf("M1_but_M2 = %e + %e i\n", zreals(M1_but_M2[i]), zimags(M1_but_M2[i])); -#endif - assert(zreals(M1_but_M2[i]) - (zreals(M1[i]) - zreals(M2[i])) == 0); - assert(zimags(M1_but_M2[i]) - (zimags(M1[i]) - zimags(M2[i])) == 0); - } -} - -static void cdiffmaTest(void) { - floatComplex M1[SIZE]; - floatComplex M2[SIZE]; - floatComplex M1_but_M2[SIZE]; - - int i = 0; - - srand(1); - for (i = 0; i < SIZE; ++i) { - M1[i] = FloatComplex((float) rand(), (float) rand()); - M2[i] = FloatComplex((float) rand(), (float) rand()); - } - cdiffma(M1, SIZE, M2, SIZE, M1_but_M2); - for (i = 0; i < SIZE; ++i) { -#ifdef LOCAL_DEBUG - printf("M1_but_M2 = %e + %e i\n", creals(M1_but_M2[i]), cimags(M1_but_M2[i])); -#endif - assert(fabsf(creals(M1_but_M2[i]) - (creals(M1[i]) - creals(M2[i]))) / creals(M1_but_M2[i]) < 1e-07); - assert(fabsf(cimags(M1_but_M2[i]) - (cimags(M1[i]) - cimags(M2[i]))) / cimags(M1_but_M2[i]) < 1e-07); - } -} - -static void sdiffmaTest(void) { - float M1[SIZE]; - float M2[SIZE]; - float M1_but_M2[SIZE]; - - int i = 0; - - srand(1); - for (i = 0; i < SIZE; ++i) { - M1[i] = (float) rand(); - M2[i] = (float) rand(); - } - sdiffma(M1, SIZE, M2, SIZE, M1_but_M2); - for (i = 0; i < SIZE; ++i) { -#ifdef LOCAL_DEBUG - printf("M1_but_M2 = %e\n", M1_but_M2[i]); - printf("M1[i] - M2[i] = %e\n", (M1[i] + M2[i])); - printf("Error = %e\n",(float) fabsf(M1_but_M2[i] - (M1[i] - M2[i])) / M1_but_M2[i]); -#endif - assert(fabsf(M1_but_M2[i] - (M1[i] - M2[i])) / M1_but_M2[i] < 1e-07); - } -} - -static void ddiffmaTest(void) { - double M1[SIZE]; - double M2[SIZE]; - double M1_but_M2[SIZE]; - - int i = 0; - - srand(1); - for (i = 0; i < SIZE; ++i) { - M1[i] = (double) rand(); - M2[i] = (double) rand(); - } - ddiffma(M1, SIZE, M2, SIZE, M1_but_M2); - for (i = 0; i < SIZE; ++i) { -#ifdef LOCAL_DEBUG - printf("M1_but_M2 = %e\n", M1_but_M2[i]); -#endif - assert(fabs(M1_but_M2[i] - (M1[i] - M2[i])) == 0); - } - -} - -static int testDiffition(void) { - - printf("\n>>>> Matrix Substraction Tests\n"); - sdiffmaTest(); - ddiffmaTest(); - cdiffmaTest(); - zdiffmaTest(); - - return 0; -} - - - -int main(void) { - assert(testDiffition() == 0); - return 0; -} diff --git a/src/matrixOperations/subtraction/zdiffma.c b/src/matrixOperations/subtraction/zdiffma.c deleted file mode 100644 index 3c3a1249..00000000 --- a/src/matrixOperations/subtraction/zdiffma.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include "matrixSubtraction.h" - -/* -** \brief Compute an substraction element ways for complex double precision. -** \param in1 : input array. -** \param size1 : size of in1 array. -** \param in2 : input arry. -** \param size2 : size of in2 array. -** \param out : array that contains in1 - in2. -*/ -void zdiffma(doubleComplex *in1, int size1, - doubleComplex *in2, int size2, - doubleComplex *out) -{ - int i = 0; - - for(i = 0 ; i < size1 && i < size2 ; ++i) - { - out[i] = zdiffs(in1[i], in2[i]); - } -} |