Merge branch 'master' into master

Hhhhhhand · Jan 13, 2024 · 6df3983 · 6df3983
2 parents 6044fbd + af7d596
commit 6df3983
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/CAT/strategy/__init__.py b/CAT/strategy/__init__.py
@@ -8,3 +8,4 @@
 from .BECAT_strategy import BECATstrategy
 from .BOBCAT_strategy import BOBCAT
 from .NCAT_strategy import NCATs
+
diff --git a/README.md b/README.md
@@ -8,6 +8,7 @@ Computerized Adaptive Testing Package, including the following models and strate
   * Bounded Ability Estimation Adaptive Testing (BECAT) strategy 
   * Bilevel Optimization-Based Computerized Adaptive Testing (BOBCAT) strategy 
   * Neural Computerized Adaptive Testing (NCAT) strategy 
+
 * Multidimensional Item Response Theory (MIRT)
   * D-Optimality (D-opt) strategy
   * Multivariate Kullback-Leibler Information (MKLI) strategy

diff --git a/scripts/test.ipynb b/scripts/test.ipynb
@@ -234,6 +234,7 @@
     "for strategy in strategies:\n",
     "    avg =[]\n",
     "    model = CAT.model.IRTModel(**config)\n",
+    "    model = CAT.model.NCDModel(**config)\n",
     "    model.init_model(test_data)\n",
     "    if strategy.name == 'BOBCAT':\n",
     "        model.adaptest_load_BOBCAT(ckpt_path,bobcat_policy_path)\n",
@@ -277,12 +278,14 @@
     "                tmp[selected_questions[sid]] = real[sid][selected_questions[sid]]\n",
     "                S_sel[sid].append(tmp)\n",
     "        elif it == 1 and strategy.name == 'BECAT Strategy':\n",
+    "        if it == 1 and strategy.name == 'BECAT Strategy':\n",
     "            for sid in range(test_data.num_students):\n",
     "                untested_questions = np.array(list(test_data.untested[sid]))\n",
     "                random_index = random.randint(0, len(untested_questions)-1)\n",
     "                selected_questions[sid] = untested_questions[random_index]\n",
     "                S_sel[sid].append(untested_questions[random_index])\n",
     "        elif strategy.name == 'BECAT Strategy': \n",
+    "        elif strategy.name == 'BECAT Strategy':     \n",
     "            selected_questions = strategy.adaptest_select(model, test_data,S_sel)\n",
     "            for sid in range(test_data.num_students):\n",
     "                S_sel[sid].append(selected_questions[sid])\n",
@@ -291,6 +294,9 @@
     "        \n",
     "        for student, question in selected_questions.items():\n",
     "            test_data.apply_selection(student, question)       \n",
+    "        for student, question in selected_questions.items():\n",
+    "            test_data.apply_selection(student, question)\n",
+    "        \n",
     "        # update models\n",
     "        model.adaptest_update(test_data)\n",
     "        # evaluate models\n",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,4 @@
		from .BECAT_strategy import BECATstrategy
		from .BOBCAT_strategy import BOBCAT
		from .NCAT_strategy import NCATs