projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ONEWAY: Fix printf format specifier.
[pspp]
/
src
/
data
/
datasheet.h
diff --git
a/src/data/datasheet.h
b/src/data/datasheet.h
index 3d106193d1cd393bec14297a392bb68bac983604..ab6c28d80af56697d18151ac7884106487b7ebfb 100644
(file)
--- a/
src/data/datasheet.h
+++ b/
src/data/datasheet.h
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007
, 2009, 2011
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,20
+17,24
@@
#ifndef DATA_DATASHEET_H
#define DATA_DATASHEET_H 1
#ifndef DATA_DATASHEET_H
#define DATA_DATASHEET_H 1
-#include
<data/case.h>
-#include
<data/value.h>
+#include
"data/case.h"
+#include
"data/value.h"
+struct caseproto;
struct casereader;
struct casereader;
-/* A datasheet is a 2-d array of
data that may be stored in
- memory or on disk. It efficiently supports data storage and
- retrieval, as well as adding, removing, and rearranging both
- rows and columns. */
+/* A datasheet is a 2-d array of
"union value"s that may be
+ stored in memory or on disk. It efficiently supports data
+ storage and retrieval, as well as adding, removing, and
+ r
earranging both r
ows and columns. */
struct datasheet *datasheet_create (struct casereader *);
void datasheet_destroy (struct datasheet *);
struct datasheet *datasheet_rename (struct datasheet *);
struct datasheet *datasheet_create (struct casereader *);
void datasheet_destroy (struct datasheet *);
struct datasheet *datasheet_rename (struct datasheet *);
+const struct caseproto *datasheet_get_proto (const struct datasheet *);
+int datasheet_get_column_width (const struct datasheet *, size_t column);
+
bool datasheet_error (const struct datasheet *);
void datasheet_force_error (struct datasheet *);
const struct taint *datasheet_get_taint (const struct datasheet *);
bool datasheet_error (const struct datasheet *);
void datasheet_force_error (struct datasheet *);
const struct taint *datasheet_get_taint (const struct datasheet *);
@@
-38,19
+42,22
@@
const struct taint *datasheet_get_taint (const struct datasheet *);
struct casereader *datasheet_make_reader (struct datasheet *);
/* Columns. */
struct casereader *datasheet_make_reader (struct datasheet *);
/* Columns. */
-size_t datasheet_get_column_cnt (const struct datasheet *);
-bool datasheet_insert_columns (struct datasheet *,
- const union value[], size_t cnt,
- size_t before);
+size_t datasheet_get_n_columns (const struct datasheet *);
+bool datasheet_insert_column (struct datasheet *,
+ const union value *, int width, size_t before);
void datasheet_delete_columns (struct datasheet *, size_t start, size_t cnt);
void datasheet_move_columns (struct datasheet *,
size_t old_start, size_t new_start,
size_t cnt);
void datasheet_delete_columns (struct datasheet *, size_t start, size_t cnt);
void datasheet_move_columns (struct datasheet *,
size_t old_start, size_t new_start,
size_t cnt);
+bool datasheet_resize_column (struct datasheet *, size_t column, int new_width,
+ void (*resize_cb) (const union value *,
+ union value *, void *aux),
+ void *aux);
/* Rows. */
/* Rows. */
-casenumber datasheet_get_
row_cnt
(const struct datasheet *);
+casenumber datasheet_get_
n_rows
(const struct datasheet *);
bool datasheet_insert_rows (struct datasheet *,
bool datasheet_insert_rows (struct datasheet *,
- casenumber before, struct ccase[],
+ casenumber before, struct ccase
*
[],
casenumber cnt);
void datasheet_delete_rows (struct datasheet *,
casenumber first, casenumber cnt);
casenumber cnt);
void datasheet_delete_rows (struct datasheet *,
casenumber first, casenumber cnt);
@@
-59,28
+66,15
@@
void datasheet_move_rows (struct datasheet *,
size_t cnt);
/* Data. */
size_t cnt);
/* Data. */
-
bool datasheet_get_row (const struct datasheet *, casenumber, struct ccase *
);
+
struct ccase *datasheet_get_row (const struct datasheet *, casenumber
);
bool datasheet_put_row (struct datasheet *, casenumber, struct ccase *);
bool datasheet_get_value (const struct datasheet *, casenumber, size_t column,
bool datasheet_put_row (struct datasheet *, casenumber, struct ccase *);
bool datasheet_get_value (const struct datasheet *, casenumber, size_t column,
- union value *
, int width
);
+ union value *);
bool datasheet_put_value (struct datasheet *, casenumber, size_t column,
bool datasheet_put_value (struct datasheet *, casenumber, size_t column,
- const union value *, int width);
-
-/* Testing. */
-struct mc_options;
-
-struct datasheet_test_params
- {
- /* Parameters. */
- int max_rows;
- int max_cols;
- int backing_rows;
- int backing_cols;
+ const union value *);
- /* State. */
- int next_value;
- };
-struct mc_results *datasheet_test (struct mc_options *options, void *params);
+unsigned int hash_datasheet (const struct datasheet *ds);
+struct datasheet *clone_datasheet (const struct datasheet *ds);
#endif /* data/datasheet.h */
#endif /* data/datasheet.h */