X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=dyncnn.git;a=blobdiff_plain;f=flatland.cc;h=75e986282aff94e82c4c94fcc7a72c62d7341a2f;hp=3a59e88d089ade1e1f96a485c6bfa60f4df25dd9;hb=39c30863654d44ce3d260f719b3b5b9e41dbd3c8;hpb=fe5dee151313b6abd8ffee2c5fc5593f326e663f

diff --git a/flatland.cc b/flatland.cc
index 3a59e88..75e9862 100644
--- a/flatland.cc
+++ b/flatland.cc
@@ -82,7 +82,6 @@ int main(int argc, char **argv) {
   const scalar_t world_width = 400;
   const scalar_t world_height = 400;
   const scalar_t scaling = 0.16; // So that 400 * 0.16 = 64
-  const scalar_t shape_size = 80;
 
   const scalar_t dt = 0.1;
   const int nb_iterations_per_steps = 5;
@@ -96,7 +95,8 @@ int main(int argc, char **argv) {
 
   int every_nth = 4;
   int nb_frames = 5;
-  int multi_grasp = 0;
+  int random_grasp = 0;
+  int random_shape_size = 0;
   int nb_shapes = 1;
   char data_dir[1024] = "/tmp/";
   int multi_images = 0;
@@ -134,8 +134,13 @@ int main(int argc, char **argv) {
       i++;
     }
 
-    else if(strcmp(argv[i], "--multi_grasp") == 0) {
-      multi_grasp = 1;
+    else if(strcmp(argv[i], "--random_grasp") == 0) {
+      random_grasp = 1;
+      i++;
+    }
+
+    else if(strcmp(argv[i], "--random_shape_size") == 0) {
+      random_shape_size = 1;
       i++;
     }
 
@@ -203,7 +208,7 @@ int main(int argc, char **argv) {
 
     scalar_t grab_start_x, grab_start_y;
 
-    if(multi_grasp) {
+    if(random_grasp) {
       grab_start_x = world_width * (0.1 + 0.8 * drand48());
       grab_start_y = world_height * (0.1 + 0.8 * drand48());
     } else {
@@ -229,6 +234,14 @@ int main(int argc, char **argv) {
 
         nb_attempts = 0;
 
+        scalar_t shape_size;
+
+        if(random_shape_size) {
+          shape_size = 40 + 80 * drand48();
+        } else {
+          shape_size = 80;
+        }
+
         do {
           scalar_t x[] = { - shape_size * 0.4, + shape_size * 0.4,
                            + shape_size * 0.4, - shape_size * 0.4 };