Implemented duplicate method for all functions

Author: sylvainhalle

Source/Charts/src/ca/uqac/lif/spreadsheet/chart/DrawChart.java

@@ -119,6 +119,16 @@ public String toString()
 	{
 		return "Draw " + m_plot;
 	}
+	
+	@Override
+	public DrawChart duplicate(boolean with_state)
+	{
+		DrawChart dp = new DrawChart(m_plot.duplicate());
+		dp.m_format = m_format;
+		dp.m_withTitle = m_withTitle;
+		super.copyInto(dp, with_state);
+		return dp;
+	}
 
 	/**
 	 * A crawler that appends a new part node to each leaf of an explanation

Source/Core/src/ca/uqac/lif/spreadsheet/functions/ApplyFormula.java

@@ -136,7 +136,9 @@ public ApplyFormula(CellFormula ... formulas)
 	public ApplyFormula(int in_arity, List<CellFormula> formulas)
 	{
 		super(in_arity, 1);
-		m_formulas = sort(formulas);
+		List<CellFormula> forms = new ArrayList<CellFormula>(formulas.size());
+		forms.addAll(formulas);
+		m_formulas = sort(forms);
 		m_computedCells = new HashSet<Cell>();
 		for (CellFormula cf : formulas)
 		{
@@ -297,6 +299,14 @@ protected Object[] getValue(Object... inputs) throws InvalidNumberOfArgumentsExc
 		return super.getExplanation(part, factory);
 	}
 
+	@Override
+	public ApplyFormula duplicate(boolean with_state)
+	{
+		ApplyFormula af = new ApplyFormula(getInputArity(), m_formulas);
+		af.m_computedCells.addAll(m_computedCells);
+		return af;
+	}
+	
 	@Override
 	public String toString()
 	{

Source/Core/src/ca/uqac/lif/spreadsheet/functions/BoxStats.java

@@ -189,4 +189,12 @@ protected Object[] getValue(Object ... inputs) throws InvalidNumberOfArgumentsEx
 		}
 		return new Object[] {new_table};
 	}
+	
+	@Override
+	public BoxStats duplicate(boolean with_state)
+	{
+		BoxStats o = new BoxStats();
+		super.copyInto(o, with_state);
+		return o;
+	}
 }

Source/Core/src/ca/uqac/lif/spreadsheet/functions/ColumnSum.java

@@ -67,4 +67,12 @@ protected Object[] getValue(Object... inputs) throws InvalidNumberOfArgumentsExc
 		}
 		return new Object[] {out};
 	}
+	
+	@Override
+	public ColumnSum duplicate(boolean with_state)
+	{
+		ColumnSum cs = new ColumnSum();
+		super.copyInto(cs, with_state);
+		return cs;
+	}
 }

Source/Core/src/ca/uqac/lif/spreadsheet/functions/ExpandAsColumns.java

@@ -226,4 +226,16 @@ public String toString()
 		}
 		return "Expand " + m_headerColumn + " as " + m_valueColumn;
 	}
+	
+	@Override
+	public ExpandAsColumns duplicate(boolean with_state)
+	{
+		ExpandAsColumns eac = new ExpandAsColumns(null, null);
+		eac.m_headerCaption = m_headerCaption;
+		eac.m_headerColumn = m_headerColumn;
+		eac.m_valueCaption = m_valueCaption;
+		eac.m_valueColumn = m_valueColumn;
+		super.copyInto(eac, with_state);
+		return eac;
+	}
 }

Source/Core/src/ca/uqac/lif/spreadsheet/functions/GetFrequencies.java

@@ -18,6 +18,7 @@
 package ca.uqac.lif.spreadsheet.functions;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import ca.uqac.lif.dag.LabelledNode;
@@ -293,6 +294,18 @@ public String toString()
 		return "Get frequencies";
 	}
 
+	@Override
+	public GetFrequencies duplicate(boolean with_state)
+	{
+		GetFrequencies gf = new GetFrequencies(m_minX, m_maxX, m_numBucketsX, m_minY, m_maxY, m_numBucketsY, m_defaultIncrement);
+		super.copyInto(gf, with_state);
+		if (with_state)
+		{
+			gf.m_pairs = Arrays.copyOf(m_pairs, m_pairs.length);
+		}
+		return gf;
+	}
+	
 	/**
 	 * Attempts to extract a pair of numbers from an object.
 	 * @param o The object

Source/Core/src/ca/uqac/lif/spreadsheet/functions/Merge.java

@@ -134,6 +134,20 @@ public Merge excludeFirst()
 	{
 		return (Merge) super.excludeFirst();
 	}
+	
+	@Override
+	public String toString()
+	{
+		return "Merge";
+	}
+	
+	@Override
+	public Merge duplicate(boolean with_state)
+	{
+		Merge m = new Merge(m_keyColumns);
+		super.copyInto(m, with_state);
+		return m;
+	}
 
 	@Override
 	protected Object[] getValue(Object... inputs) throws InvalidNumberOfArgumentsException

Source/Core/src/ca/uqac/lif/spreadsheet/functions/ReadSpreadsheet.java

@@ -98,4 +98,16 @@ public String toString()
 	{
 		return "Read spreadsheet";
 	}
+	
+	@Override
+	public ReadSpreadsheet duplicate(boolean with_state)
+	{
+		ReadSpreadsheet rs = new ReadSpreadsheet();
+		copyInto(rs, with_state);
+		if (with_state)
+		{
+			rs.m_mapping.putAll(m_mapping);
+		}
+		return rs;
+	}
 }

Source/Core/src/ca/uqac/lif/spreadsheet/functions/RenameColumn.java

@@ -61,4 +61,18 @@ protected Object[] getValue(Object... inputs) throws InvalidNumberOfArgumentsExc
 		new_s.set(index, 0, m_to);
 		return new Object[] {new_s};
 	}
+	
+	@Override
+	public String toString()
+	{
+		return "Rename " + m_from + " to " + m_to;
+	}
+	
+	@Override
+	public RenameColumn duplicate(boolean with_state)
+	{
+		RenameColumn r = new RenameColumn(m_from, m_to);
+		super.copyInto(r, with_state);
+		return r;
+	}
 }

Source/Core/src/ca/uqac/lif/spreadsheet/functions/Sort.java

@@ -136,6 +136,22 @@ protected Object[] getValue(Object... inputs) throws InvalidNumberOfArgumentsExc
 		return new Object[] {out};
 	}
 
+	@Override
+	public String toString()
+	{
+		return "Sort";
+	}
+	
+	@Override
+	public Sort duplicate(boolean with_state)
+	{
+		Sort s = new Sort();
+		copyInto(s, with_state);
+		s.m_conditions.addAll(m_conditions);
+		s.m_excludeFirst = m_excludeFirst;
+		return s;
+	}
+	
 	/**
 	 * Specification of a column index to be sorted, associated with the
 	 * direction (ascending or descending) for that sort.