Skip to content

Commit 292bcf0

Browse files
committed
Renamed python module to cuckoo_time_translator_python
This is now identical to its package/project name and apparently just the way it was expected to be. Addressing second part of #49 (2.)
1 parent 8ad6caa commit 292bcf0

File tree

12 files changed

+15
-18
lines changed

12 files changed

+15
-18
lines changed

cuckoo_time_translator_python/CMakeLists.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,20 @@ cs_add_library(${PROJECT_NAME}
3434
src/module.cpp
3535
NO_AUTO_EXPORT
3636
)
37-
38-
string(REGEX REPLACE "_python$" "" LIB_OUTPUT_DIR ${CATKIN_PACKAGE_PYTHON_DESTINATION})
3937
set_target_properties(${PROJECT_NAME} PROPERTIES
40-
LIBRARY_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${LIB_OUTPUT_DIR}
38+
LIBRARY_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_PYTHON_DESTINATION}
4139
)
4240

4341
if (APPLE)
4442
set_target_properties(${PROJECT_NAME} PROPERTIES
45-
SUFFIX ".so" # This is apparently needed for Darvin. But why
43+
SUFFIX ".so" # This is apparently needed for Darvin. But why?
4644
)
4745
endif ()
4846

4947
target_link_libraries(${PROJECT_NAME} ${PYTHON_LIBRARY} ${Boost_LIBRARIES})
5048

51-
install(FILES ${CATKIN_DEVEL_PREFIX}/${LIB_OUTPUT_DIR}/lib${PROJECT_NAME}.so
52-
DESTINATION ${LIB_OUTPUT_DIR}
49+
install(FILES ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_PYTHON_DESTINATION}/lib${PROJECT_NAME}.so
50+
DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}
5351
)
5452

5553
cs_export()

cuckoo_time_translator_python/python/cuckoo_time_translator/__init__.py renamed to cuckoo_time_translator_python/python/cuckoo_time_translator_python/__init__.py

File renamed without changes.

cuckoo_time_translator_python/python/cuckoo_time_translator/algorithms.py renamed to cuckoo_time_translator_python/python/cuckoo_time_translator_python/algorithms.py

File renamed without changes.

cuckoo_time_translator_python/python/cuckoo_time_translator/batch_algo.py renamed to cuckoo_time_translator_python/python/cuckoo_time_translator_python/batch_algo.py

File renamed without changes.

cuckoo_time_translator_python/python/cuckoo_time_translator/device_time_bags.py renamed to cuckoo_time_translator_python/python/cuckoo_time_translator_python/device_time_bags.py

File renamed without changes.

cuckoo_time_translator_python/python/cuckoo_time_translator/plotting.py renamed to cuckoo_time_translator_python/python/cuckoo_time_translator_python/plotting.py

File renamed without changes.

cuckoo_time_translator_python/python/cuckoo_time_translator/timestamp_owts.py renamed to cuckoo_time_translator_python/python/cuckoo_time_translator_python/timestamp_owts.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import numpy as np
2-
import cuckoo_time_translator.algorithms as algorithms
3-
4-
from cuckoo_time_translator.algorithms import LocalTime, RemoteTime
2+
import cuckoo_time_translator_python.algorithms as algorithms
3+
from cuckoo_time_translator_python.algorithms import LocalTime, RemoteTime
54

65

76
class TimestampOwt:

cuckoo_time_translator_python/python/cuckoo_time_translator/timestamp_series.py renamed to cuckoo_time_translator_python/python/cuckoo_time_translator_python/timestamp_series.py

File renamed without changes.

cuckoo_time_translator_python/python/cuckoo_time_translator/tools.py renamed to cuckoo_time_translator_python/python/cuckoo_time_translator_python/tools.py

File renamed without changes.

cuckoo_time_translator_python/scripts/ctt_introspect.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import sys
44
import numpy as np
55

6-
from cuckoo_time_translator import *
7-
from cuckoo_time_translator.device_time_bags import *
8-
from cuckoo_time_translator.timestamp_owts import *
9-
from cuckoo_time_translator.batch_algo import printDelayStat
6+
from cuckoo_time_translator_python import *
7+
from cuckoo_time_translator_python.device_time_bags import *
8+
from cuckoo_time_translator_python.timestamp_owts import *
9+
from cuckoo_time_translator_python.batch_algo import printDelayStat
1010

11-
from cuckoo_time_translator.tools import *
11+
from cuckoo_time_translator_python.tools import *
1212

1313
OwtsDefault = 'KalmanOwt(), ConvexHullOwt(switchTime = 100)'
1414

@@ -96,9 +96,9 @@ def addToPlot(times, label, color):
9696
for d, lab in zip(delaysToPlot, labels):
9797
printDelayStat(d, lab)
9898

99-
from cuckoo_time_translator.plotting import plotMultiDelays, show
99+
from cuckoo_time_translator_python.plotting import plotMultiDelays, show
100100
plotMultiDelays(base_times, delaysToPlot, "time [sec]", labels, markersize=4, colors=colors, fileName=args.output, overwrite=args.force, show=False)
101101

102102
if not args.output:
103-
from cuckoo_time_translator.plotting import show
103+
from cuckoo_time_translator_python.plotting import show
104104
show()

0 commit comments

Comments
 (0)