second commit

tiruss · tiruss · commit e5ddb3522fe2 · 2017-11-30T22:27:09.000+09:00
diff --git a/.recommenders/caches/identified-project-coordinates.json b/.recommenders/caches/identified-project-coordinates.json
@@ -1 +1 @@
-[[{"location":"E:\\Programming\\School\\JAVA_Application_Project\\Java_Course_Project\\Statistical_Analysis","type":"PROJECT","hints":{"PROJECT_NAME":"Statistical_Analysis"}},"ABSENT"],[{"location":"C:\\Program Files\\Java\\jre1.8.0_144","type":"JRE","hints":{"EXECUTION_ENVIRONMENT":"JavaSE-1.8"}},"jre:jre:1.8.0"]]
+[[{"location":"C:\\Users\\DongGoo\\Downloads\\jfreechart-1.0.19\\jfreechart-1.0.19\\lib\\jfreechart-1.0.19.jar","type":"JAR","hints":{}},"ABSENT"],[{"location":"C:\\Java_Course_Project\\Statistical_Analysis","type":"PROJECT","hints":{"PROJECT_NAME":"Statistical_Analysis"}},"ABSENT"],[{"location":"C:\\Program Files\\Java\\jre1.8.0_144","type":"JRE","hints":{"EXECUTION_ENVIRONMENT":"JavaSE-1.8"}},"jre:jre:1.8.0"]]
diff --git a/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/segments.gen b/.recommenders/index/http___download_eclipse_org_recommenders_models_oxygen_/segments.gen
diff --git a/Statistical_Analysis/.classpath b/Statistical_Analysis/.classpath
@@ -4,8 +4,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="GUISource"/>
 	<classpathentry kind="src" path="Global_Region"/>
-	<classpathentry kind="lib" path="E:/Programming/School/JAVA_Application_Project/Java_Course_Project/ExternalLib/Apache/commons-math3-3.6.1.jar"/>
-	<classpathentry kind="lib" path="E:/Programming/School/JAVA_Application_Project/Java_Course_Project/ExternalLib/Apache/commons-math3-3.6.1-javadoc.jar"/>
-	<classpathentry kind="lib" path="E:/Programming/School/JAVA_Application_Project/Java_Course_Project/ExternalLib/Apache/commons-math3-3.6.1-sources.jar"/>
+	<classpathentry kind="lib" path="C:/Users/DongGoo/Downloads/jfreechart-1.0.19/jfreechart-1.0.19/lib/jfreechart-1.0.19.jar"/>
+	<classpathentry kind="lib" path="C:/Users/DongGoo/Downloads/jfreechart-1.0.19/jfreechart-1.0.19/lib/jcommon-1.0.23.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Statistical_Analysis/Data/Historical/AAPL.csv b/Statistical_Analysis/Data/Historical/AAPL.csv
@@ -1,6 +1,8 @@
 timestamp,open,high,low,close,adjusted_close,volume,dividend_amount,,
-2017-11-27,175.0500,175.0800,173.3400,174.0900,174.0900,20590163,0.0000,,
-2017-11-24,175.1000,175.5000,174.6500,174.9700,174.9700,14026519,0.0000,,
+2017-11-29,172.6300,172.9200,167.1600,169.4800,169.4800,41456722,0.0000,,
+2017-11-28,174.3000,174.8700,171.8600,173.0700,173.0700,25468442,0.0000,,
+2017-11-27,175.0500,175.0800,173.3400,174.0900,174.0900,20536313,0.0000,,
+2017-11-24,175.1000,175.5000,174.6459,174.9700,174.9700,14026519,0.0000,,
 2017-11-22,173.3600,175.0000,173.0500,174.9600,174.9600,24997274,0.0000,,
 2017-11-21,170.7800,173.7000,170.7800,173.1400,173.1400,24875471,0.0000,,
 2017-11-20,170.2900,170.5600,169.5600,169.9800,169.9800,15974387,0.0000,,
diff --git a/Statistical_Analysis/DataMeta/Availability.csv b/Statistical_Analysis/DataMeta/Availability.csv
@@ -1,7 +1,7 @@
-AAPL,2017-11-28,2000-01-03,
+AAPL,2017-11-30,2000-01-03,
 SFNC,2017-11-26,2000-01-03,
 CPRT,2017-11-26,2000-01-03,
-GOOG,2017-11-27,2014-03-27,
+GOOG,2017-11-28,2014-03-27,
 EDIG,2017-11-26,2000-01-03,
 IRCP,2017-11-26,2003-11-05,
 WAYN,2017-11-26,2000-01-03,
@@ -17,8 +17,8 @@ STX,2017-11-27,2002-12-11,
 XOM,2017-11-27,2000-01-03,
 MARA,2017-11-26,2012-05-04,
 AVGO,2017-11-27,2009-08-06,
-AAPL,2017-11-28,2000-01-03,
-GOOG,2017-11-27,2014-03-27,
+AAPL,2017-11-30,2000-01-03,
+GOOG,2017-11-28,2014-03-27,
 TSLA,2017-11-28,2010-06-29,
 AMZN,2017-11-27,2000-01-03,
 XRT,2017-11-27,2006-06-22,
@@ -29,6 +29,8 @@ XOM,2017-11-27,2000-01-03,
 AVGO,2017-11-27,2009-08-06,
 AAP,2017-11-27,2001-11-29,
 ABC,2017-11-27,2000-01-03,
-AAPL,2017-11-28,2000-01-03,
+AAPL,2017-11-30,2000-01-03,
 TSLA,2017-11-28,2010-06-29,
 GOOG,2017-11-28,2014-03-27,
+AAPL,2017-11-30,2000-01-03,
+AAPL,2017-11-30,2000-01-03,
diff --git a/Statistical_Analysis/GUISource/generalInfoFrame/GeneralInfoFramePanel_LatestData.java b/Statistical_Analysis/GUISource/generalInfoFrame/GeneralInfoFramePanel_LatestData.java
@@ -2,5 +2,5 @@
 import javax.swing.*;
 
 public class GeneralInfoFramePanel_LatestData extends JPanel{
-
+	
 }
diff --git a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java
@@ -1,19 +1,120 @@
 package graphFrame;
 
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Collection;
+import java.util.Collections;
+
 import javax.swing.*;
 
+import org.jfree.chart.*;
+import org.jfree.chart.axis.DateAxis;
+import org.jfree.chart.axis.NumberAxis;
+import org.jfree.chart.axis.Timeline;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.renderer.xy.CandlestickRenderer;
+import org.jfree.data.*;
+import org.jfree.data.category.DefaultCategoryDataset;
+import org.jfree.data.general.DatasetGroup;
+import org.jfree.data.time.TimeSeries;
+import org.jfree.data.xy.DefaultHighLowDataset;
+import org.jfree.data.xy.XYDataset;
+
+import black.Utils;
 import gray.Global;
 import red.Stock;
 
 public class GraphFramePanel_Chart extends JPanel{
-	Stock stock;
+	Stock stock; 
+	
+	String symbol;
+	ArrayList<String> date;
+	ArrayList<Double> high;
+	ArrayList<Double> low;
+	ArrayList<Double> open;
+	ArrayList<Double> adj_close;
+	ArrayList<Double> volume;
+	
+	BorderLayout layout = new BorderLayout();
+	
+	DefaultHighLowDataset data;
+
+	JFreeChart chart;
+	ChartPanel insidepanel;
 	
-	String[] column;
-	String[][] data;
+	Double y_axis_min;
+	Double y_axis_max;
+
 	
 	GraphFramePanel_Chart(){
-		stock_price_graph();
+		renderPanel();
 	}
 	
+	public void renderPanel() {
+		removeAll();
+		setLayout(layout);
+		
+		data  = createDataset();
+		chart = createChart(data);
+		insidepanel = new ChartPanel(chart);
+		add(insidepanel);
+
+		
+		validate();
+		repaint();
+	}
 	
+	public DefaultHighLowDataset createDataset() {
+		stock = new Stock(Global.SYMBOL);
+		
+		symbol = stock.SYMBOL;
+		date = stock.request("DATE", "2017-09-01", "2017-11-01");
+		high = stock.request("HIGH", "2017-09-01", "2017-11-01");
+		low = stock.request("LOW", "2017-09-01", "2017-11-01");
+		open = stock.request("OPEN", "2017-09-01", "2017-11-01");
+		adj_close = stock.request("ADJ_CLOSE", "2017-09-01", "2017-11-01");
+		volume = stock.request("VOLUME", "2017-09-01", "2017-11-01");
+		
+		Date[] date_list = new Date[date.size()];
+		date_list = Utils.StringToDate(date);
+		double[] high_list = new double[high.size()];
+		double[] low_list = new double[low.size()];
+		double[] open_list = new double[open.size()];
+		double[] adj_close_list = new double[adj_close.size()];
+		double[] volume_list = new double[volume.size()];
+		for (int i=0; i<high_list.length; i++) {
+			high_list[i] = high.get(i);
+			low_list[i] = low.get(i);
+			open_list[i] = open.get(i);
+			adj_close_list[i] = adj_close.get(i);
+			volume_list[i] = volume.get(i);
+		}
+		
+		y_axis_min = Collections.min(low);
+		y_axis_max = Collections.max(high);
+		
+		DefaultHighLowDataset data = null;
+		data = new DefaultHighLowDataset(symbol, date_list, high_list, low_list, open_list, adj_close_list, volume_list);
+		
+		return data;
+	}
+
+	private JFreeChart createChart(final DefaultHighLowDataset dataset) {
+		 
+		chart = ChartFactory.createCandlestickChart("History of " + stock.SYMBOL, "Time", "Price", dataset, true);
+		
+		XYPlot plot = chart.getXYPlot();
+		CandlestickRenderer renderer = (CandlestickRenderer) plot.getRenderer();
+		renderer.setAutoWidthMethod(CandlestickRenderer.WIDTHMETHOD_SMALLEST);
+		
+		NumberAxis domain = (NumberAxis) plot.getRangeAxis();
+		domain.setRange(y_axis_min - 1, y_axis_max + 1);
+		
+		return chart;
+	}
 }
diff --git a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Mother.java b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Mother.java
@@ -4,14 +4,23 @@
 
 public class GraphFramePanel_Mother extends JPanel{
 	GraphFramePanel_Chart chart;
+	GraphFramePanel_Search search;
 	
 	GraphFramePanel_Mother() {
+		renderpanel();
+	}
+	
+	public void renderpanel() {
 		setLayout(null);
 		
 		chart = new GraphFramePanel_Chart();
-		chart.setBounds(0,0,200,100);
+		chart.setBounds(0, 0, 800, 500);
+		
+		search = new GraphFramePanel_Search();
+		search.setBounds(820, 20, 200, 50);
 		
 		add(chart);
+		add(search);
 	}
 
 }
diff --git a/Statistical_Analysis/GUISource/graphFrame/GraphFrame_Mother.java b/Statistical_Analysis/GUISource/graphFrame/GraphFrame_Mother.java
@@ -1,12 +1,16 @@
 package graphFrame;
+import java.awt.BorderLayout;
+
 import javax.swing.*;
 
 public class GraphFrame_Mother extends JInternalFrame{
 	GraphFramePanel_Mother motherpanel;
 	
+	BorderLayout layout = new BorderLayout();
 	public GraphFrame_Mother() {
 		super("Stock Data Graph", true, true, true, true);
-		setSize(1100,600);
+		setLayout(layout);
+		setSize(1050,600);
 		setLocation(500,0);
 		
 		motherpanel = new GraphFramePanel_Mother();
diff --git a/Statistical_Analysis/GUISource/white/GUIMain.java b/Statistical_Analysis/GUISource/white/GUIMain.java
@@ -1,7 +1,5 @@
 package white;
 
-import java.awt.Font;
-import java.awt.GraphicsEnvironment;
 
 import gray.Global;
 
diff --git a/Statistical_Analysis/GUISource/white/MotherFrame.java b/Statistical_Analysis/GUISource/white/MotherFrame.java
@@ -27,7 +27,7 @@ public class MotherFrame extends JFrame{
 	
 	JMenuItem menuitem_gate;
 	
-	JMenuItem graphpanelMI1;
+	JMenuItem pricegraph;
 	JMenuItem graphpanelMI2;
 	
 	JMenuItem generalinfoMI1;
@@ -53,6 +53,7 @@ public MotherFrame() {
 	private void createDefaultInternalFrames() {
 		jdpDesktop.add(new GateFrame_Mother());
 		jdpDesktop.add(new GeneralInfoFrame_Mother());
+		jdpDesktop.add(new GraphFrame_Mother());
 	}
 	
 	private void setInternalFramework() {
@@ -66,7 +67,7 @@ private void setMotherFrame() {
 		borderlayout = new BorderLayout();
 		setLayout(borderlayout);
 		setSize(1024, 768);
-		this.setBounds(0, 0, 1600, 900);
+		this.setBounds(0, 0, 1600, 1000);
 		this.setVisible(true);
 	}
 	
@@ -94,7 +95,13 @@ public void actionPerformed(ActionEvent e) {
 		});
 		
 		
-		graphpanelMI1 = new JMenuItem("graphpanelMI1");
+		pricegraph = new JMenuItem("pricegraph");
+		pricegraph.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				System.out.println("Creating Price Graph");
+				jdpDesktop.add(new GraphFrame_Mother());
+			}
+		});
 		graphpanelMI2 = new JMenuItem("graphpanelMI2");
 		
 		generalinfoMI1 = new JMenuItem("General Stock Information");
@@ -112,7 +119,7 @@ public void actionPerformed(ActionEvent e) {
 				
 		mainpanelmothermenu.add(menuitem_gate);
 		
-		graphpanelmothermenu.add(graphpanelMI1);
+		graphpanelmothermenu.add(pricegraph);
 		graphpanelmothermenu.add(graphpanelMI2);
 		
 		generalinfomothermenu.add(generalinfoMI1);
diff --git a/Statistical_Analysis/src/black/DataRetriever.java b/Statistical_Analysis/src/black/DataRetriever.java
@@ -130,9 +130,9 @@ public void retrieve(String SYMBOL) {
 								list.add(tmpList[2]); //High
 								list.add(tmpList[3]); //Low
 								list.add(tmpList[4]); //Close
-								list.add(tmpList[5]); //Volume
-								list.add(tmpList[6]); //Adjusted Close
-								list.add(tmpList[7]); //stock split event
+								list.add(tmpList[5]);
+								list.add(tmpList[6]); 
+								list.add(tmpList[7]);
 								
 								if(u != 0) {
 									Close_M.put(tmpList[0], Double.valueOf(tmpList[4]));
@@ -201,16 +201,15 @@ else if(UpdateControl.CheckValidationData(SYMBOL)) {
 							System.out.println("Bad Data!");
 							break;
 						}
-
-						list.add(tmpList[0]); 
-						list.add(tmpList[1]); 
-						list.add(tmpList[2]); 
-						list.add(tmpList[3]); 
-						list.add(tmpList[4]);
+						
+						list.add(tmpList[0]); //Time
+						list.add(tmpList[1]); //Open
+						list.add(tmpList[2]); //High
+						list.add(tmpList[3]); //Low
+						list.add(tmpList[4]); //Close
 						list.add(tmpList[5]); //Adj Close
 						list.add(tmpList[6]); //Volume
-						list.add(tmpList[7]); //stock split event
-						
+						list.add(tmpList[7]); //Dividend
 						if(u != 0) {
 							Close_M.put(tmpList[0], Double.valueOf(tmpList[4]));
 							Open_M.put(tmpList[0], Double.valueOf(tmpList[1]));
diff --git a/Statistical_Analysis/src/black/Utils.java b/Statistical_Analysis/src/black/Utils.java
@@ -1,6 +1,9 @@
 package black;
 
 import java.util.*;
+
+import javax.swing.text.DateFormatter;
+
 import java.io.*;
 import java.time.*;
 import java.time.format.*;
@@ -196,4 +199,18 @@ public final static String[][] ArrayListToPlain(ArrayList A1, int colsize) {
 		
 		return retList;
 	}
+	
+	public final static Date[] StringToDate(ArrayList A1) {
+		Date[] retarr = new Date[A1.size()];
+		DateFormatter format;
+		
+		for(int i = 0; i < retarr.length; i++) {
+			LocalDate d ;
+			d = LocalDate.parse(A1.get(i).toString());
+			Date date = Date.from(d.atStartOfDay(ZoneId.systemDefault()).toInstant());
+			
+			retarr[i] = date;
+		}
+		return retarr;
+	}
 }
diff --git a/Statistical_Analysis/src/red/Portfolio.java b/Statistical_Analysis/src/red/Portfolio.java
@@ -1,8 +1,6 @@
 package red;
 
 import java.util.*;
-import org.apache.commons.math3.*;
-import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 import black.*;
 import blue.*;
 
diff --git a/Statistical_Analysis/src/red/Stock.java b/Statistical_Analysis/src/red/Stock.java
@@ -50,7 +50,7 @@ public Stock(String SYMBOL) {
 		this.Close = DR.Close;
 		this.Date = DR.Date;
 		this.Open = DR.Open;
-		this.Volume = DR.Open;
+		this.Volume = DR.Volume;
 		this.High = DR.High;
 		this.Low = DR.Low;
 		this.Adj_Close = DR.Adj_Close;

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-[[{"location":"E:\\Programming\\School\\JAVA_Application_Project\\Java_Course_Project\\Statistical_Analysis","type":"PROJECT","hints":{"PROJECT_NAME":"Statistical_Analysis"}},"ABSENT"],[{"location":"C:\\Program Files\\Java\\jre1.8.0_144","type":"JRE","hints":{"EXECUTION_ENVIRONMENT":"JavaSE-1.8"}},"jre:jre:1.8.0"]]`
	`1`	`+[[{"location":"C:\\Users\\DongGoo\\Downloads\\jfreechart-1.0.19\\jfreechart-1.0.19\\lib\\jfreechart-1.0.19.jar","type":"JAR","hints":{}},"ABSENT"],[{"location":"C:\\Java_Course_Project\\Statistical_Analysis","type":"PROJECT","hints":{"PROJECT_NAME":"Statistical_Analysis"}},"ABSENT"],[{"location":"C:\\Program Files\\Java\\jre1.8.0_144","type":"JRE","hints":{"EXECUTION_ENVIRONMENT":"JavaSE-1.8"}},"jre:jre:1.8.0"]]`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`import javax.swing.*;`
`3`	`3`
`4`	`4`	`public class GeneralInfoFramePanel_LatestData extends JPanel{`
`5`		`-`
	`5`	`+`
`6`	`6`	`}`