diff options
Diffstat (limited to 'src/matrixOperations')
20 files changed, 133 insertions, 118 deletions
diff --git a/src/matrixOperations/Makefile.am b/src/matrixOperations/Makefile.am index 2c8cd8a4..177f0013 100644 --- a/src/matrixOperations/Makefile.am +++ b/src/matrixOperations/Makefile.am @@ -21,7 +21,10 @@ SUBDIRS= addition \ subtraction \ trace \ transpose \ - ones + ones + # inversion + + diff --git a/src/matrixOperations/Makefile.in b/src/matrixOperations/Makefile.in index f114bf3d..a3730bc4 100644 --- a/src/matrixOperations/Makefile.in +++ b/src/matrixOperations/Makefile.in @@ -176,7 +176,7 @@ SUBDIRS = addition \ subtraction \ trace \ transpose \ - ones + ones all: all-recursive diff --git a/src/matrixOperations/division/Makefile.am b/src/matrixOperations/division/Makefile.am index 6549944e..0638f845 100644 --- a/src/matrixOperations/division/Makefile.am +++ b/src/matrixOperations/division/Makefile.am @@ -22,14 +22,14 @@ pkglib_LTLIBRARIES = libMatrixDivision.la HEAD = ../includes/matrixDivision.h libMatrixDivision_la_SOURCES = $(HEAD) \ - srdiva.c \ - sldiva.c \ - drdiva.c \ - dldiva.c \ - zrdiva.c \ - zldiva.c \ - crdiva.c \ - cldiva.c + srdivma.c \ + sldivma.c \ + drdivma.c \ + dldivma.c \ + zrdivma.c \ + zldivma.c \ + crdivma.c \ + cldivma.c check_PROGRAMS = testMatrixRDivision \ testMatrixLDivision diff --git a/src/matrixOperations/division/Makefile.in b/src/matrixOperations/division/Makefile.in index b8c8001b..6b0bbdcd 100644 --- a/src/matrixOperations/division/Makefile.in +++ b/src/matrixOperations/division/Makefile.in @@ -56,10 +56,14 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) libMatrixDivision_la_LIBADD = am__objects_1 = am_libMatrixDivision_la_OBJECTS = $(am__objects_1) \ - libMatrixDivision_la-srdiva.lo libMatrixDivision_la-sldiva.lo \ - libMatrixDivision_la-drdiva.lo libMatrixDivision_la-dldiva.lo \ - libMatrixDivision_la-zrdiva.lo libMatrixDivision_la-zldiva.lo \ - libMatrixDivision_la-crdiva.lo libMatrixDivision_la-cldiva.lo + libMatrixDivision_la-srdivma.lo \ + libMatrixDivision_la-sldivma.lo \ + libMatrixDivision_la-drdivma.lo \ + libMatrixDivision_la-dldivma.lo \ + libMatrixDivision_la-zrdivma.lo \ + libMatrixDivision_la-zldivma.lo \ + libMatrixDivision_la-crdivma.lo \ + libMatrixDivision_la-cldivma.lo libMatrixDivision_la_OBJECTS = $(am_libMatrixDivision_la_OBJECTS) libMatrixDivision_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -219,14 +223,14 @@ instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libMatrixDivision.la HEAD = ../includes/matrixDivision.h libMatrixDivision_la_SOURCES = $(HEAD) \ - srdiva.c \ - sldiva.c \ - drdiva.c \ - dldiva.c \ - zrdiva.c \ - zldiva.c \ - crdiva.c \ - cldiva.c + srdivma.c \ + sldivma.c \ + drdivma.c \ + dldivma.c \ + zrdivma.c \ + zldivma.c \ + crdivma.c \ + cldivma.c check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ @@ -329,14 +333,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-cldiva.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-crdiva.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-dldiva.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-drdiva.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-sldiva.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-srdiva.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-zldiva.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-zrdiva.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-cldivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-crdivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-dldivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-drdivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-sldivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-srdivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-zldivma.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixDivision_la-zrdivma.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testMatrixLDivision-testMatrixLDivision.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testMatrixRDivision-testMatrixRDivision.Po@am__quote@ @@ -361,61 +365,61 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -libMatrixDivision_la-srdiva.lo: srdiva.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-srdiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-srdiva.Tpo -c -o libMatrixDivision_la-srdiva.lo `test -f 'srdiva.c' || echo '$(srcdir)/'`srdiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-srdiva.Tpo $(DEPDIR)/libMatrixDivision_la-srdiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='srdiva.c' object='libMatrixDivision_la-srdiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-srdivma.lo: srdivma.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-srdivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-srdivma.Tpo -c -o libMatrixDivision_la-srdivma.lo `test -f 'srdivma.c' || echo '$(srcdir)/'`srdivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-srdivma.Tpo $(DEPDIR)/libMatrixDivision_la-srdivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='srdivma.c' object='libMatrixDivision_la-srdivma.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) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-srdiva.lo `test -f 'srdiva.c' || echo '$(srcdir)/'`srdiva.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-srdivma.lo `test -f 'srdivma.c' || echo '$(srcdir)/'`srdivma.c -libMatrixDivision_la-sldiva.lo: sldiva.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-sldiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-sldiva.Tpo -c -o libMatrixDivision_la-sldiva.lo `test -f 'sldiva.c' || echo '$(srcdir)/'`sldiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-sldiva.Tpo $(DEPDIR)/libMatrixDivision_la-sldiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sldiva.c' object='libMatrixDivision_la-sldiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-sldivma.lo: sldivma.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-sldivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-sldivma.Tpo -c -o libMatrixDivision_la-sldivma.lo `test -f 'sldivma.c' || echo '$(srcdir)/'`sldivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-sldivma.Tpo $(DEPDIR)/libMatrixDivision_la-sldivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sldivma.c' object='libMatrixDivision_la-sldivma.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) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-sldiva.lo `test -f 'sldiva.c' || echo '$(srcdir)/'`sldiva.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-sldivma.lo `test -f 'sldivma.c' || echo '$(srcdir)/'`sldivma.c -libMatrixDivision_la-drdiva.lo: drdiva.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-drdiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-drdiva.Tpo -c -o libMatrixDivision_la-drdiva.lo `test -f 'drdiva.c' || echo '$(srcdir)/'`drdiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-drdiva.Tpo $(DEPDIR)/libMatrixDivision_la-drdiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drdiva.c' object='libMatrixDivision_la-drdiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-drdivma.lo: drdivma.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-drdivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-drdivma.Tpo -c -o libMatrixDivision_la-drdivma.lo `test -f 'drdivma.c' || echo '$(srcdir)/'`drdivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-drdivma.Tpo $(DEPDIR)/libMatrixDivision_la-drdivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drdivma.c' object='libMatrixDivision_la-drdivma.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) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-drdiva.lo `test -f 'drdiva.c' || echo '$(srcdir)/'`drdiva.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-drdivma.lo `test -f 'drdivma.c' || echo '$(srcdir)/'`drdivma.c -libMatrixDivision_la-dldiva.lo: dldiva.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-dldiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-dldiva.Tpo -c -o libMatrixDivision_la-dldiva.lo `test -f 'dldiva.c' || echo '$(srcdir)/'`dldiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-dldiva.Tpo $(DEPDIR)/libMatrixDivision_la-dldiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dldiva.c' object='libMatrixDivision_la-dldiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-dldivma.lo: dldivma.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-dldivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-dldivma.Tpo -c -o libMatrixDivision_la-dldivma.lo `test -f 'dldivma.c' || echo '$(srcdir)/'`dldivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-dldivma.Tpo $(DEPDIR)/libMatrixDivision_la-dldivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dldivma.c' object='libMatrixDivision_la-dldivma.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) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-dldiva.lo `test -f 'dldiva.c' || echo '$(srcdir)/'`dldiva.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-dldivma.lo `test -f 'dldivma.c' || echo '$(srcdir)/'`dldivma.c -libMatrixDivision_la-zrdiva.lo: zrdiva.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-zrdiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-zrdiva.Tpo -c -o libMatrixDivision_la-zrdiva.lo `test -f 'zrdiva.c' || echo '$(srcdir)/'`zrdiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-zrdiva.Tpo $(DEPDIR)/libMatrixDivision_la-zrdiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zrdiva.c' object='libMatrixDivision_la-zrdiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-zrdivma.lo: zrdivma.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-zrdivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-zrdivma.Tpo -c -o libMatrixDivision_la-zrdivma.lo `test -f 'zrdivma.c' || echo '$(srcdir)/'`zrdivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-zrdivma.Tpo $(DEPDIR)/libMatrixDivision_la-zrdivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zrdivma.c' object='libMatrixDivision_la-zrdivma.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) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-zrdiva.lo `test -f 'zrdiva.c' || echo '$(srcdir)/'`zrdiva.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-zrdivma.lo `test -f 'zrdivma.c' || echo '$(srcdir)/'`zrdivma.c -libMatrixDivision_la-zldiva.lo: zldiva.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-zldiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-zldiva.Tpo -c -o libMatrixDivision_la-zldiva.lo `test -f 'zldiva.c' || echo '$(srcdir)/'`zldiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-zldiva.Tpo $(DEPDIR)/libMatrixDivision_la-zldiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zldiva.c' object='libMatrixDivision_la-zldiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-zldivma.lo: zldivma.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-zldivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-zldivma.Tpo -c -o libMatrixDivision_la-zldivma.lo `test -f 'zldivma.c' || echo '$(srcdir)/'`zldivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-zldivma.Tpo $(DEPDIR)/libMatrixDivision_la-zldivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zldivma.c' object='libMatrixDivision_la-zldivma.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) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-zldiva.lo `test -f 'zldiva.c' || echo '$(srcdir)/'`zldiva.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-zldivma.lo `test -f 'zldivma.c' || echo '$(srcdir)/'`zldivma.c -libMatrixDivision_la-crdiva.lo: crdiva.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-crdiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-crdiva.Tpo -c -o libMatrixDivision_la-crdiva.lo `test -f 'crdiva.c' || echo '$(srcdir)/'`crdiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-crdiva.Tpo $(DEPDIR)/libMatrixDivision_la-crdiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='crdiva.c' object='libMatrixDivision_la-crdiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-crdivma.lo: crdivma.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-crdivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-crdivma.Tpo -c -o libMatrixDivision_la-crdivma.lo `test -f 'crdivma.c' || echo '$(srcdir)/'`crdivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-crdivma.Tpo $(DEPDIR)/libMatrixDivision_la-crdivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='crdivma.c' object='libMatrixDivision_la-crdivma.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) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-crdiva.lo `test -f 'crdiva.c' || echo '$(srcdir)/'`crdiva.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-crdivma.lo `test -f 'crdivma.c' || echo '$(srcdir)/'`crdivma.c -libMatrixDivision_la-cldiva.lo: cldiva.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-cldiva.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-cldiva.Tpo -c -o libMatrixDivision_la-cldiva.lo `test -f 'cldiva.c' || echo '$(srcdir)/'`cldiva.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-cldiva.Tpo $(DEPDIR)/libMatrixDivision_la-cldiva.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cldiva.c' object='libMatrixDivision_la-cldiva.lo' libtool=yes @AMDEPBACKSLASH@ +libMatrixDivision_la-cldivma.lo: cldivma.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -MT libMatrixDivision_la-cldivma.lo -MD -MP -MF $(DEPDIR)/libMatrixDivision_la-cldivma.Tpo -c -o libMatrixDivision_la-cldivma.lo `test -f 'cldivma.c' || echo '$(srcdir)/'`cldivma.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixDivision_la-cldivma.Tpo $(DEPDIR)/libMatrixDivision_la-cldivma.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cldivma.c' object='libMatrixDivision_la-cldivma.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) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-cldiva.lo `test -f 'cldiva.c' || echo '$(srcdir)/'`cldiva.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixDivision_la_CFLAGS) $(CFLAGS) -c -o libMatrixDivision_la-cldivma.lo `test -f 'cldivma.c' || echo '$(srcdir)/'`cldivma.c testMatrixLDivision-testMatrixLDivision.o: testMatrixLDivision.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testMatrixLDivision_CFLAGS) $(CFLAGS) -MT testMatrixLDivision-testMatrixLDivision.o -MD -MP -MF $(DEPDIR)/testMatrixLDivision-testMatrixLDivision.Tpo -c -o testMatrixLDivision-testMatrixLDivision.o `test -f 'testMatrixLDivision.c' || echo '$(srcdir)/'`testMatrixLDivision.c diff --git a/src/matrixOperations/division/testMatrixLDivision.c b/src/matrixOperations/division/testMatrixLDivision.c index 9b10c885..ad5bb9bd 100644 --- a/src/matrixOperations/division/testMatrixLDivision.c +++ b/src/matrixOperations/division/testMatrixLDivision.c @@ -25,7 +25,7 @@ #define ZCOLUMNS2 1 -static void sldivaTest ( void ){ +static void sldivmaTest ( void ){ int i = 0; float in1[] = { 4.0f , 3.0f , 8.0f , 9.0f } ; @@ -35,7 +35,7 @@ static void sldivaTest ( void ){ float out [(COLUMNS2)*(LINES)] ; - sldiva( in1 , LINES , COLUMNS1 , in2 , LINES , COLUMNS2 , out ) ; + sldivma( in1 , LINES , COLUMNS1 , in2 , LINES , COLUMNS2 , out ) ; for ( i = 0 ; i < LINES *COLUMNS2 ; i++ ) { printf ( "\t\t %d out : %e\tresult : %e\tassert : %e \n" , i , out[i] , result[i] , fabs ( out[i] - result[i] ) / fabs( out[i]) ) ; @@ -48,7 +48,7 @@ static void sldivaTest ( void ){ } -static void dldivaTest ( void ) +static void dldivmaTest ( void ) { int i = 0 ; /* here the matrixes are linearized in the wrong way so need to transpose them */ @@ -282,7 +282,7 @@ static void dldivaTest ( void ) double out [(COLUMNS2)*(LINES)] ; - dldiva( in1 , LINES , COLUMNS1 , in2 , LINES , COLUMNS2 , out ) ; + dldivma( in1 , LINES , COLUMNS1 , in2 , LINES , COLUMNS2 , out ) ; for ( i = 0 ; i < LINES *COLUMNS2 ; i++ ) { printf ( "\t\t %d out : %e\tresult : %e\tassert : %e \n" , i , out[i] , result[i] , fabs ( out[i] - result[i] ) / fabs( out[i]) ) ; @@ -294,7 +294,7 @@ static void dldivaTest ( void ) -static void cldivaTest (void ) +static void cldivmaTest (void ) { int i = 0 ; @@ -323,7 +323,7 @@ static void cldivaTest (void ) Result[2] = FloatComplex ( -1.16666666f , 0 ); Result[3] = FloatComplex ( 0.833333333333f , 0 );*/ - cldiva ( in1 , ZLINES , ZCOLUMNS1 , in2 ,ZLINES , ZCOLUMNS2 , out) ; + cldivma ( in1 , ZLINES , ZCOLUMNS1 , in2 ,ZLINES , ZCOLUMNS2 , out) ; for ( i = 0 ; i < (ZCOLUMNS1*ZCOLUMNS2 ) ; i++ ) { @@ -354,7 +354,7 @@ static void cldivaTest (void ) -static void zldivaTest (void ) +static void zldivmaTest (void ) { int i = 0 ; @@ -383,7 +383,7 @@ static void zldivaTest (void ) Result[2] = DoubleComplex ( -1.16666666 , 0 ); Result[3] = DoubleComplex ( 0.833333333333 , 0 ); */ - zldiva ( in1 , ZLINES , ZCOLUMNS1 , in2 ,ZLINES , ZCOLUMNS2 , out) ; + zldivma ( in1 , ZLINES , ZCOLUMNS1 , in2 ,ZLINES , ZCOLUMNS2 , out) ; for ( i = 0 ; i < (ZCOLUMNS1*ZCOLUMNS2 ) ; i++ ) { @@ -411,7 +411,7 @@ static void zldivaTest (void ) -static int testLDiva (void) { +static int testLDivma (void) { printf ("&&&& WARNING , TESTS FOR COMPLEX ARE STILL WRONG &&&&&&\n\n" ) ; printf("\n\n\n\n*********************\n"); @@ -419,23 +419,23 @@ static int testLDiva (void) { printf("*********************\n"); printf("\n\t>>>>Float real Tests\n"); - sldivaTest(); + sldivmaTest(); printf("\n\n\n\t>>>> Double real Tests\n"); - dldivaTest(); + dldivmaTest(); printf("\n\t>>>> Double complex Tests\n"); - zldivaTest(); + zldivmaTest(); printf("\n\t>>>> Float complex Tests\n"); - cldivaTest(); + cldivmaTest(); return 0; } int main(void) { - assert(testLDiva () == 0); + assert(testLDivma () == 0); return 0; } diff --git a/src/matrixOperations/division/testMatrixRDivision.c b/src/matrixOperations/division/testMatrixRDivision.c index 884bbc35..a6947377 100644 --- a/src/matrixOperations/division/testMatrixRDivision.c +++ b/src/matrixOperations/division/testMatrixRDivision.c @@ -26,7 +26,7 @@ -static void sdivaTest ( void ) +static void sdivmaTest ( void ) { int i = 0 ; /* @@ -220,7 +220,7 @@ float out[(COLUMNS)*(LINES2)] ;*/ - srdiva ( in1 , LINES1 , COLUMNS , in2 , LINES2 , COLUMNS , out) ; + srdivma ( in1 , LINES1 , COLUMNS , in2 , LINES2 , COLUMNS , out) ; for ( i = 0 ; i < LINES2 *COLUMNS ; ++i ) { @@ -237,7 +237,7 @@ float out[(COLUMNS)*(LINES2)] ;*/ -static void drdivaTest ( void ) +static void drdivmaTest ( void ) { int i = 0 ; @@ -251,7 +251,7 @@ static void drdivaTest ( void ) double result[] = { 1 , 2.2 }; double out [(COLUMNS)*(LINES2)] ; - drdiva ( in1 , LINES1 , COLUMNS , in2 , LINES2 , COLUMNS , out) ; + drdivma ( in1 , LINES1 , COLUMNS , in2 , LINES2 , COLUMNS , out) ; for ( i = 0 ; i < LINES2 *COLUMNS ; i++ ) { printf ( "\t\t %d out : %e result : %e assert : %e \n" , @@ -262,7 +262,7 @@ static void drdivaTest ( void ) } -static void crdivaTest (void ) +static void crdivmaTest (void ) { int i = 0 ; @@ -282,7 +282,7 @@ static void crdivaTest (void ) Result[0] = FloatComplex ( 1.0f , 0 ); Result[1] = FloatComplex ( 2.2f , 0 ); - crdiva ( in1 , ZLINES1 , ZCOLUMNS , in2 ,ZLINES2 , ZCOLUMNS , out) ; + crdivma ( in1 , ZLINES1 , ZCOLUMNS , in2 ,ZLINES2 , ZCOLUMNS , out) ; for ( i = 0 ; i < (ZLINES2*ZCOLUMNS ) ; i++ ) { @@ -310,7 +310,7 @@ static void crdivaTest (void ) -static void zrdivaTest ( void ){ +static void zrdivmaTest ( void ){ int i = 0 ; /* double tin1 [] = @@ -423,7 +423,7 @@ static void zrdivaTest ( void ){ Result[0] = DoubleComplex ( 1 , 0 ); Result[1] = DoubleComplex ( 2.2 , 0 ); - zrdiva ( in1 , ZLINES1 , ZCOLUMNS , in2 ,ZLINES2 , ZCOLUMNS , out) ; + zrdivma ( in1 , ZLINES1 , ZCOLUMNS , in2 ,ZLINES2 , ZCOLUMNS , out) ; for ( i = 0 ; i < (ZLINES2*ZCOLUMNS ) ; i++ ) { @@ -448,28 +448,28 @@ static void zrdivaTest ( void ){ } } -static int testRDiva (void) { +static int testRDivma (void) { printf("\n\n\n\n**********************\n"); printf("***** Right Tests ****\n"); printf("**********************\n"); printf("\n\t>>>> Float real Tests\n"); - sdivaTest(); + sdivmaTest(); printf("\n\n\n\n\t>>>> Double real Tests\n"); - drdivaTest(); + drdivmaTest(); printf("\n\t>>>> Float complex Tests\n"); - crdivaTest(); + crdivmaTest(); printf("\n\t>>>> Double complex Tests\n"); - zrdivaTest(); + zrdivmaTest(); return 0; } int main(void) { - assert(testRDiva () == 0); + assert(testRDivma () == 0); return 0; } diff --git a/src/matrixOperations/expm/Makefile.am b/src/matrixOperations/expm/Makefile.am index a369b489..77ece94e 100644 --- a/src/matrixOperations/expm/Makefile.am +++ b/src/matrixOperations/expm/Makefile.am @@ -61,6 +61,8 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/matrixOperations/eye/libMatrixEye.la \ $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/lib/blas/libsciblas.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ + $(top_builddir)/operations/division/libDivision.la \ libMatrixExponential.la check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/matrixOperations/expm/Makefile.in b/src/matrixOperations/expm/Makefile.in index 91eeb14c..53760dc0 100644 --- a/src/matrixOperations/expm/Makefile.in +++ b/src/matrixOperations/expm/Makefile.in @@ -247,6 +247,8 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/matrixOperations/eye/libMatrixEye.la \ $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/lib/blas/libsciblas.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ + $(top_builddir)/operations/division/libDivision.la \ libMatrixExponential.la check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/matrixOperations/expm/cexpma.c b/src/matrixOperations/expm/cexpma.c index b58855dd..fd73ea85 100644 --- a/src/matrixOperations/expm/cexpma.c +++ b/src/matrixOperations/expm/cexpma.c @@ -1,5 +1,4 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab +/* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab * Copyright (C) 2008-2008 - INRIA - Allan SIMON * * This file must be used under the terms of the CeCILL. @@ -60,7 +59,7 @@ void cexpma(floatComplex * in, floatComplex * out, int _iLeadDim) /*A = A./2^s */ for ( iIndex1 = 0 ; iIndex1 < iSquare ; iIndex1++ ) - pfltMatrixA[iIndex1] = cdevides ( in[iIndex1] , FloatComplex ( fltS2 , 0 )); + pfltMatrixA[iIndex1] = cdivides ( in[iIndex1] , FloatComplex ( fltS2 , 0 )); /* Pade approximation for exp(A) @@ -136,7 +135,7 @@ void cexpma(floatComplex * in, floatComplex * out, int _iLeadDim) pfltMatrixTemp[iIndex1] = out[iIndex1] ; /* E = D\E */ - cldiva ( pfltMatrixD , _iLeadDim , _iLeadDim , pfltMatrixTemp , _iLeadDim , _iLeadDim , out ) ; + cldivma ( pfltMatrixD , _iLeadDim , _iLeadDim , pfltMatrixTemp , _iLeadDim , _iLeadDim , out ) ; /*/ Undo scaling by repeated squaring */ for(iLoop1 = 0 ; iLoop1 < fltS ; iLoop1++) diff --git a/src/matrixOperations/expm/dexpma.c b/src/matrixOperations/expm/dexpma.c index b8616d81..df25146c 100644 --- a/src/matrixOperations/expm/dexpma.c +++ b/src/matrixOperations/expm/dexpma.c @@ -127,7 +127,7 @@ void dexpma (double* in, double* out, int _iLeadDim){ pdblMatrixTemp[iIndex1] = out[iIndex1] ; /*E = D\E*/ - dldiva ( pdblMatrixD , _iLeadDim , _iLeadDim , pdblMatrixTemp , _iLeadDim , _iLeadDim , out ); + dldivma ( pdblMatrixD , _iLeadDim , _iLeadDim , pdblMatrixTemp , _iLeadDim , _iLeadDim , out ); /* Undo scaling by repeated squaring*/ for(iLoop1 = 0 ; iLoop1 < dblS ; iLoop1++) diff --git a/src/matrixOperations/expm/sexpma.c b/src/matrixOperations/expm/sexpma.c index 7bc1e91b..77a1e43a 100644 --- a/src/matrixOperations/expm/sexpma.c +++ b/src/matrixOperations/expm/sexpma.c @@ -131,7 +131,7 @@ void sexpma (float* in, float* out, int _iLeadDim){ pfltMatrixTemp[iIndex1] = out[iIndex1] ; /*E = D\E*/ - sldiva ( pfltMatrixD , _iLeadDim , _iLeadDim , pfltMatrixTemp , _iLeadDim , _iLeadDim , out ); + sldivma ( pfltMatrixD , _iLeadDim , _iLeadDim , pfltMatrixTemp , _iLeadDim , _iLeadDim , out ); /* Undo scaling by repeated squaring*/ for(iLoop1 = 0 ; iLoop1 < fltS ; iLoop1++) diff --git a/src/matrixOperations/expm/zexpma.c b/src/matrixOperations/expm/zexpma.c index 331238d4..fcbb8222 100644 --- a/src/matrixOperations/expm/zexpma.c +++ b/src/matrixOperations/expm/zexpma.c @@ -61,7 +61,7 @@ void zexpma(doubleComplex * in, doubleComplex * out, int _iLeadDim) /*A = A./2^s */ for ( iIndex1 = 0 ; iIndex1 < iSquare ; iIndex1++ ) - pdblMatrixA[iIndex1] = zdevides ( in[iIndex1] , DoubleComplex ( dblS2 , 0 )); + pdblMatrixA[iIndex1] = zdivides ( in[iIndex1] , DoubleComplex ( dblS2 , 0 )); /* Pade approximation for exp(A) @@ -140,7 +140,7 @@ void zexpma(doubleComplex * in, doubleComplex * out, int _iLeadDim) pdblMatrixTemp[iIndex1] = out[iIndex1] ; /* E = D\E */ - zldiva ( pdblMatrixD , _iLeadDim , _iLeadDim , pdblMatrixTemp , _iLeadDim , _iLeadDim , out ) ; + zldivma ( pdblMatrixD , _iLeadDim , _iLeadDim , pdblMatrixTemp , _iLeadDim , _iLeadDim , out ) ; /*/ Undo scaling by repeated squaring */ for(iLoop1 = 0 ; iLoop1 < dblS ; iLoop1++) diff --git a/src/matrixOperations/includes/matrixDivision.h b/src/matrixOperations/includes/matrixDivision.h index 38fc9634..55006c54 100644 --- a/src/matrixOperations/includes/matrixDivision.h +++ b/src/matrixOperations/includes/matrixDivision.h @@ -23,37 +23,37 @@ #include "max.h" -void srdiva ( float* in1, int lines1, int columns1 , +void srdivma ( float* in1, int lines1, int columns1 , float* in2, int lines2, int columns2 , float* out ); -void sldiva ( float* in1, int lines1, int columns1 , +void sldivma ( float* in1, int lines1, int columns1 , float* in2, int lines2, int columns2 , float* out ); -void drdiva ( double* in1, int lines1, int columns1 , +void drdivma ( double* in1, int lines1, int columns1 , double* in2, int lines2, int columns2 , double* out ); -void dldiva ( double* in1, int lines1, int columns1 , +void dldivma ( double* in1, int lines1, int columns1 , double* in2, int lines2, int columns2 , double* out ); -void zrdiva( doubleComplex* in1, int lines1, int columns1 , +void zrdivma( doubleComplex* in1, int lines1, int columns1 , doubleComplex* in2, int lines2, int columns2 , doubleComplex* out ); -void zldiva( doubleComplex* in1, int lines1, int columns1 , +void zldivma( doubleComplex* in1, int lines1, int columns1 , doubleComplex* in2, int lines2, int columns2 , doubleComplex* out ); -void crdiva( floatComplex* in1, int lines1, int columns1 , +void crdivma( floatComplex* in1, int lines1, int columns1 , floatComplex* in2, int lines2, int columns2 , floatComplex* out ); -void cldiva( floatComplex* in1, int lines1, int columns1 , +void cldivma( floatComplex* in1, int lines1, int columns1 , floatComplex* in2, int lines2, int columns2 , floatComplex* out ); diff --git a/src/matrixOperations/includes/matrixExponential.h b/src/matrixOperations/includes/matrixExponential.h index aceed63b..44b89a68 100644 --- a/src/matrixOperations/includes/matrixExponential.h +++ b/src/matrixOperations/includes/matrixExponential.h @@ -28,7 +28,7 @@ #include "eye.h" #include "infiniteNorm.h" #include "frexp.h" - +#include "division.h" void sexpma (float* in, float* out, int _iLeadDim); diff --git a/src/matrixOperations/includes/matrixMultiplication.h b/src/matrixOperations/includes/matrixMultiplication.h index b2620498..99091a7e 100644 --- a/src/matrixOperations/includes/matrixMultiplication.h +++ b/src/matrixOperations/includes/matrixMultiplication.h @@ -13,8 +13,7 @@ #ifndef __MATRIXMULTIPLICATION_H__ #define __MATRIXMULTIPLICATION_H__ -#include "floatComplex.h" -#include "doubleComplex.h" +#include "multiplication.h" #include "addition.h" /* diff --git a/src/matrixOperations/infiniteNorm/Makefile.am b/src/matrixOperations/infiniteNorm/Makefile.am index 36da5130..0fae9268 100644 --- a/src/matrixOperations/infiniteNorm/Makefile.am +++ b/src/matrixOperations/infiniteNorm/Makefile.am @@ -41,6 +41,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ libMatrixInfiniteNorm.la check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/matrixOperations/infiniteNorm/Makefile.in b/src/matrixOperations/infiniteNorm/Makefile.in index 605e9619..d93ce6a9 100644 --- a/src/matrixOperations/infiniteNorm/Makefile.in +++ b/src/matrixOperations/infiniteNorm/Makefile.in @@ -227,6 +227,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ libMatrixInfiniteNorm.la check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/matrixOperations/multiplication/Makefile.am b/src/matrixOperations/multiplication/Makefile.am index 2e88893f..fc852e4f 100644 --- a/src/matrixOperations/multiplication/Makefile.am +++ b/src/matrixOperations/multiplication/Makefile.am @@ -32,6 +32,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ $(top_builddir)/operations/addition/libAddition.la \ $(top_builddir)/lib/blas/libsciblas.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ libMatrixMultiplication.la check_INCLUDES = -I $(top_builddir)/type \ @@ -43,4 +44,4 @@ testMatrixMultiplication_SOURCES = testFloatMatrixMultiplication.c \ testMatrixMultiplication_LDADD = $(check_LDADD) testMatrixMultiplication_CFLAGS = $(check_INCLUDES) -TESTS = testMatrixMultiplication
\ No newline at end of file +TESTS = testMatrixMultiplication diff --git a/src/matrixOperations/multiplication/Makefile.in b/src/matrixOperations/multiplication/Makefile.in index 50ed8661..6ac07df7 100644 --- a/src/matrixOperations/multiplication/Makefile.in +++ b/src/matrixOperations/multiplication/Makefile.in @@ -220,6 +220,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ $(top_builddir)/operations/addition/libAddition.la \ $(top_builddir)/lib/blas/libsciblas.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ libMatrixMultiplication.la check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/matrixOperations/multiplication/testFloatMatrixMultiplication.c b/src/matrixOperations/multiplication/testFloatMatrixMultiplication.c index 6091fc66..6e83c573 100644 --- a/src/matrixOperations/multiplication/testFloatMatrixMultiplication.c +++ b/src/matrixOperations/multiplication/testFloatMatrixMultiplication.c @@ -194,6 +194,8 @@ static void smulmaTest(void) { assert(miscM7_by_M8[7] == 34.0f); assert(miscM7_by_M8[8] == 44.0f); + + } int testFloatMultiplication(void) { |