Skip to content

Commit

Permalink
Merge branch 'ribi'
Browse files Browse the repository at this point in the history
  • Loading branch information
richelbilderbeek committed Jun 27, 2017
2 parents f1e194a + 7957ac0 commit 91600d1
Show file tree
Hide file tree
Showing 7 changed files with 153 additions and 0 deletions.
45 changes: 45 additions & 0 deletions mone.pri
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
INCLUDEPATH += ../pbdmms

SOURCES += \
$$PWD/mone_dna.cpp \
$$PWD/mone_helper.cpp \
$$PWD/mone_individual.cpp \
$$PWD/mone_parameters.cpp \
$$PWD/mone_results.cpp \
$$PWD/mone_simulation.cpp \
$$PWD/mone_species_id.cpp \
$$PWD/mone_sil_frequency_edge.cpp \
$$PWD/mone_sil_frequency_vertex.cpp \
$$PWD/mone_sil_frequency_vertex_writer.cpp \
$$PWD/mone_sil_frequency_phylogeny.cpp \
$$PWD/mone_sil.cpp \
$$PWD/mone_population.cpp \
$$PWD/mone_pin.cpp \
$$PWD/mone_menu_dialog.cpp \
$$PWD/mone_create_tally.cpp \
$$PWD/mone_hopefull_monster.cpp \
$$PWD/mone_probability.cpp \
$$PWD/mone_jkr_adapters.cpp

HEADERS += \
$$PWD/mone_dna.h \
$$PWD/mone_helper.h \
$$PWD/mone_individual.h \
$$PWD/mone_parameters.h \
$$PWD/mone_results.h \
$$PWD/mone_simulation.h \
$$PWD/mone_species_id.h \
$$PWD/mone_sil_frequency_edge.h \
$$PWD/mone_sil_frequency_vertex.h \
$$PWD/mone_sil_frequency_vertex_writer.h \
$$PWD/mone_sil_frequency_phylogeny.h \
$$PWD/mone_sil.h \
$$PWD/mone_tally_to_str.h \
$$PWD/mone_population.h \
$$PWD/mone_pin.h \
$$PWD/mone_sil_frequency_edge_writer.h \
$$PWD/mone_menu_dialog.h \
$$PWD/mone_create_tally.h \
$$PWD/mone_hopefull_monster.h \
$$PWD/mone_probability.h \
$$PWD/mone_jkr_adapters.h
12 changes: 12 additions & 0 deletions mone.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
include(any_profiling.pri)

include(gsl.pri)
include(jkr.pri)
include(mone.pri)
include(pbd.pri)

# Boost.Graph
LIBS += -lboost_graph
include(../BoostGraphTutorial/BoostGraphTutorial/boost_graph_tutorial.pri)

SOURCES += mone_main.cpp
8 changes: 8 additions & 0 deletions mone_gui.pri
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
SOURCES += \
$$PWD/mone_qtmaindialog.cpp

HEADERS += \
$$PWD/mone_qtmaindialog.h

FORMS += \
$$PWD/mone_qtmaindialog.ui
17 changes: 17 additions & 0 deletions mone_gui.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# General setup
include(any_gui.pri)

include(gsl.pri)
include(mone.pri)
include(pbd.pri)
include(mone_gui.pri)
include(jkr.pri)
include(../RibiLibraries/Qwt.pri)
include(../SurfacePlotter/QtSurfacePlotWidget.pri)

# Boost.Graph
LIBS += -lboost_graph
include(../BoostGraphTutorial/BoostGraphTutorial/boost_graph_tutorial.pri)

SOURCES += mone_qtmain.cpp

29 changes: 29 additions & 0 deletions mone_main.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#include <cassert>
#include <iostream>
#include "ribi_helper.h"
#include "ribi_menu_dialog.h"
#include "gsl/gsl_assert"

int main(int argc, char* argv[])
{
assert(!"Only run in release mode"); //!OCLINT accepted idiom
Ensures(!"Only run in release mode"); //!OCLINT accepted idiom
try
{
ribi::menu_dialog d;
const std::vector<std::string> args{
ribi::convert_arguments(argc,argv)
};
return d.execute(args);
}
catch (std::exception& e)
{
std::cerr << "Error: " << e.what() << '\n';
return 1;
}
catch (...)
{
std::cerr << "Error: Unknown\n";
return 1;
}
}
28 changes: 28 additions & 0 deletions mone_test.pri
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
INCLUDEPATH += ../pbdmms

HEADERS += \
$$PWD/mone_population_factory.h

SOURCES += \
$$PWD/mone_main_test.cpp \
$$PWD/mone_create_tally_test.cpp \
$$PWD/mone_dna_test.cpp \
$$PWD/mone_helper_test.cpp \
$$PWD/mone_individual_test.cpp \
$$PWD/mone_parameters_test.cpp \
$$PWD/mone_population_test.cpp \
$$PWD/mone_results_test.cpp \
$$PWD/mone_sil_frequency_phylogeny_test.cpp \
$$PWD/mone_sil_frequency_vertex_test.cpp \
$$PWD/mone_sil_test.cpp \
$$PWD/mone_simulation_test.cpp \
$$PWD/mone_species_id_test.cpp \
$$PWD/mone_population_factory.cpp \
$$PWD/mone_sil_frequency_edge_test.cpp \
$$PWD/mone_population_factory_test.cpp \
$$PWD/mone_menu_dialog_test.cpp \
$$PWD/mone_tally_to_str_test.cpp \
$$PWD/mone_sil_frequency_vertex_writer_test.cpp \
$$PWD/mone_jkr_adapters_test.cpp \
$$PWD/mone_hopefull_monster_test.cpp \
$$PWD/mone_sil_frequency_edge_writer_test.cpp
14 changes: 14 additions & 0 deletions mone_test.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# General setup
include(any_test.pri)

include(gsl.pri)
include(mone.pri)
include(mone_test.pri)
include(pbd.pri)
include(jkr.pri)

# Boost.Graph
LIBS += -lboost_graph
include(../BoostGraphTutorial/BoostGraphTutorial/boost_graph_tutorial.pri)

include(../RibiUnits/RibiUnits.pri)

0 comments on commit 91600d1

Please sign in to comment.