Opened 3 years ago
Last modified 3 years ago
#28757 closed enhancement
CombinatorialPolyhedron: Remove empty folder — at Version 12
Reported by:  ghkliem  Owned by:  

Priority:  major  Milestone:  sage9.1 
Component:  geometry  Keywords:  combinatorial polyhedron 
Cc:  JeanPhilippe Labbé, Laith Rastanawi  Merged in:  
Authors:  Jonathan Kliem  Reviewers:  JeanPhilippe Labbé 
Report Upstream:  N/A  Work issues:  
Branch:  public/28757reb2 (Commits, GitHub, GitLab)  Commit:  c698941441fe9be862bd5740f52dda9b900b972a 
Dependencies:  Stopgaps: 
Description (last modified by )
In the folder src/sage/geometry/polyhedron/combinatorial_polyhedron
there is an empty folder that keeps appearing.
This is because bit_vector_operations
was not properly defined in module_list.py
.
We fix this by including the functions needed directly in each file with cdef extern from "bit_vector_operations.cc"
and removing the module sage/geometry/polyhedron/combinatorial_polyhedron/bit_vector_operations.cc
.
Change History (12)
comment:1 Changed 3 years ago by
Branch:  → public/28757 

Commit:  → 3cf386ce513b4123dcc0f961f8e5848b1030a3c6 
Status:  new → needs_review 
comment:2 Changed 3 years ago by
Milestone:  sage9.0 → sage9.1 

Ticket retargeted after milestone closed
comment:3 Changed 3 years ago by
Branch:  public/28757 → public/28757new 

Commit:  3cf386ce513b4123dcc0f961f8e5848b1030a3c6 → ae89a8b44ef95e3e8d94d7bc8edb69cc33a119f1 
This is a new approach. I remove the module bit_vector_operations
completely. Instead each file just includes whatever it needs from bit_vector_operations.cc
.
New commits:
ae89a8b  remove empty folder in combinatorial polyhedron

comment:5 Changed 3 years ago by
Branch:  public/28757new → public/28757reb 

Commit:  ae89a8b44ef95e3e8d94d7bc8edb69cc33a119f1 → a584181495a1d6ab6b8be917cc5c816e4c6b06c5 
Status:  needs_work → needs_review 
New commits:
a584181  remove empty folder in combinatorial polyhedron

comment:6 Changed 3 years ago by
Status:  needs_review → needs_work 

Seems still to cause a merge conflict...
comment:7 Changed 3 years ago by
Not still. Again. The annoying thing about this approach is that I'm very likely to conflict.
comment:8 Changed 3 years ago by
Branch:  public/28757reb → public/28757reb2 

Commit:  a584181495a1d6ab6b8be917cc5c816e4c6b06c5 → c698941441fe9be862bd5740f52dda9b900b972a 
New commits:
c698941  remove empty folder in combinatorial polyhedron

comment:9 Changed 3 years ago by
Status:  needs_work → needs_review 

comment:10 Changed 3 years ago by
Reviewers:  → JeanPhilippe Labbé 

Status:  needs_review → needs_work 
Could you update the description of the ticket to also mention the new functions that are added?
Somehow, this ticket does more than changing 23 lines... Perhaps also change the title of the ticket. This will help in the future to traceback if necessary...
comment:11 Changed 3 years ago by
There are no new functions. It's just that we know grep them directly from the .cc file:
from .bit_vector_operations cimport intersection, bit_rep_to_coatom_rep + +cdef extern from "bit_vector_operations.cc": ...
comment:12 Changed 3 years ago by
Description:  modified (diff) 

Status:  needs_work → needs_review 
New commits:
stop empty folder from appearing