fix: merge conflict

Author: unixisking

Makefile

@@ -1,7 +1,8 @@
 CC = gcc
 CFLAGS = -I. -Wall -g
 RM = rm -f
-DEPS = trie_tm.h trie_ht.h
+OBJ = tp1.o trie-tm.o trie-hashtable.o search.o
+DEPS = trie-tm.h trie-hashtable.h search.h
 
 # Compiling to object files without linking
 %.o: %.c $(DEPS)
@@ -13,6 +14,9 @@ trie_tm: main_tm.o trie_tm.o
 trie_ht: main_ht.o trie_ht.o
 $(CC) -o trie_ht main_ht.o trie_ht.o $(CFLAGS)
 
+search: search.o
+$(CC) -o search search.o $(CFLAGS)
+
 .PHONY: clean
 
 clean:

search.c

@@ -0,0 +1,101 @@
+#include <stdio.h>
+#include <string.h>
+#include "search.h"
+
+int bruteFS1(const char *text, const char *pattern) {
+ int n = strlen(text);
+ int m = strlen(pattern);
+
+ for(int i = 0; i <= n - m; i++) {
+ int j = 0;
+ while(j <= m - 1 && pattern[j] == text[i+j]) {
+ j++;
+ }
+ if(j == m) {
+ return i;
+ }
+ }
+ return -1;
+}
+
+int bruteFS2(const char*text, const char* pattern) {
+ int n = strlen(text);
+ int m = strlen(pattern);
+
+ const char c = pattern[0];
+
+ int i = 0;
+ while(i <= n - m && text[i] != c) {
+ i++;
+ }
+
+ while(i <= n - m) {
+ int j = 0;
+ while(j <= m - 1 && pattern[j] == text[i+j]) {
+ j++;
+ }
+ if(j == m) {
+ return i;
+ }
+ i++;
+ }
+ return -1;
+}
+
+int searchWithHelperFunc1(const char*text, const char *pattern) {
+ int n = strlen(text);
+ int m = strlen(pattern);
+
+
+ return strncmp(pattern, text, m);
+
+
+
+
+
+}
+int searchWithHelperFunc2(const char*text, const char *pattern){
+ int n = strlen(text);
+ int m = strlen(pattern);
+
+ const char c = pattern[0];
+
+ int i = 0;
+ while(i <= n - m && text[i] != c) {
+ i++;
+ }
+
+ return -1;
+
+}
+
+int mp(const char *text, const char *pattern) {
+ int n = strlen(text);
+ int m = strlen(pattern);
+
+ // Pre-processing: construct bonPref table
+
+ // Double loop: use bonPref table to skip comparaisons
+
+}
+
+int kmp(const char *text, const char *pattern) {
+ int n = strlen(text);
+ int m = strlen(pattern);
+
+ // Pre-processing: construct MeilPref table
+
+ // Double loop: use bonPref table to skip comparaisons
+
+}
+int main() {
+
+ const char *text = "abcabcbabcabcabcaa";
+ const char *pattern = "bcaa";
+
+ // printf("bruteForce: %d\n", bruteFS1(text, pattern));
+ printf("bruteForce: %d\n", searchWithHelperFunc1(text, pattern));
+
+ 
+ return 0;
+}

search.h

@@ -0,0 +1,36 @@
+#ifndef HEADER_SEARCH
+#define HEADER_SEARCH
+
+
+/**
+ * 
+ * Brute force algorithm, no fast loop & no sentinelle.
+ */
+int bruteFS1(const char *text, const char *pattern);
+/**
+ * 
+ * Brute force algorithm, with fast loop & no sentinelle.
+ */
+int bruteFS2(const char *text, const char *pattern);
+/**
+ * 
+ * Brute force algorithm, with fast loop & sentinelle.
+ */
+int bruteFS3(const char *text, const char *pattern);
+
+/**
+ * Brute force algorithm, with strncmp, no fast loop
+ */
+int searchWithHelperFunc1(const char*text, const char *pattern);
+/**
+ * Brute force algorithm, with strncmp, with fast loop
+ */
+int searchWithHelperFunc2(const char*text, const char *pattern);
+
+int mp(const char *text, const char *pattern);
+int kmp(const char *text, const char *pattern);
+int boyer_moore(const char *text, const char *pattern);
+int harspool(const char *text, const char *pattern);
+int quick_search(const char *text, const char *pattern);
+
+#endif