-
Notifications
You must be signed in to change notification settings - Fork 110
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #103 from zinggAI/0.3.1
0.3.1
- Loading branch information
Showing
11 changed files
with
716 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| package zingg; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Scanner; | ||
|
|
||
| import org.apache.commons.logging.Log; | ||
| import org.apache.commons.logging.LogFactory; | ||
| import org.apache.spark.sql.Column; | ||
| import org.apache.spark.sql.Dataset; | ||
| import org.apache.spark.sql.Row; | ||
| import org.apache.spark.sql.SaveMode; | ||
|
|
||
| import zingg.client.ZinggClientException; | ||
| import zingg.client.ZinggOptions; | ||
| import zingg.client.pipe.Pipe; | ||
| import zingg.client.util.ColName; | ||
| import zingg.client.util.ColValues; | ||
| import zingg.util.DSUtil; | ||
| import zingg.util.LabelMatchType; | ||
| import zingg.util.PipeUtil; | ||
|
|
||
| public class LabelUpdater extends Labeller { | ||
| protected static String name = "zingg.LabelUpdater"; | ||
| public static final Log LOG = LogFactory.getLog(LabelUpdater.class); | ||
|
|
||
| public LabelUpdater() { | ||
| setZinggOptions(ZinggOptions.UPDATE_LABEL); | ||
| } | ||
|
|
||
| public void execute() throws ZinggClientException { | ||
| try { | ||
| LOG.info("Reading inputs for updateLabelling phase ..."); | ||
| Dataset<Row> markedRecords = PipeUtil.read(spark, false, false, PipeUtil.getTrainingDataMarkedPipe(args)); | ||
| processRecordsCli(markedRecords); | ||
| LOG.info("Finished updataLabelling phase"); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| throw new ZinggClientException(e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| public void processRecordsCli(Dataset<Row> lines) throws ZinggClientException { | ||
| LOG.info("Processing Records for CLI updateLabelling"); | ||
| getMarkedRecordsStat(lines); | ||
| printMarkedRecordsStat(); | ||
| if (lines == null || lines.count() == 0) { | ||
| LOG.info("There is no marked record for updating. Please run findTrainingData/label jobs to generate training data."); | ||
| return; | ||
| } | ||
|
|
||
| List<Column> displayCols = DSUtil.getFieldDefColumns(lines, args, false); | ||
| try { | ||
| int matchFlag; | ||
| Dataset<Row> updatedRecords = null; | ||
| Dataset<Row> recordsToUpdate = lines; | ||
| int selectedOption = -1; | ||
| String postMsg; | ||
|
|
||
| Scanner sc = new Scanner(System.in); | ||
| do { | ||
| System.out.print("\n\tPlease enter the cluster id (or 9 to exit): "); | ||
| String cluster_id = sc.next(); | ||
| if (cluster_id.equals("9")) { | ||
| LOG.info("User has exit in the middle. Updating the records."); | ||
| break; | ||
| } | ||
| Dataset<Row> currentPair = lines.filter(lines.col(ColName.CLUSTER_COLUMN).equalTo(cluster_id)); | ||
| if (currentPair.isEmpty()) { | ||
| System.out.println("\tInvalid cluster id. Enter '9' to exit"); | ||
| continue; | ||
| } | ||
|
|
||
| matchFlag = currentPair.head().getAs(ColName.MATCH_FLAG_COL); | ||
| String preMsg = String.format("\n\tThe record pairs belonging to the input cluster id %s are:", cluster_id); | ||
| String matchType = LabelMatchType.get(matchFlag).msg; | ||
| postMsg = String.format("\tThe above pair is labeled as %s\n", matchType); | ||
| selectedOption = displayRecordsAndGetUserInput(DSUtil.select(currentPair, displayCols), preMsg, postMsg); | ||
| updateLabellerStat(selectedOption, +1); | ||
| updateLabellerStat(matchFlag, -1); | ||
| printMarkedRecordsStat(); | ||
| if (selectedOption == 9) { | ||
| LOG.info("User has quit in the middle. Updating the records."); | ||
| break; | ||
| } | ||
| recordsToUpdate = recordsToUpdate | ||
| .filter(recordsToUpdate.col(ColName.CLUSTER_COLUMN).notEqual(cluster_id)); | ||
| if (updatedRecords != null) { | ||
| updatedRecords = updatedRecords | ||
| .filter(updatedRecords.col(ColName.CLUSTER_COLUMN).notEqual(cluster_id)); | ||
| } | ||
| updatedRecords = updateRecords(selectedOption, currentPair, updatedRecords); | ||
| } while (selectedOption != 9); | ||
|
|
||
| if (updatedRecords != null) { | ||
| updatedRecords = updatedRecords.union(recordsToUpdate); | ||
| } | ||
| writeLabelledOutput(updatedRecords); | ||
| sc.close(); | ||
| LOG.info("Processing finished."); | ||
| } catch (Exception e) { | ||
| if (LOG.isDebugEnabled()) { | ||
| e.printStackTrace(); | ||
| } | ||
| LOG.warn("An error has occured while Updating Label. " + e.getMessage()); | ||
| throw new ZinggClientException(e.getMessage()); | ||
| } | ||
| return; | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
| protected Pipe getOutputPipe() { | ||
| Pipe p = PipeUtil.getTrainingDataMarkedPipe(args); | ||
| p.setMode(SaveMode.Overwrite); | ||
| return p; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.