From 3884d7354dc758edab398e638c16d01f76463358 Mon Sep 17 00:00:00 2001 From: DongGoo Kang Date: Wed, 29 Nov 2017 12:56:23 +0900 Subject: [PATCH 1/7] first commit --- .../graphFrame/GraphFramePanel_Chart.java | 19 +++++++++++++++++++ .../graphFrame/GraphFramePanel_Mother.java | 17 +++++++++++++++++ .../graphFrame/GraphFrame_Mother.java | 16 ++++++++++++++-- 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java create mode 100644 Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Mother.java diff --git a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java new file mode 100644 index 0000000..b2bfd97 --- /dev/null +++ b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java @@ -0,0 +1,19 @@ +package graphFrame; + +import javax.swing.*; + +import gray.Global; +import red.Stock; + +public class GraphFramePanel_Chart extends JPanel{ + Stock stock; + + String[] column; + String[][] data; + + GraphFramePanel_Chart(){ + stock_price_graph(); + } + + +} diff --git a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Mother.java b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Mother.java new file mode 100644 index 0000000..c7ccf7d --- /dev/null +++ b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Mother.java @@ -0,0 +1,17 @@ +package graphFrame; + +import javax.swing.*; + +public class GraphFramePanel_Mother extends JPanel{ + GraphFramePanel_Chart chart; + + GraphFramePanel_Mother() { + setLayout(null); + + chart = new GraphFramePanel_Chart(); + chart.setBounds(0,0,200,100); + + add(chart); + } + +} diff --git a/Statistical_Analysis/GUISource/graphFrame/GraphFrame_Mother.java b/Statistical_Analysis/GUISource/graphFrame/GraphFrame_Mother.java index 5169180..6818999 100644 --- a/Statistical_Analysis/GUISource/graphFrame/GraphFrame_Mother.java +++ b/Statistical_Analysis/GUISource/graphFrame/GraphFrame_Mother.java @@ -1,5 +1,17 @@ package graphFrame; +import javax.swing.*; -public class GraphFrame_Mother { - +public class GraphFrame_Mother extends JInternalFrame{ + GraphFramePanel_Mother motherpanel; + + public GraphFrame_Mother() { + super("Stock Data Graph", true, true, true, true); + setSize(1100,600); + setLocation(500,0); + + motherpanel = new GraphFramePanel_Mother(); + add(motherpanel); + + setVisible(true); + } } From e5ddb3522fe273d7036d88c689b90acc6b2fda59 Mon Sep 17 00:00:00 2001 From: DongGoo Kang Date: Thu, 30 Nov 2017 22:26:56 +0900 Subject: [PATCH 2/7] second commit --- .../identified-project-coordinates.json | 2 +- .../segments.gen | Bin 20 -> 20 bytes Statistical_Analysis/.classpath | 5 +- Statistical_Analysis/Data/Historical/AAPL.csv | 6 +- .../DataMeta/Availability.csv | 12 +- .../GeneralInfoFramePanel_LatestData.java | 2 +- .../graphFrame/GraphFramePanel_Chart.java | 109 +++++++++++++++++- .../graphFrame/GraphFramePanel_Mother.java | 11 +- .../graphFrame/GraphFrame_Mother.java | 6 +- .../GUISource/white/GUIMain.java | 2 - .../GUISource/white/MotherFrame.java | 15 ++- .../src/black/DataRetriever.java | 21 ++-- Statistical_Analysis/src/black/Utils.java | 17 +++ Statistical_Analysis/src/red/Portfolio.java | 2 - Statistical_Analysis/src/red/Stock.java | 2 +- 15 files changed, 174 insertions(+), 38 deletions(-) diff --git a/.recommenders/caches/identified-project-coordinates.json b/.recommenders/caches/identified-project-coordinates.json index d2d0c5f..c263107 100644 --- 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"]] \ No newline at end of file +[[{"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"]] \ No newline at end of file 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 index beab6bdaf0970643be488a7a47ff54c033a76906..f142fa92b471a7c02d273c463b4395b5e21a01a6 100644 GIT binary patch literal 20 QcmezW|NlP*2w;KH07>Bl1ONa4 literal 20 QcmezW|NlP*2#|--07~x!IsgCw diff --git a/Statistical_Analysis/.classpath b/Statistical_Analysis/.classpath index eb6eb6d..0980236 100644 --- a/Statistical_Analysis/.classpath +++ b/Statistical_Analysis/.classpath @@ -4,8 +4,7 @@ - - - + + diff --git a/Statistical_Analysis/Data/Historical/AAPL.csv b/Statistical_Analysis/Data/Historical/AAPL.csv index b48cda6..1653efc 100644 --- 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 index a19ba15..4c62c75 100644 --- 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 index d8a0dba..4a0513a 100644 --- 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 index b2bfd97..9b66b83 100644 --- 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 date; + ArrayList high; + ArrayList low; + ArrayList open; + ArrayList adj_close; + ArrayList 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 Date: Fri, 1 Dec 2017 17:34:01 +0900 Subject: [PATCH 3/7] fucking refresh --- .../identified-project-coordinates.json | 2 +- .../segments.gen | Bin 20 -> 20 bytes Statistical_Analysis/Data/Historical/AAPL.csv | 1 + .../DataMeta/Availability.csv | 11 ++-- .../graphFrame/GraphFramePanel_Chart.java | 62 +++++++++++++----- 5 files changed, 52 insertions(+), 24 deletions(-) diff --git a/.recommenders/caches/identified-project-coordinates.json b/.recommenders/caches/identified-project-coordinates.json index c263107..bcc9612 100644 --- a/.recommenders/caches/identified-project-coordinates.json +++ b/.recommenders/caches/identified-project-coordinates.json @@ -1 +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"]] \ No newline at end of file +[[{"location":"C:\\Program Files\\Java\\jre1.8.0_144","type":"JRE","hints":{"EXECUTION_ENVIRONMENT":"JavaSE-1.8"}},"jre:jre:1.8.0"],[{"location":"C:\\Java_Course_Project\\Statistical_Analysis","type":"PROJECT","hints":{"PROJECT_NAME":"Statistical_Analysis"}},"ABSENT"]] \ No newline at end of file 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 index f142fa92b471a7c02d273c463b4395b5e21a01a6..fc08b1456bc49e2b9643b959a5b3b20957ce6a47 100644 GIT binary patch literal 20 QcmezW|NlP*2w;QJ07>-(2mk;8 literal 20 QcmezW|NlP*2w;KH07>Bl1ONa4 diff --git a/Statistical_Analysis/Data/Historical/AAPL.csv b/Statistical_Analysis/Data/Historical/AAPL.csv index 1653efc..a8a1507 100644 --- a/Statistical_Analysis/Data/Historical/AAPL.csv +++ b/Statistical_Analysis/Data/Historical/AAPL.csv @@ -1,4 +1,5 @@ timestamp,open,high,low,close,adjusted_close,volume,dividend_amount,, +2017-11-30,170.4300,172.1400,168.4400,171.8500,171.8500,41484363,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,, diff --git a/Statistical_Analysis/DataMeta/Availability.csv b/Statistical_Analysis/DataMeta/Availability.csv index 4c62c75..2198274 100644 --- a/Statistical_Analysis/DataMeta/Availability.csv +++ b/Statistical_Analysis/DataMeta/Availability.csv @@ -1,4 +1,4 @@ -AAPL,2017-11-30,2000-01-03, +AAPL,2017-12-01,2000-01-03, SFNC,2017-11-26,2000-01-03, CPRT,2017-11-26,2000-01-03, GOOG,2017-11-28,2014-03-27, @@ -17,7 +17,7 @@ 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-30,2000-01-03, +AAPL,2017-12-01,2000-01-03, GOOG,2017-11-28,2014-03-27, TSLA,2017-11-28,2010-06-29, AMZN,2017-11-27,2000-01-03, @@ -29,8 +29,9 @@ 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-30,2000-01-03, +AAPL,2017-12-01,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, +AAPL,2017-12-01,2000-01-03, +AAPL,2017-12-01,2000-01-03, +AAPL,2017-12-01,2000-01-03, diff --git a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java index 9b66b83..77d1642 100644 --- a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java +++ b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java @@ -30,6 +30,9 @@ import red.Stock; public class GraphFramePanel_Chart extends JPanel{ + + GraphFramePanel_Search search = new GraphFramePanel_Search(); + Stock stock; String symbol; @@ -44,41 +47,63 @@ public class GraphFramePanel_Chart extends JPanel{ DefaultHighLowDataset data; + JFreeChart chart; - ChartPanel insidepanel; + ChartPanel chartPanel; + Double y_axis_min; Double y_axis_max; + public String start_init = "2016-01-01"; + public String end_init = "2017-11-01"; + GraphFramePanel_Chart(){ - renderPanel(); + renderPanel(start_init, end_init); } - public void renderPanel() { + public void renderPanel(String start, String end) { + + removeAll(); - setLayout(layout); + revalidate(); - data = createDataset(); + data = createDataset(start, end); chart = createChart(data); - insidepanel = new ChartPanel(chart); - add(insidepanel); - + chartPanel = new ChartPanel(chart); - validate(); + setLayout(layout); + add(chartPanel); + repaint(); } - public DefaultHighLowDataset createDataset() { + /*public void refreshPanel() { + removeAll(); + revalidate(); + + data = createDataset(search.start, search.end); + chart = createChart(data); + chartPanel = new ChartPanel(chart); + + setLayout(layout); + add(chartPanel); + + repaint(); + } + */ + @SuppressWarnings("unchecked") + public DefaultHighLowDataset createDataset(String start, String end) { 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 = stock.request("DATE", start, end); + high = stock.request("HIGH", start, end); + low = stock.request("LOW", start, end); + open = stock.request("OPEN", start, end); + adj_close = stock.request("ADJ_CLOSE", start, end); + volume = stock.request("VOLUME", start, end); Date[] date_list = new Date[date.size()]; date_list = Utils.StringToDate(date); @@ -104,8 +129,8 @@ public DefaultHighLowDataset createDataset() { return data; } - private JFreeChart createChart(final DefaultHighLowDataset dataset) { - + public JFreeChart createChart(DefaultHighLowDataset dataset) { + chart = ChartFactory.createCandlestickChart("History of " + stock.SYMBOL, "Time", "Price", dataset, true); XYPlot plot = chart.getXYPlot(); @@ -117,4 +142,5 @@ private JFreeChart createChart(final DefaultHighLowDataset dataset) { return chart; } + } From c5073902f0e2c8adf2bbaf5abed347dc5424e753 Mon Sep 17 00:00:00 2001 From: DongGoo Kang Date: Fri, 1 Dec 2017 17:41:00 +0900 Subject: [PATCH 4/7] Add files via upload --- .../graphFrame/GraphFramePanel_Search.java | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Search.java diff --git a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Search.java b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Search.java new file mode 100644 index 0000000..03d1977 --- /dev/null +++ b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Search.java @@ -0,0 +1,69 @@ +package graphFrame; + +import java.awt.*; +import java.awt.event.*; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +import javax.swing.*; + +import org.jfree.chart.ChartPanel; +import org.jfree.chart.JFreeChart; +import org.jfree.data.xy.DefaultHighLowDataset; + +public class GraphFramePanel_Search extends JPanel{ + JLabel start_search = new JLabel("Start Date : "); + JLabel end_search = new JLabel(" End Date : "); + JLabel blank = new JLabel(""); + JTextField start_date = new JTextField(); + JTextField end_date = new JTextField(); + JButton button = new JButton("Search!"); + + String start; + String end; + + GraphFramePanel_Chart refresh; + + GridLayout layout = new GridLayout(); + + + GraphFramePanel_Search() { + Search(); + } + + private void Search() { + layout.setColumns(2); + layout.setRows(3); + setLayout(layout); + + + add(start_search); add(start_date); + add(end_search); add(end_date); + add(blank); add(button); + + ButtonListener listener = new ButtonListener(); + + button.addActionListener(listener); + + } + + private class ButtonListener implements ActionListener { + + + public void actionPerformed(ActionEvent e) { + if(e.getSource() == button || e.getSource() == start_date || e.getSource() == end_date) { + refresh = new GraphFramePanel_Chart(); + + start = start_date.getText(); + end = end_date.getText(); + + //LocalDate begin = LocalDate.parse(start, DateTimeFormatter.ISO_DATE); //Correct + //LocalDate fin = LocalDate.parse(end, DateTimeFormatter.ISO_DATE); + refresh.renderPanel(start, end); + System.out.println(start); + System.out.println(end); + } + } + } + +} From 5b5af721b62ff4bb7669ea7e2e0914808fc2c791 Mon Sep 17 00:00:00 2001 From: DongGoo Kang Date: Fri, 1 Dec 2017 18:24:45 +0900 Subject: [PATCH 5/7] third commit --- .../segments.gen | Bin 20 -> 20 bytes .../graphFrame/GraphFramePanel_Chart.java | 46 ++++---------- .../graphFrame/GraphFramePanel_Mother.java | 30 ++++++++- .../graphFrame/GraphFramePanel_Search.java | 58 ++++++++++++++++++ .../graphFrame/GraphFrame_Mother.java | 2 +- .../Global_Region/gray/Global.java | 4 ++ 6 files changed, 103 insertions(+), 37 deletions(-) create mode 100644 Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Search.java 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 index fc08b1456bc49e2b9643b959a5b3b20957ce6a47..ae67acc2c5924dab767e15c5265ff24ef4f4a1ef 100644 GIT binary patch literal 20 QcmezW|NlP*2w;cN07?G@3IG5A literal 20 QcmezW|NlP*2w;QJ07>-(2mk;8 diff --git a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java index 77d1642..a1db755 100644 --- a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java +++ b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Chart.java @@ -30,9 +30,6 @@ import red.Stock; public class GraphFramePanel_Chart extends JPanel{ - - GraphFramePanel_Search search = new GraphFramePanel_Search(); - Stock stock; String symbol; @@ -55,55 +52,36 @@ public class GraphFramePanel_Chart extends JPanel{ Double y_axis_min; Double y_axis_max; - - public String start_init = "2016-01-01"; - public String end_init = "2017-11-01"; - GraphFramePanel_Chart(){ - renderPanel(start_init, end_init); + renderPanel(); } - public void renderPanel(String start, String end) { - - + public void renderPanel() { removeAll(); - revalidate(); - - data = createDataset(start, end); - chart = createChart(data); - chartPanel = new ChartPanel(chart); setLayout(layout); - add(chartPanel); - - repaint(); - } - - /*public void refreshPanel() { - removeAll(); - revalidate(); - data = createDataset(search.start, search.end); + data = createDataset(); chart = createChart(data); chartPanel = new ChartPanel(chart); - setLayout(layout); add(chartPanel); + validate(); repaint(); } - */ + @SuppressWarnings("unchecked") - public DefaultHighLowDataset createDataset(String start, String end) { + public DefaultHighLowDataset createDataset() { stock = new Stock(Global.SYMBOL); symbol = stock.SYMBOL; - date = stock.request("DATE", start, end); - high = stock.request("HIGH", start, end); - low = stock.request("LOW", start, end); - open = stock.request("OPEN", start, end); - adj_close = stock.request("ADJ_CLOSE", start, end); - volume = stock.request("VOLUME", start, end); + date = stock.request("DATE", Global.GraphStart, Global.GraphEnd); + high = stock.request("HIGH", Global.GraphStart, Global.GraphEnd); + low = stock.request("LOW", Global.GraphStart, Global.GraphEnd); + open = stock.request("OPEN", Global.GraphStart, Global.GraphEnd); + adj_close = stock.request("ADJ_CLOSE", Global.GraphStart, Global.GraphEnd); + volume = stock.request("VOLUME", Global.GraphStart, Global.GraphEnd); Date[] date_list = new Date[date.size()]; date_list = Utils.StringToDate(date); diff --git a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Mother.java b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Mother.java index 83f4a54..c59b68b 100644 --- a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Mother.java +++ b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Mother.java @@ -1,7 +1,12 @@ package graphFrame; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + import javax.swing.*; +import gray.Global; + public class GraphFramePanel_Mother extends JPanel{ GraphFramePanel_Chart chart; GraphFramePanel_Search search; @@ -10,7 +15,11 @@ public class GraphFramePanel_Mother extends JPanel{ renderpanel(); } + + public void renderpanel() { + removeAll(); + setLayout(null); chart = new GraphFramePanel_Chart(); @@ -19,8 +28,25 @@ public void renderpanel() { search = new GraphFramePanel_Search(); search.setBounds(820, 20, 200, 50); + ActionControl(); + add(chart); add(search); + + validate(); + repaint(); } - -} + + public void ActionControl() { + search.button.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + chart = new GraphFramePanel_Chart(); + + Global.GraphStart = search.start_date.getText(); + Global.GraphEnd = search.end_date.getText(); + + renderpanel(); //Must render this very panel again. + } + }); + } +} \ No newline at end of file diff --git a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Search.java b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Search.java new file mode 100644 index 0000000..cc43de0 --- /dev/null +++ b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Search.java @@ -0,0 +1,58 @@ +package graphFrame; + +import java.awt.*; +import java.awt.event.*; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +import javax.swing.*; + +import org.jfree.chart.ChartPanel; +import org.jfree.chart.JFreeChart; +import org.jfree.data.xy.DefaultHighLowDataset; + +public class GraphFramePanel_Search extends JPanel{ + JLabel start_search = new JLabel("Start Date : "); + JLabel end_search = new JLabel(" End Date : "); + JLabel blank = new JLabel(""); + JTextField start_date = new JTextField(); + JTextField end_date = new JTextField(); + JButton button = new JButton("Search!"); + + String start; + String end; + + GraphFramePanel_Chart refresh; + + GridLayout layout = new GridLayout(); + + + GraphFramePanel_Search() { + renderPanel(); + } + + private void renderPanel() { + removeAll(); + + layout.setColumns(2); + layout.setRows(3); + setLayout(layout); + + start_search = new JLabel("Start Date : "); + end_search = new JLabel(" End Date : "); + blank = new JLabel(""); + start_date = new JTextField(); + end_date = new JTextField(); + button = new JButton("Search!"); + + + add(start_search); add(start_date); + add(end_search); add(end_date); + add(blank); add(button); + + + validate(); + repaint(); + + } +} diff --git a/Statistical_Analysis/GUISource/graphFrame/GraphFrame_Mother.java b/Statistical_Analysis/GUISource/graphFrame/GraphFrame_Mother.java index 356fe1f..2b34eb5 100644 --- a/Statistical_Analysis/GUISource/graphFrame/GraphFrame_Mother.java +++ b/Statistical_Analysis/GUISource/graphFrame/GraphFrame_Mother.java @@ -3,7 +3,7 @@ import javax.swing.*; -public class GraphFrame_Mother extends JInternalFrame{ +public class GraphFrame_Mother extends JInternalFrame { GraphFramePanel_Mother motherpanel; BorderLayout layout = new BorderLayout(); diff --git a/Statistical_Analysis/Global_Region/gray/Global.java b/Statistical_Analysis/Global_Region/gray/Global.java index 3e1cf4e..a3c9b5e 100644 --- a/Statistical_Analysis/Global_Region/gray/Global.java +++ b/Statistical_Analysis/Global_Region/gray/Global.java @@ -5,6 +5,10 @@ public class Global { public static String SYMBOL = "AAPL"; public static MotherFrame motherframe; + public static String GraphStart = "2016-01-01"; + public static String GraphEnd = "2017-10-01"; + + public static String Graph_SYMBOL = "AAPL"; public Global() { } From 0190f7134b72b768909412dd26208052799d3d59 Mon Sep 17 00:00:00 2001 From: DongGoo Kang Date: Fri, 1 Dec 2017 18:33:38 +0900 Subject: [PATCH 6/7] aa --- .recommenders/caches/identified-project-coordinates.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.recommenders/caches/identified-project-coordinates.json b/.recommenders/caches/identified-project-coordinates.json index bcc9612..19fa72d 100644 --- a/.recommenders/caches/identified-project-coordinates.json +++ b/.recommenders/caches/identified-project-coordinates.json @@ -1 +1 @@ -[[{"location":"C:\\Program Files\\Java\\jre1.8.0_144","type":"JRE","hints":{"EXECUTION_ENVIRONMENT":"JavaSE-1.8"}},"jre:jre:1.8.0"],[{"location":"C:\\Java_Course_Project\\Statistical_Analysis","type":"PROJECT","hints":{"PROJECT_NAME":"Statistical_Analysis"}},"ABSENT"]] \ No newline at end of file +[[{"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:\\Program Files\\Java\\jre1.8.0_144","type":"JRE","hints":{"EXECUTION_ENVIRONMENT":"JavaSE-1.8"}},"jre:jre:1.8.0"],[{"location":"C:\\Java_Course_Project\\Statistical_Analysis","type":"PROJECT","hints":{"PROJECT_NAME":"Statistical_Analysis"}},"ABSENT"]] \ No newline at end of file From 450653b25f713c2ff32187223831af2ace9e56d1 Mon Sep 17 00:00:00 2001 From: DongGoo Kang Date: Sat, 2 Dec 2017 16:48:00 +0900 Subject: [PATCH 7/7] test commit --- Statistical_Analysis/Data/Historical/AAPL.csv | 1 + Statistical_Analysis/DataMeta/Availability.csv | 13 +++++++------ .../graphFrame/GraphFramePanel_Search.java | 8 ++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Statistical_Analysis/Data/Historical/AAPL.csv b/Statistical_Analysis/Data/Historical/AAPL.csv index a8a1507..439528c 100644 --- a/Statistical_Analysis/Data/Historical/AAPL.csv +++ b/Statistical_Analysis/Data/Historical/AAPL.csv @@ -1,4 +1,5 @@ timestamp,open,high,low,close,adjusted_close,volume,dividend_amount,, +2017-12-01,169.9500,171.6700,168.5000,171.0500,171.0500,39590080,0.0000,, 2017-11-30,170.4300,172.1400,168.4400,171.8500,171.8500,41484363,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,, diff --git a/Statistical_Analysis/DataMeta/Availability.csv b/Statistical_Analysis/DataMeta/Availability.csv index 2198274..b21c825 100644 --- a/Statistical_Analysis/DataMeta/Availability.csv +++ b/Statistical_Analysis/DataMeta/Availability.csv @@ -1,4 +1,4 @@ -AAPL,2017-12-01,2000-01-03, +AAPL,2017-12-02,2000-01-03, SFNC,2017-11-26,2000-01-03, CPRT,2017-11-26,2000-01-03, GOOG,2017-11-28,2014-03-27, @@ -17,7 +17,7 @@ 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-12-01,2000-01-03, +AAPL,2017-12-02,2000-01-03, GOOG,2017-11-28,2014-03-27, TSLA,2017-11-28,2010-06-29, AMZN,2017-11-27,2000-01-03, @@ -29,9 +29,10 @@ 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-12-01,2000-01-03, +AAPL,2017-12-02,2000-01-03, TSLA,2017-11-28,2010-06-29, GOOG,2017-11-28,2014-03-27, -AAPL,2017-12-01,2000-01-03, -AAPL,2017-12-01,2000-01-03, -AAPL,2017-12-01,2000-01-03, +AAPL,2017-12-02,2000-01-03, +AAPL,2017-12-02,2000-01-03, +AAPL,2017-12-02,2000-01-03, +AAPL,2017-12-02,2000-01-03, diff --git a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Search.java b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Search.java index cc43de0..2206a37 100644 --- a/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Search.java +++ b/Statistical_Analysis/GUISource/graphFrame/GraphFramePanel_Search.java @@ -12,12 +12,12 @@ import org.jfree.data.xy.DefaultHighLowDataset; public class GraphFramePanel_Search extends JPanel{ - JLabel start_search = new JLabel("Start Date : "); - JLabel end_search = new JLabel(" End Date : "); - JLabel blank = new JLabel(""); + JLabel start_search = new JLabel(); + JLabel end_search = new JLabel(); + JLabel blank = new JLabel(); JTextField start_date = new JTextField(); JTextField end_date = new JTextField(); - JButton button = new JButton("Search!"); + JButton button = new JButton(); String start; String end;