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

Unary function change #27

Merged
merged 44 commits into from
Oct 1, 2024
Merged

Unary function change #27

merged 44 commits into from
Oct 1, 2024

Conversation

cebarboza
Copy link
Collaborator

Im also merging the changes in tests_latestcode into my branch. I made some changes in unary_function as you mentioned before, but I don´t know if that affects your config.

struct AndJibu : public std ::unary_function<int, void>
struct AndJibu : public std ::__unary_function<int, void>

AniekMarkus added 30 commits July 12, 2024 12:34
@AniekMarkus
Corrections rule instantiation continuous data #17
19bdbcf
@AniekMarkus
Checked up to rule length 2 #17
ecb2d17
@AniekMarkus
Added IsRepeated and link between operators <-> helper #17
11b43e0
@AniekMarkus
Up to rule length 3 continuous; maxCutoff also per feature, RepeatedF…
02d1b78 
…eature excludes same operator #17
@AniekMarkus
Fix revised MaxCutoff for binary data
09cc42e
@AniekMarkus
Fix repeated continuous variables #17
447d896
@AniekMarkus
Update identifying RepeatedFeature and allow both NonSoloIncluded and…
7978933 
… RepeatedFeature at the same time #21
@AniekMarkus
Restrict MinCutoff to specific range of index, Maxcutoff-- per operator
d74f419 
#21
@AniekMarkus
Fix building R package; 'no template named unary function'
34b1528
@AniekMarkus
Fixed order of data; first binary then continuous #20
8cf7f5b
@AniekMarkus
Update default settings
db102f6
@AniekMarkus
Update print statements for rashomon ratio
5f7f94f
@AniekMarkus
Fixes generation of FO pairs for mixed data with binary reduction #20
48af05f
@AniekMarkus
Change: if new rule same as current best - do not update
7ebc83c
@AniekMarkus
Remove PrintCutoffSetsBestLength and TRAIN partition - both not used
bfff55c
@AniekMarkus
Clean up and fixes finding best length using HOLDOUT and CROSS_VALIDA…
faa18aa 
…TION
@AniekMarkus
Clean model string
39ca501
@AniekMarkus
Fix two levels binary features (in case one of values not occuring)
7a8a60f
@AniekMarkus
Bug clean string <= and update defaults in modelsCurveExplore
bd98d66
@AniekMarkus
Added phi metric for sorting.
75f8e05
@AniekMarkus
Fixed running with constraints BA and F1 score (compilation flags imp…
f0af7c4 
…ortant!)
@AniekMarkus
Fix printing all candidate rules #23
5f55e56
@AniekMarkus
Update default parameters and add OutputMethod
e249518
@AniekMarkus
Fix print constraints when printSettings=yes
1f6d8aa
@AniekMarkus
Adjust reading in trained model and add function candidatesExplore
fff1be3
@AniekMarkus
Correction parallel TWO change to blocked_range2d and binaryReduction…
27e5c1c 
…=yes #24
@AniekMarkus
Change to allow larger # rule counts
e654541
@AniekMarkus
Add export candidateModelsExplore
fae9e6e
@AniekMarkus
Updates parameters in .project file + added test mandatory feature an…
4969782 
…d BA constraint
@AniekMarkus
Merged branches tests + changes_c
47eeb01 
Merge remote-tracking branch 'origin/tests' into tests_latestcode

# Conflicts:
#	R/MainFunctions.R
#	inst/examples/tests/iris.project
@cebarboza
eliminating conflicts
4e90b5c 
Merge branch 'tests' into unary_function_change

# Conflicts:
#	R/MainFunctions.R
#	R/testExplore.R
#	man/settingsExplore.Rd
#	man/trainExplore.Rd
@cebarboza
output method
1611326
@cebarboza
convert_logical function
8a1ee3e
@cebarboza cebarboza linked an issue Sep 30, 2024 that may be closed by this pull request
saveData throws NAs in train_data #28
Closed
@cebarboza
Copy link
Collaborator Author

Added a convert_logical and a test to fix issue #28

@AniekMarkus
Copy link
Contributor

  • saveData fix is great, thanks
  • unaryFuncition change: std::__unary_function works for me on my laptop=Mac, but not on the server=Linux as I need to use std::unary_function there in order to build the package

@cebarboza
Copy link
Collaborator Author

  • unaryFuncition change: std::__unary_function works for me on my laptop=Mac, but not on the server=Linux as I need to use std::unary_function there in order to build the package

Is there any way to define that function accordingly or you don't need it to work on Win?

Also when I integrated your latest changes, the results are different, is that expected?

@AniekMarkus
Copy link
Contributor

AniekMarkus commented Oct 1, 2024 •
edited
Loading

Is there any way to define that function accordingly or you don't need it to work on Win?
For you on Windows std::__unary_function worked as well right?

It needs to work on all 3 operating systems, but the difference is probably due to different (versions of) C++ compilers that are used as the function std::unary_function seems to be deprecated at some point: https://en.cppreference.com/w/cpp/utility/functional/unary_function

@AniekMarkus
Copy link
Contributor

Also when I integrated your latest changes, the results are different, is that expected?
If you mean the changes in the branch changes_c then it is correct that the results might have changed as some corrections were made in the generation of rules!

@cebarboza cebarboza merged commit a3a1e0b into tests Oct 1, 2024
@cebarboza cebarboza deleted the unary_function_change branch October 1, 2024 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AniekMarkus AniekMarkus Awaiting requested review from AniekMarkus

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

saveData throws NAs in train_data
2 participants
@cebarboza @AniekMarkus