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

sits_distances_from_data optimization (read the comments!) #22

Merged
merged 20 commits into from
Oct 4, 2017
Merged

sits_distances_from_data optimization (read the comments!) #22

merged 20 commits into from
Oct 4, 2017

Conversation

rolfsimoes
Copy link
Member 

Introduces two new functions:
- sits_distances_from_data2()
- sits_classify2()

The above functions are optimizations of sits_distances_from_data().

These functions were created to overcome an incompatibility between
old sits_distances_from_data function and the new sits_classify.

This solution needs an resolution on such duplicity.

@rolfsimoes
bug fixes in sits_foreach() and sits_distances()
b797696
@rolfsimoes
Merge branch 'master' of https://github.com/rolfsimoes/sits
96313f8
@rolfsimoes
Merge origin master
8fdf21b
@rolfsimoes
Merge branch 'dev'
5286f26
@rolfsimoes
Merge branch 'dev' of https://github.com/rolfsimoes/sits into dev
f0601f0
@rolfsimoes
Merge branch 'dev' of https://github.com/rolfsimoes/sits into dev
0316817
@rolfsimoes
Merge branch 'master' of https://github.com/e-sensing/sits into dev
a263850
@rolfsimoes
Add example PRODES accuracy experiments
8de7b60
@rolfsimoes
Merge branch 'master' of https://github.com/rolfsimoes/sits
e5a43d2 
Conflicts:
	R/sits_table.R
@rolfsimoes
Merge branch 'dev'
057e796 
Conflicts:
	R/sits_TWDTW.R
	R/sits_assessment.R
	R/sits_classification.R
	R/sits_dendrogram.R
	R/sits_export_data.R
	R/sits_gam.R
	R/sits_import.R
	R/sits_machine_learning.R
	R/sits_patterns.R
	R/sits_plot.R
	R/sits_tibble.R
	R/sits_tibble_utils.R
	inst/extdata/examples/plotClassification.R
	inst/extdata/examples/sits_TWDTW_ML_full_embrapa_dataset.R
	inst/extdata/examples/sits_cerrado_pasture_KF.R
	inst/extdata/examples/sits_example_TWDTW.R
	inst/extdata/examples/sits_filtering_comparison.R
	inst/extdata/examples/sits_get_prodes_data.R
	inst/extdata/examples/sits_machine_learning_comparison.R
	inst/extdata/examples/sits_prodes_test_3.R
	inst/extdata/examples/sits_scidb_streaming_example.R
	inst/extdata/results/read_compare_conf_matrix.R
	man/sits_TWDTW_classify.Rd
	man/sits_TWDTW_classify_tibble.Rd
	man/sits_TWDTW_matches_tibble.Rd
	man/sits_accuracy_csv.Rd
	man/sits_conf_fromGZ.Rd
	man/sits_conf_fromJSON.Rd
	man/sits_foreach.Rd
	man/sits_fromCSV.Rd
	man/sits_fromGZ.Rd
	man/sits_fromJSON.Rd
	man/sits_fromSHP.Rd
	man/sits_fromWTSS.Rd
	man/sits_fromZOO.Rd
	man/sits_fromtable.Rd
	man/sits_getdata.Rd
	man/sits_plot.Rd
	man/sits_toGZ.Rd
	man/sits_toJSON.Rd
	man/sits_toXLSX.Rd
	man/sits_toZOO.Rd
	tests/testthat/test_getdata.R
@rolfsimoes
PRODES Machine Learning comparison and results.
648d0a7 
Add accuracy results:
- sits_PRODES_TS_SPRD_accuracy.xlsx
- sits_PRODES_TWDTW_inCLUST_accuracy.xlsx
- sits_PRODES_TWDTW_CLUSTER_accuracy.xlsx
- sits_PRODES_TWDTW_GAM_accuracy.xlsx
@rolfsimoes
Merge branch 'master' of https://github.com/e-sensing/sits into dev
d146fec 
Conflicts:
	R/sits_assessment.R
@rolfsimoes
Merge branch 'master' of https://github.com/e-sensing/sits into dev
38ed25b 
Conflicts:
	inst/extdata/examples/sits_example_TWDTW.R
@rolfsimoes
Merge branch 'master' of https://github.com/e-sensing/sits into dev
42e2f66 
Conflicts:
	R/sits_patterns.R
@rolfsimoes
Merge upstream master
cafdc00
@rolfsimoes
Merge branch 'master' of https://github.com/e-sensing/sits into dev
2d92983
@rolfsimoes
Fix ML function
cc91785
@rolfsimoes
Merge branch 'master' of https://github.com/e-sensing/sits into dev
b99afb8 
Conflicts:
	inst/extdata/examples/sits_prodes_226_064_examples.R
@rolfsimoes
Merge branch 'master' of https://github.com/e-sensing/sits into dev
1578f28
@rolfsimoes
Introduces two new functions:
fbb27b6 
- sits_distances_from_data2()
- sits_classify2()

The above functions are optimizations of sits_distances_from_data().

These functions were created to overcome an incompatibility between
old sits_distances_from_data function and the new sits_classify.

This solution needs an resolution on such duplicity.
@gilbertocamara gilbertocamara merged commit 11ad7bf into e-sensing:master Oct 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@rolfsimoes @gilbertocamara