derlem · onurgu · Jun 22, 2020 · Jul 30, 2020 · Jul 30, 2020 · Jul 30, 2020
diff --git a/.gitmodules b/.gitmodules
diff --git a/.../bertcustom_2020-01-09_02_false_word_freq → .../bertcustom_2020-01-09_02_false_word_freq b/.../bertcustom_2020-01-09_02_false_word_freq → .../bertcustom_2020-01-09_02_false_word_freq
diff --git a/...s/bertcustom_2020-01-09_02_true_word_freq → ...s/bertcustom_2020-01-09_02_true_word_freq b/...s/bertcustom_2020-01-09_02_true_word_freq → ...s/bertcustom_2020-01-09_02_true_word_freq
diff --git a/...sis/bertcustom_2020-01-09_02_type1_errors → ...sis/bertcustom_2020-01-09_02_type1_errors b/...sis/bertcustom_2020-01-09_02_type1_errors → ...sis/bertcustom_2020-01-09_02_type1_errors
diff --git a/...rtcustom_2020-01-09_02_type1_errors_probs → ...rtcustom_2020-01-09_02_type1_errors_probs b/...rtcustom_2020-01-09_02_type1_errors_probs → ...rtcustom_2020-01-09_02_type1_errors_probs
diff --git a/...sis/bertcustom_2020-01-09_02_type2_errors → ...sis/bertcustom_2020-01-09_02_type2_errors b/...sis/bertcustom_2020-01-09_02_type2_errors → ...sis/bertcustom_2020-01-09_02_type2_errors
diff --git a/...rtcustom_2020-01-09_02_type2_errors_probs → ...rtcustom_2020-01-09_02_type2_errors_probs b/...rtcustom_2020-01-09_02_type2_errors_probs → ...rtcustom_2020-01-09_02_type2_errors_probs
diff --git a/error_analysis/scripts/analyze_colocation.py → ...or_analysis/scripts/analyze_colocation.py b/error_analysis/scripts/analyze_colocation.py → ...or_analysis/scripts/analyze_colocation.py
diff --git a/game_data_analysis/Game_Data_Analysis.ipynb → ...me_data_analysis/Game_Data_Analysis.ipynb b/game_data_analysis/Game_Data_Analysis.ipynb → ...me_data_analysis/Game_Data_Analysis.ipynb
diff --git a/perturbation/README.md → analysis/perturbation/README.md b/perturbation/README.md → analysis/perturbation/README.md
diff --git a/perturbation/perturb.py → analysis/perturbation/perturb.py b/perturbation/perturb.py → analysis/perturbation/perturb.py
diff --git a/scripts/conll_sample_creator.py → analysis/scripts/conll_sample_creator.py b/scripts/conll_sample_creator.py → analysis/scripts/conll_sample_creator.py
diff --git a/...tensorflow_checkpoint_to_pytorch_model.sh → ...tensorflow_checkpoint_to_pytorch_model.sh b/...tensorflow_checkpoint_to_pytorch_model.sh → ...tensorflow_checkpoint_to_pytorch_model.sh
diff --git a/scripts/convert_tf_to_pytorch.sh → analysis/scripts/convert_tf_to_pytorch.sh b/scripts/convert_tf_to_pytorch.sh → analysis/scripts/convert_tf_to_pytorch.sh
diff --git a/scripts/create-corpus.sh → analysis/scripts/create-corpus.sh b/scripts/create-corpus.sh → analysis/scripts/create-corpus.sh
diff --git a/scripts/export_data_to_google_sheets.py → ...s/scripts/export_data_to_google_sheets.py b/scripts/export_data_to_google_sheets.py → ...s/scripts/export_data_to_google_sheets.py
diff --git a/scripts/extract_errors.py → analysis/scripts/extract_errors.py b/scripts/extract_errors.py → analysis/scripts/extract_errors.py
diff --git a/scripts/morph-analyze.sh → analysis/scripts/morph-analyze.sh b/scripts/morph-analyze.sh → analysis/scripts/morph-analyze.sh
diff --git a/scripts/sentence_tokenizer.py → analysis/scripts/sentence_tokenizer.py b/scripts/sentence_tokenizer.py → analysis/scripts/sentence_tokenizer.py
diff --git a/test/test_baseline_models.py → analysis/test/test_baseline_models.py b/test/test_baseline_models.py → analysis/test/test_baseline_models.py
diff --git a/bert_pretraining/BERT_PRETRAINING.md → ...ning/bert_pretraining/BERT_PRETRAINING.md b/bert_pretraining/BERT_PRETRAINING.md → ...ning/bert_pretraining/BERT_PRETRAINING.md
diff --git a/bert_pretraining/bert → analysis/training/bert_pretraining/bert b/bert_pretraining/bert → analysis/training/bert_pretraining/bert
diff --git a/...retraining/bert_config_small_turkish.json → ...retraining/bert_config_small_turkish.json b/...retraining/bert_config_small_turkish.json → ...retraining/bert_config_small_turkish.json
diff --git a/bert_pretraining/bert_google → ...sis/training/bert_pretraining/bert_google b/bert_pretraining/bert_google → ...sis/training/bert_pretraining/bert_google
diff --git a/...pretraining/correct_punctiation_errors.sh → ...pretraining/correct_punctiation_errors.sh b/...pretraining/correct_punctiation_errors.sh → ...pretraining/correct_punctiation_errors.sh
diff --git a/bert_pretraining/rename_files.py → ...training/bert_pretraining/rename_files.py b/bert_pretraining/rename_files.py → ...training/bert_pretraining/rename_files.py
diff --git a/...retraining/run_create_pretraining_data.sh → ...retraining/run_create_pretraining_data.sh b/...retraining/run_create_pretraining_data.sh → ...retraining/run_create_pretraining_data.sh
diff --git a/...ing/run_create_pretraining_data_chunks.sh → ...ing/run_create_pretraining_data_chunks.sh b/...ing/run_create_pretraining_data_chunks.sh → ...ing/run_create_pretraining_data_chunks.sh
diff --git a/bert_pretraining/run_extract_features.sh → .../bert_pretraining/run_extract_features.sh b/bert_pretraining/run_extract_features.sh → .../bert_pretraining/run_extract_features.sh
diff --git a/bert_pretraining/run_pretraining.sh → ...ining/bert_pretraining/run_pretraining.sh b/bert_pretraining/run_pretraining.sh → ...ining/bert_pretraining/run_pretraining.sh
diff --git a/..._pretraining/run_sentencepiece_trainer.sh → ..._pretraining/run_sentencepiece_trainer.sh b/..._pretraining/run_sentencepiece_trainer.sh → ..._pretraining/run_sentencepiece_trainer.sh
diff --git a/bert_pretraining/sentence_tokenizer.py → ...ng/bert_pretraining/sentence_tokenizer.py b/bert_pretraining/sentence_tokenizer.py → ...ng/bert_pretraining/sentence_tokenizer.py
diff --git a/bert_pretraining/sentencepiece_trainer.py → ...bert_pretraining/sentencepiece_trainer.py b/bert_pretraining/sentencepiece_trainer.py → ...bert_pretraining/sentencepiece_trainer.py
diff --git a/bert_pretraining/vocab_converter.py → ...ining/bert_pretraining/vocab_converter.py b/bert_pretraining/vocab_converter.py → ...ining/bert_pretraining/vocab_converter.py
diff --git a/flair_training/bak/parameter_optimizer.py → ...flair_training/bak/parameter_optimizer.py b/flair_training/bak/parameter_optimizer.py → ...flair_training/bak/parameter_optimizer.py
diff --git a/flair_training/bak/train_bert.py → ...training/flair_training/bak/train_bert.py b/flair_training/bak/train_bert.py → ...training/flair_training/bak/train_bert.py
diff --git a/flair_training/bak/train_flair.py → ...raining/flair_training/bak/train_flair.py b/flair_training/bak/train_flair.py → ...raining/flair_training/bak/train_flair.py
diff --git a/flair_training/bak/train_flair_gpu.py → ...ing/flair_training/bak/train_flair_gpu.py b/flair_training/bak/train_flair_gpu.py → ...ing/flair_training/bak/train_flair_gpu.py
diff --git a/...convert_embedding_from_glove_to_gensim.py → ...convert_embedding_from_glove_to_gensim.py b/...convert_embedding_from_glove_to_gensim.py → ...convert_embedding_from_glove_to_gensim.py
diff --git a/...vert_embedding_from_word2vec_to_gensim.py → ...vert_embedding_from_word2vec_to_gensim.py b/...vert_embedding_from_word2vec_to_gensim.py → ...vert_embedding_from_word2vec_to_gensim.py
diff --git a/flair_training/convert_vocab.py → .../training/flair_training/convert_vocab.py b/flair_training/convert_vocab.py → .../training/flair_training/convert_vocab.py
diff --git a/flair_training/train.py → analysis/training/flair_training/train.py b/flair_training/train.py → analysis/training/flair_training/train.py
diff --git a/xnlp/__init__.py → analysis/xnlp/__init__.py b/xnlp/__init__.py → analysis/xnlp/__init__.py
diff --git a/xnlp/interpret.py → analysis/xnlp/interpret.py b/xnlp/interpret.py → analysis/xnlp/interpret.py
diff --git a/game_project/game/migrations/0021_auto_20200730_1913.py b/game_project/game/migrations/0021_auto_20200730_1913.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.0.5 on 2020-07-30 19:13
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('game', '0020_auto_20200620_1135'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='activity',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2020, 7, 30, 19, 13, 40, 289601, tzinfo=utc)),
+        ),
+    ]
diff --git a/game_project/game/migrations/0022_auto_20200731_1330.py b/game_project/game/migrations/0022_auto_20200731_1330.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.0.5 on 2020-07-31 13:30
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('game', '0021_auto_20200730_1913'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='activity',
+            name='created_at',
+            field=models.DateTimeField(default=datetime.datetime(2020, 7, 31, 13, 30, 4, 504656, tzinfo=utc)),
+        ),
+    ]
diff --git a/game_project/game/migrations/0023_auto_20200731_1331.py b/game_project/game/migrations/0023_auto_20200731_1331.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.0.5 on 2020-07-31 13:31
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('game', '0022_auto_20200731_1330'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='activity',
+            name='created_at',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]
diff --git a/game_project/game/models.py b/game_project/game/models.py
@@ -24,7 +24,7 @@ class Question(models.Model):
 
 class Activity(models.Model):
 	question = models.ForeignKey(Question, on_delete=models.CASCADE)
-	created_at = models.DateTimeField(default=timezone.now())
+	created_at = models.DateTimeField(default=timezone.now)
 	name = models.CharField(max_length=10) # INDECISIVE, SEPARATE, ADJACENT, SKIP, REPORT
 
 

diff --git a/game_project/game/static/game/main.css b/game_project/game/static/game/main.css
@@ -88,6 +88,16 @@ a.article-title:hover {
   position:relative;
 }
 
+.textdiv textarea {
+    width: 80%;
+    font-size:2vh;
+}
+
+.reportForm button {
+    background-color: #f73106;
+    color: white;
+}
+
 .textbutton{
   background-color: #f73106 ;
   color: white;

diff --git a/game_project/game/templates/game/answer.html b/game_project/game/templates/game/answer.html
@@ -806,15 +806,6 @@ <h1>{{question_idx}}/{{QUESTION_PER_TEST}}:</h1>
             <a class="btn btn-info mb-4" href=" {% url 'question' %} ">Sonraki cümleye geç</a>
         </div>
 
-        <script >
-
-            function showDiv() {
-               document.getElementById('reportDiv').style.display = "block";
-               $("#reportButton").hide()
-            }
-
-        </script>
-
         <br>
         <br>
 

diff --git a/game_project/game/templates/game/base.html b/game_project/game/templates/game/base.html
@@ -27,6 +27,16 @@
 	  gtag('js', new Date());  gtag('config', 'UA-170798910-2');
 	</script>
 
+    <script>
+
+        function showDiv() {
+           document.getElementById('reportDiv').style.display = "block";
+           $("#reportButton").hide()
+        }
+
+    </script>
+
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.4/clipboard.min.js"></script>
 </head>
 <body>
 
@@ -40,7 +50,7 @@
 	      </button>
 	      <div class="collapse navbar-collapse" id="navbarToggle">
 	        <div class="navbar-nav mr-auto">
-	          <a class="nav-item nav-link" href="{% url 'spellchecker_query' %}">-de/-da Yazım Hatası Bulucu</a>
+	          <a class="nav-item nav-link" href="{% url 'spellchecker:query' %}">-de/-da Yazım Hatası Bulucu</a>
 	          <a class="nav-item nav-link" href="{% url 'about' %}">Hakkımızda</a>
 	        </div>
 	        <!-- Navbar Right Side -->
@@ -89,6 +99,9 @@
     <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
-
+
+    <script>
+        var clipboard = new ClipboardJS('#copypaste_btn');
+    </script>
 </body>
 </html>
diff --git a/game_project/game/templates/game/test_end.html b/game_project/game/templates/game/test_end.html
@@ -26,7 +26,7 @@ <h5>"-de/-da" yazım hatalarını tespit eden uygulamayı kendi cümlelerinizle
 
 		<br>
 
-		<a class="btn btn-outline-info" href=" {% url 'spellchecker_query' %} ">Yazım denetleyicisine git.</a>
+		<a class="btn btn-outline-info" href=" {% url 'spellchecker:query' %} ">Yazım denetleyicisine git.</a>
 
 		<br>
 		<br>

diff --git a/game_project/game/templates/game/warmup_answer.html b/game_project/game/templates/game/warmup_answer.html
@@ -806,15 +806,6 @@ <h1>{{question_idx}}/{{QUESTION_PER_TEST}}:</h1>
             <a class="btn btn-info mb-4" href=" {% url 'warmup_question' %} ">Sonraki cümleye geç</a>
         </div>
 
-        <script >
-
-            function showDiv() {
-               document.getElementById('reportDiv').style.display = "block";
-               $("#reportButton").hide()
-            }
-
-        </script>
-
         <br>
         <br>
 

diff --git a/game_project/game/templates/game/welcome.html b/game_project/game/templates/game/welcome.html
@@ -15,7 +15,7 @@ <h2 style="text-align:center" >Hoş Geldiniz</h2>
 
 				Araştırma ekibimiz tarafından Boğaziçi Üniversitesi Bilgisayar Mühendisliği çatısı altında yapay zeka yöntemleri kullanarak "de/da" yazım hatalarını tespit eden bir bilgisayar uygulaması <a href="https://acl-bg.org/proceedings/2019/RANLP%202019/pdf/RANLP009.pdf">geliştirilmişti.</a>  Şimdi ise "de/da" yazım hatalarının doğasını ve geliştirdiğimiz uygulamanın kararlarını daha iyi anlamak amacıyla bir deney yapıyoruz.
 
-				İsterseniz deneyimize katılmadan önce <a href="{% url 'spellchecker_query' %}">"-de/-da Yazım Hatası Bulucu"</a> sayfasında geliştirdiğimiz uygulamayı deneyebilirsiniz.
+				İsterseniz deneyimize katılmadan önce <a href="{% url 'spellchecker:query' %}">"-de/-da Yazım Hatası Bulucu"</a> sayfasında geliştirdiğimiz uygulamayı deneyebilirsiniz.
 
 				Eğer daha önce kayıt olmadıysanız <a href="{% url 'register' %}">kayıt olarak</a> deneye başlayabilir, eğer kayıt olmuşsanız <a href="{% url 'login' %}">giriş yaparak</a> deneye kaldığınız yerden devam edebilirsiniz.     
 

diff --git a/game_project/game_project/settings.py b/game_project/game_project/settings.py
@@ -28,7 +28,7 @@
 SECRET_KEY = config['SECRET_KEY']
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = bool(os.environ["DEBUG"]) if "DEBUG" in os.environ else False
 
 ADMINS = [('Hasan', 'hasan.ozturk2398@hotmail.com'),]
 
@@ -151,4 +151,6 @@
 
 MESSAGE_TAGS = {
     messages.ERROR: 'danger',
-}
+}
+
+DOMAIN_NAME = 'dedatakintisi.derlem.com'
diff --git a/game_project/spellchecker/forms.py b/game_project/spellchecker/forms.py
@@ -3,8 +3,9 @@
 
 class QueryForm(forms.Form):
 	sentence = forms.CharField(max_length=500)
+	is_error_found = forms.BooleanField(required=False)
+	tagged_string = forms.TextInput()
 
 
 class QueryFeedbackForm(forms.Form):
-	#isHappy = forms.BooleanField(required = False)
 	report = forms.CharField(max_length=1000)
diff --git a/game_project/spellchecker/migrations/0005_auto_20200730_1913.py b/game_project/spellchecker/migrations/0005_auto_20200730_1913.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.0.5 on 2020-07-30 19:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('spellchecker', '0004_auto_20200531_0903'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='query',
+            name='tagged_sentence',
+            field=models.TextField(default=''),
+        ),
+        migrations.AlterField(
+            model_name='query',
+            name='sentence',
+            field=models.TextField(default=''),
+        ),
+    ]
diff --git a/game_project/spellchecker/migrations/0006_feedback.py b/game_project/spellchecker/migrations/0006_feedback.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.0.5 on 2020-07-31 13:30
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('spellchecker', '0005_auto_20200730_1913'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Feedback',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('report', models.TextField(null=True)),
+                ('query', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='spellchecker.Query')),
+            ],
+        ),
+    ]
diff --git a/game_project/spellchecker/migrations/0007_auto_20200731_1638.py b/game_project/spellchecker/migrations/0007_auto_20200731_1638.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.0.5 on 2020-07-31 16:38
+
+from django.db import migrations, models
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('spellchecker', '0006_feedback'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='query',
+            name='isHappy',
+        ),
+        migrations.AddField(
+            model_name='query',
+            name='random_id',
+            field=models.UUIDField(db_index=True, default=uuid.uuid4, editable=False),
+        ),
+    ]
diff --git a/game_project/spellchecker/models.py b/game_project/spellchecker/models.py
@@ -1,8 +1,19 @@
+import uuid
+
 from django.db import models
 from django.contrib.auth.models import User
 
+
 class Query(models.Model):
 
-	sentence = models.TextField()
-	isHappy = models.BooleanField( blank=True, null=True)
-	user = models.ForeignKey(User, blank=True, null=True, on_delete=models.CASCADE)
+	sentence = models.TextField(default="")
+	user = models.ForeignKey(User, blank=True, null=True, on_delete=models.CASCADE)
+	tagged_sentence = models.TextField(default="")
+
+	random_id = models.UUIDField(db_index=True, default=uuid.uuid4, editable=False)
+
+
+class Feedback(models.Model):
+
+	query = models.ForeignKey(Query, on_delete=models.DO_NOTHING)
+	report = models.TextField(null=True)
-Original file line number
+Diff line change
@@ Expand Up @@
     		<br>
-    		<a class="btn btn-outline-info" href=" {% url 'spellchecker_query' %} ">Yazım denetleyicisine git.</a>
+    		<a class="btn btn-outline-info" href=" {% url 'spellchecker:query' %} ">Yazım denetleyicisine git.</a>
     		<br>
     		<br>
@@ Expand Down @@