regfans 0.0.2__py3-none-any.whl → 0.0.3__py3-none-any.whl

regfans/fan.py

@@ -1205,7 +1205,7 @@ class Fan:
         # get the initial triangulation + heights
         T_curr   = self
         sc_curr  = T_curr.secondary_cone_hyperplanes(via_circuits=True,
-                                                     verbosity=verbosity-1)
+                                                     verbosity=-1)
         sc_curr  = np.array(sc_curr)
         
         if h_init is None:
@@ -1280,9 +1280,9 @@ class Fan:
             first_hit_ind, first_hit_dist = util.first_hit(h_curr, h_target, sc_curr)
             if first_hit_ind is None:
                 msg = "first_hit_ind=None... should've been caught earlier... "
-                msg += f"min(H@h_curr)={np.min(H@h_curr)}; "
-                msg += f"min(H@h_target)={np.min(H@h_target)}...; "
-                msg += f"H={H.tolist()}, h_curr={h_curr.tolist()}, "
+                msg += f"min(H@h_curr)={np.min(sc_curr@h_curr)}; "
+                msg += f"min(H@h_target)={np.min(sc_curr@h_target)}...; "
+                msg += f"H={sc_curr.tolist()}, h_curr={h_curr.tolist()}, "
                 msg += f"h_target={h_target.tolist()}"
                 raise ValueError(msg)
         
@@ -1292,8 +1292,8 @@ class Fan:
                                       verbosity=verbosity-1)
             except:
                 print(sc_curr.shape, first_hit_ind)
-                print('curr dists', H@h_curr)
-                print('target dists', H@h_target)
+                print('curr dists', sc_curr@h_curr)
+                print('target dists', sc_curr@h_target)
                 print('h_target',h_target)
                 raise ValueError()
 
@@ -1305,9 +1305,9 @@ class Fan:
                 h_curr = util.lerp(h_curr, h_target, 0.99*first_hit_dist)
 
                 # check that we can compute a next step
-                dists = H@h_tmp
+                dists = sc_curr@h_tmp
                 n_i   = np.argmin(dists)
-                n     = H[n_i]
+                n     = sc_curr[n_i]
                 if np.dot(n, h_tmp)>0:
                     h_curr = h_tmp
                 break
@@ -1318,9 +1318,9 @@ class Fan:
                 h_tmp = util.lerp(h_curr, h_target, 0.99*first_hit_dist)
                 
                 # check that we can compute a next step
-                dists = H@h_tmp
+                dists = sc_curr@h_tmp
                 n_i   = np.argmin(dists)
-                n     = H[n_i]
+                n     = sc_curr[n_i]
                 if np.dot(n, h_tmp)>0:
                     h_curr = h_tmp
                 break
@@ -1361,14 +1361,14 @@ class Fan:
                 print("Inputs  to first_hit: " + \
                             f"{h_curr.tolist(), h_target.tolist(), sc_curr}")
 
-                dists = H@util.lerp(h_curr, h_target, first_hit_dist)
+                dists = sc_curr@util.lerp(h_curr, h_target, first_hit_dist)
                 i = np.argmin(dists)
                 print(f"dists[argmin] = {dists[i]}")
-                print(f"H[argmin]     = {H[i].tolist()}")
+                print(f"H[argmin]     = {sc_curr[i].tolist()}")
                 print(f"circ          = {circ}")
 
                 sc_hyps = {tuple(n) for n in sc_curr}
-                n       = tuple(-H[i]) 
+                n       = tuple(-sc_curr[i]) 
                 print(f"n in sc_curr? = {n in sc_hyps}")
                 
                 raise ValueError()

regfans/util.py

@@ -253,15 +253,14 @@ def is_solid(*, R: "ArrayLike"=None, H:"ArrayLike"=None) -> int:
     assert (R is None) ^ (H is None)
 
     if R is None:
-        R = np.array(dual_cone(H))
+        # try to find a point in the strict interior
+        H = np.array(H)
+        return find_interior_point(H=H) is not None
     else:
+        # know rays -> sum of rays sould be in strict interior
         R = np.array(R)
-
-    # return
-    if len(R) == 0:
-        return False
-    else:
-        return bool(np.linalg.matrix_rank(R.T) == R.shape[1])
+        H = np.array(dual_cone(R))
+        return np.all(H@R.sum(axis=0) > 0.5)
 
 def contains(*,
     p: "ArrayLike",

{regfans-0.0.2.dist-info → regfans-0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: regfans
-Version: 0.0.2
+Version: 0.0.3
 Summary: Regular fans of vector configurations
 Author: Nate MacFadden
 License-Expression: GPL-3.0-or-later

regfans-0.0.3.dist-info/RECORD

@@ -0,0 +1,10 @@
+regfans/__init__.py,sha256=ySoKB1J2jeUD9oHoPqD2d-utSO-cqd9eI1dq4Q2SMBo,103
+regfans/circuits.py,sha256=5uLH8oQiAKe7UYl7sKvFpxMzNViP9tcLtqA91zbWduk,11244
+regfans/fan.py,sha256=dHLaDy00Qq0tWas6237vxyY88UiIo-4_3R7V7JllpY8,64783
+regfans/util.py,sha256=HdowruB_t37RWosu7XRVHjOdcxgyuxhR1YxdxUY1K94,12933
+regfans/vectorconfig.py,sha256=VUZpyzUjuMy9QCR3SayMwOE7Q-ve5V610kwQTDbl39Q,40932
+regfans-0.0.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+regfans-0.0.3.dist-info/METADATA,sha256=roRs3mohUPcBGDq358QHR26BlCO_EiZ-4OPdtEit8Rk,1154
+regfans-0.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+regfans-0.0.3.dist-info/top_level.txt,sha256=h_8B8JgprCNKyinFEG8XvWOLKDouj_vmktFOf6_7Q0Q,8
+regfans-0.0.3.dist-info/RECORD,,

regfans-0.0.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-regfans/__init__.py,sha256=ySoKB1J2jeUD9oHoPqD2d-utSO-cqd9eI1dq4Q2SMBo,103
-regfans/circuits.py,sha256=5uLH8oQiAKe7UYl7sKvFpxMzNViP9tcLtqA91zbWduk,11244
-regfans/fan.py,sha256=F0pSwjM2QTjoI32ItCL7dPmtDBlYUN8b-YKNz4Kc2nY,64720
-regfans/util.py,sha256=0CuUU32NjgnvYE64_oj1mVh0Eq7uOm7c018wCtzzS_w,12823
-regfans/vectorconfig.py,sha256=VUZpyzUjuMy9QCR3SayMwOE7Q-ve5V610kwQTDbl39Q,40932
-regfans-0.0.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-regfans-0.0.2.dist-info/METADATA,sha256=133ChifWVVTSF-jeRR6nexm0B-YW-6H0kMFOMf_kWJY,1154
-regfans-0.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-regfans-0.0.2.dist-info/top_level.txt,sha256=h_8B8JgprCNKyinFEG8XvWOLKDouj_vmktFOf6_7Q0Q,8
-regfans-0.0.2.dist-info/RECORD,,