添加第15章部分单元测试(缺矩阵连乘)

jungor · jungor · commit a2a9bca3359c · 2018-08-04T11:32:24.000+08:00
diff --git a/Makefile b/Makefile
@@ -1,63 +1,61 @@
-ALLFILES = $(subst ./,,$(wildcard ./chap*/*.[ch]) $(wildcard ./*.[ch]))
-ALLSRCS = utils.c $(subst ./,,$(wildcard ./chap*/*.c))
-TESTSRCS = $(subst ./,,$(wildcard ./chap*/test*.c))
-SRCS = $(filter-out $(TESTSRCS), $(ALLSRCS))
-ALLOBJS = $(patsubst %.c, %.o, $(ALLSRCS))
-OBJS = $(patsubst %.c, %.o, $(SRCS))
-
-CC      = gcc 
-CFLAGS  = -Wall -g -std=gnu99
-INCLUDEFLAGS = 
-LDFLAGS = -lcunit -lm
+CC=gcc
+CFLAGS=-Wall -g -std=gnu99
+INCLUDEFLAGS=
+# 注意链接参数必须放在目标后面
+LDLIBS=-lcunit -lm
+
+DLTDEP=rm -f *.d chap*/*.d
+
 TARGET = main
-TEST = test
+TESTTG = test_main
+
+TARGETSRC = $(addsuffix .c, $(TARGET))
+TESTTGSRC = $(addsuffix .c, $(TESTTG))
+
+IGNSRCS = play.c
+ALLFILES= $(subst ./, , $(wildcard ./*.[ch]) $(wildcard ./chap*/*.[ch]))
+ALLSRCS = $(filter-out $(IGNSRCS), $(subst ./, , $(wildcard ./*.c) $(wildcard ./chap*/*.c)))
+TSTSRCS = $(subst ./, , $(wildcard ./test*.c) $(wildcard ./chap*/test*.c))
+
+TARGETDEPSRCS = $(filter-out $(TSTSRCS), $(ALLSRCS))
+TESTTGDEPSRCS = $(filter-out $(TARGETSRC), $(ALLSRCS))
+TARGETDEPOBJS = $(patsubst %.c, %.o, $(TARGETDEPSRCS))
+TESTTGDEPOBJS = $(patsubst %.c, %.o, $(TESTTGDEPSRCS))
 
 .PHONY:all 
-all: $(TARGET) $(TEST) tags
+all: $(TARGET) $(TESTTG) tags
 
-$(TARGET): $(addsuffix .o, $(TARGET)) $(OBJS)
-	@$(CC) -o $@ $^ $(LDFLAGS)
+$(TARGET): $(TARGETDEPOBJS)
+	$(CC) -o $@ $^ $(LDLIBS)
+	$(DLTDEP)
 
-$(TEST): $(addsuffix .o, $(TEST)) $(ALLOBJS)
-	@$(CC) -o $@ $^ $(LDFLAGS)
+$(TESTTG): $(TESTTGDEPOBJS)
+	$(CC) -o $@ $^ $(LDLIBS)
+	$(DLTDEP)
 
 # 要么把所有源文件加到依赖；要么设为phony。
 # 否则首次生成过tags之后后续会因为已存在不再生成
 tags: $(ALLFILES)
-	@ctags -R .
+	ctags -R .
 
-%.o:%.c
-	@$(CC) -o $@ -c $< $(CFLAGS) $(INCLUDEFLAGS)
+# %.o: %.c
+	# $(COMPILE) $< -o $@
 
 # 使用gcc的-MM选项自动生成各源文件的依赖
-%.d:%.c
-	@set -e; rm -f $@; $(CC) -MM $< $(INCLUDEFLAGS) > $@.$$$$; \
-	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
-	rm -f $@.$$$$
+%.d: %c
+	$(CC) -MM $< $(INCLUDEFLAGS) | awk '{if ($$1 ~ /o:$$/) $$1 = "$*.o:"; print $$0}' > $@;
 
--include $(OBJS:.o=.d)
+#  导入依赖
+-include $(ALLSRCS:.c=.d)
 
 .PHONY:clean
 clean:
-	@rm -f $(TARGET) $(OBJS) **/*.d **/*.d.*
-
-.PHONY:debug
-debug: all
-	@gdb $(TEST)
-
-.PHONY:dump
-dump:
-	@less $(TARGET).exe.stackdump
+	rm -f $(TARGET) $(TESTTG) $(TARGETDEPOBJS) $(TESTTGDEPOBJS)
 
 .PHONY:run
 run: all
-	@./$(TEST)
+	@./$(TESTTG)
 
 .PHONY:var
 var:
-	@echo ALLFILES: $(ALLFILES)
-	@echo ALLSRCS: $(ALLSRCS)
-	@echo TESTSRCS: $(TESTSRCS)
-	@echo SRCS: $(SRCS)
-	@echo ALLOBJS: $(ALLOBJS)
-	@echo OBJS: $(OBJS)
+	@echo TSTSRCS: $(TSTSRCS)
diff --git a/Makefile.bak b/Makefile.bak
@@ -0,0 +1,63 @@
+ALLFILES = $(subst ./,,$(wildcard ./chap*/*.[ch]) $(wildcard ./*.[ch]))
+ALLSRCS = utils.c $(subst ./,,$(wildcard ./chap*/*.c))
+TESTSRCS = $(subst ./,,$(wildcard ./chap*/test*.c))
+SRCS = $(filter-out $(TESTSRCS), $(ALLSRCS))
+ALLOBJS = $(patsubst %.c, %.o, $(ALLSRCS))
+OBJS = $(patsubst %.c, %.o, $(SRCS))
+
+CC      = gcc 
+CFLAGS  = -Wall -g -std=gnu99
+INCLUDEFLAGS = 
+LDFLAGS = -lcunit -lm
+TARGET = main
+TEST = test
+
+.PHONY:all 
+all: $(TARGET) $(TEST) tags
+
+$(TARGET): $(addsuffix .o, $(TARGET)) $(OBJS)
+	@$(CC) -o $@ $^ $(LDFLAGS)
+
+$(TEST): $(addsuffix .o, $(TEST)) $(ALLOBJS)
+	@$(CC) -o $@ $^ $(LDFLAGS)
+
+# 要么把所有源文件加到依赖；要么设为phony。
+# 否则首次生成过tags之后后续会因为已存在不再生成
+tags: $(ALLFILES)
+	@ctags -R .
+
+%.o:%.c
+	@$(CC) -o $@ -c $< $(CFLAGS) $(INCLUDEFLAGS)
+
+# 使用gcc的-MM选项自动生成各源文件的依赖
+%.d:%.c
+	@set -e; rm -f $@; $(CC) -MM $< $(INCLUDEFLAGS) > $@.$$$$; \
+	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+-include $(OBJS:.o=.d)
+
+.PHONY:clean
+clean:
+	@rm -f $(TARGET) $(OBJS) **/*.d **/*.d.*
+
+.PHONY:debug
+debug: all
+	@gdb $(TEST)
+
+.PHONY:dump
+dump:
+	@less $(TARGET).exe.stackdump
+
+.PHONY:run
+run: all
+	@./$(TEST)
+
+.PHONY:var
+var:
+	@echo ALLFILES: $(ALLFILES)
+	@echo ALLSRCS: $(ALLSRCS)
+	@echo TESTSRCS: $(TESTSRCS)
+	@echo SRCS: $(SRCS)
+	@echo ALLOBJS: $(ALLOBJS)
+	@echo OBJS: $(OBJS)
diff --git a/chap15/longest_common_subsequence.c b/chap15/longest_common_subsequence.c
@@ -39,7 +39,7 @@ void free_lcs_slt(lcs_slt_t *slt) {
 lcs_slt_t lcs_length(const char *strx, const char *stry) {
     int m = strlen(strx);
     int n = strlen(stry);
-    lcs_slt_t slt;
+    lcs_slt_t slt = {NULL, NULL, 0, 0};
     init_lcs_slt(&slt, m, n);
     int **c = slt.c;
     lcs_slt_dirc_t **b = slt.b;
@@ -60,26 +60,34 @@ lcs_slt_t lcs_length(const char *strx, const char *stry) {
     return slt;
 }
 
-void print_lcs_aux(const char *strx, int i, int j, lcs_slt_dirc_t **b);
+void get_lcs_aux(const char *strx, int i, int j, lcs_slt_dirc_t **b, char *buf, int *idx);
 
-void print_lcs(const char *strx, const char *stry, int i, int j) {
+void get_lcs(const char *strx, const char *stry, int i, int j, char *buf) {
     lcs_slt_t slt = lcs_length(strx, stry);
     lcs_slt_dirc_t **b = slt.b;
-    print_lcs_aux(strx, i, j, b);
-    printf("\n");
+    int idx = 0;
+    get_lcs_aux(strx, i, j, b, buf, &idx);
+    buf[idx] = '\0';
+    for (int i = 0; i <= (idx-1)/2; i++) {
+        char tmp = buf[i];
+        buf[i] = buf[idx-i-1];
+        buf[idx-i-1] = tmp; 
+    }
     free_lcs_slt(&slt);
 }
 
-void print_lcs_aux(const char *strx, int i, int j, lcs_slt_dirc_t **b) {
+void get_lcs_aux(const char *strx, int i, int j, lcs_slt_dirc_t **b, char *buf, int *idx) {
     if (i == 0 || j == 0) {
         return;
     }
     if (b[i][j] == UP_LEFT) {
-        print_lcs_aux(strx, i-1, j-1, b);
+        buf[*idx] = strx[i-1];
+        (*idx)++;
+        get_lcs_aux(strx, i-1, j-1, b, buf, idx);
         printf("%c", strx[i-1]);
     } else if (b[i][j] == UP) {
-        print_lcs_aux(strx, i-1, j, b);
+        get_lcs_aux(strx, i-1, j, b, buf, idx);
     } else {
-        print_lcs_aux(strx, i, j-1, b);
+        get_lcs_aux(strx, i, j-1, b, buf, idx);
     }
 }
diff --git a/chap15/longest_common_subsequence.h b/chap15/longest_common_subsequence.h
@@ -21,5 +21,6 @@ typedef struct lcs_slt_s lcs_slt_t;
 void init_lcs_slt(lcs_slt_t *slt, int m, int n);
 void free_lcs_slt(lcs_slt_t *slt);
 lcs_slt_t lcs_length(const char *strx, const char *stry);
+void get_lcs(const char *strx, const char *stry, int i, int j, char *buf);
 
 #endif
diff --git a/chap15/test_cut_rod.c b/chap15/test_cut_rod.c
@@ -0,0 +1,51 @@
+#include "cut_rod.h"
+#include "test_cut_rod.h"
+#include "../utils.h"
+#include <CUnit/CUnit.h>
+#include <CUnit/Console.h>
+#include <stdio.h>
+
+static int InitSuite() {
+    return 0;
+}
+
+static int EndSuite() {
+    return 0;
+}
+
+static void test_cut_rod() {
+    int p[] = {1, 5, 8, 9, 10, 17, 17, 20, 24, 30};
+    CU_ASSERT(cut_rod(p, 1) == 1);
+    CU_ASSERT(cut_rod(p, 2) == 5);
+    CU_ASSERT(cut_rod(p, 3) == 8);
+    CU_ASSERT(cut_rod(p, 4) == 10);
+    CU_ASSERT(cut_rod(p, 5) == 13);
+    CU_ASSERT(cut_rod(p, 6) == 17);
+    CU_ASSERT(cut_rod(p, 7) == 18);
+    CU_ASSERT(cut_rod(p, 8) == 22);
+    CU_ASSERT(cut_rod(p, 9) == 25);
+    CU_ASSERT(cut_rod(p, 10) == 30);
+}
+
+CU_ErrorCode add_test_cut_rod() {
+    CU_pSuite pSuite = NULL;
+
+    /***************
+     * 1. CU_add_suite 增加一个Suite
+     * 2. Suite名字 : testSuite
+     * 3. InitSuite EndSuite：分别是测试单元初始和释放函数，如不需要则NULL传递
+     ****************/
+    pSuite = CU_add_suite("cut_rod", InitSuite, EndSuite);
+    CHECK_CU_GLOBAL();
+
+    /***************
+     * 1. 注册当前Suite下的测试用例　
+     * 2. pSuite：用例指针
+     * 3. "Test1"： 测试单元名称
+     * 4. Test1：测试函数
+     ***************/
+    CU_ADD_TEST(pSuite, test_cut_rod);
+    CHECK_CU_GLOBAL();
+
+    return CUE_SUCCESS;
+}
diff --git a/chap15/test_cut_rod.h b/chap15/test_cut_rod.h
@@ -0,0 +1,8 @@
+#ifndef TEST_CUT_ROD
+#define TEST_CUT_ROD
+
+#include <CUnit/CUnit.h>
+
+CU_ErrorCode add_test_cut_rod();
+
+#endif
diff --git a/chap15/test_longest_common_subsequence.c b/chap15/test_longest_common_subsequence.c
@@ -0,0 +1,48 @@
+#include "longest_common_subsequence.h"
+#include "test_longest_common_subsequence.h"
+#include "../utils.h"
+#include <CUnit/CUnit.h>
+#include <CUnit/Console.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+static int InitSuite() {
+    return 0;
+}
+
+static int EndSuite() {
+    return 0;
+}
+
+static void test_lcs() {
+    const char *str1 = "ABCBDAB";
+    const char *str2 = "BDCABA";
+    const char *lcs = "BCBA";
+    char buf[512];
+    get_lcs(str1, str2, strlen(str1), strlen(str2), buf);
+    CU_ASSERT(strlen(buf) == strlen(lcs));
+    CU_ASSERT(strncmp(buf, lcs, 4) == 0);
+}
+
+CU_ErrorCode add_test_lcs() {
+    CU_pSuite pSuite = NULL;
+
+    /***************
+     * 1. CU_add_suite 增加一个Suite
+     * 2. Suite名字 : testSuite
+     * 3. InitSuite EndSuite：分别是测试单元初始和释放函数，如不需要则NULL传递
+     ****************/
+    pSuite = CU_add_suite("lcs", InitSuite, EndSuite);
+    CHECK_CU_GLOBAL();
+
+    /***************
+     * 1. 注册当前Suite下的测试用例　
+     * 2. pSuite：用例指针
+     * 3. "Test1"： 测试单元名称
+     * 4. Test1：测试函数
+     ***************/
+    CU_ADD_TEST(pSuite, test_lcs);
+    CHECK_CU_GLOBAL();
+
+    return CUE_SUCCESS;
+}
diff --git a/chap15/test_longest_common_subsequence.h b/chap15/test_longest_common_subsequence.h
@@ -0,0 +1,8 @@
+#ifndef TEST_LONGEST_COMMON_SUBSEQ
+#define TEST_LONGEST_COMMON_SUBSEQ
+
+#include <CUnit/CUnit.h>
+
+CU_ErrorCode add_test_lcs();
+
+#endif
diff --git a/main.c b/main.c
@@ -16,42 +16,5 @@
 #include <time.h>
 
 int main() {
-    srand(time(NULL));
-    //int nums[] = {13,-3,-25,20,-3,-16,-23,18,20,-7,12,-5,-22,15,-4,7};
-    //int nums[10] = {1, 0, 4, 3, 7, 6, 5, 2, 9, 8};
-    int nums[] = {
-        71, 57, 79,  0, 60, 56, 89, 92, 87, 18,
-        43, 53, 86, 26, 15, 51, 73, 65, 41, 42,
-        25, 62, 49, 28, 70, 78,  5, 85, 22, 69,
-         6, 93, 37,  4, 40, 38, 77, 64, 76, 63,
-        94, 33, 21, 29, 35, 11, 12, 97, 48,  7,
-        17, 91, 99,  8, 44, 24, 39, 83,  3, 52,
-        90, 95,  2, 10, 58, 88, 27, 14, 75, 98,
-        66,  9, 68, 67, 55, 50, 16, 45, 59, 20,
-        54, 72, 32, 19, 84, 47,  1, 80, 13, 36,
-        34, 96, 81, 31, 46, 30, 61, 23, 74, 82
-    };
-    // int nums[] = {49, 26, 64, 97, 59, 62, 76, 12, 76, 20, 5, 66, 60, 0, 28, 59, 9, 43, 5, 44, 27, 80, 80, 27, 10, 10, 14, 86, 7, 37, 39, 12, 27, 40, 46, 96, 93, 38, 11, 27, 56, 6, 75, 85, 12, 50, 49, 75, 63, 12, 11, 71, 28, 38, 0, 53, 96, 2, 99, 58, 85, 81, 88, 60, 73, 15, 86, 72, 63, 58, 47, 28, 59, 96, 62, 86, 73, 92, 50, 46, 60, 2, 23, 8, 42, 5, 11, 63, 60, 14, 50, 72, 28, 48, 82, 17, 15, 22, 68, 29};
-    //int p[] = {30,35,15,5,10,20,25};
-    //const char *strx = "ABCBDAB";
-    //const char *stry = "BDCABA";
-    //print_lcs(strx, stry, 7, 6);
-    //print_optimal_parens(p, 6, 2, 5);
-    //int price_table[] = {0,1,5,8,9,10,17,17,20,24,30};
-    //print_array(nums, 100);
-    //int s = linear_select(nums, 0, 100, 10);
-    //radix_sort(nums, 100);
-    // subarr sa = maximum_subarray(nums, 0, 4);
-    //print_array(nums, 100);
-    //for (int i = 1; i <= 10; i++) {
-    //    int s = memoized_cut_rod(price_table, i);
-    //    int t = bottom_up_cut_rod(price_table, i);
-    //    printf("%d %d\n", s, t);
-    //    print_cut_rod_solution(price_table, i);
-    //}
-    //printf("left: %d, right: %d, sum: %d\n", sa.left, sa.right, sa.sum);
-    double p[] = {0, 0.15, 0.10, 0.05, 0.10, 0.20};
-    double q[] = {0.05, 0.10, 0.05, 0.05, 0.05, 0.10};
-    optimal_bst(p, q, 5);
     return 0;
 }
diff --git a/make b/make
diff --git a/test_main b/test_main
diff --git a/test_main.c b/test_main.c
diff --git a/utils.h b/utils.h
