Merge remote-tracking branch 'origin/master'

Luckabarbeau · Sep 12, 2019 · 38445d7 · 38445d7
2 parents de683ef + 1e58152
commit 38445d7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Labo_1/meshDifference.py b/Labo_1/meshDifference.py
@@ -8,7 +8,12 @@
 def meshDifference(coarseMesh, fineMesh):
     errorMatrix = np.zeros(coarseMesh.shape)
     numRows = errorMatrix.shape[0]
-    numCols = errorMatrix.shape[1]
+
+    if coarseMesh.size == 1:
+        numCols = 1
+    else:
+        numCols = errorMatrix.shape[1]
+
     for row in range(numRows):
         for col in range(numCols):
             fineMeshRows = (2 * row, 2 * row + 1)

diff --git a/Labo_1/meshDifference_test.py b/Labo_1/meshDifference_test.py
@@ -2,10 +2,9 @@
 import numpy as np
 
 
-a = np.array([[4, 5],
-              [6, 7]])
-b = np.array([2])
-expectedOutput = 14
+a = np.ones((8, 4))
+b = np.zeros((4, 2))
+expectedOutput = 32
 
 functionOutput = meshDifference(b, a)