From e691ec1c29d3c35de722a8e1cc8e13487a3ba910 Mon Sep 17 00:00:00 2001 From: Baxter Eaves Date: Tue, 14 Nov 2023 08:51:04 -0600 Subject: [PATCH] cleaning --- LICENSE | 13 +++++++------ README.md | 8 ++++---- book/src/data/basics.md | 2 +- book/src/install.md | 2 +- cli/Cargo.toml | 4 ++-- lace/Cargo.toml | 2 +- lace/lace_cc/src/state.rs | 15 +++------------ lace/src/lib.rs | 2 +- pylace/pyproject.toml | 2 +- 9 files changed, 21 insertions(+), 29 deletions(-) diff --git a/LICENSE b/LICENSE index eb795cab..7fdbf76e 100644 --- a/LICENSE +++ b/LICENSE @@ -21,12 +21,13 @@ offering, or any other offering based on a cloud computing or other type of hosted distribution model (collectively, "Hosted Offerings")), for a fee or otherwise on a commercial or other for-profit basis. -(ii) You may not link the Licensed Work to, or otherwise include the Licensed -Work in or with, any product, application, or service (including in any Hosted -Offering) that is distributed or otherwise offered, whether on a standalone -basis or in combination with other products, applications, or services for a fee -or otherwise on a commercial or other for-profit basis. Condition (ii) shall not -limit the generality of condition (i) above. +(ii) You may not link the Licensed Work or outputs generated by the Licensed +Work to, or otherwise include the Licensed Work in or with, any product, +application, or service (including in any Hosted Offering) that is distributed +or otherwise offered, whether on a standalone basis or in combination with +other products, applications, or services for a fee or otherwise on a +commercial or other for-profit basis. Condition (ii) shall not limit the +generality of condition (i) above. Change Date: Change date is four years from release date. diff --git a/README.md b/README.md index c5b78365..32a12bfd 100644 --- a/README.md +++ b/README.md @@ -32,9 +32,9 @@
Installation: - Rust | - Python | - CLI + Rust | + Python | + CLI
Contents: @@ -165,7 +165,7 @@ Lace requires rust. To install the CLI: ``` -$ cargo install --locked lace +$ cargo install --locked lace-cli ``` To install pylace diff --git a/book/src/data/basics.md b/book/src/data/basics.md index 031c4727..75cc31b8 100644 --- a/book/src/data/basics.md +++ b/book/src/data/basics.md @@ -3,7 +3,7 @@ Compared with many other machine learning tools, lace has very few requirements for data: data columns may be integer, continuous, or categorical string types; empty cells do not not need to be filled in; and the table must contain a -string row index column labeled `ID`. +string row index column labeled `ID` or `Index` (case-insensitive). ## Supported data types for inference diff --git a/book/src/install.md b/book/src/install.md index ed53e916..b3bc0c44 100644 --- a/book/src/install.md +++ b/book/src/install.md @@ -8,7 +8,7 @@ Installation requires rust, which you can get [here](https://www.rust-lang.org/t The lace CLI is installed with rust via the command ```console -$ cargo install --locked lace +$ cargo install --locked lace-cli ``` ## Rust crate diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 79c32471..0ce4865d 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "lace-cli" -version = "0.4.2" +version = "0.5.0" authors = ["Promised AI"] edition = "2021" rust-version = "1.58.1" -license = "SSPL-1.0" +license = "BSL-1.1" homepage = "https://www.lace.dev/" repository = "https://github.com/promised-ai/lace" description = "A probabilistic cross-categorization engine" diff --git a/lace/Cargo.toml b/lace/Cargo.toml index f787aace..41900c76 100644 --- a/lace/Cargo.toml +++ b/lace/Cargo.toml @@ -6,7 +6,7 @@ build = "build.rs" edition = "2021" exclude = ["tests/*", "resources/test/*", "target/*"] rust-version = "1.58.1" -license = "SSPL-1.0" +license = "BSL-1.1" homepage = "https://www.lace.dev/" repository = "https://github.com/promised-ai/lace" description = "A probabilistic cross-categorization engine" diff --git a/lace/lace_cc/src/state.rs b/lace/lace_cc/src/state.rs index c4da34c6..ca571558 100644 --- a/lace/lace_cc/src/state.rs +++ b/lace/lace_cc/src/state.rs @@ -242,14 +242,6 @@ impl State { self.loglike = self.loglike(); } - // fn log_prior(&self) -> f64 { - // self.views.iter().map(|view| { - // view.ftrs.values().map(|ftr| { - - // }) - // }) - // } - fn reassign_rows( &mut self, row_asgn_alg: RowAssignAlg, @@ -559,10 +551,9 @@ impl State { let mut col_ixs: Vec = (0..self.n_cols()).collect(); col_ixs.shuffle(rng); - self.loglike = col_ixs - .drain(..) - .map(|col_ix| self.reassign_col_gibbs(col_ix, draw_alpha, rng)) - .sum::(); + col_ixs.drain(..).for_each(|col_ix| { + self.reassign_col_gibbs(col_ix, draw_alpha, rng); + }) } /// Gibbs column transition where column transition probabilities are pre- diff --git a/lace/src/lib.rs b/lace/src/lib.rs index 2fc78a6a..c4375580 100644 --- a/lace/src/lib.rs +++ b/lace/src/lib.rs @@ -151,7 +151,7 @@ //! # Feature flags //! - `formats`: create `Engine`s and `Codebook`s from IPC, CSV, JSON, and //! Parquet data files -//! - `bencher`: Build benchmarking utilties +//! - `bencher`: Build benchmarking utilities //! - `ctrc_handler`: enables and update handler than captures Ctrl+C //! #![warn(unused_extern_crates)] diff --git a/pylace/pyproject.toml b/pylace/pyproject.toml index 892cd4e2..03225696 100644 --- a/pylace/pyproject.toml +++ b/pylace/pyproject.toml @@ -21,7 +21,7 @@ classifiers = [ "Programming Language :: Rust", "Topic :: Scientific/Engineering", ] -license = { text="SSPL-1.0" } +license = { text="BSL-1.1" } authors = [ { name="Baxter Eaves", email="bax@redpoll.ai"}, { name="Michael Schmidt", email="schmidt@redpoll.ai"},