diff --git a/README.md b/README.md index e62325a..e1fa715 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # XLKitLearn -## Version: 11.01 +## Version: 11.02 This repo contains the latest version of [XLKitLearn](https://www.xlkitlearn.com). Please see the website for authorship, license, installation, and usage information - this repo provides information for those interested in seeing the add-in's code and/or contributing to it. diff --git a/docs/index.html b/docs/index.html index 06b8f0c..9abb2f7 100644 --- a/docs/index.html +++ b/docs/index.html @@ -71,7 +71,7 @@

Welcome to XLKitLearn!

-

Latest Version: 11.01

+

Latest Version: 11.02

XLKitLearn was designed to teach machine learning to non-technical students without the distraction of code - it exposes the power of scikit-learn through Excel, and works on PC and Mac computers. This page contains installation instructions - for more background, demos, and pedagogical notes, click on "more info" below.

diff --git a/~VBA Code/frm_file b/~VBA Code/frm_file index 1adf87a..20a909c 100644 --- a/~VBA Code/frm_file +++ b/~VBA Code/frm_file @@ -24,8 +24,8 @@ private sub lst_files_dblclick(byval cancel as msforms.returnboolean) end sub private sub userform_activate() - lst_files.width = me.width - 99 - lst_files.height = me.height - 97 + lst_files.width = me.width - 21.1 + lst_files.height = me.height - 54.1 end sub private sub userform_initialize() diff --git a/~VBA Code/frm_pred b/~VBA Code/frm_pred index 270d419..9f3451b 100644 --- a/~VBA Code/frm_pred +++ b/~VBA Code/frm_pred @@ -571,12 +571,9 @@ public sub validate_parameters_pred() if header_errors.count > 0 then lbl_training_data.width = formula_width_small lbl_training_data.controltiptext = t_bad_headers - lbl_training_data.backcolor = red - lbl_training_errors.backcolor = red lbl_training_errors.visible = true - pred_errors = true end if end if diff --git a/~VBA Code/mdl_dev b/~VBA Code/mdl_dev index 17e3f1c..cd12cba 100644 --- a/~VBA Code/mdl_dev +++ b/~VBA Code/mdl_dev @@ -107,6 +107,9 @@ public sub prepare_for_prod() ' hide the sheets, etc... check_debug_mode + ' select email box + activeworkbook.sheets("add-in").range("f17").select + ' end msgbox "please immediately save and close the workbook", vbinformation end sub \ No newline at end of file diff --git a/~VBA Code/mdl_form_utils b/~VBA Code/mdl_form_utils index a324681..d0fe8bd 100644 --- a/~VBA Code/mdl_form_utils +++ b/~VBA Code/mdl_form_utils @@ -530,6 +530,12 @@ public function validate_formula(formula_text as string) as string this_term = split(formula_parts(j) & " ", "(") this_term = split(this_term(ubound(this_term)), ")")(0) + ' if there is a comma inside the parentheses, assume it's a function with many + ' arguments and only take the first argument + if instr(1, this_term, ",") > 0 then + this_term = split(this_term, ",")(0) + end if + ' if we have interaction terms, split them out this_term = split(this_term, "*")