X-Git-Url: https://git.aubio.org/?p=aubio.git;a=blobdiff_plain;f=tests%2Fsrc%2Ftest-fmat.c;h=fea911f504d5fbc87cf6b37cc1c37b03831219f3;hp=ab8b27460ed5f913710face662690656346d6859;hb=fce8496404e1272b3960f1bbc7e59ee5288f6ec4;hpb=158e031b2ce797901e8e4f39ad185c008e4103c2

diff --git a/tests/src/test-fmat.c b/tests/src/test-fmat.c
index ab8b2746..fea911f5 100644
--- a/tests/src/test-fmat.c
+++ b/tests/src/test-fmat.c
@@ -1,30 +1,96 @@
-#include <aubio.h>
-#include <assert.h>
+#include "aubio.h"
+#include "utils_tests.h"
 
 // create a new matrix and fill it with i * 1. + j * .1, where i is the row,
 // and j the column.
 
-int main (void)
+void assert_fmat_all_equal(fmat_t *mat, smpl_t scalar)
 {
-  uint_t height = 3, length = 9, i, j;
-  // create fmat_t object
-  fmat_t * mat = new_fmat (height, length);
+  uint_t i, j;
   for ( i = 0; i < mat->height; i++ ) {
     for ( j = 0; j < mat->length; j++ ) {
+      assert(mat->data[i][j] == scalar);
+    }
+  }
+}
+
+int main (void)
+{
+  uint_t i, j;
+  uint_t height = 3, length = 9;
+
+  // create fmat_t object
+  fmat_t * mat = new_fmat(height, length);
+  fmat_t * other_mat = new_fmat(height, length);
+
+  assert(mat);
+  assert(other_mat);
+
+  assert(mat->length == length);
+  assert(mat->height == height);
+
+  for (i = 0; i < mat->height; i++) {
+    for (j = 0; j < mat->length; j++) {
       // all elements are already initialized to 0.
       assert(mat->data[i][j] == 0);
       // setting element of row i, column j
-      mat->data[i][j] = i * 1. + j *.1;
+      mat->data[i][j] = i * 10. + j;
+    }
+  }
+
+  // print out matrix
+  fmat_print(mat);
+
+  // helpers
+  fmat_rev(mat);
+  fmat_print(mat);
+  for (i = 0; i < mat->height; i++) {
+    for (j = 0; j < mat->length; j++) {
+      assert(mat->data[i][j] == i * 10. + mat->length - 1. - j);
     }
   }
+
+  fmat_set_sample(mat, 3, 1, 1);
+  assert(fmat_get_sample(mat, 1, 1) == 3.);
+
+  fmat_ones(mat);
+  assert_fmat_all_equal(mat, 1.);
+
+  fmat_set(other_mat, .5);
+  assert_fmat_all_equal(other_mat, .5);
+
+  fmat_weight(mat, other_mat);
+  assert_fmat_all_equal(mat, .5);
+
   fvec_t channel_onstack;
   fvec_t *channel = &channel_onstack;
   fmat_get_channel(mat, 1, channel);
-  fvec_print (channel);
-  // print out matrix
-  fmat_print(mat);
-  // destroy it
-  del_fmat(mat);
+  assert(channel->data == mat->data[1]);
+
+  // copy of the same size
+  fmat_copy(mat, other_mat);
+  del_fmat(other_mat);
+
+  // copy to undersized
+  other_mat = new_fmat(height - 1, length);
+  fmat_copy(mat, other_mat);
+  del_fmat(other_mat);
+
+  // copy from undersized
+  other_mat = new_fmat(height, length + 1);
+  fmat_copy(mat, other_mat);
+
+  // wrong parameters
+  assert(new_fmat(-1, length) == NULL);
+  assert(new_fmat(height, -1) == NULL);
+
+  // methods for wrappers with opaque structure
+  assert (fmat_get_channel_data(mat, 0) == mat->data[0]);
+  assert (fmat_get_data(mat) == mat->data);
+
+  if (mat)
+    del_fmat(mat);
+  if (other_mat)
+    del_fmat(other_mat);
   return 0;
 }
-