Move cheat to top-level.

Author: cirosantilli

Diff for: .gitignore

@@ -1,13 +1,10 @@
-#docs, examples, tests
-_gitignore/
-
-#output files: bins/.so/.a
+# Output files: bins/.so/.a
 _out/
 
-#intermediate compilation files: .o
+# Intermediate compilation files: .o
 _tmp/
 
-#cmake style generated files
+# Cmake style generated files
 build/
 
 # Compiled Object files
@@ -25,8 +22,8 @@ build/
 *.la
 *.a
 
-#assembly code
+# Assembly code
 *.s
 
-#temporary files
+# Temporary files
 *.tmp

Diff for: Makefile

@@ -0,0 +1 @@
+Makefile_many

Diff for: makefile.individual_out renamed to Makefile_many

@@ -1,13 +1,32 @@
-#compiles c files with gcc and c++ files with g++, one by one separatelly
-
-#this is mostly for test purposes. see: ``makefile.individual_out_bins`` for a more complete makefile
+# Compiles C files with GCC, and c++ files with g++, one by one separatelly.
+#
+# Executables have no extension, and the same name without extension as the file that originated it:
+#
+#     c.c -> c
+#     cpp.c -> cpp
+#     fortran.f -> fortran
+#
+# Therefore don'e use files with the same basename without extension: e.g. `main.c` and `main.cpp`.
+#
+# # Most useful invocations
+#
+# Build all:
+#
+#     make
+#
+# Build and run output with the default basename:
+#
+#     make run
+#
+# Build and run output with given basename:
+#
+#     make run c
 
--include makefile_params
+-include Makefile_params
 
 # c/cpp
-#
 # Don't use the standard names like `CC` and `CXX` to avoid `?=` getting overridden.
-# by the default values.
+# by the Makefile default values.
 MYCC			?= gcc
 MYCXX			?= g++
 CFLAGS			?= -std=c11   -Wall -pedantic-errors -march=native $(CFLAGS_EXTRA)
@@ -16,29 +35,28 @@ LIBS			?= -lm #-lGL -lGLU -lglut
 INCLUDE_DIRS 	?= #-I/usr/include
 DEFINES 		?= #-D_XOPEN_SOURCE 700
 
-#fortran
+# Fortran
 FF 		?= gfortran
 FFLIBS 	?= #-l:lapack/liblapack.so
 FFLAGS 	?= -std=f2003 -Wall -pedantic-errors -march=native $(FFLAGS_EXTRA)
 
-#paths
+# Paths
 IN_DIR 		?= ./
 IN_EXTS 	?= .c .cpp .f
 OUT_DIR 	?= _out/
 OUT_EXT 	?= #.elf
 
-#basename without extension of file to run
+# Basename without extension of file to run:
 RUN ?= main
 
 ASSEMBLER_NOEXT		?= $(IN_DIR)$(RUN)
-
 DEBUG_DEFINE 		?=
 DEBUG_FLAGS  		?=
 PROFILE_DEFINE 		?= #-DDEBUG
 PROFILE_FLAGS  		?= #
 OPTIMIZE_FLAGS		?= #-O3
 
-#extra phony targets
+# Extra phony targets
 PHONY				?=
 
 RUN_BNAME 	:= $(RUN)$(OUT_EXT)
@@ -62,9 +80,9 @@ $(OUT_DIR)%$(OUT_EXT): $(IN_DIR)%.cpp
 $(OUT_DIR)%$(OUT_EXT): $(IN_DIR)%.f
 	$(FF) $(FFLAGS) $(PROFILE_DEFINE) $(PROFILE_FLAGS) $(DEBUG_DEFINE) $(DEBUG_FLAGS) $(OPTIMIZE_FLAGS) -o "$@" "$<" $(FFLIBS)
 
-#make assembly intermingled with original c code to stdout
-#TODO0: how not to rewrite the make rules?
-#for bare asm: $(MYCC) $(PROFILE_DEFINE) $(PROFILE_FLAGS) $(DEBUG_DEFINE) $(DEBUG_FLAGS) $(OPTIMIZE_FLAGS) $(CFLAGS) -fverbose-asm -S "$(ASSEMBLER_NOEXT)$$EXT"
+# Make assembly intermingled with original C code to stdout>
+# TODO0: how not to rewrite the make rules?
+# For bare asm: $(MYCC) $(PROFILE_DEFINE) $(PROFILE_FLAGS) $(DEBUG_DEFINE) $(DEBUG_FLAGS) $(OPTIMIZE_FLAGS) $(CFLAGS) -fverbose-asm -S "$(ASSEMBLER_NOEXT)$$EXT"
 asm: mkdir set_asm_flags
 	for EXT in $(IN_EXTS); do \
 		if [ -f "$(ASSEMBLER_NOEXT)$$EXT" ]; then \
@@ -100,7 +118,6 @@ set_debug_flags:
 mkdir:
 	mkdir -p "$(OUT_DIR)"
 
-#
 objdump: mkdir set_objdump_flags all
 	cd $(OUT_DIR) && objdump -S $(RUN_BNAME)
 
@@ -112,11 +129,11 @@ profile: clean set_profile_flags all run
 	cd $(OUT_DIR) && gprof -b $(RUN_BNAME) gmon.out | tee "$(RUN_BNAME).profile_out" | less
 
 run: all
-	cd $(OUT_DIR) && ./$(RUN_BNAME) #run from out dir
+	cd $(OUT_DIR) && ./$(RUN_BNAME)
 
 set_profile_flags:
 	$(eval PROFILE_FLAGS := -p -pg)
 	$(eval PROFILE_DEFINE := -DPROFILE)
 	#$(eval OPTIMIZE_FLAGS := -O0)
 
--include makefile_targets
+-include Makefile_targets

Diff for: makefile.single_out renamed to Makefile_one

@@ -1,4 +1,6 @@
-#compiles all c or cpp files in current dir into a single output file
+# Compiles all C or CPP files in current dir into a single output file.
+
+-include Makefile_params
 
 ASSEMBLE_BASENAME 		?= a.c									#basename of the file to generate assembly code for
 AUX_DIR 				?= _aux/
@@ -52,42 +54,25 @@ clean:
 debug: clean set_debug_flags all
 	gdb $(OUT)
 
-set_debug_flags:
-	$(eval DEBUG_FLAGS := -ggdb3)
-	$(eval DEBUG_DEFINE := -DDEBUG)
-	$(eval OPTIMIZE_FLAGS := -O0)
+mkdir:
+	mkdir -p "$(AUX_DIR)"
+	mkdir -p "$(OUT_DIR)"
 
 profile: clean set_profile_flags all run
 	mv -f gmon.out "$(OUT_DIR)"
 	gprof -b $(OUT) "$(OUT_DIR)"gmon.out | tee "$(OUT).profile_out" | less
 
+set_debug_flags:
+	$(eval DEBUG_FLAGS := -ggdb3)
+	$(eval DEBUG_DEFINE := -DDEBUG)
+	$(eval OPTIMIZE_FLAGS := -O0)
+
 set_profile_flags:
 	$(eval PROFILE_FLAGS := -p -pg)
 	$(eval PROFILE_DEFINE := -DPROFILE)
 	#$(eval OPTIMIZE_FLAGS := )
 
 run: all
-	cd $(OUT_DIR) && ./$(OUT_BASENAME) $(RUN_ARGS) #run from out dir
-
-mkdir:
-	mkdir -p "$(AUX_DIR)"
-	mkdir -p "$(OUT_DIR)"
+	cd $(OUT_DIR) && ./$(OUT_BASENAME) $(RUN_ARGS)
 
-ubuntu_install_deps:
-	#sudo aptitude install -y libgtk-3-dev
-
-help:
-	@echo 'sample invocations:'
-	@echo '  ubuntu_install_deps'
-	@echo '    #installs dependencies on Ubuntu'
-	@echo '  make'
-	@echo '  make clean'
-	@echo '  make run'
-	@echo '    #makes then runs output'
-	@echo '  make debug'
-	@echo '    #makes with -DDEBUG and -ggdb3'
-	@echo '    #and runs with gdb -b'
-	@echo '  make profile'
-	@echo '    #clean, make with -DPROFILE and -p -pg'
-	@echo '    #runs and pipes output through less'
-	@echo '    #and saves compile output to <outname>.profile_out'
+-include Makefile_targets

Diff for: c/makefile_params renamed to Makefile_params

@@ -2,4 +2,4 @@ CFLAGS_EXTRA	:= -Wno-overflow -Wno-sequence-point -Wno-unused-variable -Wno-unus
 CXXFLAGS_EXTRA	:= -Wno-sequence-point -Wno-unused-variable -Wno-unused-but-set-variable -pthread
 FFLAGS_EXTRA 	:= -Wno-unused-variable -Wno-unused-but-set-variable
 RUN				:= c
-PHONY			:= install-deps-ubuntu
+PHONY			:= install-ubuntu

Diff for: Makefile_targets

@@ -0,0 +1,14 @@
+install-ubuntu:
+	sudo apt-get update
+	sudo apt-get install aptitude
+	sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+	sudo aptitude update
+	# C
+	sudo aptitude install -y gcc-4.8
+	sudo aptitude install -y gcc-4.8-doc
+	sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50
+	# C++
+	sudo aptitude install -y g++-4.8
+	sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
+	# Fortran
+	sudo aptitude install -y gfortran

Diff for: README.md

@@ -1,32 +1,37 @@
-Simple C and C++ programs, cheats and mini projects.
+C and C++ information, cheatsheets and mini-projects.
 
-The most useful sections are currently:
+Based on Linux tools, but portable code is clearly separated from non-portable. Thoroughly tested on Ubuntu 12.04. Ports and reproduction reports on other systems are welcome.
 
-- [c/c.c](c/c.c): C cheatsheet.
-- [c/cpp.cpp](c/cpp.cpp): C++ cheatsheet.
-- `makefile.*`: makefiles that take care of a ton of possibilities.
+# Compile and run
 
-Other reasonably useful cheats can be found under:
+To compile and run each directory on Ubuntu 12.04 do:
 
-- [opengl/](opengl/)
-- [kde/](kde/)
+    make install-ubuntu
+    make run
 
-# Install on Linux
+You *must* run `make install-ubuntu` on the top-level before compiling any subdirectories.
 
-Most systems already have GCC installed, however some of this relies on the recent GCC 4.7 to be able to try out bleeding edge c11.
+When there are multiple files compiled, e.g.:
 
-This is not recommended for production.
+    c.c -> c
+    cpp.cpp -> cpp
 
-On Ubuntu 12.04, install GCC 4.8 with:
+run a given file by specifying the basename without extension:
 
-    sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-    sudo aptitude install -y update
-    sudo aptitude install gcc-4.8
-    sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50
+    make run RUN=c
+    make run RUN=cpp
 
-# About
+Doing just `make run` in those cases will run the default file.
+
+# Most useful files
 
-Currently uses Linux tools, but Windows ports are welcome.
+- [c.c](c.c): C cheatsheet.
+- [cpp.cpp](main_cpp.cpp): C++ cheatsheet.
+- `Makefile.*`: Makefiles that take care of a ton of possibilities.
+- [opengl/](opengl/)
+- [kde/](kde/)
+
+# About
 
 Larger projects may be in separate dirs.
 

Diff for: c/algorithm.cpp renamed to algorithm.cpp

@@ -0,0 +1 @@
+../Makefile_many

Diff for: boost/Makefile

@@ -0,0 +1,2 @@
+LIBS	:= -lboost_graph -lm
+PHONY	:= install-ubuntu

Diff for: boost/Makefile_params

@@ -0,0 +1,3 @@
+install-ubuntu:
+	sudo aptitude update
+	sudo aptitude install -y libboost1.48-all-dev

Diff for: boost/Makefile_targets

@@ -62,7 +62,7 @@ main(int, char *[])
 
   graph_traits < graph_t >::edge_iterator ei, ei_end;
   for (boost::tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) {
-    graph_traits < graph_t >::edge_descriptor e = *ei;
+    edge_descriptor e = *ei;
     graph_traits < graph_t >::vertex_descriptor
       u = source(e, g), v = target(e, g);
     dot_file << name[u] << " -> " << name[v]

Diff for: boost/graph.cpp

@@ -6530,11 +6530,11 @@ int main(int argc, char **argv)
                         sprintf(s, "%-6s", "abc");
                         assert(strcmp(s, "abc   ") == 0);
 
-                        // Does not work with zeros:
+                        // Does not work with zeros. gcc 4.8.1 gives a warning.
 
-                        sprintf(s, "%-06s", "abc");
-                        /*printf("%s\n", s);*/
-                        /*assert(strcmp(s, "abc   ") == 0);*/
+                        // sprintf(s, "%-06s", "abc");
+                        // printf("%s\n", s);
+                        // assert(strcmp(s, "abc   ") == 0);
                     }
                 }
 
@@ -8492,7 +8492,7 @@ int main(int argc, char **argv)
         C99: return is optional. If omited a `return 0` is added to the program.
     */
 
-    //main returns status:
+    // Main returns status:
 
         return EXIT_SUCCESS;
         return EXIT_FAILURE;

Diff for: boost/makefile

@@ -9133,11 +9133,11 @@ int main(int argc, char **argv)
 #if __cplusplus >= 201103L
 
         /*
-        #thread
+        #thread #multithreading #parallel #concurrency
 
             c++11
 
-            needs `-pthread` flag on g++ linux
+            Needs `-pthread` flag on g++ Linux. 
         */
         {