From 08f493ae797e4a4c69249a35bd29ca9dfc5069e2 Mon Sep 17 00:00:00 2001
From: Lafrite <lafrite@poneyworld.net>
Date: Tue, 6 Aug 2013 08:01:40 +0200
Subject: [PATCH] add docstring test in calculus.py

---
 calculus.py | 68 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/calculus.py b/calculus.py
index 5c52129..ee7d508 100644
--- a/calculus.py
+++ b/calculus.py
@@ -12,6 +12,14 @@ def infixToPostfix(infixExp):
 	:param infixExp: an infix expression (caracters must be separate by a space)
 	:returns: the corresponding postfix expression
 
+	:Example:
+
+	>>> infixToPostfix("1 + 2")
+	'1 2 +'
+
+	>>> infixToPostfix("1 * 2 + 3")
+	'1 2 * 3 +'
+
 	"""
 	priority = {"*" : 3, "/": 3, "+": 2, "-":2, "(": 1}
 	
@@ -190,7 +198,7 @@ def needPar(operande, operator, posi = "after"):
 		return 0
 
 def get_main_op(exp):
-	"""Getting the main operation of th expression
+	"""Getting the main operation of the expression
 
 	:param exp: the expression
 	:returns: the main operation (+, -, * or /) or 0 if the expression is only one element
@@ -221,11 +229,15 @@ def get_main_op(exp):
 
 def expand_list(list_list):
 	"""Expand list of list
-	[1,2,[3,4],5,[6,7,8]] -> [1,2,3,5,6], [1,2,4,5,7], [1,2,4,5,8]
 
 	:param list: the list to expande
 	:returns: list of expanded lists
 
+	:Example:
+
+	>>> expand_list([1,2,[3,4],5,[6,7,8]])
+	[[1, 2, 3, 5, 6], [1, 2, 4, 5, 7], [1, 2, 4, 5, 8]]
+
 	"""
 	list_in_list = [i for i in list_list if type(i) == list].copy()
 	nbr_ans_list = max([len(i) for i in list_in_list])
@@ -270,38 +282,40 @@ if __name__ == '__main__':
 	#exp = "2 * 3 * 3 * 5"
 	#test(exp)
 
-	exp = "2 * 3 + 3 * 5"
-	test(exp)
+	#exp = "2 * 3 + 3 * 5"
+	#test(exp)
 
-	exp = "2 * ( 3 + 4 ) + 3 * 5"
-	test(exp)
-	
-	exp = "2 * ( 3 + 4 ) + ( 3 - 4 ) * 5"
-	test(exp)
-	
-	exp = "2 * ( 2 - ( 3 + 4 ) ) + ( 3 - 4 ) * 5"
-	test(exp)
-	
-	exp = "2 * ( 2 - ( 3 + 4 ) ) + 5 * ( 3 - 4 )"
-	test(exp)
-	
-	exp = "2 + 5 * ( 3 - 4 )"
-	test(exp)
-	
-	exp = "( 2 + 5 ) * ( 3 - 4 )"
-	test(exp)
-	
-	exp = "( 2 + 5 ) * ( 3 * 4 )"
-	test(exp)
-	
-	exp = "( 2 + 5 ) / ( 3 * 4 )"
-	test(exp)
+	#exp = "2 * ( 3 + 4 ) + 3 * 5"
+	#test(exp)
+	#
+	#exp = "2 * ( 3 + 4 ) + ( 3 - 4 ) * 5"
+	#test(exp)
+	#
+	#exp = "2 * ( 2 - ( 3 + 4 ) ) + ( 3 - 4 ) * 5"
+	#test(exp)
+	#
+	#exp = "2 * ( 2 - ( 3 + 4 ) ) + 5 * ( 3 - 4 )"
+	#test(exp)
+	#
+	#exp = "2 + 5 * ( 3 - 4 )"
+	#test(exp)
+	#
+	#exp = "( 2 + 5 ) * ( 3 - 4 )"
+	#test(exp)
+	#
+	#exp = "( 2 + 5 ) * ( 3 * 4 )"
+	#test(exp)
+	#
+	#exp = "( 2 + 5 ) / ( 3 * 4 )"
+	#test(exp)
 
 	#print(expand_list([1,2,['a','b','c'], 3, ['d','e']]))
 	
 	## Ce denier pose un soucis. Pour le faire marcher il faudrai implémenter le calcul avec les fractions
 	#exp = "( 2 + 5 ) / 3 * 4"
 	#test(exp)
+	import doctest
+	doctest.testmod()
 
 
 # -----------------------------