Commit 636f538a authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Increase default overlap tolerance to 0.1 times the radius of the smallest sphere

parent 7399abff

src/cluster/cluster.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -237,7 +237,7 @@ void cluster(const string& config_file, const string& data_file, const string& o 
      // Overlapping spheres test

      // Overlapping spheres test

      double tolerance = gconf->tolerance;

      double tolerance = gconf->tolerance;

      if (tolerance < 0.0) {

      if (tolerance < 0.0) {

	tolerance = 0.01 * sconf->get_min_radius();

	tolerance = 0.1 * sconf->get_min_radius();

      }

      }

      int *overlaps = check_overlaps(sconf, gconf, tolerance);

      int *overlaps = check_overlaps(sconf, gconf, tolerance);

      if (overlaps[0] != 0) {

      if (overlaps[0] != 0) {
@@ -248,8 +248,8 @@ void cluster(const string& config_file, const string& data_file, const string& o 
	  int index_1 = overlaps[2 + 2 * oi];

	  int index_1 = overlaps[2 + 2 * oi];

	  double overlap = get_overlap(sconf, gconf, index_0 - 1, index_1 - 1);

	  double overlap = get_overlap(sconf, gconf, index_0 - 1, index_1 - 1);

	  if (overlap > 0.0) {

	  if (overlap > 0.0) {

	    message = "INFO: sphere " + to_string(overlaps[index_0]) +

	    message = "INFO: sphere " + to_string(index_0) +

	      " overlaps with sphere " + to_string(overlaps[index_1]) +

	      " overlaps with sphere " + to_string(index_1) +

	      "\n";

	      "\n";

	    logger->log(message);

	    logger->log(message);

	    sprintf(

	    sprintf(

src/inclusion/inclusion.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -237,7 +237,7 @@ void inclusion(const string& config_file, const string& data_file, const string& 
      // Overlapping spheres test

      // Overlapping spheres test

      double tolerance = gconf->tolerance;

      double tolerance = gconf->tolerance;

      if (tolerance < 0.0) {

      if (tolerance < 0.0) {

	tolerance = 0.01 * sconf->get_min_radius();

	tolerance = 0.1 * sconf->get_min_radius();

      }

      }

      int *overlaps = check_overlaps(sconf, gconf, tolerance);

      int *overlaps = check_overlaps(sconf, gconf, tolerance);

      if (overlaps[0] != 0) {

      if (overlaps[0] != 0) {
@@ -248,8 +248,8 @@ void inclusion(const string& config_file, const string& data_file, const string& 
	  int index_1 = overlaps[2 + 2 * oi];

	  int index_1 = overlaps[2 + 2 * oi];

	  double overlap = get_overlap(sconf, gconf, index_0 - 1, index_1 - 1);

	  double overlap = get_overlap(sconf, gconf, index_0 - 1, index_1 - 1);

	  if (overlap > 0.0) {

	  if (overlap > 0.0) {

	    message = "INFO: sphere " + to_string(overlaps[index_0]) +

	    message = "INFO: sphere " + to_string(index_0) +

	      " overlaps with sphere " + to_string(overlaps[index_1]) +

	      " overlaps with sphere " + to_string(index_1) +

	      "\n";

	      "\n";

	    logger->log(message);

	    logger->log(message);

	    sprintf(

	    sprintf(