From 04a003485be572267d6837756c6aaccea3c277f7 Mon Sep 17 00:00:00 2001
From: julie <vpar0302@gmail.com>
Date: Sun, 17 Sep 2017 00:36:50 -0700
Subject: [PATCH] DSSM English README

---
 dssm/README.md  | 9 +++------
 dssm/index.html | 5 +++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dssm/README.md b/dssm/README.md
index 0ce99cab..ab9d4a1b 100644
--- a/dssm/README.md
+++ b/dssm/README.md
@@ -10,11 +10,8 @@ DSSM \[[1](##References)]is a classic semantic model proposed by the Institute o
 
 
 ## Model Architecture
-<<<<<<< HEAD
+
 In the original paper \[[1](#References)] the DSSM model uses the implicit semantic relation between the user search query and the document as metric. The model structure is as follows
-=======
-In the original paper \[[1](#References)]\[[1](#References\] the DSSM model uses the implicit semantic relation between the user search query and the document as metric. The model structure is as follows
->>>>>>> 5b6cd993c4dcd577787a375c0b0be056325cac52
 
 <p align="center">
 <img src="./images/dssm.png"/><br/><br/>
@@ -396,14 +393,14 @@ optional arguments:
                         number of batches to output model, (default: 400)
 ```
 
-重要的参数描述如下
+Parameter description:
 
 - `train_data_path` Training data path
 - `test_data_path`  Test data path, optional
 - `source_dic_path`  Source dictionary path
 - `target_dic_path` 目Target dictionary path
 - `model_type`  The type of loss function of the model: classification 0, sort 1, regression 2
-- `model_arch` Model structure: FC 0， CNN 1, RNN 2
+- `model_arch` Model structure: FC 0，CNN 1, RNN 2
 - `dnn_dims` The dimension of each layer of the model is set, the default is `256,128,64,32`，with 4 layers.
 
 ## To predict using the trained model
diff --git a/dssm/index.html b/dssm/index.html
index c049929b..2231c012 100644
--- a/dssm/index.html
+++ b/dssm/index.html
@@ -52,6 +52,7 @@ DSSM \[[1](##References)]is a classic semantic model proposed by the Institute o
 
 
 ## Model Architecture
+
 In the original paper \[[1](#References)] the DSSM model uses the implicit semantic relation between the user search query and the document as metric. The model structure is as follows
 
 <p align="center">
@@ -434,14 +435,14 @@ optional arguments:
                         number of batches to output model, (default: 400)
 ```
 
-重要的参数描述如下
+Parameter description:
 
 - `train_data_path` Training data path
 - `test_data_path`  Test data path, optional
 - `source_dic_path`  Source dictionary path
 - `target_dic_path` 目Target dictionary path
 - `model_type`  The type of loss function of the model: classification 0, sort 1, regression 2
-- `model_arch` Model structure: FC 0， CNN 1, RNN 2
+- `model_arch` Model structure: FC 0，CNN 1, RNN 2
 - `dnn_dims` The dimension of each layer of the model is set, the default is `256,128,64,32`，with 4 layers.
 
 ## To predict using the trained model
-- 
GitLab