Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes C++ #13

Merged
merged 7 commits into from
Oct 31, 2023
Merged

Fixes C++ #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4fc4b0c
Add count total candidates!
AniekMarkus Jul 12, 2023
f58739f
Fix executable CMakeLists.txt
AniekMarkus Jul 13, 2023
8da5923
delete Debug folder
AniekMarkus Jul 14, 2023
2819a34
Merge pull request #9 from mi-erasmusmc/develop
cebarboza Aug 25, 2023
ed50e1a
Merge branch 'main' of https://github.com/mi-erasmusmc/Explore
cebarboza Aug 25, 2023
9a978c4
Merge branch 'main' into fix_c++
AniekMarkus Aug 30, 2023
5c5e425
Fixes CMakeList.txt
AniekMarkus Aug 30, 2023
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
114 changes: 55 additions & 59 deletions inst/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,65 +42,61 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ltbb")

set(SOURCE_FILES
Clion/main.cpp
src/C++/CMExplore/cmdline.h
src/C++/CMExplore/CMExplore.cbproj
src/C++/CMExplore/CMExplore.cbproj.local
src/C++/CMExplore/initialise.h
src/C++/CMExplore/main.h
src/C++/CMExplore/Makefile
src/C++/CMExplore/ProjectGroup1.groupproj
src/C++/CMExplore/ProjectGroup1.groupproj.local
src/C++/Explore/bin.cpp
src/C++/Explore/bin.h
src/C++/Explore/candidate.cpp
src/C++/Explore/candidate.h
src/C++/Explore/classdef.cpp
src/C++/Explore/classdef.h
src/C++/Explore/condition.cpp
src/C++/Explore/condition.h
src/C++/Explore/conjunction.cpp
src/C++/Explore/conjunction.h
src/C++/Explore/constraint.cpp
src/C++/Explore/constraint.h
src/C++/Explore/cutoff.cpp
src/C++/Explore/cutoff.h
src/C++/Explore/explore.cpp
src/C++/Explore/explore.h
src/C++/Explore/feature.cpp
src/C++/Explore/feature.h
src/C++/Explore/initialise.h
src/C++/Explore/mandatory.cpp
src/C++/Explore/mandatory.h
src/C++/Explore/observation.cpp
src/C++/Explore/observation.h
src/C++/Explore/outbuf.h
src/C++/Explore/partition.cpp
src/C++/Explore/partition.h
src/C++/Explore/performance.cpp
src/C++/Explore/performance.h
src/C++/Explore/population.cpp
src/C++/Explore/population.h
src/C++/Explore/roc.cpp
src/C++/Explore/roc.h
src/C++/Explore/rocpair.cpp
src/C++/Explore/rocpair.h
src/C++/Explore/rule.cpp
src/C++/Explore/rule.h
src/C++/Explore/set.cpp
src/C++/Explore/set.h
src/C++/Explore/timing.cpp
src/C++/Explore/timing.h
src/C++/Explore/values.h
src/C++/IOExplore/initialise.h
src/C++/IOExplore/IOExplore.cpp
src/C++/IOExplore/IOExplore.h
src/C++/Test/iris.arff
src/C++/Test/iris.cutoff
src/C++/Test/test.project
src/C++/common.cpp
src/C++/common.h
src/C++/stl.h
src/C++/stlpmt.lib)
../src/C++/CMExplore/cmdline.h
../src/C++/CMExplore/initialise.h
../src/C++/CMExplore/main.h
../src/C++/CMExplore/Makefile
../src/C++/Explore/bin.cpp
../src/C++/Explore/bin.h
../src/C++/Explore/candidate.cpp
../src/C++/Explore/candidate.h
../src/C++/Explore/classdef.cpp
../src/C++/Explore/classdef.h
../src/C++/Explore/condition.cpp
../src/C++/Explore/condition.h
../src/C++/Explore/conjunction.cpp
../src/C++/Explore/conjunction.h
../src/C++/Explore/constraint.cpp
../src/C++/Explore/constraint.h
../src/C++/Explore/cutoff.cpp
../src/C++/Explore/cutoff.h
../src/C++/Explore/explore.cpp
../src/C++/Explore/explore.h
../src/C++/Explore/feature.cpp
../src/C++/Explore/feature.h
../src/C++/Explore/initialise.h
../src/C++/Explore/mandatory.cpp
../src/C++/Explore/mandatory.h
../src/C++/Explore/observation.cpp
../src/C++/Explore/observation.h
../src/C++/Explore/outbuf.h
../src/C++/Explore/partition.cpp
../src/C++/Explore/partition.h
../src/C++/Explore/performance.cpp
../src/C++/Explore/performance.h
../src/C++/Explore/population.cpp
../src/C++/Explore/population.h
../src/C++/Explore/roc.cpp
../src/C++/Explore/roc.h
../src/C++/Explore/rocpair.cpp
../src/C++/Explore/rocpair.h
../src/C++/Explore/rule.cpp
../src/C++/Explore/rule.h
../src/C++/Explore/set.cpp
../src/C++/Explore/set.h
../src/C++/Explore/timing.cpp
../src/C++/Explore/timing.h
../src/C++/Explore/values.h
../src/C++/IOExplore/initialise.h
../src/C++/IOExplore/IOExplore.cpp
../src/C++/IOExplore/IOExplore.h
../src/C++/Test/iris.arff
../src/C++/Test/iris.cutoff
../src/C++/Test/test.project
../src/C++/common.cpp
../src/C++/common.h
../src/C++/stl.h
../src/C++/stlpmt.lib)

add_executable(Explore ${SOURCE_FILES})

Expand Down
Binary file removed src/C++/CMExplore/Debug/CMExplore.#0J
View file
Open in desktop
Binary file not shown.
6 changes: 0 additions & 6 deletions src/C++/CMExplore/Debug/CMExplore.map
View file
Open in desktop

This file was deleted.

Binary file removed src/C++/CMExplore/Debug/CMExplore.pch
View file
Open in desktop
Binary file not shown.
Binary file removed src/C++/CMExplore/Debug/CMExplore.tds
View file
Open in desktop
Binary file not shown.
Loading
Loading