added auto.th and auto.delta options

karchjd · Oct 7, 2024 · c50cace · c50cace
1 parent f781f4f
commit c50cace
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 52 deletions.
diff --git a/frontend/src/MenuTop/AddMenu.svelte b/frontend/src/MenuTop/AddMenu.svelte
@@ -29,6 +29,14 @@
       name: "Treat Exogenous Observed Variables as Fixed Variables",
       modelProperty: "fixed_x",
     },
+    {
+      name: "Include Freely Estimated Thresholds for Ordered Variables in the Model",
+      modelProperty: "auto.th",
+    },
+    {
+      name: "Include Freely Estimated Response Scaling Parameters for Ordered Variables in the Model",
+      modelProperty: "auto.delta",
+    },
   ];
 
   const name = "Automatically..";
@@ -42,12 +50,6 @@
 </script>
 
 <Dropdown {name}>
-  {#each menuItems as item}
-    <CheckItem
-      bind:name={item.name}
-      bind:checked={$modelOptions[item.modelProperty]}
-    />
-  {/each}
   <li class="dropdown-submenu">
     <a tabindex="-1" href={"#"}>Add Means?</a>
     <ul class="dropdown-menu">
@@ -70,6 +72,12 @@
     bind:checked={$modelOptions.intLvFree}
     bind:disable={disabledInts}
   />
+  {#each menuItems as item}
+    <CheckItem
+      bind:name={item.name}
+      bind:checked={$modelOptions[item.modelProperty]}
+    />
+  {/each}
 </Dropdown>
 
 <style>

diff --git a/frontend/src/Shiny/toR.js b/frontend/src/Shiny/toR.js
@@ -358,7 +358,8 @@ function produceLavaanOptions(ordered_labels) {
 \t\t auto.cov.lv.x = ${boolToString(
     modelOpt.auto_cov_lv_x
   )}, auto.cov.y = ${boolToString(modelOpt.auto_cov_y)},
-  \t\t fixed.x = ${boolToString(modelOpt.fixed_x)}`;
+  \t\t fixed.x = ${boolToString(modelOpt.fixed_x)}, auto.th = ${boolToString(modelOpt["auto.th"])}, 
+  \t\t auto.delta = ${boolToString(modelOpt["auto.delta"])}`;
   if (modelOpt.se == "boot") {
     const additional = `, bootstrap = ${modelOpt.n_boot})`;
     options = options + additional;
@@ -368,7 +369,8 @@ function produceLavaanOptions(ordered_labels) {
 
   if (ordered_labels.length > 0) {
     const ordered_arg = 'c("' + ordered_labels.join('", "') + '")'
-    options = `ordered = ${ordered_arg}, ${options}`
+    options = `ordered = ${ordered_arg}, 
+    \t\t ${options}`
   }
   return options;
 }

diff --git a/frontend/src/stores.js b/frontend/src/stores.js
@@ -19,6 +19,8 @@ export let modelOptions = writable({
   auto_cov_y: true,
   fixed_x: true,
   mode: "user model",
+  "auto.th": true,
+  "auto.delta": true,
 });
 
 export let gridViewOptions = writable({

diff --git a/inst/www/assets/index-53e5964a.js b/inst/www/assets/index-53e5964a.js
diff --git a/inst/www/assets/index-c381e0bd.js b/inst/www/assets/index-c381e0bd.js
diff --git a/inst/www/index.html b/inst/www/index.html
@@ -51,7 +51,7 @@
   </style>
 
   </script>
-  <script type="module" crossorigin src="./assets/index-c381e0bd.js"></script>
+  <script type="module" crossorigin src="./assets/index-53e5964a.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/svelte-fdfc2579.js">
   <link rel="modulepreload" crossorigin href="./assets/core-js-bbf708ea.js">
   <link rel="modulepreload" crossorigin href="./assets/lodash-6eb5ace2.js">