From c0f5111872bb0436c778a059ffa067b0bf3193e5 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Tue, 21 Sep 2021 13:38:08 +0200
Subject: [PATCH] The Big Merge

---
 {om-graphs => 50-graphs}/Makefile                 |  0
 {om-graphs => 50-graphs}/expose-idea.ipe          |  0
 {om-graphs => 50-graphs}/expose-phases.ipe        |  0
 {om-graphs => 50-graphs}/expose-real.ipe          |  0
 {om-graphs => 50-graphs}/graphs.tex               |  2 +-
 {om-graphs => 50-graphs}/heavy-light.ipe          |  0
 {om-graphs => 50-graphs}/lazy-update.ipe          |  0
 {om-graphs => 50-graphs}/level-network.ipe        |  0
 {om-graphs => 50-graphs}/middle-sons.ipe          |  0
 {om-graphs => 50-graphs}/range-tree.ipe           |  0
 {vk-dynamic => 51-dynamize}/Makefile              |  0
 .../dynamic.tex => 51-dynamize/dynamize.tex       |  2 +-
 .../semidynamic-insert.asy                        |  0
 {201-persist => 52-persist}/Makefile              |  0
 {201-persist => 52-persist}/fat-nodes.asy         |  0
 {201-persist => 52-persist}/path-copying.asy      |  0
 {201-persist => 52-persist}/persist.tex           |  4 +++-
 .../point-localization.asy                        |  0
 {fs-succinct => 53-succinct}/Makefile             |  1 -
 {fs-succinct => 53-succinct}/composition.asy      |  0
 {fs-succinct => 53-succinct}/mixer.asy            |  0
 {fs-succinct => 53-succinct}/mixer_chain.asy      |  0
 {fs-succinct => 53-succinct}/mixer_tree.asy       |  0
 {fs-succinct => 53-succinct}/sole.asy             |  0
 {fs-succinct => 53-succinct}/sole_boxes.asy       |  0
 {fs-succinct => 53-succinct}/sole_hilevel.asy     |  0
 {fs-succinct => 53-succinct}/succinct.tex         |  2 +-
 {fs-succinct => 53-succinct}/succinct_common.asy  |  0
 {fs-succinct => 53-succinct}/tree_shapes.asy      |  0
 {streaming => 54-streaming}/Makefile              |  0
 {streaming => 54-streaming}/streaming.tex         |  2 +-
 Makefile                                          | 15 +++++----------
 32 files changed, 12 insertions(+), 16 deletions(-)
 rename {om-graphs => 50-graphs}/Makefile (100%)
 rename {om-graphs => 50-graphs}/expose-idea.ipe (100%)
 rename {om-graphs => 50-graphs}/expose-phases.ipe (100%)
 rename {om-graphs => 50-graphs}/expose-real.ipe (100%)
 rename {om-graphs => 50-graphs}/graphs.tex (99%)
 rename {om-graphs => 50-graphs}/heavy-light.ipe (100%)
 rename {om-graphs => 50-graphs}/lazy-update.ipe (100%)
 rename {om-graphs => 50-graphs}/level-network.ipe (100%)
 rename {om-graphs => 50-graphs}/middle-sons.ipe (100%)
 rename {om-graphs => 50-graphs}/range-tree.ipe (100%)
 rename {vk-dynamic => 51-dynamize}/Makefile (100%)
 rename vk-dynamic/dynamic.tex => 51-dynamize/dynamize.tex (99%)
 rename {vk-dynamic => 51-dynamize}/semidynamic-insert.asy (100%)
 rename {201-persist => 52-persist}/Makefile (100%)
 rename {201-persist => 52-persist}/fat-nodes.asy (100%)
 rename {201-persist => 52-persist}/path-copying.asy (100%)
 rename {201-persist => 52-persist}/persist.tex (99%)
 rename {201-persist => 52-persist}/point-localization.asy (100%)
 rename {fs-succinct => 53-succinct}/Makefile (99%)
 rename {fs-succinct => 53-succinct}/composition.asy (100%)
 rename {fs-succinct => 53-succinct}/mixer.asy (100%)
 rename {fs-succinct => 53-succinct}/mixer_chain.asy (100%)
 rename {fs-succinct => 53-succinct}/mixer_tree.asy (100%)
 rename {fs-succinct => 53-succinct}/sole.asy (100%)
 rename {fs-succinct => 53-succinct}/sole_boxes.asy (100%)
 rename {fs-succinct => 53-succinct}/sole_hilevel.asy (100%)
 rename {fs-succinct => 53-succinct}/succinct.tex (99%)
 rename {fs-succinct => 53-succinct}/succinct_common.asy (100%)
 rename {fs-succinct => 53-succinct}/tree_shapes.asy (100%)
 rename {streaming => 54-streaming}/Makefile (100%)
 rename {streaming => 54-streaming}/streaming.tex (99%)

diff --git a/om-graphs/Makefile b/50-graphs/Makefile
similarity index 100%
rename from om-graphs/Makefile
rename to 50-graphs/Makefile
diff --git a/om-graphs/expose-idea.ipe b/50-graphs/expose-idea.ipe
similarity index 100%
rename from om-graphs/expose-idea.ipe
rename to 50-graphs/expose-idea.ipe
diff --git a/om-graphs/expose-phases.ipe b/50-graphs/expose-phases.ipe
similarity index 100%
rename from om-graphs/expose-phases.ipe
rename to 50-graphs/expose-phases.ipe
diff --git a/om-graphs/expose-real.ipe b/50-graphs/expose-real.ipe
similarity index 100%
rename from om-graphs/expose-real.ipe
rename to 50-graphs/expose-real.ipe
diff --git a/om-graphs/graphs.tex b/50-graphs/graphs.tex
similarity index 99%
rename from om-graphs/graphs.tex
rename to 50-graphs/graphs.tex
index a0be31b..355a07b 100644
--- a/om-graphs/graphs.tex
+++ b/50-graphs/graphs.tex
@@ -1,6 +1,6 @@
 \ifx\chapter\undefined
 \input adsmac.tex
-\singlechapter{42}
+\singlechapter{50}
 \fi
 
 \def\TODO{{\bf TODO}}
diff --git a/om-graphs/heavy-light.ipe b/50-graphs/heavy-light.ipe
similarity index 100%
rename from om-graphs/heavy-light.ipe
rename to 50-graphs/heavy-light.ipe
diff --git a/om-graphs/lazy-update.ipe b/50-graphs/lazy-update.ipe
similarity index 100%
rename from om-graphs/lazy-update.ipe
rename to 50-graphs/lazy-update.ipe
diff --git a/om-graphs/level-network.ipe b/50-graphs/level-network.ipe
similarity index 100%
rename from om-graphs/level-network.ipe
rename to 50-graphs/level-network.ipe
diff --git a/om-graphs/middle-sons.ipe b/50-graphs/middle-sons.ipe
similarity index 100%
rename from om-graphs/middle-sons.ipe
rename to 50-graphs/middle-sons.ipe
diff --git a/om-graphs/range-tree.ipe b/50-graphs/range-tree.ipe
similarity index 100%
rename from om-graphs/range-tree.ipe
rename to 50-graphs/range-tree.ipe
diff --git a/vk-dynamic/Makefile b/51-dynamize/Makefile
similarity index 100%
rename from vk-dynamic/Makefile
rename to 51-dynamize/Makefile
diff --git a/vk-dynamic/dynamic.tex b/51-dynamize/dynamize.tex
similarity index 99%
rename from vk-dynamic/dynamic.tex
rename to 51-dynamize/dynamize.tex
index 9b99bc6..9f3f32c 100644
--- a/vk-dynamic/dynamic.tex
+++ b/51-dynamize/dynamize.tex
@@ -1,6 +1,6 @@
 \ifx\chapter\undefined
 \input adsmac.tex
-\singlechapter{90}
+\singlechapter{51}
 \fi
 
 \chapter[dynamic]{Dynamization}
diff --git a/vk-dynamic/semidynamic-insert.asy b/51-dynamize/semidynamic-insert.asy
similarity index 100%
rename from vk-dynamic/semidynamic-insert.asy
rename to 51-dynamize/semidynamic-insert.asy
diff --git a/201-persist/Makefile b/52-persist/Makefile
similarity index 100%
rename from 201-persist/Makefile
rename to 52-persist/Makefile
diff --git a/201-persist/fat-nodes.asy b/52-persist/fat-nodes.asy
similarity index 100%
rename from 201-persist/fat-nodes.asy
rename to 52-persist/fat-nodes.asy
diff --git a/201-persist/path-copying.asy b/52-persist/path-copying.asy
similarity index 100%
rename from 201-persist/path-copying.asy
rename to 52-persist/path-copying.asy
diff --git a/201-persist/persist.tex b/52-persist/persist.tex
similarity index 99%
rename from 201-persist/persist.tex
rename to 52-persist/persist.tex
index 681867c..ddf062f 100644
--- a/201-persist/persist.tex
+++ b/52-persist/persist.tex
@@ -1,6 +1,6 @@
 \ifx\chapter\undefined
 \input adsmac.tex
-\singlechapter{9}
+\singlechapter{52}
 \fi
 
 \chapter[persist]{Persistence}
@@ -240,6 +240,8 @@ Some common types of binary search trees like red-black trees or weak-AVL trees
  
 \: In semi-persistence it was not needed to store all information about nodes. It was sufficient to store pointers to children, key, and value for older versions. Fields useful for balancing were not needed for older versions. This is not true for full-persistence. All information must be stored.
 
+\endlist
+
 \section{List Ordering}
 
 Moving from semi-persistence to full persistence we encounter an obstacle -- versions no longer form an implicit linear order. 
diff --git a/201-persist/point-localization.asy b/52-persist/point-localization.asy
similarity index 100%
rename from 201-persist/point-localization.asy
rename to 52-persist/point-localization.asy
diff --git a/fs-succinct/Makefile b/53-succinct/Makefile
similarity index 99%
rename from fs-succinct/Makefile
rename to 53-succinct/Makefile
index 12eb933..a2e7c91 100644
--- a/fs-succinct/Makefile
+++ b/53-succinct/Makefile
@@ -1,7 +1,6 @@
 TOP=..
 PICS=sole sole_boxes sole_hilevel mixer composition mixer_chain mixer_tree tree_shapes
 
-
 include ../Makerules
 
 sole.pdf:: succinct_common.asy
diff --git a/fs-succinct/composition.asy b/53-succinct/composition.asy
similarity index 100%
rename from fs-succinct/composition.asy
rename to 53-succinct/composition.asy
diff --git a/fs-succinct/mixer.asy b/53-succinct/mixer.asy
similarity index 100%
rename from fs-succinct/mixer.asy
rename to 53-succinct/mixer.asy
diff --git a/fs-succinct/mixer_chain.asy b/53-succinct/mixer_chain.asy
similarity index 100%
rename from fs-succinct/mixer_chain.asy
rename to 53-succinct/mixer_chain.asy
diff --git a/fs-succinct/mixer_tree.asy b/53-succinct/mixer_tree.asy
similarity index 100%
rename from fs-succinct/mixer_tree.asy
rename to 53-succinct/mixer_tree.asy
diff --git a/fs-succinct/sole.asy b/53-succinct/sole.asy
similarity index 100%
rename from fs-succinct/sole.asy
rename to 53-succinct/sole.asy
diff --git a/fs-succinct/sole_boxes.asy b/53-succinct/sole_boxes.asy
similarity index 100%
rename from fs-succinct/sole_boxes.asy
rename to 53-succinct/sole_boxes.asy
diff --git a/fs-succinct/sole_hilevel.asy b/53-succinct/sole_hilevel.asy
similarity index 100%
rename from fs-succinct/sole_hilevel.asy
rename to 53-succinct/sole_hilevel.asy
diff --git a/fs-succinct/succinct.tex b/53-succinct/succinct.tex
similarity index 99%
rename from fs-succinct/succinct.tex
rename to 53-succinct/succinct.tex
index b87d93f..4db78b5 100644
--- a/fs-succinct/succinct.tex
+++ b/53-succinct/succinct.tex
@@ -1,6 +1,6 @@
 \ifx\chapter\undefined
 \input adsmac.tex
-\singlechapter{50}
+\singlechapter{53}
 \fi
 \input tabto.tex
 
diff --git a/fs-succinct/succinct_common.asy b/53-succinct/succinct_common.asy
similarity index 100%
rename from fs-succinct/succinct_common.asy
rename to 53-succinct/succinct_common.asy
diff --git a/fs-succinct/tree_shapes.asy b/53-succinct/tree_shapes.asy
similarity index 100%
rename from fs-succinct/tree_shapes.asy
rename to 53-succinct/tree_shapes.asy
diff --git a/streaming/Makefile b/54-streaming/Makefile
similarity index 100%
rename from streaming/Makefile
rename to 54-streaming/Makefile
diff --git a/streaming/streaming.tex b/54-streaming/streaming.tex
similarity index 99%
rename from streaming/streaming.tex
rename to 54-streaming/streaming.tex
index 9785c3c..66908e3 100644
--- a/streaming/streaming.tex
+++ b/54-streaming/streaming.tex
@@ -1,6 +1,6 @@
 \ifx\chapter\undefined
 \input adsmac.tex
-\singlechapter{20}
+\singlechapter{54}
 \fi
 
 \chapter[streaming]{Streaming Algorithms}
diff --git a/Makefile b/Makefile
index 9813328..d871f30 100644
--- a/Makefile
+++ b/Makefile
@@ -9,16 +9,11 @@ ebook: chapters
 include Makerules
 
 CHAPTERS= \
-	01-prelim \
-	02-splay \
-	03-abtree \
-	04-heaps \
-	05-cache \
-	06-hash \
-	07-geom \
-	08-string \
-	vk-dynamic \
-	fs-succinct
+	50-graphs \
+	51-dynamize \
+	52-persist \
+	53-succinct \
+	54-streaming
 
 chapters:
 	for ch in $(CHAPTERS) ; do $(MAKE) -C $$ch pics ; done
-- 
GitLab