удаление отладочной печати сравнения и не только

This commit is contained in:
2024-07-22 00:57:05 +03:00
parent 3374c9783b
commit 53ad5e637f
76 changed files with 78 additions and 328 deletions

View File

@@ -1082,14 +1082,11 @@ public class db_project_info extends DBObject {
public void Clone(File dst, boolean cloneData) throws Exception {
CopySubdirectories(dst);
//->
System.out.println("---->>>>>CLONE >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
for (DBProjectFile file : db.files.Data.values()) {
File src_file = file.file;
File dst_file = Paths.get(dst.getAbsolutePath(),
Global.isWindows ? file.name :
file.name.replace('\\', '/')).toFile();
System.out.println("src=" + src_file);
System.out.println("dst=" + dst_file);
Files.copy(src_file.toPath(), dst_file.toPath());
}
//теперь копируем инфу по файлам.
@@ -1263,7 +1260,6 @@ public class db_project_info extends DBObject {
LinkedHashMap<String, Long> res = new LinkedHashMap<>();
for (DBProjectFile file : db.files.Data.values()) {
if (!file.state.equals(FileState.Excluded)) {
System.out.println(file.file.getAbsolutePath());
long matches_count = Utils.findInFile(keyword_in, registerOn, wholeWord, file.file);
if (matches_count > 0) {
res.put(file.name, matches_count);
@@ -1273,14 +1269,8 @@ public class db_project_info extends DBObject {
return res;
}
public db_project_info CreateVersionsTree() throws Exception {
// System.out.println("CREATE VERSIONS TREE");
File anchestor_file = find_anchestor();
// System.out.println("anchestor = " + anchestor_file);
// System.out.println("---------------");
db_project_info root_ = createVersionsTree_r(anchestor_file);
// System.out.println("print versions r--------");
// root_.PrintVersions_r();
// System.out.println("----------------");
return root_;
}
public static int extractVersionNumber(db_project_info version) {
@@ -1387,7 +1377,6 @@ public class db_project_info extends DBObject {
ProjectArray mainTemplate = sortedSizeTemplates.get(0);
for (long mVarId : mainTemplate.get_varIDs(false)) {
String main_binary = mainTemplate.get_binary(mVarId);
// System.out.println("main_binary = " + main_binary);
boolean variantEnabled = true;
for (int i = 1; i < sortedSizeTemplates.size(); ++i) {
ProjectArray template = sortedSizeTemplates.get(i);
@@ -1419,7 +1408,6 @@ public class db_project_info extends DBObject {
for (Vector<BigInteger> triple : main_template_triples) {
//двоичное представление максимального шаблона. 1111
String main_binary = mainTemplate.get_binary(triple.get(1).longValueExact());
// System.out.println("main_binary = " + main_binary);
boolean variantEnabled = true;
Vector<BigInteger> variantVector = new Vector<>(triple);
//перебор остальных шаблонов
@@ -1428,7 +1416,6 @@ public class db_project_info extends DBObject {
String template_binary = (mainTemplate.dimSize > template.dimSize) ?
main_binary.substring(0, template.dimSize) :
main_binary;
// System.out.println("template_binary: " + template_binary);
//сконвертировать из двоичной в long, чтобы получить varId
long varID = Long.parseLong(template_binary, 2);
//-- проверить на пригодность этот самый varID