第四章通过测试

jungor · jungor · commit 0b6a4934a8c7 · 2017-07-17T21:07:43.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -28,8 +28,22 @@
 *.out
 *.app
 
+## Add By JunGor
+
 # Stackdump
 *.stackdump
 
-# Dependency ifles
+# Dependency files
 *.d
+
+# Bin files
+main
+test
+
+# Tags files
+tags
+
+# YCM Config files
+compile_commands.json
+.ycm_extra_conf.py
+.color_coded
diff --git a/Makefile b/Makefile
@@ -1,31 +1,31 @@
+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
+CFLAGS  = -Wall -g -std=gnu99
 INCLUDEFLAGS = 
 LDFLAGS = -lcunit
 TARGET = main
 TEST = test
 
-.PHONY:run
-run: all
-	./$(TEST)
-
 .PHONY:all 
-all: $(TARGET) $(TEST)
+all: $(TARGET) $(TEST) tags
 
 $(TARGET): $(addsuffix .o, $(TARGET)) $(OBJS)
-	$(CC) -o $@ $^ $(LDFLAGS)
+	@$(CC) -o $@ $^ $(LDFLAGS)
 
 $(TEST): $(addsuffix .o, $(TEST)) $(ALLOBJS)
-	$(CC) -o $@ $^ $(LDFLAGS)
+	@$(CC) -o $@ $^ $(LDFLAGS)
+
+tags: $(ALLFILES)
+	@ctags -R .
 
 %.o:%.c
-	$(CC) -o $@ -c $< $(CFLAGS) $(INCLUDEFLAGS)
+	@$(CC) -o $@ -c $< $(CFLAGS) $(INCLUDEFLAGS)
 
 %.d:%.c
 	@set -e; rm -f $@; $(CC) -MM $< $(INCLUDEFLAGS) > $@.$$$$; \
@@ -36,17 +36,23 @@ $(TEST): $(addsuffix .o, $(TEST)) $(ALLOBJS)
 
 .PHONY:clean
 clean:
-	rm -f $(TARGET) $(OBJS) **/*.d **/*.d.*
+	@rm -f $(TARGET) $(OBJS) **/*.d **/*.d.*
 
 .PHONY:debug
 debug:
-	gdb $(TARGET)
+	@gdb $(TEST)
 
 .PHONY:dump
 dump:
-	less $(TARGET).exe.stackdump
+	@less $(TARGET).exe.stackdump
+
+.PHONY:run
+run: all
+	@./$(TEST)
+
 .PHONY:var
 var:
+	@echo ALLFILES: $(ALLFILES)
 	@echo ALLSRCS: $(ALLSRCS)
 	@echo TESTSRCS: $(TESTSRCS)
 	@echo SRCS: $(SRCS)
diff --git a/chap02/test_insertion_sort.c b/chap02/test_insertion_sort.c
@@ -17,7 +17,7 @@ static void test_insertion_sort() {
 }
 
 CU_ErrorCode add_test_insertion_sort() {
-    CU_pSuite pSuite = CU_add_suite("SuitInsertionSort", NULL, NULL);
+    CU_pSuite pSuite = CU_add_suite("insertion_sort", NULL, NULL);
     CHECK_CU_GLOBAL();
     CU_ADD_TEST(pSuite, test_insertion_sort);
     CHECK_CU_GLOBAL();
diff --git a/chap02/test_merge_sort.c b/chap02/test_merge_sort.c
@@ -1,5 +1,25 @@
+#include "merge_sort.h"
 #include "test_merge_sort.h"
 #include "../utils.h"
+#include <CUnit/CUnit.h>
 #include <stdlib.h>
 
-CU_ErrorCode add
+static void test_merge_sort() {
+    int len = 100;
+    int nums[len];
+    for (int i = 0; i < len; i++) {
+        nums[i] = rand();
+    }
+    merge_sort(nums, len);
+    for (int i = 1; i < len; i++) {
+        CU_ASSERT(nums[i-1] <= nums[i]);
+    }
+}
+
+CU_ErrorCode add_test_merge_sort() {
+    CU_pSuite pSuite = CU_add_suite("merge_sort", NULL, NULL);
+    CHECK_CU_GLOBAL();
+    CU_ADD_TEST(pSuite, test_merge_sort);
+    CHECK_CU_GLOBAL();
+    return CUE_SUCCESS;
+}
diff --git a/chap04/maximum_subarray.c b/chap04/maximum_subarray.c
@@ -1,56 +1,68 @@
 /**
  * maximum_subarray.cpp
  * 最大子数组
+ */
+#include <limits.h>
+#include <stdio.h>
+#include "maximum_subarray.h"
+#include "../utils.h"
+
+static MSA_slt_t maximum_subarray_daq(int nums[], int begin, int end);
+static MSA_slt_t maximum_subarray_linear(int nums[], int begin, int end);
+
+/**
+ * 解法1：分治法
  * 分:均分成两个子数组。最大子数组只能是以下三种位置：
  *     1. 完全在左子数组。此时它也是左子数组的最大子数组
  *     2. 完全在右子数组。此时它也是左子数组的最大子数组
  *     3. 一部分在左，一部分在右
  * 此思路不是最优算法，有线性时间算法。
  */
-#include <limits.h>
-#include <stdio.h>
-#include "maximum_subarray.h"
-
-subarr maximum_subarray(int nums[], int begin, int end) {
+MSA_slt_t maximum_subarray_daq(int nums[], int begin, int end) {
     int len = end - begin;
-    subarr sa;
+    MSA_slt_t sa;
     if (len == 1) {
         sa.left = sa.right = begin;
-        sa.sum = nums[0];
+        sa.sum = nums[begin];
         return sa;
     }
     int mid = begin + len/2;
     // 左右子数组的最大子数组
-    subarr lsa = maximum_subarray(nums, begin, mid);
-    subarr rsa = maximum_subarray(nums, mid, end);
+    MSA_slt_t lsa = maximum_subarray_daq(nums, begin, mid);
+    MSA_slt_t rsa = maximum_subarray_daq(nums, mid, end);
     // 跨越mid的最大子数组
     int maxsum = INT_MIN;
     int suml = 0;
-    int maxi, sum = 0;
+    int sum = 0;
     int maxil = mid-1;
-    for (int i = mid-1; i >= 0; i--) {
-        suml += nums[begin+i];
+    for (int i = mid-1; i >= begin; i--) {
+        suml += nums[i];
         if (suml > maxsum) {
             maxsum = suml;
-            maxil = begin+i;
+            maxil = i;
         }
     }
     sum += maxsum;
     maxsum = INT_MIN;
     int sumr = 0;
     int maxir = mid;
-    for (int i = mid; i < len; i++) {
-        sumr += nums[begin+i];
+    for (int i = mid; i < end; i++) {
+        sumr += nums[i];
         if (sumr > maxsum) {
             maxsum = sumr;
-            maxir = begin+i;
+            maxir = i;
         }
     }
     sum += maxsum;
+    // 选择三种分类中的最优解
     if (lsa.sum > rsa.sum) {
-        sa = lsa;
+        sa.left = lsa.left;
+        sa.right = lsa.right;
+        sa.sum = lsa.sum;
     } else {
-        sa = rsa;
+        sa.left = rsa.left;
+        sa.right = rsa.right;
+        sa.sum = rsa.sum;
     }
     if (sum > sa.sum) {
         sa.sum = sum;
@@ -60,3 +72,32 @@ subarr maximum_subarray(int nums[], int begin, int end) {
     // printf("%d %d %d\n", suml, sumr, sum);
     return sa;
 }
+
+
+MSA_slt_t maximum_subarray_linear(int nums[], int begin, int end) {
+    MSA_slt_t slt = {begin, begin, nums[begin]};
+    int cur = nums[begin];
+    int left = begin;
+    for (int i = begin+1; i < end; i++) {
+        if (cur <= 0) {
+            cur = nums[i];
+            left = i;
+        } else {
+            cur += nums[i];
+        }
+        if (cur > slt.sum) {
+            slt.left = left;
+            slt.right = i;
+            slt.sum = cur;
+        }
+    }
+    return slt;
+}
+
+MSA_slt_t maximum_subarray(int nums[], int begin, int end, MSA_policy_t p) {
+    if (p == MSA_PLC_DAQ) {
+        return maximum_subarray_daq(nums, begin, end);
+    } else {
+        return maximum_subarray_linear(nums, begin, end);
+    }
+}
diff --git a/chap04/maximum_subarray.h b/chap04/maximum_subarray.h
@@ -1,14 +1,21 @@
 #ifndef MAXIMUM_SUBARRAY_H
 #define MAXIMUM_SUBARRAY_H
 
-struct subarr {
-    int left;
-    int right;
-    int sum;
+struct MSA_slt_s {
+    int left;  // 最大子数组的左端点(闭)
+    int right; // 最大子数组的右端点(闭)
+    int sum;   // 最大子数组的和
 };
 
-typedef struct subarr subarr;
+typedef struct MSA_slt_s MSA_slt_t;
 
-subarr maximum_subarray(int nums[], int begin, int end);
+enum MSA_policy_e {
+    MSA_PLC_DAQ,       // 分治法
+    MSA_PLC_LINEAR     // 线性时间算法
+};
+
+typedef enum MSA_policy_e MSA_policy_t;
+
+MSA_slt_t maximum_subarray(int nums[], int begin, int end, MSA_policy_t p);
 
 #endif
diff --git a/chap04/test_maximum_subarray.c b/chap04/test_maximum_subarray.c
@@ -0,0 +1,31 @@
+#include "test_maximum_subarray.h"
+#include "maximum_subarray.h"
+#include "../utils.h"
+#include <CUnit/CUnit.h>
+#include <stdlib.h>
+
+static void test_maximum_subarray() {
+    int nums[] = {13,-3,-25,20,-3,-16,-23,18,20,-7,12,-5,-22,15,-4,7};
+    MSA_slt_t slt = maximum_subarray(nums, 0, sizeof(nums)/sizeof(int), MSA_PLC_DAQ);
+    CU_ASSERT_EQUAL(slt.left, 7);
+    CU_ASSERT_EQUAL(slt.right, 10);
+    CU_ASSERT_EQUAL(slt.sum, 43);
+    slt = maximum_subarray(nums, 0, sizeof(nums)/sizeof(int), MSA_PLC_LINEAR);
+    CU_ASSERT_EQUAL(slt.left, 7);
+    CU_ASSERT_EQUAL(slt.right, 10);
+    CU_ASSERT_EQUAL(slt.sum, 43);
+    int nums2[] = {1, 2, -3, 1};
+    slt = maximum_subarray(nums2, 0, sizeof(nums2)/sizeof(int), MSA_PLC_LINEAR);
+    printf("%d, %d, %d\n", slt.left, slt.right, slt.sum);
+    CU_ASSERT_EQUAL(slt.left, 0);
+    CU_ASSERT_EQUAL(slt.right, 1);
+    CU_ASSERT_EQUAL(slt.sum, 3);
+}
+
+CU_ErrorCode add_test_maximum_subarray() {
+    CU_pSuite pSuite = CU_add_suite("maximum_subarray", NULL, NULL);
+    CHECK_CU_GLOBAL();
+    CU_ADD_TEST(pSuite, test_maximum_subarray);
+    CHECK_CU_GLOBAL();
+    return CUE_SUCCESS;
+}
diff --git a/chap04/test_maximum_subarray.h b/chap04/test_maximum_subarray.h
@@ -0,0 +1,8 @@
+#ifndef TEST_MAXIMUM_SUBARRAY_H
+#define TEST_MAXIMUM_SUBARRAY_H
+
+#include <CUnit/CUnit.h>
+
+CU_ErrorCode add_test_maximum_subarray();
+
+#endif
diff --git a/chap15/test_optimal_binary_search_tree.c b/chap15/test_optimal_binary_search_tree.c
@@ -1,7 +1,7 @@
 #include "optimal_binary_search_tree.h"
 #include "../utils.h"
 #include <CUnit/CUnit.h>
-#include <CUnit/console.h>
+#include <CUnit/Console.h>
 #include <stdio.h>
 
 static int InitSuite() {
@@ -28,7 +28,7 @@ CU_ErrorCode add_test_obst() {
      * 2. Suite名字 : testSuite
      * 3. InitSuite EndSuite：分别是测试单元初始和释放函数，如不需要则NULL传递
      ****************/
-    pSuite = CU_add_suite("TestOBST", InitSuite, EndSuite);
+    pSuite = CU_add_suite("optimal_bst", InitSuite, EndSuite);
     CHECK_CU_GLOBAL();
 
     /***************
diff --git a/test.c b/test.c
@@ -1,10 +1,12 @@
 #include "chap02/test_insertion_sort.h"
+#include "chap02/test_merge_sort.h"
+#include "chap04/test_maximum_subarray.h"
 #include "chap15/test_optimal_binary_search_tree.h"
 #include "utils.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <CUnit/console.h>
+#include <CUnit/Console.h>
 
 int main() {
     srand(time(NULL));
@@ -20,8 +22,10 @@ int main() {
     //assert(!CU_is_test_running());
 
     //注册各个suite
-    CHECK_CU_RETURN(add_test_obst());
     CHECK_CU_RETURN(add_test_insertion_sort());
+    CHECK_CU_RETURN(add_test_merge_sort());
+    CHECK_CU_RETURN(add_test_maximum_subarray());
+    CHECK_CU_RETURN(add_test_obst());
 
     //使用console控制交互界面的函数入口
     CU_console_run_tests();

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ static void test_insertion_sort() {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`CU_ErrorCode add_test_insertion_sort() {`
`20`		`- CU_pSuite pSuite = CU_add_suite("SuitInsertionSort", NULL, NULL);`
	`20`	`+ CU_pSuite pSuite = CU_add_suite("insertion_sort", NULL, NULL);`
`21`	`21`	`CHECK_CU_GLOBAL();`
`22`	`22`	`CU_ADD_TEST(pSuite, test_insertion_sort);`
`23`	`23`	`CHECK_CU_GLOBAL();`