First steps of building the index.

Signed-off-by: Heikki Salo <[email protected]>

Author: deggis

Makefile

@@ -0,0 +1,4 @@
+all: rasterize
+
+rasterize: rasterize.c rasterize.h
+	gcc rasterize.c -o rasterize -lm -Wall

rasterize.c

@@ -19,30 +19,29 @@
  *                                      
  */
 
-// void append(Point** node, Point* new) {
-//     if( *node == 0 ) {
-//         *node = malloc(sizeof(PointNode));
-//         *node->p = *new;
-//         *node->next = 0;
-//     } else {
-//         append(*node->
-//     }
-// }
 #include "rasterize.h"
 
+#define END_SECT "\n\n"
+
 int main(int argc, char **argv) {
-    printf("Jotain\n");
+    printf("\n");
+    printf("Welcome to Rasterizer 3000.\n");
+    printf("===========================\n\n");
 
-    TaskInfo info = { 24.0, 65.0, 25.0, 66.0, 0.05 };
+    TaskInfo info = { 0.0, 5.0, 5.0, 0.0, 1.0 };
 
-    int rows=5, //9175,
-        cols=5, //6814,
+    int rows, //9175,
+        cols, //6814,
         i,
         j;
 
+    calcImageSize(info, &rows, &cols);
+
     Index index;
     index.nodes = malloc(rows*cols*sizeof(PointNode *));
     index.info = info;
+    index.rows = rows;
+    index.cols = cols;
 
     Image image;
     image.pixels = malloc(rows*cols*sizeof(float));
@@ -58,44 +57,144 @@ int main(int argc, char **argv) {
     }
 
     // data
-    Point3D a = { 1.7, 2.7, 8 }; 
-    Point3D b = { 1.2, 2.2, 6 };
-    Point3D c = { 1.4, 3.2, 5 };
-    Point3D d = { 1.4, 3.2, 5 };
-    Point3D e = { 2.5, 4.5, 3 };
-
-//    addPoint(nodes, rows, cols, &a);
-//    addPoint(nodes, rows, cols, &b);
-//    addPoint(nodes, rows, cols, &c);
-//    addPoint(nodes, rows, cols, &d);
-//    addPoint(nodes, rows, cols, &e);
+    readPointsFromFile("sample.txt", &index);
 
     // FIXME: muistin vapautus
+    printIndexBins(index);
 
     printImage(image);
 
     free(image.pixels);
     free(index.nodes);
-    printf("Float %d", sizeof(float));
     return 0;
 }
 
+void calcImageSize(TaskInfo info, int *rows, int *cols) {
+    assert(info.lu_long < info.rl_long && "Longitudes switched.");
+    assert(info.lu_lat  > info.rl_lat  && "Latitudes switched.");
+    printf("Calculating image size ...\n");
+    printf("    Image extents: left  upper corner %6.2f %6.2f\n", info.lu_long, info.lu_lat);
+    printf("                   right lower corner %6.2f %6.2f\n", info.rl_long, info.rl_lat);
+    printf("    GSD: %6.2f metres.\n\n", info.gsd);
+
+    double hor = info.rl_long - info.lu_long;
+    double ver = info.lu_lat  - info.rl_lat;
+
+    *rows = floor(hor / info.gsd);
+    *cols = floor(ver / info.gsd);
+
+    printf("    Horizontal extent: %6.2f metres => %d cols.\n", hor, *cols);
+    printf("    Vertical   extent: %6.2f metres => %d rows.\n", ver, *rows);
+    printf(END_SECT);
+}
+
+int depth(int d, PointNode *node) {
+    if(node == 0) {
+        return d;
+    } else {
+        return depth(d+1, node->next);
+    }
+}
+
+// Prints out Index struct's bin usages.
+void printIndexBins(Index index) {
+    printf("Printing number of links per index bins.\n\n");
+
+    int i,j,d;
+    for (j=0; j<index.rows; j++) {
+        for (i=0; i<index.cols; i++) {
+            d = depth(0, *(index.nodes + index.cols*j + i));
+            printf("%d  ", d);
+        }
+        printf("\n");
+    }
+
+    printf(END_SECT);
+}
+
 void printImage(Image im) {
+    printf("Printing rasterized image:\n\n");
+
     int i,j;
     for (j=0; j<im.rows; j++) {
         for (i=0; i<im.cols; i++) {
             printf("%04.2f  ", *(im.pixels+(j*im.cols)+im.rows));
         }
         printf("\n");
     }
+
+    printf(END_SECT);
 }
 
-void addPoint(Index index, Point3D *point) {
-//    int i = floor(p->x);
-//    int j = floor(p->y);
-//    append(&nodes[j][i], p);
+void readPointsFromFile(char *filename, Index *index) {
+    printf("Reading points from file: %s\n\n", filename);
+    FILE *file = fopen(filename, "r");
+    float rx,ry,rz;
+    int n = 0;
+
+    int valuesToRead = 3;
+    while (fscanf(file, "%f %f %f", &rx, &ry, &rz) == valuesToRead) {
+        Point3D p;
+        p.x = rx;
+        p.y = ry;
+        p.z = rz;
+        addPointToIndex(index, &p);
+
+        if(n < 10) {
+            printf("x=%04.2f y=%04.2f z=%04.2f\n", rx, ry, rz);
+        } else if (n == 11) {
+            printf("...\n");
+        } else {
+            // Gradually increase shown amounts.
+            if (n <= 100 && n % 10) { printf("%d.. ", n); }
+            else if (n > 100    && n <= 1000    && n % 100   ) { printf("%d.. ", n); }
+            else if (n > 1000   && n <= 10000   && n % 1000  ) { printf("%d.. ", n); }
+            else if (n > 10000  && n <= 100000  && n % 10000 ) { printf("%d.. ", n); }
+            else if (n > 100000 && n <= 1000000 && n % 100000) { printf("%d.. ", n); }
+        }
+        n++;
+    }
+
+    fclose(file);
+
+    printf("\nDone reading %d points to index.\n", n);
+
+    printf(END_SECT);
+}
+
+
+
+
+void addPointToIndex(Index *index, Point3D *point) {
+    int col,row;
+    transformPoint(index->info, point, &row, &col);
+    assert(row < (index->rows) && col < (index->cols) && "col,row < cols,rows");
+    PointNode **binstart = (index->nodes)+(row*index->cols)+col;
+    addToBin(binstart, point);
 }
 
-// void transform(TaskInfo info, Point3D *p, int *row, int *col) {
-//     printf("asda");
-// }
+void addToBin(PointNode **current, Point3D* point) {
+    PointNode *new = malloc(sizeof(PointNode));
+    (new->p).x = point->x;
+    (new->p).y = point->y;
+    (new->p).z = point->z;
+    new->next = NULL;
+
+    if( *current == NULL ) {
+        *current = new;
+    } else {
+        PointNode *i = *current;
+        while(1) {
+            if (i->next == NULL) break;
+            i = (*current)->next;
+        }
+        i->next = new;
+    }
+}
+
+void transformPoint(TaskInfo info, Point3D *p, int *row, int *col) {
+    *row = floor((p->x - info.lu_long) / info.gsd);
+    *col = floor((p->y - info.rl_lat) / info.gsd);
+    assert(*row >= 0 && *col >= 0 && "Row number positive.");
+    printf("  Transformed point %4.2f %4.2f %4.2f to row=%d col=%d.\n", p->x, p->y, p->z, *row, *col);
+}

rasterize.h

@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <assert.h>
 
 #define EMPTY_VAL 0.0f
 
@@ -19,9 +20,9 @@ typedef struct {
 //     double y;
 // } Point2D;
 
-typedef struct {
+typedef struct PointNode_t {
     Point3D p;
-    struct PointNode *next;
+    struct PointNode_t *next;
 } PointNode;
 
 typedef struct {
@@ -47,8 +48,16 @@ typedef struct {
 
 void printImage(Image image);
 
-void addPoint(Index index, Point3D *point);
+void printIndexBins(Index index);
+
+void addPointToIndex(Index *index, Point3D *point);
+
+void addToBin(PointNode **current, Point3D* point);
+
+void readPointsFromFile(char *filename, Index *index);
+
+void transformPoint(TaskInfo info, Point3D *p, int *row, int *col);
 
-// void transform(TaskInfo info, Point3D *p, int *row, int *col);
+void calcImageSize(TaskInfo info, int *rows, int *cols);
 
 #endif