Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 0 additions & 50 deletions src/main/java/coordinates/Controller.java

This file was deleted.

41 changes: 0 additions & 41 deletions src/main/java/coordinates/CoordinatesServes.java

This file was deleted.

24 changes: 22 additions & 2 deletions src/main/java/coordinates/MainController.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,31 @@
package coordinates;

import coordinates.domain.Point;
import coordinates.util.MainControllerUtil;
import coordinates.view.InputView;
import coordinates.view.ResultView;
import org.slf4j.Logger;

import java.util.List;

import static org.slf4j.LoggerFactory.getLogger;

public class MainController {
private static final int ZERO = 0;
private static final Logger log = getLogger(MainController.class);

private static CoordinatesServes coordinatesServes = new CoordinatesServes();
private static MainControllerUtil mainControllerUtil = new MainControllerUtil();

public static void main(String[] args) {
coordinatesServes.main();
String inputPoint = InputView.pointInput();
List<Integer> axiss = mainControllerUtil.axisNum();
List<Integer> reversalAxis = mainControllerUtil.reversalAxisNum();
List<Point> points = mainControllerUtil.objectCoordinates(inputPoint);

ResultView.graphWidthLin(points, reversalAxis, axiss);
System.out.print(String.format("%3d", ZERO));
ResultView.height(axiss);

ResultView.mathLine(mainControllerUtil.getMathPoint(mainControllerUtil.objectLine(points)));
}
}
30 changes: 0 additions & 30 deletions src/main/java/coordinates/ResultView.java

This file was deleted.

15 changes: 15 additions & 0 deletions src/main/java/coordinates/domain/Line.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package coordinates.domain;

public class Line {
private Point point;
private Point distinctPoint;

public Line(Point point, Point distinctPoint){
this.point = point;
this.distinctPoint = distinctPoint;
}

public double mathPoint(){
return point.getMath(distinctPoint);
}
}
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
package coordinates;
package coordinates.domain;

public class Coordinates {
public class Point {

private int x;
private int y;

public int getX() {
return x;
public Point(int x, int y){
this.x = x;
this.y = y;
}

public void setX(int x) {
this.x = x;
public int getX() {
return x;
}

public int getY() {
return y;
}

public void setY(int y) {
this.y = y;
public double getMath(Point point){
return Math.sqrt(Math.pow(Math.abs(point.getX()-x),2)+Math.pow(Math.abs(point.getY()-y),2));
}

@Override
public String toString() {
return "Coordinates{" +
return "Point{" +
"x=" + x +
", y=" + y +
'}';
}

}
58 changes: 58 additions & 0 deletions src/main/java/coordinates/util/MainControllerUtil.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package coordinates.util;

import coordinates.domain.Line;
import coordinates.domain.Point;
import org.slf4j.Logger;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import static org.slf4j.LoggerFactory.getLogger;

public class MainControllerUtil {
private static final int ZERO = 0;
private static final int ONE = 1;
private static final int TWO = 2;

private static final Logger log = getLogger(MainControllerUtil.class);

public List<Integer> axisNum() {
//List 1~24까지 숫자 넣기
List<Integer> axis = new ArrayList<>();
for (int i = 1; i <= 24; i++) {
axis.add(i);
}
return axis;
}

public List<Integer> reversalAxisNum() {
//List에 1~24를 24~1로 자리수 변환하기
List<Integer> reversalAxis = axisNum();
Collections.reverse(reversalAxis);

return reversalAxis;
}

public List<Integer> inputNumber(String input) {
//Scnner 입력값 객체 상속 받아 List로 변환
return SplitUtil.changeNum(input);
}

public List<Point> objectCoordinates(String input) {
//point 객체 생성
List<Point> coordinates = new ArrayList<>();
for (int i = 0; i < inputNumber(input).size(); i = i + TWO) {
coordinates.add(new Point(inputNumber(input).get(i), inputNumber(input).get(i + ONE)));
}
return coordinates;
}

public Line objectLine(List<Point> points) {
return new Line(points.get(ZERO), points.get(ONE));
}

public double getMathPoint(Line line) {
return line.mathPoint();
}
}
26 changes: 26 additions & 0 deletions src/main/java/coordinates/util/SplitUtil.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package coordinates.util;

import java.util.ArrayList;
import java.util.List;

public class SplitUtil {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

메소드가 인스턴스 변수에 접근하지 않으면 굳이 인스턴스 메소드로 구현할 필요 없음
클래스 메소드로 구현한다.


private static String input(String input){
input = input.replace("(", "").replace(")","").replace("-",",");
return input;
}

private static String[] splitNum(String input){
String[] split = input(input).split(",");
return split;
}

public static List<Integer> changeNum(String input){
List<Integer> pointNum = new ArrayList<>();

for (String number : splitNum(input)){
pointNum.add(Integer.parseInt(number));
}
return pointNum;
}
}
13 changes: 13 additions & 0 deletions src/main/java/coordinates/view/InputView.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package coordinates.view;

import java.util.Scanner;

public class InputView {

private static Scanner s = new Scanner(System.in);

public static String pointInput(){
System.out.println("좌표를 입력하세요.");
return s.next();
}
}
68 changes: 68 additions & 0 deletions src/main/java/coordinates/view/ResultView.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package coordinates.view;

import coordinates.domain.Point;

import java.util.List;

public class ResultView {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

메소드가 인스턴스 변수에 접근하지 않으면 굳이 인스턴스 메소드로 구현할 필요 없음
클래스 메소드로 구현한다.


private static final String STICK = "|";
private static final String HORIZONTAL = " ̄";
private static final String POINT = "ㆍ";

public static void graphWidthLin(List<Point> points, List<Integer> reversalAxis, List<Integer> axis) {
for (int i = 0; i < 24; i++) {
System.out.print(String.format("%2d", reversalAxis.get(i)));
System.out.print(STICK);

twoLine(points, reversalAxis.get(i), axis);

System.out.println();
}
}

private static void twoLine(List<Point> points, int reversalAxis, List<Integer> axis) {
for (int k = 0; k < 2; k++) {
if (points.get(k).getY() == reversalAxis) {
oneLine(points.get(k), axis);
}
}
}

private static void oneLine(Point points, List<Integer> axis) {
for (int j = 0; j < 24; j++) {
String blankNum = " ";
if (points.getX() == axis.get(j)) {
blankNum = POINT;
}
System.out.print(blankNum);
}
}

public static void graphHeightLine(int axis, boolean blank) {
String input = "";
if (blank == true) {
input = String.valueOf(axis);
System.out.print(HORIZONTAL);
System.out.print(HORIZONTAL);
System.out.print(input);
}
}

public static void height(List<Integer> axiss) {
for (int i = 0; i < axiss.size(); i++) {
int axis = axiss.get(i);
graphHeightLine(axis, blankCondition(axiss.get(i)));
}
System.out.println();
}

public static boolean blankCondition(int axis) {
//1~24까지의 %2는 true
return axis % 2 == 0;
}

public static void mathLine(double line) {
System.out.println("두 점의 길이는 : " + line);
}
}
Loading