Add numset versions for lecture.

kohler · kohler · commit b98131291804 · 2016-09-29T10:46:24.000-07:00
diff --git a/future/numset.h b/future/numset.h
diff --git a/storage1/.gitignore b/storage1/.gitignore
diff --git a/storage1/GNUmakefile b/storage1/GNUmakefile
@@ -15,7 +15,7 @@ numset-%: numset.o %.o
 	$(CC) $(CFLAGS) -o $@ $^
 
 clean:
-	rm -f $(ALLPROGRAMS) *.o
+	rm -f *.o $(ALLPROGRAMS)
 	rm -rf $(DEPSDIR) *.dSYM
 
 .PHONY: all clean
diff --git a/storage1/array.c b/storage1/array.c
@@ -39,11 +39,11 @@ void numset_add(numset* s, unsigned value) {
     ++s->size;
 }
 
-unsigned numset_remove_index(numset* s, unsigned index) {
-    if (index < s->size) {
-        unsigned value = s->v[index];
-        memmove(&s->v[index], &s->v[index + 1],
-                sizeof(unsigned) * (s->size - index - 1));
+unsigned numset_remove_index(numset* s, unsigned pos) {
+    if (pos < s->size) {
+        unsigned value = s->v[pos];
+        memmove(&s->v[pos], &s->v[pos + 1],
+                sizeof(unsigned) * (s->size - pos - 1));
         --s->size;
         return value;
     } else
diff --git a/storage1/basiclist.c b/storage1/basiclist.c
@@ -39,13 +39,13 @@ void numset_add(numset* s, unsigned value) {
         s->head = n;
 }
 
-unsigned numset_remove_index(numset* s, unsigned index) {
+unsigned numset_remove_index(numset* s, unsigned pos) {
     node* prev = NULL;
     node* trav = s->head;
-    while (trav && index != 0) {
+    while (trav && pos != 0) {
         prev = trav;
         trav = trav->next;
-        --index;
+        --pos;
     }
 
     if (trav) {
diff --git a/storage1/bsearchvector.c b/storage1/bsearchvector.c
@@ -54,11 +54,11 @@ void numset_add(numset* s, unsigned value) {
     ++s->size;
 }
 
-unsigned numset_remove_index(numset* s, unsigned index) {
-    if (index < s->size) {
-        unsigned value = s->values[index];
-        memmove(&s->values[index], &s->values[index + 1],
-                sizeof(unsigned) * (s->size - index - 1));
+unsigned numset_remove_index(numset* s, unsigned pos) {
+    if (pos < s->size) {
+        unsigned value = s->values[pos];
+        memmove(&s->values[pos], &s->values[pos + 1],
+                sizeof(unsigned) * (s->size - pos - 1));
         --s->size;
         return value;
     } else
diff --git a/storage1/file.c b/storage1/file.c
@@ -59,7 +59,7 @@ void numset_add(numset* s, unsigned value) {
     fclose(out);
 }
 
-unsigned numset_remove_index(numset* s, unsigned index) {
+unsigned numset_remove_index(numset* s, unsigned pos) {
     (void) s; // avoid uninitialized-variable warning
 
     // rename old file to backup
@@ -73,17 +73,17 @@ unsigned numset_remove_index(numset* s, unsigned index) {
 
     // read values from old file until the right position;
     // then write value
-    unsigned cur_index = 0, value = 0;
+    unsigned cur_pos = 0, value = 0;
     while (1) {
         unsigned x;
         r = fscanf(in, "%u", &x);
         if (r == 0 || r == EOF)
             break;
-        if (index == cur_index)
+        if (pos == cur_pos)
             value = x;
-        if (index != cur_index)
+        if (pos != cur_pos)
             fprintf(out, "%u\n", x);
-        ++cur_index;
+        ++cur_pos;
     }
 
     // close files
diff --git a/storage1/list.c b/storage1/list.c
@@ -39,11 +39,11 @@ void numset_add(numset* s, unsigned value) {
     *pprev = n;
 }
 
-unsigned numset_remove_index(numset* s, unsigned index) {
+unsigned numset_remove_index(numset* s, unsigned pos) {
     node** pprev = &s->head;
-    while (*pprev && index != 0) {
+    while (*pprev && pos != 0) {
         pprev = &(*pprev)->next;
-        --index;
+        --pos;
     }
 
     if (*pprev) {
diff --git a/storage1/numset.c b/storage1/numset.c
diff --git a/storage1/numset.h b/storage1/numset.h
@@ -0,0 +1,22 @@
+#ifndef CS61_NUMSET_H
+#define CS61_NUMSET_H
+
+typedef struct numset numset;
+
+// numset_new()
+//    Return a new numset, which is a multiset of unsigned values.
+numset *numset_new(void);
+
+// numset_add(s, x)
+//    Add value `x` to numset `s`.
+void numset_add(numset *s, unsigned x);
+
+// numset_remove_index(s, pos)
+//    Remove and return the `pos`th largest element in `s`. For
+//    instance, `numset_remove_sorted(s, 0)` will remove and return
+//    the numerically lowest value in `s`. If there is no such
+//    element (if `pos` is greater than or equal to the number of
+//    values in `s`), returns 0.
+unsigned numset_remove_index(numset *s, unsigned pos);
+
+#endif
diff --git a/storage1/plot.pl b/storage1/plot.pl
diff --git a/storage1/tree.c b/storage1/tree.c
@@ -12,7 +12,7 @@
 
 typedef struct node {
     unsigned value;
-    bool color;
+    int color;
     struct node* child[2];
     struct node* parent;
     unsigned count;
@@ -31,11 +31,11 @@ static inline void tree_free(node* t) {
     free(t);
 }
 
-static inline bool tree_isred(node* t) {
+static inline int tree_isred(node* t) {
     return t && t->color;
 }
 
-static inline bool tree_children_same_color(node* t) {
+static inline int tree_children_same_color(node* t) {
     return tree_isred(t->child[0]) == tree_isred(t->child[1]);
 }
 
@@ -290,18 +290,18 @@ void numset_add(numset* s, unsigned value) {
     tree_insert_node(&s->root, new_node);
 }
 
-unsigned numset_remove_index(numset* s, unsigned index) {
+unsigned numset_remove_index(numset* s, unsigned pos) {
     node* t = s->root;
     while (t) {
-        unsigned t_index = tree_count(t->child[0]);
-        if (t_index > index)
+        unsigned t_pos = tree_count(t->child[0]);
+        if (t_pos > pos)
             t = t->child[0];
-        else if (t_index == index) {
+        else if (t_pos == pos) {
             unsigned value = t->value;
             tree_remove_node(&s->root, t);
             return value;
         } else {
-            index -= t_index + 1;
+            pos -= t_pos + 1;
             t = t->child[1];
         }
     }
diff --git a/storage1/vector.c b/storage1/vector.c
@@ -6,7 +6,7 @@
 // Numset implementation that uses a smart array data structure.
 // This code reallocates the array much less frequently than array.c does.
 // It uses the "vector pattern" explained on the C Patterns page:
-// http://cs61.seas.harvard.edu/wiki/2013/Patterns
+// http://cs61.seas.harvard.edu/wiki/2016/Patterns
 
 struct numset {
     unsigned* v;
@@ -50,11 +50,11 @@ void numset_add(numset* s, unsigned value) {
     ++s->size;
 }
 
-unsigned numset_remove_index(numset* s, unsigned index) {
-    if (index < s->size) {
-        unsigned value = s->v[index];
-        memmove(&s->v[index], &s->v[index + 1],
-                sizeof(unsigned) * (s->size - index - 1));
+unsigned numset_remove_index(numset* s, unsigned pos) {
+    if (pos < s->size) {
+        unsigned value = s->v[pos];
+        memmove(&s->v[pos], &s->v[pos + 1],
+                sizeof(unsigned) * (s->size - pos - 1));
         --s->size;
         return value;
     } else

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,11 @@ void numset_add(numset* s, unsigned value) {`
`39`	`39`	`*pprev = n;`
`40`	`40`	`}`
`41`	`41`
`42`		`-unsigned numset_remove_index(numset* s, unsigned index) {`
	`42`	`+unsigned numset_remove_index(numset* s, unsigned pos) {`
`43`	`43`	`node** pprev = &s->head;`
`44`		`- while (*pprev && index != 0) {`
	`44`	`+ while (*pprev && pos != 0) {`
`45`	`45`	`pprev = &(*pprev)->next;`
`46`		`- --index;`
	`46`	`+ --pos;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`if (*pprev) {`