Update

cair · Aug 6, 2024 · f2120a5 · f2120a5
1 parent 9a584f5
commit f2120a5
Showing 1 changed file with 10 additions and 86 deletions.
diff --git a/tmu/lib/src/ClauseBank.c b/tmu/lib/src/ClauseBank.c
@@ -367,16 +367,19 @@ void cb_calculate_clause_specific_features(
 
 	unsigned int number_of_ta_chunks = (number_of_literals-1)/32 + 1;
 
-	// Counts how many times true before (#patches features)
-	// Counts how many times true before in sequence (#patches features)
-
-	unsigned int true_before = 0;
-	unsigned int true_consecutive_before = 0;
+	// Counts how many times true
+	unsigned int number_of_matches = 0;
+	for (int patch = 0; patch < number_of_patches; ++patch) {
+		if (clause_value_in_patch[clause*number_of_patches + patch]) {
+			number_of_matches++;
+		}
+	}
+
 	for (int patch = 0; patch < number_of_patches; ++patch) {
-		// Set bits based on true_before and true_consecutive_before
+		// Set bits based on how many times true
 
 		for (int l = 0; l < number_of_patches; ++l) {
-			if (l < true_before) { 
+			if (l < number_of_matches) { 
 				chunk_nr = (number_of_clauses*6 + l) / 32;
 				chunk_pos = (number_of_clauses*6 + l) % 32;
 				Xi[patch*number_of_ta_chunks + chunk_nr] |= (1 << chunk_pos);
@@ -393,85 +396,6 @@ void cb_calculate_clause_specific_features(
 				chunk_pos = (number_of_clauses*6 + l + number_of_literals/2) % 32;
 				Xi[patch*number_of_ta_chunks + chunk_nr] |= (1 << chunk_pos);
 			}
-
-			if (l < true_consecutive_before) { 
-				chunk_nr = (number_of_clauses*6 + number_of_patches + l) / 32;
-				chunk_pos = (number_of_clauses*6 + number_of_patches + l) % 32;
-				Xi[patch*number_of_ta_chunks + chunk_nr] |= (1 << chunk_pos);
-
-				chunk_nr = (number_of_clauses*6 + number_of_patches + l + number_of_literals/2) / 32;
-				chunk_pos = (number_of_clauses*6 + number_of_patches + l + number_of_literals/2) % 32;
-				Xi[patch*number_of_ta_chunks + chunk_nr] &= ~(1 << chunk_pos);
-			} else {
-				chunk_nr = (number_of_clauses*6 + number_of_patches + l) / 32;
-				chunk_pos = (number_of_clauses*6 + number_of_patches + l) % 32;
-				Xi[patch*number_of_ta_chunks + chunk_nr] &= ~(1 << chunk_pos);
-
-				chunk_nr = (number_of_clauses*6 + number_of_patches + l + number_of_literals/2) / 32;
-				chunk_pos = (number_of_clauses*6 + number_of_patches + l + number_of_literals/2) % 32;
-				Xi[patch*number_of_ta_chunks + chunk_nr] |= (1 << chunk_pos);
-			}
-		}
-
-		if (clause_value_in_patch[clause*number_of_patches + patch]) {
-			true_before++;
-			true_consecutive_before++;
-		} else {
-			true_consecutive_before = 0;
-		}
-	}
-
-	// Counts how many times true after (#patches features)
-	// Counts how many times true after in sequence (#patches features)
-
-	unsigned int true_after = 0; 
-	unsigned int true_consecutive_after = 0;
-	for (int patch = number_of_patches-1; patch >= 0; --patch) {
-		// Set bits based on true_after and true_consecutive_after
-
-		for (int l = 0; l < number_of_patches; ++l) {
-			if (l < true_after) { 
-				chunk_nr = (number_of_clauses*6 + number_of_patches*2 + l) / 32;
-				chunk_pos = (number_of_clauses*6 + number_of_patches*2 + l) % 32;
-				Xi[patch*number_of_ta_chunks + chunk_nr] |= (1 << chunk_pos);
-
-				chunk_nr = (number_of_clauses*6 + number_of_patches*2 + l + number_of_literals/2) / 32;
-				chunk_pos = (number_of_clauses*6 + number_of_patches*2 + l + number_of_literals/2) % 32;
-				Xi[patch*number_of_ta_chunks + chunk_nr] &= ~(1 << chunk_pos);
-			} else {
-				chunk_nr = (number_of_clauses*6 + number_of_patches*2 + l) / 32;
-				chunk_pos = (number_of_clauses*6 + number_of_patches*2 + l) % 32;
-				Xi[patch*number_of_ta_chunks + number_of_patches*2 + chunk_nr] &= ~(1 << chunk_pos);
-
-				chunk_nr = (number_of_clauses*6 + number_of_patches*2 + l + number_of_literals/2) / 32;
-				chunk_pos = (number_of_clauses*6 + number_of_patches*2 + l + number_of_literals/2) % 32;
-				Xi[patch*number_of_ta_chunks + chunk_nr] |= (1 << chunk_pos);
-			}
-
-			if (l < true_consecutive_after) { 
-				chunk_nr = (number_of_clauses*6 + number_of_patches*3 + l) / 32;
-				chunk_pos = (number_of_clauses*6 + number_of_patches*3 + l) % 32;
-				Xi[patch*number_of_ta_chunks + chunk_nr] |= (1 << chunk_pos);
-
-				chunk_nr = (number_of_clauses*6 + number_of_patches*3 + l + number_of_literals/2) / 32;
-				chunk_pos = (number_of_clauses*6 + number_of_patches*3 + l + number_of_literals/2) % 32;
-				Xi[patch*number_of_ta_chunks + chunk_nr] &= ~(1 << chunk_pos);
-			} else {
-				chunk_nr = (number_of_clauses*6 + number_of_patches*3 + l) / 32;
-				chunk_pos = (number_of_clauses*6 + number_of_patches*3 + l) % 32;
-				Xi[patch*number_of_ta_chunks + chunk_nr] &= ~(1 << chunk_pos);
-
-				chunk_nr = (number_of_clauses*6 + number_of_patches*3 + l + number_of_literals/2) / 32;
-				chunk_pos = (number_of_clauses*6 + number_of_patches*3 + l + number_of_literals/2) % 32;
-				Xi[patch*number_of_ta_chunks + chunk_nr] |= (1 << chunk_pos);
-			}
-		}
-
-		if (clause_value_in_patch[clause*number_of_patches + patch]) {
-			true_after++;
-			true_consecutive_after++;
-		} else {
-			true_consecutive_after = 0;
 		}
 	}
 }