-

diff --git a/dfbapi.c b/dfbapi.c
index aeb6cff..dfb3ae8 100644 (file)
--- a/dfbapi.c
+++ b/dfbapi.c
@@ -275,17 +275,17 @@ int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v)
  return 1;
 }
 
-int 2d_event_init(2d_lattice *2d_l)
+int d2_event_init(d2_lattice *d2_l)
 {
- 2d_l->dfb->GetInputDevice(2d_l->dfb,DIDID_KEYBOARD,&(2d_l->keyboard));
- 2d_l->keyboard->CreateEventBuffer(2d_l->keyboard,&(2d_l->k_buffer));
+ d2_l->dfb->GetInputDevice(d2_l->dfb,DIDID_KEYBOARD,&(d2_l->keyboard));
+ d2_l->keyboard->CreateEventBuffer(d2_l->keyboard,&(d2_l->k_buffer));
  
  return 1;
 }
 
 int d3_event_init(d3_lattice *d3_l)                                           
 {                                                                             
- d3_l->dfb->GetInputDevice(d3_l->dfb,DIDID_KEYBOARD,&(3d_l->keyboard));
+ d3_l->dfb->GetInputDevice(d3_l->dfb,DIDID_KEYBOARD,&(d3_l->keyboard));
  d3_l->keyboard->CreateEventBuffer(d3_l->keyboard,&(d3_l->k_buffer));  
 
  return 1;                                                           
@@ -300,11 +300,11 @@ int scan_event(d3_lattice *d3_l,int *x,int *y,int *z,int *q,int *esc)
  {
   if(ke.key_id==DIKI_LEFT && *x!=0) *x-=1;
   if(ke.key_id==DIKI_RIGHT && *x!=d3_l->max_x-1) *x+=1;
-  if(ke.key_id==DIET_DOWN && *y!=0) *y-=1;
-  if(ke.key_id==DIET_UP && *y!=d3_l->max_y-1) *y+=1;
-  if(ke.key_id==DIET_PAGE_DOWN && *z!=0) *z-=1;
-  if(ke.key_id==DIET_PAGE_UP && *z!=d3_l->mac_z-1) *z+=1;
-  if(ke.key_id==DIKI_Q) *quit=1;
+  if(ke.key_id==DIKI_DOWN && *y!=0) *y-=1;
+  if(ke.key_id==DIKI_UP && *y!=d3_l->max_y-1) *y+=1;
+  if(ke.key_id==DIKI_PAGE_DOWN && *z!=0) *z-=1;
+  if(ke.key_id==DIKI_PAGE_UP && *z!=d3_l->max_z-1) *z+=1;
+  if(ke.key_id==DIKI_Q) *q=1;
   if(ke.key_id==DIKI_ESCAPE) *esc=1;
  }
 

diff --git a/dfbapi.h b/dfbapi.h
index c51bfe4..54ab56b 100644 (file)
--- a/dfbapi.h
+++ b/dfbapi.h
@@ -40,7 +40,7 @@ typedef struct __d3_lattice
  int info_w,info_h;
  int font_h;
  unsigned char *status; /* status&1 -> red, else blue */
- int *extra /* store extra values */
+ int *extra; /* store extra values */
  void *v_ptr; /* void ptr, for any use */
  IDirectFB *dfb;
  IDirectFBSurface *p_surface;

diff --git a/nlsop.c b/nlsop.c
index 9e4c3bf..030db9f 100644 (file)
--- a/nlsop.c
+++ b/nlsop.c
@@ -56,15 +56,15 @@ int usage(void)
  return 1;
 }
 
-int process_cell(3d_lattice *3d_l,u32 x,u32 y,u32 z,int r,double a,double b,int *t_c)
+int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,int r,double a,double b,int *t_c)
 {
  unsigned char *thiz;
  int *conc;
  int i,j;
  double p;
 
- thiz=3d_l->status+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y;
- conc=3d_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y;
+ thiz=d3_l->status+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y;
+ conc=d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y;
  p=b*URAND_MAX;
  for(i=-r;i<=r;i++)
  {
@@ -97,7 +97,7 @@ int process_cell(3d_lattice *3d_l,u32 x,u32 y,u32 z,int r,double a,double b,int
  return 1;
 }
 
-int distrib_c(3d_lattice *3d_l,int t_c,double a,double b)
+int distrib_c(d3_lattice *d3_l,int t_c,double a,double b)
 {
  int i,j,k,total,area,sum;
  int temp,left;
@@ -135,7 +135,7 @@ int distrib_c(3d_lattice *3d_l,int t_c,double a,double b)
     }
    }
   }
-  left=(((i+1)*a+b)*t_c/sum)%area_h[i];
+  left=(int)(((i+1)*a+b)*t_c/sum)%area_h[i];
   while(left)
   {
   x=get_rand(d3_l->max_x);
@@ -164,7 +164,7 @@ int distrib_c(3d_lattice *3d_l,int t_c,double a,double b)
  return 1;
 }
 
-int save_to_file(char *sf,3d_lattice *3d_l)
+int save_to_file(char *sf,d3_lattice *d3_l)
 {
  int sf_fd,c;
 
@@ -173,18 +173,18 @@ int save_to_file(char *sf,3d_lattice *3d_l)
   puts("cannot open save file");
   return -1;
  }
- if(write(sf_fd,3d_l,sizeof(3d_lattice))<sizeof(3d_lattice))
+ if(write(sf_fd,d3_l,sizeof(d3_lattice))<sizeof(d3_lattice))
  {
-  puts("failed saving 3d lattice struct");
+  puts("failed saving d3 lattice struct");
   return -1;
  }
  c=d3_l->max_x*d3_l->max_y*d3_l->max_z;
- if(write(sf_fd,3d_l->status,c*sizeof(unsigned char)<c*sizeof(unsigned char))
+ if(write(sf_fd,d3_l->status,c*sizeof(unsigned char))<c*sizeof(unsigned char))
  {
-  puts("failed saving status of 3d lattice sites");
+  puts("failed saving status of d3 lattice sites");
   return -1;
  }
- if(write(sf_fd,3d_l->extra,c*sizeof(int)<c*sizeof(int))
+ if(write(sf_fd,d3_l->extra,c*sizeof(int))<c*sizeof(int))
  {
   puts("failed saving sites concentration");
   return -1;
@@ -194,7 +194,7 @@ int save_to_file(char *sf,3d_lattice *3d_l)
  return 1;
 }
 
-int load_from_file(char *lf,3d_lattice *3d_l)
+int load_from_file(char *lf,d3_lattice *d3_l)
 {
  int lf_fd,c;
 
@@ -203,7 +203,7 @@ int load_from_file(char *lf,3d_lattice *3d_l)
   puts("cannot open load file");
   return -1;
  }
- if(read(lf_fd,3d_l,sizeof(3d_lattice))<sizeof(3d_lattice))
+ if(read(lf_fd,d3_l,sizeof(d3_lattice))<sizeof(d3_lattice))
  {
   puts("failed reading d3 lattice struct");
   return -1;
@@ -219,12 +219,12 @@ int load_from_file(char *lf,3d_lattice *3d_l)
   puts("cannot allocate concentration buffer");
   return -1;
  }
- if(read(lf_fd,3d_l->status,c*sizeof(unsigned char))<c*sizeof(unsigned char))
+ if(read(lf_fd,d3_l->status,c*sizeof(unsigned char))<c*sizeof(unsigned char))
  {
-  puts("failed reading status of 3d lattice sites");
+  puts("failed reading status of d3 lattice sites");
   return -1;
  }
- if(read(lf_fd,3d_l->extra,c*sizeof(int))<c*sizeof(int))
+ if(read(lf_fd,d3_l->extra,c*sizeof(int))<c*sizeof(int))
  {
   puts("failed reading sites concentration");
   return -1;
@@ -243,14 +243,14 @@ int main(int argc,char **argv)
  char s_file[MAX_CHARS];
  char l_file[MAX_CHARS];
  char r_file[MAX_CHARS];
- x_txt[MAX_TXT];
- y_txt[MAX_TXT];
- z_txt[MAX_TXT];
- status_txt[MAX_TXT];
- conc_txt[MAX_TXT];
- steps_txt[MAX_TXT];
- cc_txt[MAX_TXT];
- **arg_v;
+ char x_txt[MAX_TXT];
+ char y_txt[MAX_TXT];
+ char z_txt[MAX_TXT];
+ char status_txt[MAX_TXT];
+ char conc_txt[MAX_TXT];
+ char steps_txt[MAX_TXT];
+ char cc_txt[MAX_TXT];
+ char **arg_v;
  d3_lattice d3_l;
 
  max_x=X;
@@ -274,7 +274,7 @@ int main(int argc,char **argv)
  strcpy(l_file,"");
  strcpy(r_file,"");
 
- for(i=1,i<argc,i++)
+ for(i=1;i<argc;i++)
  {
   if(argv[i][0]=='-')
   {
@@ -357,22 +357,22 @@ int main(int argc,char **argv)
  {
   i=max_x*max_y*max_z;
   d3_lattice_init(&argc,argv,&d3_l,max_x,max_y,max_z);
-  if((d3_l->status=(unsigned char *)malloc(i*sizeof(unsigned char)))==NULL)
+  if((d3_l.status=(unsigned char *)malloc(i*sizeof(unsigned char)))==NULL)
   {
    puts("failed allocating status buffer");
    return -1;
   }
-  memset(d3_l->status,0,i*sizeof(unsigned char));
-  if((d3_l->extra=(int *)malloc(i*sizeof(int)))==NULL)
+  memset(d3_l.status,0,i*sizeof(unsigned char));
+  if((d3_l.extra=(int *)malloc(i*sizeof(int)))==NULL)
   {
    puts("failed allocating concentration buffer");
    return -1;
   }
-  memset(d3_l->extra,0,i*sizeof(int));
+  memset(d3_l.extra,0,i*sizeof(int));
  } else
  {
   load_from_file(l_file,&d3_l);
-  d3_lattice_init(&argc,argv,&d3_l,d3_l->max_x,d3_l->max_y,d3_l->max_z);
+  d3_lattice_init(&argc,argv,&d3_l,d3_l.max_x,d3_l.max_y,d3_l.max_z);
  }
 
  d3_event_init(&d3_l);
@@ -381,18 +381,18 @@ int main(int argc,char **argv)
  {
   while((i<steps) && (quit==0) && (escape==0))
   {
-   x_c=rand_get(d3_l->max_x);
-   y_c=rand_get(d3_l->max_y);
-   z_c=rand_get_lgp(d3_l->max_z,a_el,b_el);
-   distrib_c(&3d_l,cc,a_cd,b_cd);
-   process_cell(&3d_l,x_c,y_c,z_c,range,a_ap,b_ap,&cc);
+   x_c=rand_get(d3_l.max_x);
+   y_c=rand_get(d3_l.max_y);
+   z_c=rand_get_lgp(d3_l.max_z,a_el,b_el);
+   distrib_c(&d3_l,cc,a_cd,b_cd);
+   process_cell(&d3_l,x_c,y_c,z_c,range,a_ap,b_ap,&cc);
    if(i%refresh==0)
    {
     sprintf(x_txt,"x: %d",x);
     sprintf(y_txt,"y: %d",y);
     sprintf(z_txt,"z: %d",z);
-    sprintf(status_txt,"status: %c",(*(d3_l->status+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?'a':'c');
-    sprintf(conc_txt,"conc: %d",*(d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y));
+    sprintf(status_txt,"status: %c",(*(d3_l.status+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y)&AMORPH)?'a':'c');
+    sprintf(conc_txt,"conc: %d",*(d3_l.extra+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y));
     sprintf(steps_txt,"step: %d",i);
     sprintf(cc_txt,"total c: %d",cc);
     arg_v[1]=x_txt;
@@ -417,8 +417,8 @@ int main(int argc,char **argv)
   sprintf(x_txt,"x: %d",x);
   sprintf(y_txt,"y: %d",y);
   sprintf(z_txt,"z: %d",z);
-  sprintf(status_txt,"status: %c",(*(d3_l->status+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?'a':'c');
-  sprintf(conc_txt,"conc: %d",*(d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y));
+  sprintf(status_txt,"status: %c",(*(d3_l.status+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y)&AMORPH)?'a':'c');
+  sprintf(conc_txt,"conc: %d",*(d3_l.extra+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y));
   strcpy(steps_txt,"step: end!");
   sprintf(cc_txt,"total c: %d",cc);
   arg_v[1]=x_txt;

diff --git a/nlsop.h b/nlsop.h
index 528c1c4..4700010 100644 (file)
--- a/nlsop.h
+++ b/nlsop.h
@@ -29,3 +29,4 @@ typedef unsigned int u32;
 #define B_AP .2
 
 #define MAX_CHARS 64
+#define MAX_TXT 32

diff --git a/random.c b/random.c
index 17cbd73..6694317 100644 (file)
--- a/random.c
+++ b/random.c
@@ -9,6 +9,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <stdlib.h>
 
 #include "random.h"
 

diff --git a/random.h b/random.h
index 4fa9aae..54d0f78 100644 (file)
--- a/random.h
+++ b/random.h
@@ -12,8 +12,8 @@
 /* function prototypes */
 int rand_init(char *rf);
 int rand_close(void);
-int get_rand(u32 max);
-int get_rand_lgp(u32 max,double a,double b);
+u32 get_rand(u32 max);
+u32 get_rand_lgp(u32 max,double a,double b);
 
 #define BUFSIZE (16*1048576) /* 64 MByte */
 #define URAND_MAX 0xffffffff