added save/load feature

diff --git a/defines.h b/defines.h
index 17e680f0c2f1fb27cc753e49b9833893e74d7b1c..3473e3067566ff9a6c8d670173246b6f34b663a1 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -36,6 +36,8 @@
 #define URAND_2BYTE_MAX 0xffff
 
 #define MAX_CHARS_RANDOM_FILE 64
+#define MAX_CHARS_SAVE_FILE 64
+#define MAX_CHARS_LOAD_FILE 64
 
 typedef unsigned int u32;
 typedef long long unsigned int u64;

diff --git a/main.c b/main.c
index d171490c9286ba63af063212c3ca7db0ea01db66..08c6a6c42be5bea2c3a0b230da94bf9b2ba53884 100644 (file)
--- a/main.c
+++ b/main.c
@@ -11,12 +11,14 @@
  *  - Maik Haeberlen. Diplomarbeit, Universitaet Augsburg.
  */
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 /* important defines */
 #include "defines.h"
@@ -50,7 +52,9 @@ int usage()
  printf("-p <value> \t p0 for probability of cell getting amorph (default %f)\n",DEFAULT_A_P_P0);
  printf("-C <value> \t C start concentration (default %d)\n",DEFAULT_C_DIST_START_CONC);
  printf("-S <value> \t slope of linear C distribution (default %d)\n",DEFAULT_C_DIST_SLOPE);
- puts("-R <file> \t read random datat from file (default not used)");
+ puts("-R <file> \t read random data from file (default not used)");
+ puts("-D <file> \t dump cell info into <file> (default not used)");
+ puts("-L <file> \t load cell info and display it (default no)");
  return -23;
 }
 
@@ -66,6 +70,74 @@ int make_cryst(cell *cell)
  return 23;
 }
 
+int load_from_file(char *file,display *display)
+{
+ int load_file_fd;
+
+ if((load_file_fd=open(file,O_RDONLY))<0)
+ {
+  puts("cannot open load file");
+  return -23;
+ }
+ if(read(load_file_fd,&(display->max_x),sizeof(u32))<sizeof(u32))
+ {
+  puts("failed reading max x");
+  return-23;
+ }
+ if(read(load_file_fd,&(display->max_y),sizeof(u32))<sizeof(u32))
+ {
+  puts("failed reading max y");
+  return -23;
+ }
+ if(read(load_file_fd,&(display->max_z),sizeof(u32))<sizeof(u32))
+ {
+  puts("failed reading max z");
+  return -23;
+ }
+ if(read(load_file_fd,display->cell_p,display->max_x*display->max_y*display->max_z*sizeof(cell))<display->max_x*display->max_y*display->max_z*sizeof(cell))
+ {
+  puts("failed reading cell info from file");
+  return -23;
+ }
+ close(load_file_fd);
+ puts("loaded file");
+ return 23;
+}
+
+int save_to_file(char *file,display *display)
+{
+ int save_file_fd;
+
+ if((save_file_fd=open(file,O_CREAT|O_WRONLY|O_TRUNC))<0)
+ {
+  puts("cannot open save file");
+  return -23;
+ }
+ if(write(save_file_fd,&(display->max_x),sizeof(u32))<sizeof(u32))
+ {
+  puts("failed saving max x");
+  return -23;
+ }
+ if(write(save_file_fd,&(display->max_y),sizeof(u32))<sizeof(u32))
+ {
+  puts("failed saving max y");
+  return -23;
+ }
+ if(write(save_file_fd,&(display->max_z),sizeof(u32))<sizeof(u32))
+ {
+  puts("failed saving max z");
+  return -23;
+ }
+ if(write(save_file_fd,display->cell_p,display->max_x*display->max_y*display->max_z*sizeof(cell))!=display->max_x*display->max_y*display->max_z*sizeof(cell))
+ {
+  puts("saving file failed");
+  return -23;
+ }
+ close(save_file_fd);
+ puts("saved file");
+ return 23;
+}
+
 int distrib_c_conc(cell *cell_p,int c_c0,int c_slope,u32 c_conc,u32 x_max,u32 y_max,u32 z_max)
 {
  int i,j;
@@ -181,6 +253,8 @@ int main(int argc,char **argv)
  u32 display_x,display_y,display_z; /* intercept point of diplayed areas */
  u32 display_refresh_rate; /* refresh rate for display */
  int quit=0; /* continue/quit status */
+ char save_file[MAX_CHARS_SAVE_FILE];
+ char load_file[MAX_CHARS_LOAD_FILE];
 
  printfd("debug: sizeof my u32 variable: %d\n",sizeof(u32));
  printfd("debug: sizeof my cell struct: %d\n",sizeof(cell));
@@ -203,6 +277,8 @@ int main(int argc,char **argv)
  display_z=z_cell/2;
  display_refresh_rate=DEFAULT_DISPLAY_REF_RATE;
  strcpy(random_file,"");
+ strcpy(save_file,"");
+ strcpy(load_file,"");
  
  /* parse command args */
  for(i=1;i<argc;i++)
@@ -266,6 +342,12 @@ int main(int argc,char **argv)
     case 'R':
      strcpy(random_file,argv[++i]);
      break;
+    case 'D':
+     strcpy(save_file,argv[++i]);
+     break;
+    case 'L':
+     strcpy(load_file,argv[++i]);
+     break;
     default:
      usage();
      return -23;
@@ -297,7 +379,7 @@ int main(int argc,char **argv)
   return -23;
  }
  rand_current=rand_buf+RAND_BUF_SIZE;
-  
+
  /* calculate gr one time! */
  gr=0;
  for(i=1;i<=z_cell;i++) gr+=i;
@@ -312,11 +394,26 @@ int main(int argc,char **argv)
  }
  memset(cell_p,0,x_cell*y_cell*z_cell*sizeof(cell));
 
+ /* load from file */
+ if(strcmp(load_file,""))
+ {
+  display.cell_p=cell_p;
+  load_from_file(load_file,&display);
+  x_cell=display.max_x;
+  y_cell=display.max_y;
+  z_cell=display.max_z;
+ }
+
  /* init display */
  printfd("debug: init display now ...\n");
  display_init(x_cell,y_cell,z_cell,&display,cell_p,&argc,argv);
 
  /* main routine */
+ 
+ /* did we load from file? */
+ if(!strcmp(load_file,""))
+ {
+
  printfd("debug: starting main routine ...\n");
  for(display.step=0;display.step<steps;display.step++)
  {
@@ -324,7 +421,7 @@ int main(int argc,char **argv)
   y=rand_get(y_cell);
   z=rand_get_lgp(slope_nel,start_nel,z_cell);
 
-  /* todo */
+  /* distribute c concentration */
   distrib_c_conc(cell_p,c_dist_c0,c_dist_slope,c_conc,x_cell,y_cell,z_cell);
 
   process_cell(cell_p,x,y,z,x_cell,y_cell,z_cell,a_p_range,a_p_faktor,a_p_p0,&c_conc);
@@ -333,6 +430,11 @@ int main(int argc,char **argv)
   if((display.step%display_refresh_rate)==0)
    display_draw(&display,display_x,display_y,display_z);
  }
+
+ }
+
+ if(strcmp(save_file,"")) save_to_file(save_file,&display);
+
  printfd("debug: main routine finished!\n");
   
  /* display again and listen for events */