SITS buf fix and improvements #4

rolfsimoes · 2017-08-03T20:37:19Z

In this pull request:

Users and Producers accuracy bug fix -- it removes the rfUtilities dependence and implements its own accuracy algorithms (sits_assessment.R);
Introduces sits_plot_dendrogram() function with color brewer schemes to distinguish between label classes (sits_plot.R);
Introduces new function sits_last_cluster() that returns the last cluster computed object (sits_cluster.R);
Fix sits_cluster() function -- a bug in unsupervised classification;
Improves sits_labels() function by including from_members parameter (sits_table.R);
Change names from "sits_segregation" family of functions to "sits_separability" (sits_separability.R);
Fix calculation of entropy in sits_segregation_measure();
Some parameters documentation;

add centroids samples damien with labels

…sits)

…EFLATE

Assessment function from dtwSat package

…sits_fromWTSS based in `coverage attributes description`. Fix small bugs.

Conflicts: R/sits_WTSS.R

Merge branch 'master' of https://github.com/gilbertocamara/sits Conflicts: R/sits_getdata.R

Merge branch 'master' of https://github.com/gilbertocamara/sits Conflicts: R/sits_getdata.R Merge branch 'master' of https://github.com/gilbertocamara/sits Conflicts: R/sits_getdata.R

…ts_get_data, fixed ensurer, cleaned samples data_set

# Conflicts: # inst/extdata/examples/sits_filtering_comparison.R

# Conflicts: # inst/extdata/examples/sits_filtering_comparison_2.R

# Conflicts: # inst/extdata/examples/sits_filtering_comparison2.R

Merge branch 'master' of https://github.com/gilbertocamara/sits # Conflicts: # R/sits_assessment.R # R/sits_table.R # inst/extdata/examples/sits_patterns_show.R # man/sits_relabel.Rd

* .sits_last_cluster * brewer color set names and valaues Introduces new functions: * sits_last_cluster() Changed sits_segregation.R to sits_separability.R

* Introduces a new function sits_plot_dendrogram() to plot label based colors dendrograms; * Change all "segregation" functions to "separability" functions (including sits_segregation.R --> sits_separability.R)

Conflicts: .Rbuildignore .gitignore DESCRIPTION LICENSE NAMESPACE R/sits_TWDTW.R R/sits_assessment.R R/sits_cluster.R R/sits_filters.R R/sits_getdata.R R/sits_init.R R/sits_patterns.R R/sits_plot.R R/sits_table.R inst/extdata/examples/sits_cerrado_pasture.R inst/extdata/examples/sits_cluster_TWDTW.R inst/extdata/examples/sits_example_TWDTW_2.R inst/extdata/examples/sits_examples_TWDTW_3.R inst/extdata/examples/sits_examples_TWDTW_4.R inst/extdata/examples/sits_fao_validation.R inst/extdata/examples/sits_filtering_comparison2.R inst/extdata/examples/sits_matogrosso_validation.R inst/extdata/examples/sits_pasture_cerrado_patterns.R inst/extdata/examples/sits_prodes_test_1.R inst/extdata/examples/sits_scidb_streaming_example.R inst/extdata/examples/sits_validation_examples.R inst/extdata/patterns/patterns_Damien_Ieda_Rodrigo_17classes_3bands.json inst/extdata/patterns/patterns_MT_18052017.json inst/extdata/patterns/patterns_MatoGrosso_18052017.json inst/extdata/samples/savanna_pasture_samples_2.csv man/sits_accuracy.Rd man/sits_cluster.Rd man/sits_cross_validate.Rd man/sits_labels.Rd man/sits_missing_values.Rd man/sits_patterns.Rd man/sits_patterns_gam.Rd man/sits_plot.Rd man/sits_plot_title.Rd man/sits_test_patterns.Rd sits.Rproj

Conflicts: .gitignore DESCRIPTION NAMESPACE R/sits_init.R

Conflicts: inst/extdata/PosProcessamentoDTW/ProgramasR/Modelagem_classificacao_dados_simulados.R

Add new patterns with 14 signatures and 3 bands generated by Michelle

vwmaus and others added 30 commits March 9, 2017 19:37

Update README.md

8f84363

version 0.3.9c

b4feeff

Merge pull request #5 from luizassis/master

91161f8

add centroids samples damien with labels

Update travis script

9491307

Include assessment from dtwSat package

5f842b1

Remove MacOS from travis

4fd5e60

Replace path of call for samples files with system.file(..., package=…

bcc8224

…sits)

Fix git and Rbuild ignore

3f42e61

Compress tif files using gdal_translate in.tif out.tif -co COMPRESS=D…

5789c10

…EFLATE

clean check as cran

01021c0

Merge branch 'master' into master

41d7c72

Merge pull request #7 from vwmaus/master

c1afae6

Assessment function from dtwSat package

version 0.3.10

075f056

Merge branch 'master' of https://github.com/gilbertocamara/sits

2f27540

version 0.3.13a

44a31f1

Apply scale factor and missing value on data bands retrieved by .…

ad498ca

…sits_fromWTSS based in `coverage attributes description`. Fix small bugs.

version 0.3.13b

2de70b5

version 0.3.13c

a95d450

version 0.3.13d

56fdb28

Merge branch 'master' of https://github.com/gilbertocamara/sits

8526edf

Conflicts: R/sits_WTSS.R

version 0.3.14a

15af279

Git conflict issue

37706b8

Git conflict issues

7bd0730

Merge branch 'master' of https://github.com/gilbertocamara/sits Conflicts: R/sits_getdata.R

version 0.3.14c

b175751

Git conflict issues

5bf4090

Merge branch 'master' of https://github.com/gilbertocamara/sits Conflicts: R/sits_getdata.R Merge branch 'master' of https://github.com/gilbertocamara/sits Conflicts: R/sits_getdata.R

version 0.3.15a - removed missing values from time series, rebuilt si…

a00e767

…ts_get_data, fixed ensurer, cleaned samples data_set

version 0.3.15a - removed missing values from time series, rebuilt si…

1683d4c

…ts_get_data, fixed ensurer, cleaned samples data_set

Merge branch 'master' of https://github.com/gilbertocamara/sits

62e022b

Merge branch 'master' of https://github.com/gilbertocamara/sits

6c23e1d

new data sets for MatoGrosso

2b7eba7

gilbertocamara and others added 28 commits July 25, 2017 13:47

Adjustments in sits_relabel and in the filtering examples

8ef9a73

Adjustments in sits_relabel and in the filtering examples

3e7618a

Merge branch 'master' of https://github.com/gilbertocamara/sits

0e7490e

# Conflicts: # inst/extdata/examples/sits_filtering_comparison.R

Merge branch 'master' of https://github.com/gilbertocamara/sits

2e5bdcc

# Conflicts: # inst/extdata/examples/sits_filtering_comparison_2.R

examples

d83d08c

performance measures for sits_envelope

577f874

new examples for PRODES

10efb40

PRODES examples

a5b13e5

more examples

2391283

Merge branch 'master' of https://github.com/gilbertocamara/sits

1b362d6

# Conflicts: # inst/extdata/examples/sits_filtering_comparison2.R

Upstream Merge

1b64220

Merge branch 'master' of https://github.com/gilbertocamara/sits # Conflicts: # R/sits_assessment.R # R/sits_table.R # inst/extdata/examples/sits_patterns_show.R # man/sits_relabel.Rd

Upstream Merge

ab64261

Merge branch 'master' of https://github.com/gilbertocamara/sits # Conflicts: # R/sits_assessment.R # R/sits_table.R # inst/extdata/examples/sits_patterns_show.R # man/sits_relabel.Rd

Introduces global variable:

e855c77

* .sits_last_cluster * brewer color set names and valaues Introduces new functions: * sits_last_cluster() Changed sits_segregation.R to sits_separability.R

Merge branch 'master' of https://github.com/rolfsimoes/sits

81c6b98

* Fix confusion matrix of sits_accuracy;

42eccc6

* Introduces a new function sits_plot_dendrogram() to plot label based colors dendrograms; * Change all "segregation" functions to "separability" functions (including sits_segregation.R --> sits_separability.R)

Merge branch 'master' of https://github.com/rolfsimoes/sits

63ea1be

Merge branch 'master' of https://github.com/rolfsimoes/sits

85f316a

Merge branch 'master' of https://github.com/rolfsimoes/sits

ec5ae90

Conflicts: .gitignore DESCRIPTION NAMESPACE R/sits_init.R

Fix gitignore

01ad23b

Fix gitignore

407425d

Merge branch 'master' of https://github.com/rolfsimoes/sits

29966d9

Merge branch 'master' of https://github.com/rolfsimoes/sits

d5d2820

Merge branch 'master' of https://github.com/rolfsimoes/sits

4053597

Fix .gitignore

09ddce7

Merge branch 'master' of https://github.com/rolfsimoes/sits

142225d

Conflicts: inst/extdata/PosProcessamentoDTW/ProgramasR/Modelagem_classificacao_dados_simulados.R

Move PosPorcessamento folder to inst/extdata/

90d35ce

gilbertocamara merged commit 06cf625 into e-sensing:master Aug 3, 2017

gilbertocamara added a commit that referenced this pull request Aug 3, 2017

Merge pull request #4 from ammaciel/master

05a57fa

Add new patterns with 14 signatures and 3 bands generated by Michelle

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SITS buf fix and improvements #4

SITS buf fix and improvements #4

rolfsimoes commented Aug 3, 2017

SITS buf fix and improvements #4

SITS buf fix and improvements #4

Conversation

rolfsimoes commented Aug 3, 2017