Merge branch 'master' of github.com:uvaes/dotfiles

Conflicts:
	zshrc

4 files changed, 58 insertions, 20 deletions

diff --git a/vim/mySnippets/cpp.snippets b/vim/mySnippets/cpp.snippets
index 62c1faa..d314641 100644
--- a/vim/mySnippets/cpp.snippets
+++ b/vim/mySnippets/cpp.snippets
@@ -1,10 +1,35 @@
 snippet print_mat "Print matrix" b
-for (unsigned int iii = 0; iii < ${0:mat}.size(); ++iii) {
-	cout << setw(12) << mat[iii][0];
-	for (unsigned int jjj = 1; jjj < mat.size(); ++jjj) {
+for (unsigned int iii = 0; iii < ${1:mat}.size(); ++iii) {
+	cout << setw(12) << $1[iii][0];
+	for (unsigned int jjj = 1; jjj < $1.size(); ++jjj) {
 		cout << ", ";
-		cout << setw(12) << mat[iii][jjj];
+		cout << setw(12) << $1[iii][jjj];
 	}
 	cout << endl;
 }
+$0
+endsnippet
+
+snippet print_vec "Print vector" b
+for (unsigned int iii = 0; iii < ${1:mat}.size(); ++iii) {
+	cout << setw(12) << $1[iii];
+	cout << endl;
+}
+$0
+endsnippet
+
+snippet forij "Matrix iteration" b
+for (int ${2:i} = 0; $2 < ${1:count}; $2++) {
+	for (int ${4:j} = 0; $4 < $1; $4++) {
+		${5}
+	}
+}
+endsnippet
+
+snippet vec "vector" i
+vector<${1:double}> $0
+endsnippet
+
+snippet mat "matrix" i
+vector< vector<${1:double}> > $0
 endsnippet
diff --git a/vim/mySnippets/mail.snippets b/vim/mySnippets/mail.snippets
index c512f9b..9839916 100644
--- a/vim/mySnippets/mail.snippets
+++ b/vim/mySnippets/mail.snippets
@@ -15,7 +15,9 @@ ${3:Urbain}
 endsnippet
 
 snippet sign "Signature" b
-Urbain Vaes,
+Best wishes,
+
+Urbain Vaes
 Department of Mathematics
 Office 6M09
 endsnippet
diff --git a/vim/mySnippets/python.snippets b/vim/mySnippets/python.snippets
index e69de29..4a7d74d 100644
--- a/vim/mySnippets/python.snippets
+++ b/vim/mySnippets/python.snippets
@@ -0,0 +1,4 @@
+snippet nicolas "Nicolas" i
+Nicolas est le meilleur programmeur $1
+$0
+endsnippet
diff --git a/vim/mySnippets/tex.snippets b/vim/mySnippets/tex.snippets
index fb061f0..884cc2d 100644
--- a/vim/mySnippets/tex.snippets
+++ b/vim/mySnippets/tex.snippets
@@ -15,7 +15,7 @@ snippet new "New command" b
 endsnippet
 
 snippet op "Operator style" i
-\op 
+\op
 endsnippet
 
 snippet pard "Partial derivative" i
@@ -27,7 +27,7 @@ snippet pardd "Double partial derivative" i
 endsnippet
 
 snippet herm "Hermite polynomials" i
-\hermite 
+\hermite
 endsnippet
 
 snippet red "Red text" i
@@ -39,35 +39,35 @@ snippet sumi "Sum over index set" i
 endsnippet
 
 snippet int "Integral" i
-\int_{$1} 
+\int_{$1}
 endsnippet
 
 snippet ip "Inner product" i
 \ip{$1}{$2}$0
 endsnippet
 
-snippet norm "Norm" i
-\norm{$1}$0
+snippet ipw "Inner product" i
+\wip{$1}{$2}{$3}$0
 endsnippet
 
-snippet test "Test functions" i
-\test{${1:\real^n}}$0
+snippet norm "Norm" i
+\norm{$1}$0
 endsnippet
 
-snippet lp "Flat Lp space" i
-\lp{${1:2}}{${2:\real^n}}$0
+snippet normw "Weighted norm" i
+\wnorm{$1}{${2:\gamma}}
 endsnippet
 
-snippet lpw "Weighted Lp space" i
-\wlp{${1:2}}{${2:\real^n}}{${3:\rho}}$0
+snippet test "Test functions" i
+\test{${1:\real^n}}$0
 endsnippet
 
-snippet sob "Flat Sobolev space" i
-\sobolev{${1:s}}{${2:\real^n}}$0
+snippet lp "Lp spaces" w
+\lp{${1:exponent}}{${2:domain}}${3/^.+$/[/}${3:weight}${3/^.+$/]/}$0
 endsnippet
 
-snippet sobw "Weighted Sobolev space" i
-\wsobolev{${1:s}}{${2:\real^n}}{${3:\rho}}$0
+snippet  sob "Sobolev spaces" w
+\sobolev{${1:exponent}}{${2:domain}}${3/^.+$/[/}${3:weight}${3/^.+$/]/}$0
 endsnippet
 
 snippet cont "Continuous function" i
@@ -101,3 +101,10 @@ endsnippet
 snippet ref "Clever reference" i
 \cref{$1}$0
 endsnippet
+
+snippet frame "My frame snippet" b
+\begin{frame}
+	\frametitle{$1}
+	$0
+\end{frame}
+endsnippet