Browse Source

修改xx年的问题

zfrr 2 months ago
parent
commit
21a3a7be99

+ 1 - 1
.idea/insertMysql.iml

@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="VAE" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.9 (BJKG)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

+ 1 - 1
.idea/misc.xml

@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.9" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="VAE" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (BJKG)" project-jdk-type="Python SDK" />
 </project>

BIN
final/ByRules/__pycache__/util.cpython-39.pyc


+ 1 - 1
final/ByRules/similarity.py

@@ -32,7 +32,7 @@ for key, sentences in template_dict.items():
         templates.append(s)
         key_map.append(key)
 
-query = "2024年12月交易电量是多少?"
+query = "2023年累计省间交易电量是多少??"
 
 vectorizer = TfidfVectorizer(tokenizer=jieba_tokenizer)
 tfidf_matrix = vectorizer.fit_transform([query] + templates)

+ 4 - 1
final/ByRules/similarity_answer_json.py

@@ -241,6 +241,9 @@ def classify_by_time_type(query, time_info):
     if 'year' in time and 'month' in time:
         return ['2']  # 某年某月交易电量
 
+    # 情况 3:仅 year,全年
+    if 'year' in time and 'month' not in time:
+        return ['1','8.1','8.2','8.3','8.4','9.1','9.2','9.3','9.4','9.5','9.6','9.7','9.8','9.9','9.10','9.11','9.12','9.13','9.14','9.15','9.16','9.17']  # 某年全年累计交易电量
 def match_template_with_time_filter(query, template_dict, tokenizer, extract_time_location_func):
     """
     先基于时间信息筛选候选模板,再进行TF-IDF匹配。
@@ -463,7 +466,7 @@ def find_key_recursively(data, target_key):
     return results
 # query = "当月省间交易完成的交易是多少?"
 # query = "2024年1月到2月累计交易电量是多少?"
-query = "2024年12月交易电量是多少?"
+query = "2023年累计省间交易电量是多少??"
 # query = "但同样阿贾克斯大口径的话我可合金外壳设计文件突然发?"
 json_folder = "templatesJson"