SR: Adding changes to Matrix Multiplication

Author: Sushmit Roy

.DS_Store

@@ -12,10 +12,10 @@
      "output_type": "stream",
      "text": [
       "b'\\x16\\r\\r\\n'\n",
-      "3.5.1 |Continuum Analytics, Inc.| (default, Dec  7 2015, 11:24:55) \n",
+      "3.5.1 |Anaconda 2.4.1 (x86_64)| (default, Dec  7 2015, 11:24:55) \n",
       "[GCC 4.2.1 (Apple Inc. build 5577)]\n",
       "b'\\x16\\r\\r\\n'\n",
-      "3.5.1 |Continuum Analytics, Inc.| (default, Dec  7 2015, 11:24:55) \n",
+      "3.5.1 |Anaconda 2.4.1 (x86_64)| (default, Dec  7 2015, 11:24:55) \n",
       "[GCC 4.2.1 (Apple Inc. build 5577)]\n",
       "b'\\x16\\r\\r\\n'\n"
      ]
@@ -54,7 +54,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "{'#', '@', '?'}\n",
+      "{'@', '#', '?'}\n",
       "2\n",
       "\n",
       "        #  ?  @\n",
@@ -180,7 +180,7 @@
       " gnome hoop putty shooter slinky\n",
       "--------------------------------\n",
       "   240   55   133      90    150\n",
-      "4.596345395924539e-25\n"
+      "1.1071820576957945e-25\n"
      ]
     }
    ],
@@ -261,7 +261,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 7,
    "metadata": {
     "collapsed": false
    },
@@ -291,13 +291,13 @@
       " 5  |  2\n",
       "\n",
       "False\n",
-      "('b', 'B')\n",
-      "('a', 'B')\n",
       "('b', 'A')\n",
+      "('a', 'B')\n",
+      "('b', 'B')\n",
       "0\n",
       "True\n",
       "True\n",
-      "({'b', 'a'}, {'A', 'B'})\n",
+      "({'a', 'b'}, {'A', 'B'})\n",
       "Addition starts\n",
       "True\n",
       "True\n",
@@ -317,6 +317,16 @@
       "True\n",
       "True\n"
      ]
+    },
+    {
+     "data": {
+      "text/plain": [
+       "True"
+      ]
+     },
+     "execution_count": 7,
+     "metadata": {},
+     "output_type": "execute_result"
     }
    ],
    "source": [
@@ -396,7 +406,18 @@
     "print(v2*M2 == Vec({0, 2, 4, 6, 7},{}))\n",
     "v3 = Vec({'a','b'},{'a':1,'b':1})\n",
     "M3 = Mat(({'a', 'b'}, {0, 1}), {('a', 1): 1, ('b', 1): 1, ('a', 0): 1, ('b', 0): 1})\n",
-    "print(v3*M3 == Vec({0, 1},{0: 2, 1: 2}))\n"
+    "print(v3*M3 == Vec({0, 1},{0: 2, 1: 2}))\n",
+    "B=Mat(({'a','b','c'}, {5,6}), {})\n",
+    "B.D[1]\n",
+    "v1.f\n",
+    "v4 = Vec({'a','b'},{'a':1,'b':1})\n",
+    "\n",
+    "{key1[0]: M3[key1] for key1 in M3.f if key1[1] == 0}\n",
+    "A = Mat(({0,1,2}, {0,1,2}), {(1,1):4, (0,0):0, (1,2):1, (1,0):5, (0,1):3, (0,2):2})\n",
+    "B = Mat(({0,1,2}, {0,1,2}), {(1,0):5, (2,1):3, (1,1):2, (2,0):0, (0,0):1, (0,1):4})\n",
+    "\n",
+    "#A * B == Mat(({0,1,2}, {0,1,2}), {(0,0):15, (0,1):12, (1,0):25, (1,1):31})\n",
+    "A * B"
    ]
   }
  ],

.idea/workspace.xml

@@ -54,7 +54,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "{'@', '#', '?'}\n",
+      "{'?', '#', '@'}\n",
       "2\n",
       "\n",
       "        #  ?  @\n",
@@ -180,7 +180,7 @@
       " gnome hoop putty shooter slinky\n",
       "--------------------------------\n",
       "   240   55   133      90    150\n",
-      "1.262177448353619e-25\n"
+      "9.956055712613346e-26\n"
      ]
     }
    ],
@@ -261,7 +261,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 6,
    "metadata": {
     "collapsed": false
    },
@@ -292,8 +292,8 @@
       "\n",
       "False\n",
       "('b', 'A')\n",
-      "('a', 'B')\n",
       "('b', 'B')\n",
+      "('a', 'B')\n",
       "0\n",
       "True\n",
       "True\n",
@@ -317,6 +317,16 @@
       "True\n",
       "True\n"
      ]
+    },
+    {
+     "data": {
+      "text/plain": [
+       "Mat(({0, 1, 2}, {0, 1, 2}), {(0, 1): 12, (1, 0): 25, (0, 0): 15, (1, 1): 31})"
+      ]
+     },
+     "execution_count": 6,
+     "metadata": {},
+     "output_type": "execute_result"
     }
    ],
    "source": [
@@ -396,7 +406,18 @@
     "print(v2*M2 == Vec({0, 2, 4, 6, 7},{}))\n",
     "v3 = Vec({'a','b'},{'a':1,'b':1})\n",
     "M3 = Mat(({'a', 'b'}, {0, 1}), {('a', 1): 1, ('b', 1): 1, ('a', 0): 1, ('b', 0): 1})\n",
-    "print(v3*M3 == Vec({0, 1},{0: 2, 1: 2}))\n"
+    "print(v3*M3 == Vec({0, 1},{0: 2, 1: 2}))\n",
+    "B=Mat(({'a','b','c'}, {5,6}), {})\n",
+    "B.D[1]\n",
+    "v1.f\n",
+    "v4 = Vec({'a','b'},{'a':1,'b':1})\n",
+    "\n",
+    "{key1[0]: M3[key1] for key1 in M3.f if key1[1] == 0}\n",
+    "A = Mat(({0,1,2}, {0,1,2}), {(1,1):4, (0,0):0, (1,2):1, (1,0):5, (0,1):3, (0,2):2})\n",
+    "B = Mat(({0,1,2}, {0,1,2}), {(1,0):5, (2,1):3, (1,1):2, (2,0):0, (0,0):1, (0,1):4})\n",
+    "\n",
+    "#A * B == Mat(({0,1,2}, {0,1,2}), {(0,0):15, (0,1):12, (1,0):25, (1,1):31})\n",
+    "A * B"
    ]
   }
  ],

.ipynb_checkpoints/Python3_chapter4-checkpoint.ipynb

@@ -246,8 +246,14 @@ def matrix_matrix_mul(A, B):
     True
     """
     assert A.D[1] == B.D[0]
-    mat_mul =
-    pass
+    mat_mul = Mat((A.D[0], B.D[1]), {})
+    for k in B.D[1]:
+        vec_col = Vec(B.D[0], {key1[0]: B[key1] for key1 in B.f if key1[1] == k})
+        for j in vec_col.D:
+            if sum([A[key1]*vec_col[key1[1]] for key1 in A.f if key1[0] == j]) != 0: # if condition for sparsity
+                mat_mul[j, k] = sum([A[key1]*vec_col[key1[1]] for key1 in A.f if key1[0] == j])
+
+    return mat_mul
 
 ################################################################################