updated 同性关系判断的优化!男性的爱人一定是妻子

This commit is contained in:
mumuy 2016-10-12 17:40:35 +08:00
parent d7313598c1
commit ed9d9d1e1e
5 changed files with 15 additions and 4 deletions

View File

@ -822,7 +822,8 @@
function selector2id(selector,sex){
var result = [];
var hash = {};
if(sex<0){ //如果自己的性别不确定
var sex2 = -1;
if(sex<0){ //如果自己的性别不确定
if(selector.indexOf(',w')==0){
sex = 1;
}else if(selector.indexOf(',h')==0){
@ -832,6 +833,9 @@
if(sex>-1){
selector = ','+sex+selector;
}
if(selector.match(/,[w0],w|,[h1],h/)){ //同志关系去除
return false;
}
var getId = function(selector){
var s='';
if(!hash[selector]){

File diff suppressed because one or more lines are too long

View File

@ -77,7 +77,7 @@
</div>
</div>
<script src="script/common.js"></script>
<script src="dist/relationship.min.js"></script>
<script src="script/relationship.js"></script>
<script>
(function(){
var $type = document.getElementsByName('type');

View File

@ -822,7 +822,8 @@
function selector2id(selector,sex){
var result = [];
var hash = {};
if(sex<0){ //如果自己的性别不确定
var sex2 = -1;
if(sex<0){ //如果自己的性别不确定
if(selector.indexOf(',w')==0){
sex = 1;
}else if(selector.indexOf(',h')==0){
@ -832,6 +833,9 @@
if(sex>-1){
selector = ','+sex+selector;
}
if(selector.match(/,[w0],w|,[h1],h/)){ //同志关系去除
return false;
}
var getId = function(selector){
var s='';
if(!hash[selector]){

View File

@ -5,6 +5,9 @@ var relationship = require('..');
test('relationship.js show to be tested', function (t) {
// TODO
t.deepEqual(relationship({text:'儿子的爸爸的妈妈',sex:1}),['妈妈']);
t.deepEqual(relationship({text:'爱人',sex:1}),['老婆']);
t.deepEqual(relationship({text:'爱人的爱人',sex:1}),['自己']);
t.deepEqual(relationship({text:'老婆的爱人',sex:1}),['自己']);
t.deepEqual(relationship({text:'老婆的老公',sex:1}),['自己']);
t.deepEqual(relationship({text:'老婆的外孙的姥爷',sex:1}),['自己']);
t.deepEqual(relationship({text:'表姐的哥哥',sex:1}),['姑表哥','舅表哥','姨表哥']);