Merge branch 'maint'

[platform/upstream/isl.git] / isl_vec.c

diff --git a/isl_vec.c b/isl_vec.c
index d380f7f..61bd57f 100644 (file)
--- a/isl_vec.c
+++ b/isl_vec.c
@@ -7,8 +7,14 @@
  * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium
  */
 
-#include "isl_seq.h"
-#include "isl_vec.h"
+#include <isl_ctx_private.h>
+#include <isl/seq.h>
+#include <isl/vec.h>
+
+isl_ctx *isl_vec_get_ctx(__isl_keep isl_vec *vec)
+{
+       return vec ? vec->ctx : NULL;
+}
 
 struct isl_vec *isl_vec_alloc(struct isl_ctx *ctx, unsigned size)
 {
@@ -128,22 +134,60 @@ void isl_vec_free(struct isl_vec *vec)
        free(vec);
 }
 
-void isl_vec_dump(struct isl_vec *vec, FILE *out, int indent)
+int isl_vec_is_equal(__isl_keep isl_vec *vec1, __isl_keep isl_vec *vec2)
+{
+       if (!vec1 || !vec2)
+               return -1;
+
+       if (vec1->size != vec2->size)
+               return 0;
+
+       return isl_seq_eq(vec1->el, vec2->el, vec1->size);
+}
+
+__isl_give isl_printer *isl_printer_print_vec(__isl_take isl_printer *printer,
+       __isl_keep isl_vec *vec)
 {
        int i;
 
-       if (!vec) {
-               fprintf(out, "%*snull vec\n", indent, "");
-               return;
-       }
+       if (!printer || !vec)
+               goto error;
 
-       fprintf(out, "%*s[", indent, "");
+       printer = isl_printer_print_str(printer, "[");
        for (i = 0; i < vec->size; ++i) {
                if (i)
-                   fprintf(out, ",");
-               isl_int_print(out, vec->el[i], 0);
+                       printer = isl_printer_print_str(printer, ",");
+               printer = isl_printer_print_isl_int(printer, vec->el[i]);
        }
-       fprintf(out, "]\n");
+       printer = isl_printer_print_str(printer, "]");
+
+       return printer;
+error:
+       isl_printer_free(printer);
+       return NULL;
+}
+
+void isl_vec_dump(struct isl_vec *vec)
+{
+       isl_printer *printer;
+
+       if (!vec)
+               return;
+
+       printer = isl_printer_to_file(vec->ctx, stderr);
+       printer = isl_printer_print_vec(printer, vec);
+       printer = isl_printer_end_line(printer);
+
+       isl_printer_free(printer);
+}
+
+__isl_give isl_vec *isl_vec_clr(__isl_take isl_vec *vec)
+{
+       vec = isl_vec_cow(vec);
+       if (!vec)
+               return NULL;
+       isl_seq_clr(vec->el, vec->size);
+       return vec;
 }
 
 void isl_vec_lcm(struct isl_vec *vec, isl_int *lcm)
@@ -175,6 +219,15 @@ struct isl_vec *isl_vec_normalize(struct isl_vec *vec)
        return vec;
 }
 
+__isl_give isl_vec *isl_vec_neg(__isl_take isl_vec *vec)
+{
+       vec = isl_vec_cow(vec);
+       if (!vec)
+               return NULL;
+       isl_seq_neg(vec->el, vec->el, vec->size);
+       return vec;
+}
+
 __isl_give isl_vec *isl_vec_scale(__isl_take isl_vec *vec, isl_int m)
 {
        if (isl_int_is_one(m))
@@ -205,3 +258,87 @@ error:
        isl_vec_free(vec2);
        return NULL;
 }
+
+static int qsort_int_cmp(const void *p1, const void *p2)
+{
+       const isl_int *i1 = (const isl_int *) p1;
+       const isl_int *i2 = (const isl_int *) p2;
+
+       return isl_int_cmp(*i1, *i2);
+}
+
+__isl_give isl_vec *isl_vec_sort(__isl_take isl_vec *vec)
+{
+       if (!vec)
+               return NULL;
+       
+       qsort(vec->el, vec->size, sizeof(*vec->el), &qsort_int_cmp);
+
+       return vec;
+}
+
+__isl_give isl_vec *isl_vec_drop_els(__isl_take isl_vec *vec,
+       unsigned pos, unsigned n)
+{
+       if (n == 0)
+               return vec;
+       vec = isl_vec_cow(vec);
+       if (!vec)
+               return NULL;
+
+       if (pos + n > vec->size)
+               isl_die(vec->ctx, isl_error_invalid,
+                       "range out of bounds", goto error);
+
+       if (pos + n != vec->size)
+               isl_seq_cpy(vec->el + pos, vec->el + pos + n,
+                           vec->size - pos - n);
+
+       vec->size -= n;
+       
+       return vec;
+error:
+       isl_vec_free(vec);
+       return NULL;
+}
+
+__isl_give isl_vec *isl_vec_insert_els(__isl_take isl_vec *vec,
+       unsigned pos, unsigned n)
+{
+       isl_vec *ext = NULL;
+
+       if (n == 0)
+               return vec;
+       if (!vec)
+               return NULL;
+
+       if (pos > vec->size)
+               isl_die(vec->ctx, isl_error_invalid,
+                       "position out of bounds", goto error);
+
+       ext =  isl_vec_alloc(vec->ctx, vec->size + n);
+       if (!ext)
+               goto error;
+
+       isl_seq_cpy(ext->el, vec->el, pos);
+       isl_seq_cpy(ext->el + pos + n, vec->el + pos, vec->size - pos);
+
+       isl_vec_free(vec);
+       return ext;
+error:
+       isl_vec_free(vec);
+       isl_vec_free(ext);
+       return NULL;
+}
+
+__isl_give isl_vec *isl_vec_insert_zero_els(__isl_take isl_vec *vec,
+       unsigned pos, unsigned n)
+{
+       vec = isl_vec_insert_els(vec, pos, n);
+       if (!vec)
+               return NULL;
+
+       isl_seq_clr(vec->el + pos, n);
+
+       return vec;
+}