X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=main.c;h=3c8120081b1c9edec94e84163f1b0ac32db603f9;hb=46b1c51ef602958cd5acf558c9aa8a9f88fcd9b5;hp=66503eeda10ef9ba2e783f058eb2d7a6f91ef446;hpb=eecd9c34f43a4ee119595dd00261d1bff2fdf859;p=physik%2Fmorpheus.git

diff --git a/main.c b/main.c
index 66503ee..3c81200 100644
--- a/main.c
+++ b/main.c
@@ -27,26 +27,25 @@
 
 /* global variables */
 u32 sum_z_cells;
-u32 sum_range_rate;
 int random_fd; /* /dev/urandom file descriptor */
 
 int usage()
 {
  puts("usage:");
  puts("-h: help");
- puts("-a <value> \t slope of nuclear energy loss (default 1)");
- puts("-c <value> \t nuclear enery loss at depths 0 (default 0)");
- puts("-x <value> \t # x cells (default 50)");
- puts("-y <value> \t # y cells (default 50)");
- puts("-z <value> \t # z cells (default 100)");
- puts("-s <value> \t # steps to calculate (default 5000)");
+ printf("-a <value> \t slope of nuclear energy loss (default %d)\n",DEFAULT_SLOPE_NEL);
+ printf("-c <value> \t nuclear enery loss at depths 0 (default %d)\n",DEFAULT_START_NEL);
+ printf("-x <value> \t # x cells (default %d)\n",DEFAULT_X_SEG);
+ printf("-y <value> \t # y cells (default %d)\n",DEFAULT_Y_SEG);
+ printf("-z <value> \t # z cells (default %d)\n",DEFAULT_Z_SEG);
+ printf("-s <value> \t # steps to calculate (default %d)\n",DEFAULT_STEPS);
  puts("-X <value> \t display area intercept point x (default # x celss / 2)");
  puts("-Y <value> \t display area intercept point y (default # y cells / 2)");
  puts("-Z <value> \t display area intercept point z (default # z cells / 2)");
- puts("-d <value> \t refresh every <value> loops (default 100)");
- puts("-r <value> \t pressure range from amorphous SiCx (default 2)");
- puts("-f <value> \t (unused) faktor for pressure from amorphous SiCx (default 1)");
- puts("-p <value> \t p0 for probability of cell getting amorph (default sum_range_rate / 4)");
+ printf("-d <value> \t refresh every <value> loops (default %d)\n",DEFAULT_DISPLAY_REF_RATE);
+ printf("-r <value> \t pressure range from amorphous SiCx (default %d)\n",DEFAULT_A_P_RANGE);
+ printf("-f <value> \t faktor for pressure from amorphous SiCx (default %f)\n",DEFAULT_A_P_FAKTOR);
+ printf("-p <value> \t p0 for probability of cell getting amorph (default %f)\n",DEFAULT_A_P_P0);
  return -23;
 }
 
@@ -63,13 +62,13 @@ int make_cryst(u32 *cell)
 }
 
 /* look at cell ... */
-int process_cell(void *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,int range,int faktor,int p0)
+int process_cell(void *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,int range,double faktor,double p0)
 {
  u32 *cell;
- int i,j,k,count;
- // float count;
+ int i,j,k;
+ double pressure;
  cell=(u32 *)(cell_p+x+y*(x_max-1)+z*(x_max-1)*(y_max-1));
- count=p0;
+ pressure=p0*URAND_2BYTE_MAX;
  for(i=-range;i<=range;i++)
  {
   for(j=-range;j<=range;j++)
@@ -78,19 +77,18 @@ int process_cell(void *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,in
    {
     if(!(i==0 && j==0 && k==0))
     {
-     if(*(u32 *)(cell_p+((x+x_max+i)%x_max)+((y+j+y_max)%y_max)*(x_max-1)+((z+k+z_max)%z_max)*(x_max-1)*(y_max-1))&AMORPH) count+=(3*range*range-i*i-j*j-k*k);
+     if(*(u32 *)(cell_p+((x+x_max+i)%x_max)+((y+j+y_max)%y_max)*(x_max-1)+((z+k+z_max)%z_max)*(x_max-1)*(y_max-1))&AMORPH) pressure+=faktor*URAND_2BYTE_MAX/(i*i+j*j+k*k);
     }
    }
   }
  }
- // count+=faktor*1.0/(i*i+j*j+k*k);
  if(*cell&AMORPH)
  {
   /* wrong probability! just test by now ...*/
-  if(rand_get(sum_range_rate)>count) make_cryst(cell);
+  if(rand_get(URAND_2BYTE_MAX)>pressure) make_cryst(cell);
  } else
  {
-  if(rand_get(sum_range_rate)<=count) make_amorph(cell);
+  if(rand_get(URAND_2BYTE_MAX)<=pressure) make_amorph(cell);
  }
  return 23;
 }
@@ -99,14 +97,16 @@ int main(int argc,char **argv)
 {
  u32 x_cell,y_cell,z_cell; /* amount of segments */
  u32 x,y,z; /* cells */
- int i,j,k; /* for counting */
+ int i; /* for counting */
  int slope_nel,start_nel; /* nuclear energy loss: slope, constant */
- int a_p_range,a_p_faktor,a_p_p0; /* p. range, p0 and faktor of amorphous sic */
+ int a_p_range; /* p. range of amorphous sic */
+ double a_p_faktor,a_p_p0; /* p0 and faktor of amorphous sic */
  int steps; /* # steps */
  void *cell_p;
  struct __display display;
  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 */
 
  /* default values */
  x_cell=DEFAULT_X_SEG;
@@ -116,7 +116,7 @@ int main(int argc,char **argv)
  start_nel=DEFAULT_START_NEL;
  a_p_range=DEFAULT_A_P_RANGE;
  a_p_faktor=DEFAULT_A_P_FAKTOR;
- a_p_p0=NOT_SPECIFIED;
+ a_p_p0=DEFAULT_A_P_P0;
  steps=DEFAULT_STEPS;
  display_x=x_cell/2;
  display_y=y_cell/2;
@@ -168,10 +168,10 @@ int main(int argc,char **argv)
      a_p_range=atoi(argv[++i]);
      break;
     case 'f':
-     a_p_faktor=atoi(argv[++i]);
+     a_p_faktor=atof(argv[++i]);
      break;
     case 'p':
-     a_p_p0=atoi(argv[++i]);
+     a_p_p0=atof(argv[++i]);
      break;
     default:
      usage();
@@ -187,27 +187,10 @@ int main(int argc,char **argv)
   return -23;
  }
 
- /* calculate sum_z_cells, sum_range_rate one time! */
+ /* calculate sum_z_cells one time! */
  sum_z_cells=0;
  for(i=1;i<=z_cell;i++) sum_z_cells+=(start_nel+i*slope_nel);
  printfd("debug: sum z cells -> %u\n",sum_z_cells);
- sum_range_rate=0;
- for(i=-a_p_range;i<=a_p_range;i++)
- {
-  for(j=-a_p_range;j<=a_p_range;j++)
-  {
-   for(k=-a_p_range;k<=a_p_range;k++)
-   {
-    if(!(i==0 && j==0 && k==0))
-     sum_range_rate+=((3*a_p_range*a_p_range)-i*i-j*j-k*k);
-   }
-  }
- }
- printfd("debug: sum range rate -> %u\n",sum_range_rate);
- /* add a_p_p0 ... */
- if(a_p_p0==NOT_SPECIFIED) a_p_p0=sum_range_rate/4;
- sum_range_rate+=a_p_p0;
-
 
  /* testing ... */
 
@@ -235,16 +218,26 @@ int main(int argc,char **argv)
 
   // process_cell((u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1)));
   process_cell(cell_p,x,y,z,x_cell,y_cell,z_cell,a_p_range,a_p_faktor,a_p_p0);
+ 
+  if(*(u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1)) && *(u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1))!=1)
+  { 
+   printfd("debug: x: %u y: %u z: %u -> %x\n",x,y,z,*(u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1)));
+  }
 
   /* display stuff */
-  if((i%display_refresh_rate)==0) 
+  if((i%display_refresh_rate)==0)
    display_draw(&display,display_x,display_y,display_z);
  }
   
- /* display again and quit when button hit */
+ /* display again and listen for events */
  display_draw(&display,display_x,display_y,display_z);
- puts("hit button to quit ...");
- getchar();
+ display_event_init(&display);
+
+ while(!quit)
+ {
+  display_scan_event(&display,&display_x,&display_y,&display_z,&quit);
+  display_draw(&display,display_x,display_y,display_z);
+ }
 
  display_release(&display);