summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAdam NAILI2017-12-10 11:37:22 +0100
committerAdam NAILI2017-12-10 11:37:22 +0100
commit14808ee3083f788fd84c898632407c4d4b4e50d8 (patch)
tree784bed8f4b8dae5e0b8933e08ddbb4a4c4253b79 /include
parent16b67f89eccc78ed6d04f889cae8c2e5c2a3b49d (diff)
parent7beb6bfadb504f8d1d7c1d069986e9eb9cd32673 (diff)
downloadmorpher-14808ee3083f788fd84c898632407c4d4b4e50d8.tar.gz
Merge remote-tracking branch 'origin/master' into gui
Diffstat (limited to 'include')
-rw-r--r--include/common/geom.h12
-rw-r--r--include/common/matrix.h6
2 files changed, 15 insertions, 3 deletions
diff --git a/include/common/geom.h b/include/common/geom.h
index 4445998..a843c76 100644
--- a/include/common/geom.h
+++ b/include/common/geom.h
@@ -15,16 +15,24 @@
15typedef int32_t IntVector; 15typedef int32_t IntVector;
16 16
17/** 17/**
18 * Type: CartesianVector 18 * Struct: CartesianVector
19 * An abstract 2-D vector in cartesian coordinates. 19 * An abstract 2-D vector in cartesian coordinates.
20 *
21 * Fields:
22 * x - the horizontal component
23 * y - the vertical component
20 */ 24 */
21typedef struct { 25typedef struct {
22 IntVector x, y; 26 IntVector x, y;
23} CartesianVector; 27} CartesianVector;
24 28
25/** 29/**
26 * Type: CartesianMapping 30 * Struct: CartesianMapping
27 * A tuple of cartesian vectors representing a mapping. 31 * A tuple of cartesian vectors representing a mapping.
32 *
33 * Fields:
34 * origin - preimage vector
35 * target - image vector
28 */ 36 */
29typedef struct { 37typedef struct {
30 CartesianVector origin, target; 38 CartesianVector origin, target;
diff --git a/include/common/matrix.h b/include/common/matrix.h
index 726a8ab..fe4a12a 100644
--- a/include/common/matrix.h
+++ b/include/common/matrix.h
@@ -12,8 +12,12 @@
12#include "geom.h" 12#include "geom.h"
13 13
14/** 14/**
15 * Type: IntSquareMatrix 15 * Struct: IntSquareMatrix
16 * Represents a square integer matrix. 16 * Represents a square integer matrix.
17 *
18 * Fields:
19 * **elements - NULL-terminated array of element pointers
20 * dim - dimension
17 */ 21 */
18typedef struct { 22typedef struct {
19 IntVector **elements; 23 IntVector **elements;