From 85294d233a1cb169074337f40ff7bd5a3f5f043e Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a.beckmann@fz-juelich.de>
Date: Thu, 29 Apr 2021 21:14:53 +0200
Subject: [PATCH] drop unneeded variants

---
 prepare-selection.sh   | 10 ++--------
 slots-reserves-2-5.csv |  2 --
 slots-round1.csv       |  2 --
 slots-round2-1-2.csv   |  2 --
 slots-round2-1-5.csv   |  2 --
 slots-round2-2-5.csv   |  2 --
 6 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 slots-reserves-2-5.csv
 delete mode 100644 slots-round1.csv
 delete mode 100644 slots-round2-1-2.csv
 delete mode 100644 slots-round2-1-5.csv
 delete mode 100644 slots-round2-2-5.csv

diff --git a/prepare-selection.sh b/prepare-selection.sh
index 483446f..5f8ac3c 100755
--- a/prepare-selection.sh
+++ b/prepare-selection.sh
@@ -20,18 +20,12 @@ python3 ../create-evaluation-files.py ../registrations.csv ../reviews.csv ../ass
 cd ..
 mv Selection/students.csv .
 
-perl sohpc-assign.pl slots.csv weights-pref.csv students.csv project-preferences.csv > select-both-by-pref.txt
-#perl sohpc-assign.pl slots-round1.csv weights-pref.csv students.csv project-preferences.csv > select-round1-by-pref.txt
-#sed -n -e '1a\#ID,selected' -e 's/\([0-9\.]\{4,\}\)[: ]\{1,\}\([0-9]\{1,\}\).*/\2,\1/p' select-both-by-pref.txt > assign-1.csv 
-#perl sohpc-assign.pl slots-round2-1-2.csv weights-pref.csv students.csv project-preferences.csv | grep -v .1: > select-round2-by-pref-1-2.txt
-#perl sohpc-assign.pl slots-round2-1-5.csv weights-pref.csv students.csv project-preferences.csv | grep -v .1: > select-round2-by-pref-1-5.txt
-#perl sohpc-assign.pl slots-round2-2-5.csv weights-pref.csv students.csv project-preferences.csv | grep -v .1: > select-round2-by-pref-2-5.txt
-#perl sohpc-assign.pl slots.csv weights-pref.csv  students.csv project-preferences.csv > select-by-pref.txt
+perl sohpc-assign.pl slots.csv weights-pref.csv  students.csv project-preferences.csv > select-by-pref.txt
 #perl sohpc-assign.pl slots.csv weights-score.csv students.csv project-preferences.csv > select-by-score.txt
 
 # apply tentative selections
 if true ; then
-	sed -n -e '1aID,selected' -e 's/\([0-9\.]\{4,\}\)[: ]\{1,\}\([0-9]\{1,\}\).*/-\2,\1/p' select-both-by-pref.txt > assign-t.csv
+	sed -n -e '1aID,selected' -e 's/\([0-9\.]\{4,\}\)[: ]\{1,\}\([0-9]\{1,\}\).*/-\2,\1/p' select-by-pref.txt > assign-t.csv
 	rm -rf Selection
 	mkdir Selection
 	cd Selection
diff --git a/slots-reserves-2-5.csv b/slots-reserves-2-5.csv
deleted file mode 100644
index 56c8dce..0000000
--- a/slots-reserves-2-5.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-defaultslots, 3
-maxslots, 6
diff --git a/slots-round1.csv b/slots-round1.csv
deleted file mode 100644
index a4dc746..0000000
--- a/slots-round1.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-defaultslots, 1
-maxslots, 2
diff --git a/slots-round2-1-2.csv b/slots-round2-1-2.csv
deleted file mode 100644
index 23b65c0..0000000
--- a/slots-round2-1-2.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-defaultslots, 2
-maxslots, 2
diff --git a/slots-round2-1-5.csv b/slots-round2-1-5.csv
deleted file mode 100644
index f30bc62..0000000
--- a/slots-round2-1-5.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-defaultslots, 1
-maxslots, 5
diff --git a/slots-round2-2-5.csv b/slots-round2-2-5.csv
deleted file mode 100644
index d4b912f..0000000
--- a/slots-round2-2-5.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-defaultslots, 2
-maxslots, 5
-- 
GitLab