SR: Changing mat.py logic

Author: Sushmit Roy

.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.1071820576957945e-25\n"
+      "4.8568588212647255e-25\n"
      ]
     }
    ],
@@ -230,12 +230,31 @@
       " 6  |  one   0   0   0\n",
       "\n",
       "\n",
-      "       0 1   2 3   4   5   6\n",
-      "     -----------------------\n",
-      " 0  |  0 0   0 0   0   0 one\n",
-      " 1  |  0 0   0 0   0 one   0\n",
-      " 2  |  0 0   0 0 one   0   0\n",
-      " 3  |  0 0 one 0   0   0   0\n",
+      "         0\n",
+      "     -----\n",
+      " 0  |  one\n",
+      " 1  |    0\n",
+      " 2  |    0\n",
+      " 3  |  one\n",
+      "\n",
+      "\n",
+      "         0\n",
+      "     -----\n",
+      " 0  |    0\n",
+      " 1  |    0\n",
+      " 2  |  one\n",
+      " 3  |  one\n",
+      " 4  |    0\n",
+      " 5  |    0\n",
+      " 6  |  one\n",
+      "\n",
+      "\n",
+      "         0\n",
+      "     -----\n",
+      " 0  |  one\n",
+      " 1  |    0\n",
+      " 2  |    0\n",
+      " 3  |  one\n",
       "\n"
      ]
     }
@@ -245,23 +264,25 @@
     "# Task 4.14.1 \n",
     "G = listlist2mat([[one,zero,one,one],\n",
     "                  [one,one,zero,one],[zero,zero,zero,one],\n",
-    "                  [one,one,one,zero],[zero,zero,one,zero],[zero,one,zero,zero],[one,zero,zero,zero]])\n",
-    "\n",
-    "print(G)\n",
-    "\n",
-    "# Task 4.14.3\n",
-    "\n",
+    "                  [one,one,one,zero],[zero,zero,one,zero],\n",
+    "                  [zero,one,zero,zero],[one,zero,zero,zero]])\n",
+    "c1 = listlist2mat([[one],[zero],[zero],[one]])\n",
+    "c = listlist2mat([[one,zero,zero,one]])\n",
+    "res = G*c1\n",
+    "#Task 4.14.3\n",
     "R = listlist2mat([[zero,zero,zero,zero,zero,zero,one],\n",
     "                 [zero,zero,zero,zero,zero,one,zero],\n",
     "                 [zero,zero,zero,zero,one,zero,zero],\n",
     "                 [zero,zero,one,zero,zero,zero,zero]])\n",
-    "\n",
-    "print(R)"
+    "print(G)\n",
+    "print(c1)\n",
+    "print(G*c1)\n",
+    "print(R * res)\n"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 6,
    "metadata": {
     "collapsed": false
    },
@@ -291,13 +312,13 @@
       " 5  |  2\n",
       "\n",
       "False\n",
-      "('b', 'A')\n",
       "('a', 'B')\n",
       "('b', 'B')\n",
+      "('b', 'A')\n",
       "0\n",
       "True\n",
       "True\n",
-      "({'a', 'b'}, {'A', 'B'})\n",
+      "({'a', 'b'}, {'B', 'A'})\n",
       "Addition starts\n",
       "True\n",
       "True\n",
@@ -315,18 +336,65 @@
       "True\n",
       "True\n",
       "True\n",
-      "True\n"
+      "True\n",
+      "testing for mat * mat\n",
+      "True\n",
+      "\n",
+      "        0  1 2\n",
+      "     ---------\n",
+      " 0  |  15 12 0\n",
+      " 1  |  25 31 0\n",
+      " 2  |   0  0 0\n",
+      "\n",
+      "\n",
+      "       a  b\n",
+      "     ------\n",
+      " 0  |  4 -3\n",
+      " 1  |  1  0\n",
+      " 2  |  1 -2\n",
+      "\n",
+      "\n",
+      "       x  y\n",
+      "     ------\n",
+      " a  |  3 -2\n",
+      " b  |  4 -1\n",
+      "\n",
+      "\n",
+      "        x  y\n",
+      "     -------\n",
+      " 0  |   0 -5\n",
+      " 1  |   3 -2\n",
+      " 2  |  -5  0\n",
+      "\n",
+      "True\n",
+      "\n",
+      "       (1, 1) (2, 2)\n",
+      "     ---------------\n",
+      " 0  |       0      0\n",
+      " 1  |       0      0\n",
+      "\n",
+      "True\n",
+      "\n",
+      "       c  d\n",
+      "     ------\n",
+      " a  |  0  5\n",
+      " b  |  0 15\n",
+      "\n",
+      "True\n",
+      "True\n",
+      "\n",
+      "       A B\n",
+      "     -----\n",
+      " a  |  1 2\n",
+      " b  |  3 4\n",
+      "\n",
+      "\n",
+      "       c d\n",
+      "     -----\n",
+      " A  |  0 5\n",
+      " B  |  0 0\n",
+      "\n"
      ]
-    },
-    {
-     "data": {
-      "text/plain": [
-       "True"
-      ]
-     },
-     "execution_count": 7,
-     "metadata": {},
-     "output_type": "execute_result"
     }
    ],
    "source": [
@@ -412,12 +480,74 @@
     "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",
+    "#{key1[0]: M3[key1] for key1 in M3.f if key1[1] == 0}\n",
+    "print('testing for mat * mat')\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"
+    "print(A * B == Mat(({0,1,2}, {0,1,2}), {(0,0):15, (0,1):12, (1,0):25, (1,1):31}))\n",
+    "#print(A * B)\n",
+    "C = Mat(({0,1,2}, {'a','b'}), {(0,'a'):4, (0,'b'):-3, (1,'a'):1, (2,'a'):1, (2,'b'):-2})\n",
+    "D = Mat(({'a','b'}, {'x','y'}), {('a','x'):3, ('a','y'):-2, ('b','x'):4, ('b','y'):-1})\n",
+    "#print(C)\n",
+    "#print(D)\n",
+    "#print(C*D)\n",
+    "print(C*D == Mat(({0,1,2}, {'x','y'}), {(0,'y'):-5, (1,'x'):3, (1,'y'):-2, (2,'x'):-5}))\n",
+    "M = Mat(({0, 1}, {'a', 'c', 'b'}), {})\n",
+    "N = Mat(({'a', 'c', 'b'}, {(1, 1), (2, 2)}), {})\n",
+    "#print(M * N)\n",
+    "print(M*N == Mat(({0,1}, {(1,1), (2,2)}), {}))\n",
+    "E = Mat(({'a','b'},{'A','B'}), {('a','A'):1,('a','B'):2,('b','A'):3,('b','B'):4})\n",
+    "F = Mat(({'A','B'},{'c','d'}),{('A','d'):5})\n",
+    "\n",
+    "#print(E * F)\n",
+    "print(E*F == Mat(({'a', 'b'}, {'d', 'c'}), {('b', 'd'): 15, ('a', 'd'): 5}))\n",
+    "print(F.transpose()*E.transpose() == \n",
+    "      Mat(({'d', 'c'}, {'a', 'b'}), {('d', 'b'): 15, ('d', 'a'): 5}))\n",
+    "\n",
+    "#print(Mat(({0,1,2}, {'x','y'}), {(0,'y'):-5, (1,'x'):3, (1,'y'):-2, (2,'x'):-5}))\n",
+    "#print(E)\n",
+    "#print(F)\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 7,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "0\n",
+      "0\n",
+      "5\n",
+      "15\n",
+      "\n",
+      "       c  d\n",
+      "     ------\n",
+      " a  |  0  5\n",
+      " b  |  0 15\n",
+      "\n"
+     ]
+    }
+   ],
+   "source": [
+    "E = Mat(({'a','b'},{'A','B'}), {('a','A'):1,('a','B'):2,('b','A'):3,('b','B'):4})\n",
+    "F = Mat(({'A','B'},{'c','d'}),{('A','d'):5})\n",
+    "mat_mul = Mat((E.D[0], F.D[1]), {})\n",
+    "for k in F.D[1]:\n",
+    "        vec_col = Vec(F.D[0], {key1[0]: F[key1] for key1 in F.f if key1[1] == k})\n",
+    "        # print(vec_col)\n",
+    "        for j in E.D[0]:\n",
+    "            mat_mul[j, k] = sum([E[key1]*vec_col[key1[1]] for key1 in E.f if key1[0] == j])\n",
+    "            print(mat_mul[j,k])\n",
+    "    \n",
+    "print(mat_mul)\n",
+    "#print(E,F)\n"
    ]
   }
  ],