Merge pull request #149 from promised-ai/bugfix/0.5.0-score

cleaning

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.

README.md

@@ -32,9 +32,9 @@
      </div>
     <div>
         <strong>Installation</strong>: 
-        <a href='#'>Rust</a> | 
-        <a href='#'>Python</a> | 
-        <a href='#'>CLI</a>
+        <a href='#installation'>Rust</a> | 
+        <a href='#installation'>Python</a> | 
+        <a href='#installation'>CLI</a>
      </div>
     <div>
         <strong>Contents</strong>: 
@@ -165,7 +165,7 @@ Lace requires rust.
 
 To install the CLI:
 ```
-$ cargo install --locked lace
+$ cargo install --locked lace-cli
 ```
 
 To install pylace
@@ -275,8 +275,6 @@ You can monitor the progress of the training using diagnostic plots
 
 ## License
 
-Lace is licensed under Server Side Public License (SSPL), which is a copyleft
-license based on AGPL.
+Lace is licensed under the Business Source License v1.1, which restricts commercial use. See `LICENSE` for full details.
 
-If you would like a license for use in closed source code please contact
-`lace@redpoll.ai`
+If you would like a license for use in commercial please contact `lace@redpoll.ai`

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
 

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

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"

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"

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<R: Rng>(
         &mut self,
         row_asgn_alg: RowAssignAlg,
@@ -559,10 +551,9 @@ impl State {
         let mut col_ixs: Vec<usize> = (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::<f64>();
+        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-

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)]

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="[email protected]"},
   { name="Michael Schmidt", email="[email protected]"},