update

geom_solver.py

@@ -23,6 +23,7 @@ def cheat_the_metric_solution(vertices=None):
 		vertices_new = vertices.mean(0)[None].repeat(nverts, axis=0)
 	all_verts = list(range(nverts))
 	edges = list(itertools.product(all_verts, all_verts))
+	edges = [edg for edg in edges if edg[0] < edg[1]]
 	return vertices_new, edges
 
 
@@ -298,8 +299,12 @@ class GeomSolver(object):
 			edges = [(0, 0)]
 
 		if self.cheat_metric:
-			vertices, edges = cheat_the_metric_solution(np.zeros((vertices.shape[0],3)))
-		
+			dumb_vertices = np.zeros((vertices.shape[0],3))
+			# dumb_vertices = self.wf_center[None].repeat(vertices.shape[0], axis=0)
+			vertices, edges = cheat_the_metric_solution(dumb_vertices)
+			# vertices_new, edges = cheat_the_metric_solution(np.zeros((vertices.shape[0] // 2,3)))
+			# vertices = np.concatenate((vertices_new, vertices[:vertices_new.shape[0]]))
+
 		if visualize:
 			from hoho.viz3d import plot_estimate_and_gt
 			plot_estimate_and_gt(vertices, [(0,0)], self.human_entry['wf_vertices'], self.human_entry['wf_edges'])

testing.ipynb

@@ -179,69 +179,46 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 41,
    "id": "88f4fc8f-efa9-404b-9073-c7d4a73f9075",
    "metadata": {},
    "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "[autoreload of geom_solver failed: Traceback (most recent call last):\n",
-      "  File \"/local/home/denysr/anaconda3/envs/pytorch3d/lib/python3.9/site-packages/IPython/extensions/autoreload.py\", line 276, in check\n",
-      "    superreload(m, reload, self.old_objects)\n",
-      "  File \"/local/home/denysr/anaconda3/envs/pytorch3d/lib/python3.9/site-packages/IPython/extensions/autoreload.py\", line 475, in superreload\n",
-      "    module = reload(module)\n",
-      "  File \"/local/home/denysr/anaconda3/envs/pytorch3d/lib/python3.9/importlib/__init__.py\", line 169, in reload\n",
-      "    _bootstrap._exec(spec, module)\n",
-      "  File \"<frozen importlib._bootstrap>\", line 613, in _exec\n",
-      "  File \"<frozen importlib._bootstrap_external>\", line 846, in exec_module\n",
-      "  File \"<frozen importlib._bootstrap_external>\", line 983, in get_code\n",
-      "  File \"<frozen importlib._bootstrap_external>\", line 913, in source_to_code\n",
-      "  File \"<frozen importlib._bootstrap>\", line 228, in _call_with_frames_removed\n",
-      "  File \"/local/home/denysr/src/DRAK/geom_solver.py\", line 23\n",
-      "    \t    vertices_new = vertices.mean(0)[None].repeat(nverts, axis=0)\n",
-      "    \t                                                                ^\n",
-      "IndentationError: unindent does not match any outer indentation level\n",
-      "]\n"
-     ]
-    },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "1.9910005379350753 2.038011551581092\n",
-      "1.155493663554789 2.0791329825966307\n",
-      "1.8937823420984958 1.9571821768853723\n",
-      "1.4662642868108817 1.6480476517464842\n",
-      "1.4392552092630544 1.9072141124210245\n",
-      "1.5925989421699698 1.9669375395419233\n",
-      "1.5539408355135909 1.8261703137595002\n",
-      "1.2228932592065895 1.5438357003585348\n",
-      "2.1274713572398154 2.0208250158182977\n",
-      "1.3685338868039278 2.0591274030268125\n",
-      "1.4155485596537 1.8200081675273143\n",
-      "1.1617889927813057 1.6349180731050583\n",
-      "1.0817899095268082 1.5980454240474442\n",
-      "1.666904350571549 1.7471060400666858\n",
-      "1.6614444388753227 1.79492456777979\n",
-      "2.4956206644241483 2.547320745504473\n",
-      "1.179582538097543 1.6773627395408943\n",
-      "2.4820178038365137 2.5549005938032896\n",
-      "1.884718689026595 2.2057496679708675\n",
-      "1.6783293011691325 1.6157957180712181\n",
-      "0.9111219580007252 1.5783560571139401\n",
-      "2.427829987725191 1.8880643428184267\n",
-      "1.2548770020794227 1.6981983360768251\n",
-      "1.220655890771462 1.8107543937460209\n",
-      "2.070457013514992 1.9712181594952118\n",
-      "2.2994303422101536 2.2261780468037515\n",
-      "1.5976115560610675 1.6635009240983105\n",
-      "1.8492345282638551 1.8154885350210161\n",
-      "1.4122192669731761 1.6075314334284299\n",
-      "1.6917171249372092 2.059612285543195\n",
+      "2.4474938507570014 2.0380115872555993\n",
+      "2.155493663554789 2.0791329825966307\n",
+      "2.966738398116498 2.5122864698365484\n",
+      "2.3048509249500877 1.6419987209613565\n",
+      "2.4392552092630546 1.9072141202952857\n",
+      "2.3044038230625525 1.9669375395419233\n",
+      "2.046493931546576 1.8261703137595002\n",
+      "2.2923488211178036 1.5820313304436742\n",
+      "2.6384056810126153 1.9803316094654626\n",
+      "1.9408082827536148 2.0591274592222977\n",
+      "2.4155485596537 1.8657650987336327\n",
+      "2.1617889927813057 1.6349180537901107\n",
+      "2.0817899095268078 1.5980454220244267\n",
+      "2.4745481682707555 1.961346755339051\n",
+      "2.2681739877281197 1.7949245584633193\n",
+      "2.6953644761870827 2.5473207425518596\n",
+      "2.1795825380975424 1.6773471533492506\n",
+      "2.639685047878952 2.55490058167698\n",
+      "2.4855541483148036 2.205749686606505\n",
+      "2.6783293011691325 1.6157957471412452\n",
+      "1.9111219580007248 1.578356057609313\n",
+      "2.9007240216586974 2.0007638857204086\n",
+      "2.2548770020794224 1.6981983648905474\n",
+      "2.220655890771462 1.799613238503135\n",
+      "2.5168573984848948 1.7985373057168828\n",
+      "2.7875047648676476 2.2261780523874157\n",
+      "2.50676648176771 1.5399683606078607\n",
+      "2.347918731861892 1.8154885095510576\n",
+      "2.4122192669731763 1.6075314439702364\n",
+      "2.2224512277919746 2.059612285543195\n",
       "Averages\n",
-      "1.6418044746365352 1.885383956643261\n"
+      "2.38992514866668 1.905786781251824\n"
      ]
     }
    ],
@@ -270,10 +247,11 @@
     "    nverts = entry['wf_vertices'].shape[0]\n",
     "    nverts = vertices.shape[0]\n",
     "    all_verts = list(range(nverts))\n",
-    "    c = list(itertools.product(all_verts, all_verts))\n",
+    "    edges0 = list(itertools.product(all_verts, all_verts))\n",
+    "    edges0 = [edg for edg in edges0 if edg[0] < edg[1]]\n",
     "    \n",
     "    scores0 = (compute_WED(np.zeros((nverts,3)),\n",
-    "            c,\n",
+    "            edges,\n",
     "            np.array(entry['wf_vertices']),\n",
     "            np.array(entry['wf_edges'])))\n",
     "\n",
@@ -306,17 +284,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 210,
+   "execution_count": 28,
    "id": "a34d0a2b-9986-47cc-8a3f-c15397370c4d",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "29"
+       "900"
       ]
      },
-     "execution_count": 210,
+     "execution_count": 28,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -325,7 +303,7 @@
     "# human_entry['images'][1]\n",
     "# # human_entry['cameras'][1].width\n",
     "# Image.new('RGB', (human_entry['cameras'][1].width, human_entry['cameras'][1].height)).height\n",
-    "ki"
+    "\n"
    ]
   },
   {