Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
Merge commit '9bc3ab2960a2117cf9ae469a6332849fd52fe148'

Conflicts:
	R/celery-package.R
	R/kmeans_diagnostics.R
	R/tunable.R
  • Loading branch information
EmilHvitfeldt committed Jul 3, 2022
2 parents 8ea81e8 + 9bc3ab2 commit ba3531b
Show file tree
Hide file tree
Showing 77 changed files with 840 additions and 679 deletions.
2 changes: 1 addition & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
^celery\.Rproj$
^tidyclust\.Rproj$
^\.Rproj\.user$
^isc-proposal.pdf$
^LICENSE\.md$
Expand Down
10 changes: 6 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Package: celery
Package: tidyclust
Title: What the Package Does (One Line, Title Case)
Version: 0.0.0.9000
Authors@R: c(
Expand All @@ -9,14 +9,15 @@ Authors@R: c(
)
Description: What the package does (one paragraph).
License: MIT + file LICENSE
URL: https://github.com/EmilHvitfeldt/celery
BugReports: https://github.com/EmilHvitfeldt/celery/issues
URL: https://github.com/EmilHvitfeldt/tidyclust
BugReports: https://github.com/EmilHvitfeldt/tidyclust/issues
Imports:
cli,
cluster,
ClusterR,
dials,
dplyr,
forcats,
foreach,
generics,
glue,
Expand All @@ -25,6 +26,7 @@ Imports:
parsnip,
prettyunits,
purrr,
RcppHungarian,
rlang,
rsample,
stats,
Expand Down Expand Up @@ -52,4 +54,4 @@ Config/Needs/website: pkgdown, tidymodels, tidyverse, palmerpenguins
Config/testthat/edition: 3
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.0
RoxygenNote: 7.2.0.9000
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License

Copyright (c) 2022 celery authors
Copyright (c) 2022 tidyclust authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
55 changes: 28 additions & 27 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ S3method(predict_cluster,cluster_fit)
S3method(predict_raw,cluster_fit)
S3method(print,cluster_fit)
S3method(print,cluster_spec)
S3method(print,control_celery)
S3method(print,control_tidyclust)
S3method(print,k_means)
S3method(tidy,cluster_fit)
S3method(translate_celery,default)
S3method(translate_celery,k_means)
S3method(translate_tidyclust,default)
S3method(translate_tidyclust,k_means)
S3method(tune_cluster,cluster_spec)
S3method(tune_cluster,default)
S3method(tune_cluster,workflow)
Expand All @@ -35,10 +35,10 @@ export(.convert_x_to_form_new)
export(ClusterR_kmeans_fit)
export(augment)
export(avg_silhouette)
export(check_empty_ellipse_celery)
export(check_model_doesnt_exist_celery)
export(check_model_exists_celery)
export(control_celery)
export(check_empty_ellipse_tidyclust)
export(check_model_doesnt_exist_tidyclust)
export(check_model_exists_tidyclust)
export(control_tidyclust)
export(enrichment)
export(extract_centroids)
export(extract_cluster_assignment)
Expand All @@ -51,17 +51,17 @@ export(fit)
export(fit.cluster_spec)
export(fit_xy)
export(fit_xy.cluster_spec)
export(get_dependency_celery)
export(get_encoding_celery)
export(get_fit_celery)
export(get_from_env_celery)
export(get_model_env_celery)
export(get_pred_type_celery)
export(get_dependency_tidyclust)
export(get_encoding_tidyclust)
export(get_fit_tidyclust)
export(get_from_env_tidyclust)
export(get_model_env_tidyclust)
export(get_pred_type_tidyclust)
export(glance)
export(k)
export(k_means)
export(load_pkgs)
export(make_classes_celery)
export(make_classes_tidyclust)
export(min_grid)
export(new_cluster_spec)
export(predict.cluster_fit)
Expand All @@ -70,25 +70,26 @@ export(predict_cluster.cluster_fit)
export(predict_raw)
export(predict_raw.cluster_fit)
export(prepare_data)
export(reconcile_clusterings)
export(required_pkgs)
export(set_dependency_celery)
export(set_encoding_celery)
export(set_engine_celery)
export(set_env_val_celery)
export(set_fit_celery)
export(set_model_arg_celery)
export(set_model_engine_celery)
export(set_model_mode_celery)
export(set_new_model_celery)
export(set_pred_celery)
export(show_model_info_celery)
export(set_dependency_tidyclust)
export(set_encoding_tidyclust)
export(set_engine_tidyclust)
export(set_env_val_tidyclust)
export(set_fit_tidyclust)
export(set_model_arg_tidyclust)
export(set_model_engine_tidyclust)
export(set_model_mode_tidyclust)
export(set_new_model_tidyclust)
export(set_pred_tidyclust)
export(show_model_info_tidyclust)
export(silhouettes)
export(sse_ratio)
export(tidy)
export(tot_sse)
export(tot_wss)
export(translate_celery)
export(translate_celery.default)
export(translate_tidyclust)
export(translate_tidyclust.default)
export(tune)
export(tune_cluster)
export(within_cluster_sse)
Expand Down
Loading

0 comments on commit ba3531b

Please sign in to comment.