-

diff --git a/dfbapi.c b/dfbapi.c
index dfb3ae8..138f7e4 100644 (file)
--- a/dfbapi.c
+++ b/dfbapi.c
@@ -232,7 +232,7 @@ int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v)
    d3_l->p_surface->SetColor(d3_l->p_surface,r,g,b,a);
    d3_l->p_surface->DrawRectangle(d3_l->p_surface,
                                   x_c*d3_l->fakt_x+X_GAP,
    d3_l->p_surface->SetColor(d3_l->p_surface,r,g,b,a);
    d3_l->p_surface->DrawRectangle(d3_l->p_surface,
                                   x_c*d3_l->fakt_x+X_GAP,

-                                  y_c*d3_l->fakt_x+d3_l->info_x,
+                                  y_c*d3_l->fakt_y+d3_l->info_y,

                                   d3_l->fakt_x,d3_l->fakt_y);
   }
  }
                                   d3_l->fakt_x,d3_l->fakt_y);
   }
  }


@@ -272,6 +272,9 @@ int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v)
   }
  }
 
   }
  }
 

+ /* now we flip all to surface */
+ d3_l->p_surface->Flip(d3_l->p_surface,NULL,0);
+

  return 1;
 }
 
  return 1;
 }
 

diff --git a/nlsop.c b/nlsop.c
index 736003a..1d2e6d6 100644 (file)
--- a/nlsop.c
+++ b/nlsop.c
@@ -99,7 +99,8 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,int r,double a,double b,int
 
 int distrib_c(d3_lattice *d3_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 i,j,k,total,area;
+ double sum;

  int temp,left;
  int *area_h;
  u32 x,y,z;
  int temp,left;
  int *area_h;
  u32 x,y,z;


@@ -108,7 +109,7 @@ int distrib_c(d3_lattice *d3_l,int t_c,double a,double b)
  area_h=(int *)malloc(d3_l->max_z*sizeof(int));
 
  total=0;
  area_h=(int *)malloc(d3_l->max_z*sizeof(int));
 
  total=0;

- sum=0;
+ sum=b*d3_l->max_z+a*d3_l->max_z*(d3_l->max_z+1)/2;

  for(i=0;i<d3_l->max_z;i++)
  {
   area_h[i]=0;
  for(i=0;i<d3_l->max_z;i++)
  {
   area_h[i]=0;


@@ -116,15 +117,11 @@ int distrib_c(d3_lattice *d3_l,int t_c,double a,double b)
   {
    if(!(*(d3_l->status+(i*area)+j)&AMORPH))
    {
   {
    if(!(*(d3_l->status+(i*area)+j)&AMORPH))
    {

-    sum+=(i+1)*a+b;

     area_h[i]+=1;
    }
   }
     area_h[i]+=1;
    }
   }

- }
- for(i=0;i<d3_l->max_z;i++)
- {
-  temp=((i+1)*a+b)*t_c/(sum+area_h[i]);
-  if(temp>1)
+  temp=(int)((i+1)*a+b)*t_c/(sum*area_h[i]);
+  if(temp)

   {
    for(j=0;j<area;j++)
    {
   {
    for(j=0;j<area;j++)
    {


@@ -140,7 +137,7 @@ int distrib_c(d3_lattice *d3_l,int t_c,double a,double b)
   {
    x=get_rand(d3_l->max_x);
    y=get_rand(d3_l->max_y);
   {
    x=get_rand(d3_l->max_x);
    y=get_rand(d3_l->max_y);

-   if(!(*(d3_l->status+(i*area)+x+y*d3_l->max_x)&AMORPH))
+   if(!(*(d3_l->status+(i*area)+j)&AMORPH))

    {
     *(d3_l->extra+(i*area)+x+y*d3_l->max_x)+=1;
     total+=1;
    {
     *(d3_l->extra+(i*area)+x+y*d3_l->max_x)+=1;
     total+=1;


@@ -158,9 +155,9 @@ int distrib_c(d3_lattice *d3_l,int t_c,double a,double b)
   {
    *(d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)+=1;
    left-=1;
   {
    *(d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)+=1;
    left-=1;

-   total+=1;

   }
  }
   }
  }

+ free(area_h);

 
  return 1;
 }
 
  return 1;
 }


@@ -251,7 +248,7 @@ int main(int argc,char **argv)
  char conc_txt[MAX_TXT];
  char steps_txt[MAX_TXT];
  char cc_txt[MAX_TXT];
  char conc_txt[MAX_TXT];
  char steps_txt[MAX_TXT];
  char cc_txt[MAX_TXT];

- char **arg_v;
+ char *arg_v[MAX_ARGV];

  d3_lattice d3_l;
 
  max_x=X;
  d3_lattice d3_l;
 
  max_x=X;


@@ -382,6 +379,7 @@ int main(int argc,char **argv)
 
  if(!strcmp(l_file,""))
  {
 
  if(!strcmp(l_file,""))
  {

+  i=0;

   while((i<steps) && (quit==0) && (escape==0))
   {
    x_c=get_rand(d3_l.max_x);
   while((i<steps) && (quit==0) && (escape==0))
   {
    x_c=get_rand(d3_l.max_x);


@@ -391,9 +389,9 @@ int main(int argc,char **argv)
    process_cell(&d3_l,x_c,y_c,z_c,range,a_ap,b_ap,&cc);
    if(i%refresh==0)
    {
    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(x_txt,"x: %d",x+1);
+    sprintf(y_txt,"y: %d",y+1);
+    sprintf(z_txt,"z: %d",z+1);

     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(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);

diff --git a/nlsop.h b/nlsop.h
index 54c3bbf..c2baf3e 100644 (file)
--- a/nlsop.h
+++ b/nlsop.h
@@ -33,5 +33,6 @@ typedef unsigned int u32;
 
 #define MAX_CHARS 64
 #define MAX_TXT 32
 
 #define MAX_CHARS 64
 #define MAX_TXT 32

+#define MAX_ARGV 16

 
 #endif /* NLSOP_H */
 
 #endif /* NLSOP_H */

diff --git a/random.c b/random.c
index 6694317..4d96243 100644 (file)
--- a/random.c
+++ b/random.c
@@ -63,7 +63,7 @@ u32 get_rand(u32 max)
   }
   c_ptr=b_ptr;
  }
   }
   c_ptr=b_ptr;
  }

- 
+

  return((u32)(*(c_ptr++)*(max*1.0/((long long unsigned int)URAND_MAX+1))));
 }
 
  return((u32)(*(c_ptr++)*(max*1.0/((long long unsigned int)URAND_MAX+1))));
 }