Dipaths and dihomotopies in a cubical complex

In the geometric realization of a cubical complex without degeneracies, a @?-set, dipaths and dihomotopies may not be combinatorial, i.e., not geometric realizations of combinatorial dipaths and equivalences. When we want to use geometric/topological tools to classify dipaths on the 1-skeleton, combinatorial dipaths, up to dihomotopy, and in particular up to combinatorial dihomotopy, we need that all dipaths are in fact dihomotopic to a combinatorial dipath. And moreover that two combinatorial dipaths which are dihomotopic are then combinatorially dihomotopic. We prove that any dipath from a vertex to a vertex is dihomotopic to a combinatorial dipath, in a non-selfintersecting @?-set. And that two combinatorial dipaths which are dihomotopic through a non-combinatorial dihomotopy are in fact combinatorially dihomotopic, in a geometric @?-set. Moreover, we prove that in a geometric @?-set, the d-homotopy introduced in [M. Grandis, Directed homotopy theory, I, Cah. Topol. Geom. Differ. Categ. 44 (4) (2003) 281-316] coincides with the dihomotopy in [L. Fajstrup, E. Goubault, M. Raussen, Algebraic topology and concurrency, Theoret. Comput. Sci., in press; also technical report, Aalborg University, 1999].