Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
*.app

# SIST build outputs
trans_three/qsidd
trans_compete/qsidd
trans_three/depend
trans_compete/depend
src/trans_three/qsidd
src/trans_compete/qsidd
src/trans_three/depend
src/trans_compete/depend

# Debug information files
*.dwo
Expand Down
64 changes: 32 additions & 32 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@ project(code)

set(CMAKE_CXX_STANDARD 14)

include_directories(trans_compete)
include_directories(trans_three)
include_directories(src/trans_compete)
include_directories(src/trans_three)

add_executable(code
trans_compete/G_x.cpp
trans_compete/G_x.h
trans_compete/qsidd.cpp
trans_compete/SIDD_1R.cpp
trans_compete/SIDD_1R.h
trans_compete/SIDD_2R.cpp
trans_compete/SIDD_2R.h
trans_compete/SIDD_3R.cpp
trans_compete/SIDD_3R.h
trans_compete/SIDD_4R.cpp
trans_compete/SIDD_4R.h
trans_compete/SIDD_Base.cpp
trans_compete/SIDD_Base.h
trans_compete/stat_1R.cpp
trans_compete/stat_1R.h
trans_three/G_x.cpp
trans_three/G_x.h
trans_three/qsidd.cpp
trans_three/SIDD_1R.cpp
trans_three/SIDD_1R.h
trans_three/SIDD_2R.cpp
trans_three/SIDD_2R.h
trans_three/SIDD_3R.cpp
trans_three/SIDD_3R.h
trans_three/SIDD_4R.cpp
trans_three/SIDD_4R.h
trans_three/SIDD_Base.cpp
trans_three/SIDD_Base.h
trans_three/stat_1R.cpp
trans_three/stat_1R.h)
src/trans_compete/G_x.cpp
src/trans_compete/G_x.h
src/trans_compete/qsidd.cpp
src/trans_compete/SIDD_1R.cpp
src/trans_compete/SIDD_1R.h
src/trans_compete/SIDD_2R.cpp
src/trans_compete/SIDD_2R.h
src/trans_compete/SIDD_3R.cpp
src/trans_compete/SIDD_3R.h
src/trans_compete/SIDD_4R.cpp
src/trans_compete/SIDD_4R.h
src/trans_compete/SIDD_Base.cpp
src/trans_compete/SIDD_Base.h
src/trans_compete/stat_1R.cpp
src/trans_compete/stat_1R.h
src/trans_three/G_x.cpp
src/trans_three/G_x.h
src/trans_three/qsidd.cpp
src/trans_three/SIDD_1R.cpp
src/trans_three/SIDD_1R.h
src/trans_three/SIDD_2R.cpp
src/trans_three/SIDD_2R.h
src/trans_three/SIDD_3R.cpp
src/trans_three/SIDD_3R.h
src/trans_three/SIDD_4R.cpp
src/trans_three/SIDD_4R.h
src/trans_three/SIDD_Base.cpp
src/trans_three/SIDD_Base.h
src/trans_three/stat_1R.cpp
src/trans_three/stat_1R.h)
20 changes: 10 additions & 10 deletions conda-recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#!/usr/bin/env bash
set -euxo pipefail

make -C trans_three clean
make -C trans_three
make -C src/trans_three clean
make -C src/trans_three

make -C trans_compete clean
make -C trans_compete
make -C src/trans_compete clean
make -C src/trans_compete

install -d "${PREFIX}/bin"
install -d "${PREFIX}/libexec/sist"
install -d "${PREFIX}/libexec/sist/trans_three"
install -d "${PREFIX}/libexec/sist/trans_compete"
install -d "${PREFIX}/libexec/sist/src/trans_three"
install -d "${PREFIX}/libexec/sist/src/trans_compete"

install -m 755 \
master.pl \
Expand All @@ -21,12 +21,12 @@ install -m 755 \
"${PREFIX}/libexec/sist/IR_finder.pl"

install -m 755 \
trans_three/qsidd \
"${PREFIX}/libexec/sist/trans_three/qsidd"
src/trans_three/qsidd \
"${PREFIX}/libexec/sist/src/trans_three/qsidd"

install -m 755 \
trans_compete/qsidd \
"${PREFIX}/libexec/sist/trans_compete/qsidd"
src/trans_compete/qsidd \
"${PREFIX}/libexec/sist/src/trans_compete/qsidd"

cat > "${PREFIX}/bin/sist" << 'EOF'
#!/usr/bin/env bash
Expand Down
8 changes: 4 additions & 4 deletions docs/source/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ Build the C++ components from the repository root:

.. code-block:: bash

make -C trans_three clean
make -C trans_three
make -C trans_compete clean
make -C trans_compete
make -C src/trans_three clean
make -C src/trans_three
make -C src/trans_compete clean
make -C src/trans_compete

The Makefiles are also used by the Conda build and accept the compiler and
linker settings supplied by the Conda toolchain.
Expand Down
4 changes: 2 additions & 2 deletions docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ Build both C++ components from the repository root:

.. code-block:: bash

make -C trans_three
make -C trans_compete
make -C src/trans_three
make -C src/trans_compete

The source-tree pipeline can then be run with:

Expand Down
14 changes: 7 additions & 7 deletions docs/source/source-usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ Source components
repeat information required for cruciform calculations, including start
positions, possible extrusion lengths, and cruciform formation energies.

``trans_three/``
``src/trans_three/``
C++ implementation for analysing strand separation, Z-DNA, and cruciform
extrusion independently.

``trans_compete/``
``src/trans_compete/``
C++ implementation for analysing competition between strand separation,
Z-DNA, and cruciform extrusion.

Expand Down Expand Up @@ -75,13 +75,13 @@ Compile the C++ implementations with:

.. code-block:: bash

make -C trans_three
make -C trans_compete
make -C src/trans_three
make -C src/trans_compete

After compilation, each directory contains a ``qsidd`` executable.

Running ``qsidd`` without the required arguments displays its detailed usage
information. For example, from ``trans_three``:
information. For example, from ``src/trans_three``:

.. code-block:: bash

Expand All @@ -99,13 +99,13 @@ Run ``IR_finder.pl`` first:

perl IR_finder.pl temperature shape sequence_file

For a cruciform calculation using ``trans_three``:
For a cruciform calculation using ``src/trans_three``:

.. code-block:: bash

./qsidd -C -X "string" -f sequence_file

For a competition calculation using ``trans_compete``:
For a competition calculation using ``src/trans_compete``:

.. code-block:: bash

Expand Down
8 changes: 4 additions & 4 deletions master.pl
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"Script analyzes superhelically induced structural transition probabilities for each base pair.\n".
"Algorithm types: M (melting), Z (Z-DNA), C (cruciforms), and A (competition between all three).\n".
"Sequence file will be converted to the format required by the algorithm.\n".
"Code in directory trans_three/ will handle M, Z, and C algorithm types.\n".
"Code in directory trans_compete/ will handle A algorithm type.\n".
"Code in directory src/trans_three/ will handle M, Z, and C algorithm types.\n".
"Code in directory src/trans_compete/ will handle A algorithm type.\n".
"For algorithm type options -a C and -a A user will need an Inverted Repeat Finder (IRF) executable compatible with user's operating system.\n".
"IRF download page: http://tandem.bu.edu/irf/irf.download.html.\n".
"Selected output will be printed to the screen.\n\n".
Expand Down Expand Up @@ -73,8 +73,8 @@


my @name = split("/",$file);
my $single_exe = "$RealBin/trans_three/qsidd";
my $compete_exe = "$RealBin/trans_compete/qsidd";
my $single_exe = "$RealBin/src/trans_three/qsidd";
my $compete_exe = "$RealBin/src/trans_compete/qsidd";

my $output_IR;
if ($trans eq "M") {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def build_sist(
),
)

for directory in ("trans_three", "trans_compete"):
for directory in ("src/trans_three", "src/trans_compete"):
clean_result = run_command(
["make", "-C", directory, "clean"],
cwd=working_copy,
Expand Down
Loading