Bug fixes

Author: robkle

calc.py

@@ -4,7 +4,6 @@
 class Calc(ParseArg):
 	def solve(self):
 		self.clean()
-		self.pol = [*self.s_equ][-1]
 		self.polynomial()
 		if self.pol == 1:
 			self.linear()
@@ -16,10 +15,18 @@ def clean(self):
 		for x in self.equ:
 			if self.equ[x] != 0:
 				temp[x] = self.equ[x]
-		self.s_equ = dict(sorted(temp.items(), key=lambda item: item[0]))
-		if bool(self.s_equ) == False:
+		if bool(temp) == False:
 			sys.exit('Each real number is a solution!')
-
+		self.s_equ = dict(sorted(temp.items(), key=lambda item: item[0]))
+		self.pol = [*self.s_equ][-1]
+		i = 0
+		while i < self.pol:
+			if i in self.s_equ.keys():
+				pass
+			else:
+				self.s_equ[i] = 0
+			i += 1
+		
 	def polynomial(self):
 		print ('Polynomial degree: %d' % int(self.pol))
 		if self.pol > 2:
@@ -29,7 +36,8 @@ def polynomial(self):
 
 	def linear(self):
 		result = -(self.s_equ[0]) / self.s_equ[1]
-		print (int(result) if result == int(result) else result)
+		print ('The solution is:')
+		print (int(result) if result == int(result) else round(result, 6))
 
 	def quadratic(self):
 		result = [0] * 2

parse.py

@@ -8,17 +8,19 @@ def __init__(self, av):
 
 	def process(self, av):
 		raw = av.replace(" ", "").split("=")
+		self.trim(raw)
 		if len(raw) != 2:
-			sys.exit('Input contains invalid equation!')
+			sys.exit('Input contains an invalid equation!')
 		self.parse(raw[0], 1)
 		self.parse(raw[1], -1)
 
 	def parse(self, side, sv):
 		val = 1.0
 		sign = 1
 		parts = re.split('([+-]+)', side)
+		self.trim(parts)
 		if re.match('[+-]+', parts[-1]):
-			sys.exit('Input contains invalid equation!')
+			sys.exit('Input contains an invalid equation!')
 		for i in parts:
 			if re.match('[+-]+', i):
 				sign = -1 if i.count('-') % 2 == 1 else 1
@@ -33,14 +35,19 @@ def parse(self, side, sv):
 					if (nums[0] != ''):
 						val = float(nums[0])
 					x = 1
-				elif re.match('\d+(\.?\d+)*', i):
+				elif re.match('^(\d+(\.?\d+)*)$', i):
 					val = float(i)
 					x = 0
 				else:
-					sys.exit('Input contains invalid equation!')
+					sys.exit('Input contains an invalid equation!')
 				self.update(val * sign, x, sv)
 				val = 1
 
+	def trim(self, lst):
+		for i in lst:
+			if i == '':
+				lst.remove(i)
+	
 	def update(self, val, x, sv):
 		if (x in self.equ):
 			self.equ[x] += val * sv