skrutable 2.5.2__tar.gz → 2.5.4__tar.gz

{skrutable-2.5.2 → skrutable-2.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skrutable
-Version: 2.5.2
+Version: 2.5.4
 Summary: skrutable library for working with Sanskrit text
 Home-page: https://github.com/tylergneill/skrutable
 Author: Tyler Neill

skrutable-2.5.4/src/skrutable/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.5.4"

{skrutable-2.5.2 → skrutable-2.5.4}/src/skrutable/meter_identification.py

@@ -59,9 +59,10 @@ def flush_profiling_report(write_file=False):
 		return
 	import sys, os
 	scan_keys = ('scan_clean', 'scan_translit', 'scan_syllabify', 'scan_weights', 'scan_morae_gana')
-	type_keys = ('anuzwuB', 'samavftta', 'upajAti', 'vizamavftta', 'jAti')
+	type_keys = ('anuzwuB', 'samavftta_etc', 'samavftta', 'upajAti', 'ardhasamavftta', 'vizamavftta', 'jAti')
 	type_abbrev = {
-		'anuzwuB': 'anuṣṭ', 'samavftta': 'samav', 'upajAti': 'upajāti', 'vizamavftta': 'vizama', 'jAti': 'jāti',
+		'anuzwuB': 'anuṣṭ', 'samavftta_etc': 'vftta↑', 'samavftta': 'samav', 'upajAti': 'upajāti',
+		'ardhasamavftta': 'ardha', 'vizamavftta': 'vizama', 'jAti': 'jāti',
 	}
 	scan_abbrev = {'scan_clean': 'clean', 'scan_translit': 'transl', 'scan_syllabify': 'syl', 'scan_weights': 'wts', 'scan_morae_gana': 'mor+g'}
 	cat_order = ['anuṣṭubh', 'samavṛtta', 'upajāti', 'ardhasamavṛtta', 'viṣamavṛtta', 'jāti', 'na kiṃcid adhyavasitam']
@@ -914,7 +915,7 @@ class VerseTester(object):
 			 and wbp_lens.count(11) != 4 # bc triṣṭubh upajāti so common
 			 ):
 			# will give id_score == 8
-			self.evaluate_ardhasamavftta(Vrs)
+			timed('ardhasamavftta')(self.evaluate_ardhasamavftta)(Vrs)
 			# max score not necessarily yet reached, don't return
 
 		# test perfect single pāda of samavṛtta
@@ -1297,7 +1298,12 @@ class VerseTester(object):
 			return 1
 
 		# samavftta, upajAti, vizamavftta, ardhasamavftta
-		success_samavftta_etc = self.test_as_samavftta_etc(Vrs)
+		_inner_keys = ('samavftta', 'upajAti', 'ardhasamavftta', 'vizamavftta')
+		_pre_inner = {k: _section_totals.get(k, 0.0) for k in _inner_keys} if _DEBUG_TIMING else None
+		success_samavftta_etc = timed('samavftta_etc')(self.test_as_samavftta_etc)(Vrs)
+		if _DEBUG_TIMING:
+			inner_delta = sum(_section_totals.get(k, 0.0) - _pre_inner[k] for k in _inner_keys)
+			_section_totals['samavftta_etc'] -= inner_delta
 		if success_samavftta_etc and Vrs.identification_score >= 8:
 			return 1
 		# i.e., if upajāti or anything imperfect, also continue on to check jāti
@@ -1480,7 +1486,7 @@ class MeterIdentifier(object):
 
 		if _DEBUG_TIMING:
 			_pre_keys = ('scan_clean', 'scan_translit', 'scan_syllabify', 'scan_weights', 'scan_morae_gana',
-				'anuzwuB', 'samavftta', 'upajAti', 'vizamavftta', 'jAti')
+				'anuzwuB', 'samavftta', 'upajAti', 'ardhasamavftta', 'vizamavftta', 'jAti', 'samavftta_etc')
 			_pre = {k: _section_totals.get(k, 0.0) for k in _pre_keys}
 
 		# gets back mostly populated Verse object
@@ -1568,7 +1574,7 @@ class MeterIdentifier(object):
 
 		if _DEBUG_TIMING:
 			all_keys = ('scan_clean', 'scan_translit', 'scan_syllabify', 'scan_weights', 'scan_morae_gana',
-				'anuzwuB', 'samavftta', 'upajAti', 'vizamavftta', 'jAti')
+				'anuzwuB', 'samavftta', 'upajAti', 'ardhasamavftta', 'vizamavftta', 'jAti', 'samavftta_etc')
 			verse_times = {k: _section_totals.get(k, 0.0) - _pre[k] for k in all_keys}
 			verse_times['scan'] = sum(verse_times[k] for k in ('scan_clean', 'scan_translit', 'scan_syllabify', 'scan_weights', 'scan_morae_gana'))
 			cat = _meter_label_to_category(V.meter_label)

{skrutable-2.5.2 → skrutable-2.5.4}/src/skrutable.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skrutable
-Version: 2.5.2
+Version: 2.5.4
 Summary: skrutable library for working with Sanskrit text
 Home-page: https://github.com/tylergneill/skrutable
 Author: Tyler Neill

skrutable-2.5.2/src/skrutable/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.5.2"