Use configuration count in comparison operator (7b863f1d) · Commits · Giacomo Mulas / NP_TMcode

src/libnptm/Configuration.cpp

+20 −22

Original line number	Original line	Diff line number	Diff line
	@@ -1113,36 +1113,34 @@ bool ScattererConfiguration::operator ==(ScattererConfiguration &other) {
	if (scale_vec[svi] != other.scale_vec[svi]) {		if (scale_vec[svi] != other.scale_vec[svi]) {
	return false;		return false;
	}		}
	int dj_index = 0;		int configurations = 0;
	int dim3 = (idfc == 0) ? number_of_scales : 1;		int dim3 = (idfc == 0) ? number_of_scales : 1;
	for (int dj = 0; dj < number_of_spheres; dj++) {		for (int ci = 1; ci <= number_of_spheres; ci++) {
	bool check_matrixes = false;		if (iog_vec[ci - 1] != other.iog_vec[ci - 1]) {
	if (iog_vec[dj] >= dj + 1) {
	dj_index = iog_vec[dj] - 1;
	check_matrixes = true;
	}
	if (iog_vec[dj] != other.iog_vec[dj]) {
	return false;		return false;
	}		}
	if (radii_of_spheres[dj_index] != other.radii_of_spheres[dj_index]) {		if (iog_vec[ci - 1] < ci) continue;
			configurations++;
			}
			for (int ri = 0; ri < configurations; ri++) {
			if (radii_of_spheres[ri] != other.radii_of_spheres[ri]) {
	return false;		return false;
	}		}
	int layers = nshl_vec[dj_index];		if (nshl_vec[ri] != other.nshl_vec[ri]) {
	if (layers != other.nshl_vec[dj_index]) {
	return false;		return false;
	}		}
	if (check_matrixes) {		for (int rj = 0; rj < nshl_vec[ri]; rj++) {
	for (int di = 0; di < layers; di++) {		if (rcf[ri][rj] != other.rcf[ri][rj]) {
	if (rcf[dj_index][di] != other.rcf[dj_index][di]) {
	return false;		return false;
	}		}
			} // rj loop
			for (int dj = 0; dj < number_of_spheres; dj++) {
	for (int dk = 0; dk < dim3; dk++) {		for (int dk = 0; dk < dim3; dk++) {
	if (dc0_matrix[di][dj_index][dk] != other.dc0_matrix[di][dj_index][dk]) {		if (dc0_matrix[ri][dj][dk] != other.dc0_matrix[ri][dj][dk]) {
	return false;		return false;
	}		}
	} // dk loop		} // dk loop
	} // di loop
	}
	} // dj loop		} // dj loop
			} // ri loop
	return true;		return true;
	}		}